diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3018ebf68746..7dc14a61cbae 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -97,9 +97,9 @@ /pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 # Perl -/pkgs/development/interpreters/perl @volth @stigtsp -/pkgs/top-level/perl-packages.nix @volth @stigtsp -/pkgs/development/perl-modules @volth @stigtsp +/pkgs/development/interpreters/perl @volth @stigtsp @zakame +/pkgs/top-level/perl-packages.nix @volth @stigtsp @zakame +/pkgs/development/perl-modules @volth @stigtsp @zakame # R /pkgs/applications/science/math/R @jbedo @bcdarwin diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 2b7c35f68d3b..775a7a1a6429 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -158,7 +158,23 @@ This can be overridden. By default, Agda sources are files ending on `.agda`, or literate Agda files ending on `.lagda`, `.lagda.tex`, `.lagda.org`, `.lagda.md`, `.lagda.rst`. The list of recognised Agda source extensions can be extended by setting the `extraExtensions` config variable. -## Adding Agda packages to Nixpkgs {#adding-agda-packages-to-nixpkgs} +## Maintaining the Agda package set on Nixpkgs {#maintaining-the-agda-package-set-on-nixpkgs} + +We are aiming at providing all common Agda libraries as packages on `nixpkgs`, +and keeping them up to date. +Contributions and maintenance help is always appreciated, +but the maintenance effort is typically low since the Agda ecosystem is quite small. + +The `nixpkgs` Agda package set tries to take up a role similar to that of [Stackage](https://www.stackage.org/) in the Haskell world. +It is a curated set of libraries that: + +1. Always work together. +2. Are as up-to-date as possible. + +While the Haskell ecosystem is huge, and Stackage is highly automatised, +the Agda package set is small and can (still) be maintained by hand. + +### Adding Agda packages to Nixpkgs {#adding-agda-packages-to-nixpkgs} To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like: @@ -192,3 +208,49 @@ mkDerivation { This library has a file called `.agda-lib`, and so we give an empty string to `libraryFile` as nothing precedes `.agda-lib` in the filename. This file contains `name: IAL-1.3`, and so we let `libraryName = "IAL-1.3"`. This library does not use an `Everything.agda` file and instead has a Makefile, so there is no need to set `everythingFile` and we set a custom `buildPhase`. When writing an Agda package it is essential to make sure that no `.agda-lib` file gets added to the store as a single file (for example by using `writeText`). This causes Agda to think that the nix store is a Agda library and it will attempt to write to it whenever it typechecks something. See [https://github.com/agda/agda/issues/4613](https://github.com/agda/agda/issues/4613). + +In the pull request adding this library, +you can test whether it builds correctly by writing in a comment: + +``` +@ofborg build agdaPackages.iowa-stdlib +``` + +### Maintaining Agda packages + +As mentioned before, the aim is to have a compatible, and up-to-date package set. +These two conditions sometimes exclude each other: +For example, if we update `agdaPackages.standard-library` because there was an upstream release, +this will typically break many reverse dependencies, +i.e. downstream Agda libraries that depend on the standard library. +In `nixpkgs` we are typically among the first to notice this, +since we have build tests in place to check this. + +In a pull request updating e.g. the standard library, you should write the following comment: + +``` +@ofborg build agdaPackages.standard-library.passthru.tests +``` + +This will build all reverse dependencies of the standard library, +for example `agdaPackages.agda-categories`, or `agdaPackages.generic`. + +In some cases it is useful to build _all_ Agda packages. +This can be done with the following Github comment: + +``` +@ofborg build agda.passthru.tests.allPackages +``` + +Sometimes, the builds of the reverse dependencies fail because they have not yet been updated and released. +You should drop the maintainers a quick issue notifying them of the breakage, +citing the build error (which you can get from the ofborg logs). +If you are motivated, you might even send a pull request that fixes it. +Usually, the maintainers will answer within a week or two with a new release. +Bumping the version of that reverse dependency should be a further commit on your PR. + +In the rare case that a new release is not to be expected within an acceptable time, +simply mark the broken package as broken by setting `meta.broken = true;`. +This will exclude it from the build test. +It can be added later when it is fixed, +and does not hinder the advancement of the whole package set in the meantime. diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 1bcb6e45210e..9bf96f3198a1 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -28,8 +28,7 @@ mkShell { packages = [ (with dotnetCorePackages; combinePackages [ sdk_3_1 - sdk_3_0 - sdk_2_1 + sdk_5_0 ]) ]; } @@ -64,12 +63,46 @@ $ dotnet --info The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project. -## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore {#dotnetcorepackages.sdk-vs-dotnetcorepackages.net-vs-dotnetcorepackages.netcore-vs-dotnetcorepackages.aspnetcore} +## dotnetCorePackages.sdk vs dotnetCorePackages.runtime vs dotnetCorePackages.aspnetcore {#dotnetcorepackages.sdk-vs-dotnetcorepackages.runtime-vs-dotnetcorepackages.aspnetcore} -The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version. +The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `runtime` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. ## Packaging a Dotnet Application {#packaging-a-dotnet-application} -Ideally, we would like to build against the sdk, then only have the dotnet runtime available in the runtime closure. +To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions: -TODO: Create closure-friendly way to package dotnet applications +* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. +* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. This file should be generated using `nuget-to-nix` tool, which is available in nixpkgs. +* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`. +* `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies. +* `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`. +* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. +* `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. +* `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`. +* `dotnetBuildFlags` can be used to pass flags to `dotnet build`. +* `dotnetInstallFlags` can be used to pass flags to `dotnet install`. +* `dotnetFlags` can be used to pass flags to all of the above phases. + +Here is an example `default.nix`, using some of the previously discussed arguments: +```nix +{ lib, buildDotnetModule, dotnetCorePackages, ffmpeg }: + +buildDotnetModule rec { + pname = "someDotnetApplication"; + version = "0.1"; + + src = ./.; + + projectFile = "src/project.sln"; + nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix`. + + dotnet-sdk = dotnetCorePackages.sdk_3_1; + dotnet-runtime = dotnetCorePackages.net_5_0; + dotnetFlags = [ "--runtime linux-x64" ]; + + executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. + executables = []; # Don't install any executables. + + runtimeDeps = [ ffmpeg ]; # This will wrap ffmpeg's library path into `LD_LIBRARY_PATH`. +} +``` diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index b010f27cac02..f221693e764c 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -12,6 +12,7 @@ + diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index b2f045b11b32..26eb9e26bd00 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -237,22 +237,6 @@ where they are known to differ. But there are ways to customize the argument: --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""} ``` -Finally, as an ad-hoc escape hatch, a computed target (string or JSON file -path) can be passed directly to `buildRustPackage`: - -```nix -pkgs.rustPlatform.buildRustPackage { - /* ... */ - target = "x86_64-fortanix-unknown-sgx"; -} -``` - -This is useful to avoid rebuilding Rust tools, since they are actually target -agnostic and don't need to be rebuilt. But in the future, we should always -build the Rust tools and standard library crates separately so there is no -reason not to take the `stdenv.hostPlatform.rustc`-modifying approach, and the -ad-hoc escape hatch to `buildRustPackage` can be removed. - Note that currently custom targets aren't compiled with `std`, so `cargo test` will fail. This can be ignored by adding `doCheck = false;` to your derivation. diff --git a/lib/licenses.nix b/lib/licenses.nix index bde2aaca2ee5..d305001a5c19 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -153,6 +153,11 @@ in mkLicense lset) ({ free = false; }; + capec = { + fullName = "Common Attack Pattern Enumeration and Classification"; + url = "https://capec.mitre.org/about/termsofuse.html"; + }; + clArtistic = { spdxId = "ClArtistic"; fullName = "Clarified Artistic License"; diff --git a/lib/trivial.nix b/lib/trivial.nix index 7956ba4bde6f..a389c7cdfacb 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -303,7 +303,26 @@ rec { # TODO: figure out a clever way to integrate location information from # something like __unsafeGetAttrPos. - warn = msg: builtins.trace "warning: ${msg}"; + /* + Print a warning before returning the second argument. This function behaves + like `builtins.trace`, but requires a string message and formats it as a + warning, including the `warning: ` prefix. + + To get a call stack trace and abort evaluation, set the environment variable + `NIX_ABORT_ON_WARN=true` and set the Nix options `--option pure-eval false --show-trace` + + Type: string -> a -> a + */ + warn = + if lib.elem (builtins.getEnv "NIX_ABORT_ON_WARN") ["1" "true" "yes"] + then msg: builtins.trace "warning: ${msg}" (abort "NIX_ABORT_ON_WARN=true; warnings are treated as unrecoverable errors.") + else msg: builtins.trace "warning: ${msg}"; + + /* + Like warn, but only warn when the first argument is `true`. + + Type: bool -> string -> a -> a + */ warnIf = cond: msg: if cond then warn msg else id; info = msg: builtins.trace "INFO: ${msg}"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9467796d45c0..a60b1c972391 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -440,6 +440,12 @@ githubId = 173595; name = "Caleb Maclennan"; }; + ALEX11BR = { + email = "alexioanpopa11@gmail.com"; + github = "ALEX11BR"; + githubId = 49609151; + name = "Popa Ioan Alexandru"; + }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; @@ -896,6 +902,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arkivm = { + email = "vikram186@gmail.com"; + github = "arkivm"; + githubId = 1118815; + name = "Vikram Narayanan"; + }; armijnhemel = { email = "armijn@tjaldur.nl"; github = "armijnhemel"; @@ -1185,6 +1197,12 @@ email = "sivaraman.balaji@gmail.com"; name = "Balaji Sivaraman"; }; + balodja = { + email = "balodja@gmail.com"; + github = "balodja"; + githubId = 294444; + name = "Vladimir Korolev"; + }; baloo = { email = "nixpkgs@superbaloo.net"; github = "baloo"; @@ -1909,6 +1927,12 @@ email = "me@philscotted.com"; name = "Phil Scott"; }; + chekoopa = { + email = "chekoopa@mail.ru"; + github = "chekoopa"; + githubId = 1689801; + name = "Mikhail Chekan"; + }; ChengCat = { email = "yu@cheng.cat"; github = "ChengCat"; @@ -2078,6 +2102,16 @@ githubId = 25088352; name = "Christian Kögler"; }; + ckie = { + email = "nixpkgs-0efe364@ckie.dev"; + github = "ckiee"; + githubId = 2526321; + keys = [{ + longkeyid = "rsa4096/0x13E79449C0525215"; + fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; + }]; + name = "ckie"; + }; clkamp = { email = "c@lkamp.de"; github = "clkamp"; @@ -2409,6 +2443,12 @@ githubId = 4331004; name = "Naoya Hatta"; }; + dalpd = { + email = "denizalpd@ogr.iu.edu.tr"; + github = "dalpd"; + githubId = 16895361; + name = "Deniz Alp Durmaz"; + }; DamienCassou = { email = "damien@cassou.me"; github = "DamienCassou"; @@ -4054,6 +4094,12 @@ githubId = 16470252; name = "Gemini Lasswell"; }; + gbtb = { + email = "goodbetterthebeast3@gmail.com"; + github = "gbtb"; + githubId = 37017396; + name = "gbtb"; + }; gebner = { email = "gebner@gebner.org"; github = "gebner"; @@ -4381,6 +4427,16 @@ githubId = 54728477; name = "Happy River"; }; + hardselius = { + email = "martin@hardselius.dev"; + github = "hardselius"; + githubId = 1422583; + name = "Martin Hardselius"; + keys = [{ + longkeyid = "rsa4096/0x03A6E6F786936619"; + fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; + }]; + }; haslersn = { email = "haslersn@fius.informatik.uni-stuttgart.de"; github = "haslersn"; @@ -5144,6 +5200,12 @@ githubId = 117874; name = "Jeroen de Haas"; }; + jdreaver = { + email = "johndreaver@gmail.com"; + github = "jdreaver"; + githubId = 1253071; + name = "David Reaver"; + }; jduan = { name = "Jingjing Duan"; email = "duanjingjing@gmail.com"; @@ -5443,6 +5505,12 @@ githubId = 8735102; name = "John Ramsden"; }; + johnrichardrinehart = { + email = "johnrichardrinehart@gmail.com"; + github = "johnrichardrinehart"; + githubId = 6321578; + name = "John Rinehart"; + }; johntitor = { email = "huyuumi.dev@gmail.com"; github = "JohnTitor"; @@ -6488,6 +6556,12 @@ githubId = 791115; name = "Linquize"; }; + linsui = { + email = "linsui555@gmail.com"; + github = "linsui"; + githubId = 36977733; + name = "linsui"; + }; linus = { email = "linusarver@gmail.com"; github = "listx"; @@ -8296,6 +8370,17 @@ githubId = 127548; name = "Judson Lester"; }; + nzbr = { + email = "nixos@nzbr.de"; + github = "nzbr"; + githubId = 7851175; + name = "nzbr"; + matrix = "@nzbr:nzbr.de"; + keys = [{ + longkeyid = "rsa2048/0x6C78B50B97A42F8A"; + fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A"; + }]; + }; nzhang-zh = { email = "n.zhang.hp.au@gmail.com"; github = "nzhang-zh"; @@ -8658,6 +8743,12 @@ githubId = 13225611; name = "Nicolas Martin"; }; + pennae = { + name = "pennae"; + email = "github@quasiparticle.net"; + github = "pennae"; + githubId = 82953136; + }; p3psi = { name = "Elliot Boo"; email = "p3psi.boo@gmail.com"; @@ -9654,16 +9745,6 @@ githubId = 1312525; name = "Rongcui Dong"; }; - ronthecookie = { - name = "Ron B"; - email = "me@ronthecookie.me"; - github = "ronthecookie"; - githubId = 2526321; - keys = [{ - longkeyid = "rsa2048/0x6F5B32DE5E5FA80C"; - fingerprint = "4B2C DDA5 FA35 642D 956D 7294 6F5B 32DE 5E5F A80C"; - }]; - }; roosemberth = { email = "roosembert.palacios+nixpkgs@posteo.ch"; github = "roosemberth"; @@ -10134,6 +10215,12 @@ githubId = 307899; name = "Gurkan Gur"; }; + sersorrel = { + email = "ash@sorrel.sh"; + github = "sersorrel"; + githubId = 9433472; + name = "ash"; + }; servalcatty = { email = "servalcat@pm.me"; github = "servalcatty"; @@ -10353,6 +10440,12 @@ fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; }]; }; + sirseruju = { + email = "sir.seruju@yandex.ru"; + github = "sirseruju"; + githubId = 74881555; + name = "Fofanov Sergey"; + }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; @@ -10448,6 +10541,13 @@ githubId = 4477729; name = "Sergey Mironov"; }; + smitop = { + name = "Smitty van Bodegom"; + email = "me@smitop.com"; + matrix = "@smitop:kde.org"; + github = "Smittyvb"; + githubId = 10530973; + }; sna = { email = "abouzahra.9@wright.edu"; github = "s-na"; diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index a465031b9112..c559d5699dff 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -33,8 +33,7 @@ TMP_FILE="$(mktemp)" GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix" LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua" -HEADER = """ -/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! +HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! Regenerate it with: nixpkgs$ ./maintainers/scripts/update-luarocks-packages @@ -99,9 +98,8 @@ class LuaEditor(Editor): header2 = textwrap.dedent( # header2 = inspect.cleandoc( """ - { self, stdenv, lib, fetchurl, fetchgit, ... } @ args: - self: super: - with self; + { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: + final: prev: { """) f.write(header2) @@ -199,6 +197,7 @@ def generate_pkg_nix(plug: LuaPlugin): log.debug("running %s", ' '.join(cmd)) output = subprocess.check_output(cmd, text=True) + output = "callPackage(" + output.strip() + ") {};\n\n" return (plug, output) def main(): diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9171c10da460..75a7940aa879 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -137,7 +137,7 @@ with lib.maintainers; { cleverca22 disassembler jonringer - maveru + manveru nrdxp ]; scope = "Input-Output Global employees, which maintain critical software"; 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 25f984f9378f..f3a5db5fb1c8 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 @@ -55,6 +55,11 @@ actions. + + + KDE Plasma now finally works on Wayland. + + bash now defaults to major version 5. @@ -81,6 +86,13 @@ 6 for more details. + + + GNOME has been upgraded to 41. Please take a look at their + Release + Notes for details. + +
@@ -269,6 +281,14 @@ postfixadmin. + + + prowlarr, + an indexer manager/proxy built on the popular arr .net/reactjs + base stack + services.prowlarr. + + soju, a @@ -329,11 +349,25 @@ controller support. + + + multipath, + the device mapper multipath (DM-MP) daemon. Available as + services.multipath. + +
Backward Incompatibilities + + + The services.wakeonlan option was removed, + and replaced with + networking.interfaces.<name>.wakeOnLan. + + The security.wrappers option now requires @@ -1077,6 +1111,23 @@ Superuser created successfully. functionality. + + + services.xserver.displayManager.defaultSession = "plasma5" + does not work anymore, instead use either + "plasma" for the Plasma X11 + session or "plasmawayland" for + the Plasma Wayland sesison. + + + + + boot.kernelParams now only accepts one + command line parameter per string. This change is aimed to + reduce common mistakes like param = 12, which + would be parsed as 3 parameters. + +
@@ -1477,6 +1528,73 @@ Superuser created successfully. /etc/xdg/mimeapps.list. + + + Kopia was upgraded from 0.8.x to 0.9.x. Please read the + upstream + release notes for changes and upgrade instructions. + + + + + The systemd.network module has gained + support for the FooOverUDP link type. + + + + + The networking module has a new + networking.fooOverUDP option to configure + Foo-over-UDP encapsulations. + + + + + networking.sits now supports Foo-over-UDP + encapsulation. + + + + + Changing systemd .socket units now restarts + them and stops the service that is activated by them. + Additionally, services with + stopOnChange = false don’t break anymore + when they are socket-activated. + + + + + The virtualisation.libvirtd module has been + refactored and updated with new options: + + + + + virtualisation.libvirtd.qemu* options + (e.g.: + virtualisation.libvirtd.qemuRunAsRoot) + were moved to + virtualisation.libvirtd.qemu + submodule, + + + + + software TPM1/TPM2 support (e.g.: Windows 11 guests) + (virtualisation.libvirtd.qemu.swtpm), + + + + + custom OVMF package (e.g.: + pkgs.OVMFFull with HTTP, CSM and Secure + Boot support) + (virtualisation.libvirtd.qemu.ovmf.package). + + + +
diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh index 6dd4b8c6e419..e0274f5619c7 100755 --- a/nixos/doc/manual/md-to-db.sh +++ b/nixos/doc/manual/md-to-db.sh @@ -6,7 +6,7 @@ # into DocBook files in the from_md folder. DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -pushd $DIR +pushd "$DIR" # NOTE: Keep in sync with Nixpkgs manual (/doc/Makefile). # TODO: Remove raw-attribute when we can get rid of DocBook altogether. @@ -29,7 +29,7 @@ mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$') for mf in ${MD_FILES[*]}; do if [ "${mf: -11}" == ".section.md" ]; then - mkdir -p $(dirname "$OUT/$mf") + mkdir -p "$(dirname "$OUT/$mf")" OUTFILE="$OUT/${mf%".section.md"}.section.xml" pandoc "$mf" "${pandoc_flags[@]}" \ -o "$OUTFILE" @@ -37,7 +37,7 @@ for mf in ${MD_FILES[*]}; do fi if [ "${mf: -11}" == ".chapter.md" ]; then - mkdir -p $(dirname "$OUT/$mf") + mkdir -p "$(dirname "$OUT/$mf")" OUTFILE="$OUT/${mf%".chapter.md"}.chapter.xml" pandoc "$mf" "${pandoc_flags[@]}" \ --top-level-division=chapter \ diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 40a671e3efa9..c1958b3a6bd4 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -20,6 +20,8 @@ In addition to numerous new and upgraded packages, this release has the followin This allows activation scripts to output what they would change if the activation was really run. The users/modules activation script supports this and outputs some of is actions. +- KDE Plasma now finally works on Wayland. + - bash now defaults to major version 5. - Systemd was updated to version 249 (from 247). @@ -28,6 +30,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `kubernetes-helm` now defaults to 3.7.0, which introduced some breaking changes to the experimental OCI manifest format. See [HIP 6](https://github.com/helm/community/blob/main/hips/hip-0006.md) for more details. +- GNOME has been upgraded to 41. Please take a look at their [Release Notes](https://help.gnome.org/misc/release-notes/41.0/) for details. + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). @@ -82,6 +86,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [postfixadmin](https://postfixadmin.sourceforge.io/), a web based virtual user administration interface for Postfix mail servers. Available as [postfixadmin](#opt-services.postfixadmin.enable). +- [prowlarr](https://wiki.servarr.com/prowlarr), an indexer manager/proxy built on the popular arr .net/reactjs base stack [services.prowlarr](#opt-services.prowlarr.enable). + - [soju](https://sr.ht/~emersion/soju), a user-friendly IRC bouncer. Available as [services.soju](options.html#opt-services.soju.enable). - [nats](https://nats.io/), a high performance cloud and edge messaging system. Available as [services.nats](#opt-services.nats.enable). @@ -101,8 +107,12 @@ In addition to numerous new and upgraded packages, this release has the followin - [joycond](https://github.com/DanielOgorchock/joycond), a service that uses `hid-nintendo` to provide nintendo joycond pairing and better nintendo switch pro controller support. +- [multipath](https://github.com/opensvc/multipath-tools), the device mapper multipath (DM-MP) daemon. Available as [services.multipath](#opt-services.multipath.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} +- The `services.wakeonlan` option was removed, and replaced with `networking.interfaces..wakeOnLan`. + - The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set. This is motivated by the fact that before NixOS 21.11, specifying either setuid or setgid but not owner/group resulted in wrappers owned by nobody/nogroup, which is unsafe. @@ -334,6 +344,9 @@ In addition to numerous new and upgraded packages, this release has the followin configuration file. For details, see the [upstream changelog](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst). - `opencv2` no longer includes the non-free libraries by default, and consequently `pfstools` no longer includes OpenCV support by default. Both packages now support an `enableUnfree` option to re-enable this functionality. +- `services.xserver.displayManager.defaultSession = "plasma5"` does not work anymore, instead use either `"plasma"` for the Plasma X11 session or `"plasmawayland"` for the Plasma Wayland sesison. + +- `boot.kernelParams` now only accepts one command line parameter per string. This change is aimed to reduce common mistakes like "param = 12", which would be parsed as 3 parameters. ## Other Notable Changes {#sec-release-21.11-notable-changes} @@ -428,3 +441,18 @@ In addition to numerous new and upgraded packages, this release has the followin directories, thus increasing the purity of the build. - Three new options, [xdg.mime.addedAssociations](#opt-xdg.mime.addedAssociations), [xdg.mime.defaultApplications](#opt-xdg.mime.defaultApplications), and [xdg.mime.removedAssociations](#opt-xdg.mime.removedAssociations) have been added to the [xdg.mime](#opt-xdg.mime.enable) module to allow the configuration of `/etc/xdg/mimeapps.list`. + +- Kopia was upgraded from 0.8.x to 0.9.x. Please read the [upstream release notes](https://github.com/kopia/kopia/releases/tag/v0.9.0) for changes and upgrade instructions. + +- The `systemd.network` module has gained support for the FooOverUDP link type. + +- The `networking` module has a new `networking.fooOverUDP` option to configure Foo-over-UDP encapsulations. + +- `networking.sits` now supports Foo-over-UDP encapsulation. + +- Changing systemd `.socket` units now restarts them and stops the service that is activated by them. Additionally, services with `stopOnChange = false` don't break anymore when they are socket-activated. + +- The `virtualisation.libvirtd` module has been refactored and updated with new options: + - `virtualisation.libvirtd.qemu*` options (e.g.: `virtualisation.libvirtd.qemuRunAsRoot`) were moved to [`virtualisation.libvirtd.qemu`](options.html#opt-virtualisation.libvirtd.qemu) submodule, + - software TPM1/TPM2 support (e.g.: Windows 11 guests) ([`virtualisation.libvirtd.qemu.swtpm`](options.html#opt-virtualisation.libvirtd.qemu.swtpm)), + - custom OVMF package (e.g.: `pkgs.OVMFFull` with HTTP, CSM and Secure Boot support) ([`virtualisation.libvirtd.qemu.ovmf.package`](options.html#opt-virtualisation.libvirtd.qemu.ovmf.package)). diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 0f0bdb4a86cb..05d9ce89dbdc 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -68,9 +68,8 @@ rec { prefixLength = 24; } ]; }); - in - { key = "ip-address"; - config = + + networkConfig = { networking.hostName = mkDefault m.fst; networking.interfaces = listToAttrs interfaces; @@ -96,7 +95,15 @@ rec { in flip concatMap interfacesNumbered ({ fst, snd }: qemu-common.qemuNICFlags snd fst m.snd); }; - } + + in + { key = "ip-address"; + config = networkConfig // { + # Expose the networkConfig items for tests like nixops + # that need to recreate the network config. + system.build.networkConfig = networkConfig; + }; + } ) (getAttr m.fst nodes) ] ); diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 14015ab64abb..e058e70f3888 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -83,10 +83,13 @@ let optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); # Customly sort option list for the man page. + # Always ensure that the sort order matches sortXML.py! optionsList = lib.sort optionLess optionsListDesc; # Convert the list of options into an XML file. - optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); + # This file is *not* sorted sorted to save on eval time, since the docbook XML + # and the manpage depend on it and thus we evaluate this on every system rebuild. + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsListDesc); optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); @@ -185,9 +188,10 @@ in { exit 1 fi + ${pkgs.python3Minimal}/bin/python ${./sortXML.py} $optionsXML sorted.xml ${pkgs.libxslt.bin}/bin/xsltproc \ --stringparam revision '${revision}' \ - -o intermediate.xml ${./options-to-docbook.xsl} $optionsXML + -o intermediate.xml ${./options-to-docbook.xsl} sorted.xml ${pkgs.libxslt.bin}/bin/xsltproc \ -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml ''; diff --git a/nixos/lib/make-options-doc/sortXML.py b/nixos/lib/make-options-doc/sortXML.py new file mode 100644 index 000000000000..717820788c94 --- /dev/null +++ b/nixos/lib/make-options-doc/sortXML.py @@ -0,0 +1,28 @@ +import xml.etree.ElementTree as ET +import sys + +tree = ET.parse(sys.argv[1]) +# the xml tree is of the form +# {all options, each an attrs} +options = list(tree.getroot().find('list')) + +def sortKey(opt): + def order(s): + if s.startswith("enable"): + return 0 + if s.startswith("package"): + return 1 + return 2 + + return [ + (order(p.attrib['value']), p.attrib['value']) + for p in opt.findall('attr[@name="loc"]/list/string') + ] + +# always ensure that the sort order matches the order used in the nix expression! +options.sort(key=sortKey) + +doc = ET.Element("expr") +newOptions = ET.SubElement(doc, "list") +newOptions.extend(options) +ET.ElementTree(doc).write(sys.argv[2], encoding='utf-8') diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 56c510c4e692..e659b0c04f50 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -1126,9 +1126,9 @@ class Driver: try: yield return True - except: - rootlog.error(f'Test "{name}" failed with error:') - raise + except Exception as e: + rootlog.error(f'Test "{name}" failed with error: "{e}"') + raise e def test_symbols(self) -> Dict[str, Any]: @contextmanager diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix index ad62dcd14a0b..310eba3621a6 100644 --- a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix +++ b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix @@ -1,6 +1,6 @@ let pkgs = (import ../../../../../../default.nix {}); - machine = import "${pkgs.path}/nixos/lib/eval-config.nix" { + machine = import (pkgs.path + "/nixos/lib/eval-config.nix") { system = "x86_64-linux"; modules = [ ({config, ...}: { imports = [ ./system.nix ]; }) diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index c4bd3a077d33..db4b6c638ab4 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -50,9 +50,8 @@ in config = mkIf cfg.enable { - # This is enough to make a symlink because the xserver - # module already links all /share/X11 paths. environment.systemPackages = [ x11Fonts ]; + environment.pathsToLink = [ "/share/X11/fonts" ]; services.xserver.filesSection = '' FontPath "${x11Fonts}/share/X11/fonts" diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index b9eb7f69ef43..8f6b5c22ea4f 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -213,7 +213,7 @@ in } { - assertion = cfg.powerManagement.enable -> offloadCfg.enable; + assertion = cfg.powerManagement.finegrained -> offloadCfg.enable; message = "Fine-grained power management requires offload to be enabled."; } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b77ef42a1657..f392ca52566f 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -144,7 +144,7 @@ in dictd = 105; couchdb = 106; #searx = 107; # dynamically allocated as of 2020-10-27 - kippo = 108; + #kippo = 108; # removed 2021-10-07, the kippo package was removed in 1b213f321cdbfcf868b96fd9959c24207ce1b66a during 2021-04 jenkins = 109; systemd-journal-gateway = 110; #notbit = 111; # unused @@ -462,7 +462,7 @@ in dictd = 105; couchdb = 106; #searx = 107; # dynamically allocated as of 2020-10-27 - kippo = 108; + #kippo = 108; # removed 2021-10-07, the kippo package was removed in 1b213f321cdbfcf868b96fd9959c24207ce1b66a during 2021-04 jenkins = 109; systemd-journal-gateway = 110; #notbit = 111; # unused diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f701f38c9dd1..df35a57d047f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -571,6 +571,7 @@ ./services/misc/plex.nix ./services/misc/plikd.nix ./services/misc/podgrab.nix + ./services/misc/prowlarr.nix ./services/misc/tautulli.nix ./services/misc/pinnwand.nix ./services/misc/pykms.nix @@ -759,7 +760,6 @@ ./services/networking/kea.nix ./services/networking/keepalived/default.nix ./services/networking/keybase.nix - ./services/networking/kippo.nix ./services/networking/knot.nix ./services/networking/kresd.nix ./services/networking/lambdabot.nix @@ -779,6 +779,7 @@ ./services/networking/mstpd.nix ./services/networking/mtprotoproxy.nix ./services/networking/mullvad-vpn.nix + ./services/networking/multipath.nix ./services/networking/murmur.nix ./services/networking/mxisd.nix ./services/networking/namecoind.nix @@ -883,7 +884,6 @@ ./services/video/unifi-video.nix ./services/networking/v2ray.nix ./services/networking/vsftpd.nix - ./services/networking/wakeonlan.nix ./services/networking/wasabibackend.nix ./services/networking/websockify.nix ./services/networking/wg-quick.nix diff --git a/nixos/modules/programs/evince.nix b/nixos/modules/programs/evince.nix index 473fddb09d02..c033230afb10 100644 --- a/nixos/modules/programs/evince.nix +++ b/nixos/modules/programs/evince.nix @@ -4,7 +4,9 @@ with lib; -{ +let cfg = config.programs.evince; + +in { # Added 2019-08-09 imports = [ @@ -22,6 +24,13 @@ with lib; enable = mkEnableOption "Evince, the GNOME document viewer"; + package = mkOption { + type = types.package; + default = pkgs.evince; + defaultText = literalExpression "pkgs.evince"; + description = "Evince derivation to use."; + }; + }; }; @@ -31,11 +40,11 @@ with lib; config = mkIf config.programs.evince.enable { - environment.systemPackages = [ pkgs.evince ]; + environment.systemPackages = [ cfg.package ]; - services.dbus.packages = [ pkgs.evince ]; + services.dbus.packages = [ cfg.package ]; - systemd.packages = [ pkgs.evince ]; + systemd.packages = [ cfg.package ]; }; diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix index 461207a6cd34..06ce374b1992 100644 --- a/nixos/modules/programs/git.nix +++ b/nixos/modules/programs/git.nix @@ -20,7 +20,7 @@ in }; config = mkOption { - type = types.attrs; + type = with types; attrsOf (attrsOf anything); default = { }; example = { init.defaultBranch = "main"; @@ -31,15 +31,39 @@ in section of git-config(1) for more information. ''; }; + + lfs = { + enable = mkEnableOption "git-lfs"; + + package = mkOption { + type = types.package; + default = pkgs.git-lfs; + defaultText = literalExpression "pkgs.git-lfs"; + description = "The git-lfs package to use"; + }; + }; }; }; - config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; - environment.etc.gitconfig = mkIf (cfg.config != {}) { - text = generators.toGitINI cfg.config; - }; - }; + config = mkMerge [ + (mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + environment.etc.gitconfig = mkIf (cfg.config != {}) { + text = generators.toGitINI cfg.config; + }; + }) + (mkIf (cfg.enable && cfg.lfs.enable) { + environment.systemPackages = [ cfg.lfs.package ]; + programs.git.config = { + filter.lfs = { + clean = "git-lfs clean -- %f"; + smudge = "git-lfs smudge -- %f"; + process = "git-lfs filter-process"; + required = true; + }; + }; + }) + ]; meta.maintainers = with maintainers; [ figsoda ]; } diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 4db6efb75d82..8e1d6f7bc4a5 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -79,6 +79,9 @@ with lib; The hidepid module was removed, since the underlying machinery is broken when using cgroups-v2. '') + (mkRemovedOptionModule ["services" "wakeonlan"] "This module was removed in favor of enabling it with networking.interfaces..wakeOnLan") + + (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") # Do NOT add any option renames here, see top of the file ]; diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index c7c9871cfecc..f7383b2023a4 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -96,9 +96,8 @@ let }; } cfg.extraConfig; - configFile = pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; + configFile = pkgs.runCommandLocal "config.toml" { + nativeBuildInputs = [ pkgs.remarshal ]; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \ diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 437bd05fdc2e..950c72c6e589 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -122,6 +122,14 @@ in { options = { services.matrix-synapse = { enable = mkEnableOption "matrix.org synapse"; + configFile = mkOption { + type = types.str; + readOnly = true; + description = '' + Path to the configuration file on the target system. Useful to configure e.g. workers + that also need this. + ''; + }; package = mkOption { type = types.package; default = pkgs.matrix-synapse; @@ -706,6 +714,8 @@ in { } ]; + services.matrix-synapse.configFile = "${configFile}"; + users.users.matrix-synapse = { group = "matrix-synapse"; home = cfg.dataDir; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index d5d2a7d8b878..d04937004777 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -555,6 +555,22 @@ in + "\n" ) cfg.buildMachines; }; + assertions = + let badMachine = m: m.system == null && m.systems == []; + in [ + { + assertion = !(builtins.any badMachine cfg.buildMachines); + message = '' + At least one system type (via system or + systems) must be set for every build machine. + Invalid machine specifications: + '' + " " + + (builtins.concatStringsSep "\n " + (builtins.map (m: m.hostName) + (builtins.filter (badMachine) cfg.buildMachines))); + } + ]; + systemd.packages = [ nix ]; diff --git a/nixos/modules/services/misc/prowlarr.nix b/nixos/modules/services/misc/prowlarr.nix new file mode 100644 index 000000000000..ef820b4022d5 --- /dev/null +++ b/nixos/modules/services/misc/prowlarr.nix @@ -0,0 +1,41 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prowlarr; + +in +{ + options = { + services.prowlarr = { + enable = mkEnableOption "Prowlarr"; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for the Prowlarr web interface."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.prowlarr = { + description = "Prowlarr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + StateDirectory = "prowlarr"; + ExecStart = "${pkgs.prowlarr}/bin/Prowlarr -nobrowser -data=/var/lib/prowlarr"; + Restart = "on-failure"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 9696 ]; + }; + }; +} diff --git a/nixos/modules/services/misc/sickbeard.nix b/nixos/modules/services/misc/sickbeard.nix index f560f838e49f..8e871309c98e 100644 --- a/nixos/modules/services/misc/sickbeard.nix +++ b/nixos/modules/services/misc/sickbeard.nix @@ -86,7 +86,7 @@ in serviceConfig = { User = cfg.user; Group = cfg.group; - ExecStart = "${sickbeard}/SickBeard.py --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port}"; + ExecStart = "${sickbeard}/bin/${sickbeard.pname} --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port}"; }; }; }; diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index 340683ae6f26..98b85918ad18 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -109,7 +109,7 @@ let cfg = config.services.subsonic; in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; script = '' - ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \ + ${pkgs.jre8}/bin/java -Xmx${toString cfg.maxMemory}m \ -Dsubsonic.home=${cfg.home} \ -Dsubsonic.host=${cfg.listenAddress} \ -Dsubsonic.port=${toString cfg.port} \ diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index b40d6b3ca004..62e90232e114 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -192,7 +192,7 @@ let serviceConfig.MemoryDenyWriteExecute = true; serviceConfig.NoNewPrivileges = true; serviceConfig.PrivateDevices = true; - serviceConfig.ProtectClock = true; + serviceConfig.ProtectClock = mkDefault true; serviceConfig.ProtectControlGroups = true; serviceConfig.ProtectHome = true; serviceConfig.ProtectHostname = true; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index ed594460d95c..baac21b050f5 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -35,6 +35,10 @@ in ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags} ''; + # The systemd collector needs AF_UNIX + RestrictAddressFamilies = lib.optional (lib.any (x: x == "systemd") cfg.enabledCollectors) "AF_UNIX"; + # The timex collector needs to access clock APIs + ProtectClock = lib.any (x: x == "timex") cfg.disabledCollectors; }; }; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix index 01e420db3897..ef829a1b7d02 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix @@ -61,6 +61,11 @@ in serviceConfig = { # rtl-sdr udev rules make supported USB devices +rw by plugdev. SupplementaryGroups = "plugdev"; + # rtl_433 needs rw access to the USB radio. + PrivateDevices = lib.mkForce false; + DeviceAllow = lib.mkForce "char-usb_device rw"; + RestrictAddressFamilies = [ "AF_NETLINK" ]; + ExecStart = let matchers = (map (m: "--channel_matcher '${m.name},${toString m.channel},${m.location}'" diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix index ce9e57a187cd..e2271e571c40 100644 --- a/nixos/modules/services/monitoring/teamviewer.nix +++ b/nixos/modules/services/monitoring/teamviewer.nix @@ -24,18 +24,21 @@ in environment.systemPackages = [ pkgs.teamviewer ]; + services.dbus.packages = [ pkgs.teamviewer ]; + systemd.services.teamviewerd = { description = "TeamViewer remote control daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "NetworkManager-wait-online.service" "network.target" ]; + after = [ "NetworkManager-wait-online.service" "network.target" "dbus.service" ]; + requires = [ "dbus.service" ]; preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer"; startLimitIntervalSec = 60; startLimitBurst = 10; serviceConfig = { - Type = "forking"; - ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -d"; + Type = "simple"; + ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -f"; PIDFile = "/run/teamviewerd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-abort"; diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 3fedaeb49529..9ed755d0465c 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -87,13 +87,20 @@ in If you use the firewall consider adding the following: - networking.firewall.allowedTCPPorts = [ 139 445 ]; - networking.firewall.allowedUDPPorts = [ 137 138 ]; + services.samba.openFirewall = true; ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to automatically open the necessary ports in the firewall. + ''; + }; + enableNmbd = mkOption { type = types.bool; default = true; @@ -235,7 +242,10 @@ in }; security.pam.services.samba = {}; - environment.systemPackages = [ config.services.samba.package ]; + environment.systemPackages = [ cfg.package ]; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ 139 445 ]; + networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ 137 138 ]; }) ]; diff --git a/nixos/modules/services/networking/iscsi/root-initiator.nix b/nixos/modules/services/networking/iscsi/root-initiator.nix index 3274878c4fae..c12aca1bc24d 100644 --- a/nixos/modules/services/networking/iscsi/root-initiator.nix +++ b/nixos/modules/services/networking/iscsi/root-initiator.nix @@ -64,6 +64,12 @@ in default = false; }; + extraIscsiCommands = mkOption { + description = "Extra iscsi commands to run in the initrd."; + default = ""; + type = lines; + }; + extraConfig = mkOption { description = "Extra lines to append to /etc/iscsid.conf"; default = null; @@ -162,6 +168,9 @@ in '' else '' iscsiadm --mode node --targetname ${escapeShellArg cfg.target} --login ''} + + ${cfg.extraIscsiCommands} + pkill -9 iscsid ''; }; diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix deleted file mode 100644 index 6fedb0a270f4..000000000000 --- a/nixos/modules/services/networking/kippo.nix +++ /dev/null @@ -1,117 +0,0 @@ -# NixOS module for kippo honeypot ssh server -# See all the options for configuration details. -# -# Default port is 2222. Recommend using something like this for port redirection to default SSH port: -# networking.firewall.extraCommands = '' -# iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222''; -# -# Lastly: use this service at your own risk. I am working on a way to run this inside a VM. -{ config, lib, pkgs, ... }: -with lib; -let - cfg = config.services.kippo; -in -{ - options = { - services.kippo = { - enable = mkOption { - default = false; - type = types.bool; - description = "Enable the kippo honeypot ssh server."; - }; - port = mkOption { - default = 2222; - type = types.int; - description = "TCP port number for kippo to bind to."; - }; - hostname = mkOption { - default = "nas3"; - type = types.str; - description = "Hostname for kippo to present to SSH login"; - }; - varPath = mkOption { - default = "/var/lib/kippo"; - type = types.path; - description = "Path of read/write files needed for operation and configuration."; - }; - logPath = mkOption { - default = "/var/log/kippo"; - type = types.path; - description = "Path of log files needed for operation and configuration."; - }; - pidPath = mkOption { - default = "/run/kippo"; - type = types.path; - description = "Path of pid files needed for operation."; - }; - extraConfig = mkOption { - default = ""; - type = types.lines; - description = "Extra verbatim configuration added to the end of kippo.cfg."; - }; - }; - - }; - config = mkIf cfg.enable { - environment.systemPackages = with pkgs.pythonPackages; [ - python pkgs.kippo.twisted pycrypto pyasn1 ]; - - environment.etc."kippo.cfg".text = '' - # Automatically generated by NixOS. - # See ${pkgs.kippo}/src/kippo.cfg for details. - [honeypot] - log_path = ${cfg.logPath} - download_path = ${cfg.logPath}/dl - filesystem_file = ${cfg.varPath}/honeyfs - filesystem_file = ${cfg.varPath}/fs.pickle - data_path = ${cfg.varPath}/data - txtcmds_path = ${cfg.varPath}/txtcmds - public_key = ${cfg.varPath}/keys/public.key - private_key = ${cfg.varPath}/keys/private.key - ssh_port = ${toString cfg.port} - hostname = ${cfg.hostname} - ${cfg.extraConfig} - ''; - - users.users.kippo = { - description = "kippo web server privilege separation user"; - uid = 108; # why does config.ids.uids.kippo give an error? - }; - users.groups.kippo.gid = 108; - - systemd.services.kippo = with pkgs; { - description = "Kippo Web Server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.kippo.twisted}/lib/python2.7/site-packages/:."; - preStart = '' - if [ ! -d ${cfg.varPath}/ ] ; then - mkdir -p ${cfg.logPath}/tty - mkdir -p ${cfg.logPath}/dl - mkdir -p ${cfg.varPath}/keys - cp ${pkgs.kippo}/src/honeyfs ${cfg.varPath} -r - cp ${pkgs.kippo}/src/fs.pickle ${cfg.varPath}/fs.pickle - cp ${pkgs.kippo}/src/data ${cfg.varPath} -r - cp ${pkgs.kippo}/src/txtcmds ${cfg.varPath} -r - - chmod u+rw ${cfg.varPath} -R - chown kippo.kippo ${cfg.varPath} -R - chown kippo.kippo ${cfg.logPath} -R - chmod u+rw ${cfg.logPath} -R - fi - if [ ! -d ${cfg.pidPath}/ ] ; then - mkdir -p ${cfg.pidPath} - chmod u+rw ${cfg.pidPath} - chown kippo.kippo ${cfg.pidPath} - fi - ''; - - serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; - serviceConfig.PermissionsStartOnly = true; - serviceConfig.User = "kippo"; - serviceConfig.Group = "kippo"; - }; -}; -} - - diff --git a/nixos/modules/services/networking/multipath.nix b/nixos/modules/services/networking/multipath.nix new file mode 100644 index 000000000000..1cc2ad1fc849 --- /dev/null +++ b/nixos/modules/services/networking/multipath.nix @@ -0,0 +1,572 @@ +{ config, lib, pkgs, ... }: with lib; + +# See http://christophe.varoqui.free.fr/usage.html and +# https://github.com/opensvc/multipath-tools/blob/master/multipath/multipath.conf.5 + +let + cfg = config.services.multipath; + + indentLines = n: str: concatStringsSep "\n" ( + map (line: "${fixedWidthString n " " " "}${line}") ( + filter ( x: x != "" ) ( splitString "\n" str ) + ) + ); + + addCheckDesc = desc: elemType: check: types.addCheck elemType check + // { description = "${elemType.description} (with check: ${desc})"; }; + hexChars = stringToCharacters "0123456789abcdef"; + isHexString = s: all (c: elem c hexChars) (stringToCharacters (toLower s)); + hexStr = addCheckDesc "hexadecimal string" types.str isHexString; + +in { + + options.services.multipath = with types; { + + enable = mkEnableOption "the device mapper multipath (DM-MP) daemon"; + + package = mkOption { + type = package; + description = "multipath-tools package to use"; + default = pkgs.multipath-tools; + defaultText = "pkgs.multipath-tools"; + }; + + devices = mkOption { + default = [ ]; + example = literalExpression '' + [ + { + vendor = "\"COMPELNT\""; + product = "\"Compellent Vol\""; + path_checker = "tur"; + no_path_retry = "queue"; + max_sectors_kb = 256; + }, ... + ] + ''; + description = '' + This option allows you to define arrays for use in multipath + groups. + ''; + type = listOf (submodule { + options = { + + vendor = mkOption { + type = str; + example = "COMPELNT"; + description = "Regular expression to match the vendor name"; + }; + + product = mkOption { + type = str; + example = "Compellent Vol"; + description = "Regular expression to match the product name"; + }; + + revision = mkOption { + type = nullOr str; + default = null; + description = "Regular expression to match the product revision"; + }; + + product_blacklist = mkOption { + type = nullOr str; + default = null; + description = "Products with the given vendor matching this string are blacklisted"; + }; + + alias_prefix = mkOption { + type = nullOr str; + default = null; + description = "The user_friendly_names prefix to use for this device type, instead of the default mpath"; + }; + + vpd_vendor = mkOption { + type = nullOr str; + default = null; + description = "The vendor specific vpd page information, using the vpd page abbreviation"; + }; + + hardware_handler = mkOption { + type = nullOr (enum [ "emc" "rdac" "hp_sw" "alua" "ana" ]); + default = null; + description = "The hardware handler to use for this device type"; + }; + + # Optional arguments + path_grouping_policy = mkOption { + type = nullOr (enum [ "failover" "multibus" "group_by_serial" "group_by_prio" "group_by_node_name" ]); + default = null; # real default: "failover" + description = "The default path grouping policy to apply to unspecified multipaths"; + }; + + uid_attribute = mkOption { + type = nullOr str; + default = null; + description = "The udev attribute providing a unique path identifier (WWID)"; + }; + + getuid_callout = mkOption { + type = nullOr str; + default = null; + description = '' + (Superseded by uid_attribute) The default program and args to callout + to obtain a unique path identifier. Should be specified with an absolute path. + ''; + }; + + path_selector = mkOption { + type = nullOr (enum [ + ''"round-robin 0"'' + ''"queue-length 0"'' + ''"service-time 0"'' + ''"historical-service-time 0"'' + ]); + default = null; # real default: "service-time 0" + description = "The default path selector algorithm to use; they are offered by the kernel multipath target"; + }; + + path_checker = mkOption { + type = enum [ "readsector0" "tur" "emc_clariion" "hp_sw" "rdac" "directio" "cciss_tur" "none" ]; + default = "tur"; + description = "The default method used to determine the paths state"; + }; + + prio = mkOption { + type = nullOr (enum [ + "none" "const" "sysfs" "emc" "alua" "ontap" "rdac" "hp_sw" "hds" + "random" "weightedpath" "path_latency" "ana" "datacore" "iet" + ]); + default = null; # real default: "const" + description = "The name of the path priority routine"; + }; + + prio_args = mkOption { + type = nullOr str; + default = null; + description = "Arguments to pass to to the prio function"; + }; + + features = mkOption { + type = nullOr str; + default = null; + description = "Specify any device-mapper features to be used"; + }; + + failback = mkOption { + type = nullOr str; + default = null; # real default: "manual" + description = "Tell multipathd how to manage path group failback. Quote integers as strings"; + }; + + rr_weight = mkOption { + type = nullOr (enum [ "priorities" "uniform" ]); + default = null; # real default: "uniform" + description = '' + If set to priorities the multipath configurator will assign path weights + as "path prio * rr_min_io". + ''; + }; + + no_path_retry = mkOption { + type = nullOr str; + default = null; # real default: "fail" + description = "Specify what to do when all paths are down. Quote integers as strings"; + }; + + rr_min_io = mkOption { + type = nullOr int; + default = null; # real default: 1000 + description = '' + Number of I/O requests to route to a path before switching to the next in the + same path group. This is only for Block I/O (BIO) based multipath and + only apply to round-robin path_selector. + ''; + }; + + rr_min_io_rq = mkOption { + type = nullOr int; + default = null; # real default: 1 + description = '' + Number of I/O requests to route to a path before switching to the next in the + same path group. This is only for Request based multipath and + only apply to round-robin path_selector. + ''; + }; + + fast_io_fail_tmo = mkOption { + type = nullOr str; + default = null; # real default: 5 + description = '' + Specify the number of seconds the SCSI layer will wait after a problem has been + detected on a FC remote port before failing I/O to devices on that remote port. + This should be smaller than dev_loss_tmo. Setting this to "off" will disable + the timeout. Quote integers as strings. + ''; + }; + + dev_loss_tmo = mkOption { + type = nullOr str; + default = null; # real default: 600 + description = '' + Specify the number of seconds the SCSI layer will wait after a problem has + been detected on a FC remote port before removing it from the system. This + can be set to "infinity" which sets it to the max value of 2147483647 + seconds, or 68 years. It will be automatically adjusted to the overall + retry interval no_path_retry * polling_interval + if a number of retries is given with no_path_retry and the + overall retry interval is longer than the specified dev_loss_tmo value. + The Linux kernel will cap this value to 600 if fast_io_fail_tmo + is not set. + ''; + }; + + flush_on_last_del = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "no" + description = '' + If set to "yes" multipathd will disable queueing when the last path to a + device has been deleted. + ''; + }; + + user_friendly_names = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "no" + description = '' + If set to "yes", using the bindings file /etc/multipath/bindings + to assign a persistent and unique alias to the multipath, in the + form of mpath. If set to "no" use the WWID as the alias. In either + case this be will be overridden by any specific aliases in the + multipaths section. + ''; + }; + + retain_attached_hw_handler = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "yes" + description = '' + (Obsolete for kernels >= 4.3) If set to "yes" and the SCSI layer has + already attached a hardware_handler to the device, multipath will not + force the device to use the hardware_handler specified by mutipath.conf. + If the SCSI layer has not attached a hardware handler, multipath will + continue to use its configured hardware handler. + + Important Note: Linux kernel 4.3 or newer always behaves as if + "retain_attached_hw_handler yes" was set. + ''; + }; + + detect_prio = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "yes" + description = '' + If set to "yes", multipath will try to detect if the device supports + SCSI-3 ALUA. If so, the device will automatically use the sysfs + prioritizer if the required sysf attributes access_state and + preferred_path are supported, or the alua prioritizer if not. If set + to "no", the prioritizer will be selected as usual. + ''; + }; + + detect_checker = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "yes" + description = '' + If set to "yes", multipath will try to detect if the device supports + SCSI-3 ALUA. If so, the device will automatically use the tur checker. + If set to "no", the checker will be selected as usual. + ''; + }; + + deferred_remove = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "no" + description = '' + If set to "yes", multipathd will do a deferred remove instead of a + regular remove when the last path device has been deleted. This means + that if the multipath device is still in use, it will be freed when + the last user closes it. If path is added to the multipath device + before the last user closes it, the deferred remove will be canceled. + ''; + }; + + san_path_err_threshold = mkOption { + type = nullOr str; + default = null; + description = '' + If set to a value greater than 0, multipathd will watch paths and check + how many times a path has been failed due to errors.If the number of + failures on a particular path is greater then the san_path_err_threshold, + then the path will not reinstate till san_path_err_recovery_time. These + path failures should occur within a san_path_err_forget_rate checks, if + not we will consider the path is good enough to reinstantate. + ''; + }; + + san_path_err_forget_rate = mkOption { + type = nullOr str; + default = null; + description = '' + If set to a value greater than 0, multipathd will check whether the path + failures has exceeded the san_path_err_threshold within this many checks + i.e san_path_err_forget_rate. If so we will not reinstante the path till + san_path_err_recovery_time. + ''; + }; + + san_path_err_recovery_time = mkOption { + type = nullOr str; + default = null; + description = '' + If set to a value greater than 0, multipathd will make sure that when + path failures has exceeded the san_path_err_threshold within + san_path_err_forget_rate then the path will be placed in failed state + for san_path_err_recovery_time duration. Once san_path_err_recovery_time + has timeout we will reinstante the failed path. san_path_err_recovery_time + value should be in secs. + ''; + }; + + marginal_path_err_sample_time = mkOption { + type = nullOr int; + default = null; + description = "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; + }; + + marginal_path_err_rate_threshold = mkOption { + type = nullOr int; + default = null; + description = "The error rate threshold as a permillage (1/1000)"; + }; + + marginal_path_err_recheck_gap_time = mkOption { + type = nullOr str; + default = null; + description = "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; + }; + + marginal_path_double_failed_time = mkOption { + type = nullOr str; + default = null; + description = "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; + }; + + delay_watch_checks = mkOption { + type = nullOr str; + default = null; + description = "This option is deprecated, and mapped to san_path_err_forget_rate"; + }; + + delay_wait_checks = mkOption { + type = nullOr str; + default = null; + description = "This option is deprecated, and mapped to san_path_err_recovery_time"; + }; + + skip_kpartx = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "no" + description = "If set to yes, kpartx will not automatically create partitions on the device"; + }; + + max_sectors_kb = mkOption { + type = nullOr int; + default = null; + description = "Sets the max_sectors_kb device parameter on all path devices and the multipath device to the specified value"; + }; + + ghost_delay = mkOption { + type = nullOr int; + default = null; + description = "Sets the number of seconds that multipath will wait after creating a device with only ghost paths before marking it ready for use in systemd"; + }; + + all_tg_pt = mkOption { + type = nullOr str; + default = null; + description = "Set the 'all targets ports' flag when registering keys with mpathpersist"; + }; + + }; + }); + }; + + defaults = mkOption { + type = nullOr str; + default = null; + description = '' + This section defines default values for attributes which are used + whenever no values are given in the appropriate device or multipath + sections. + ''; + }; + + blacklist = mkOption { + type = nullOr str; + default = null; + description = '' + This section defines which devices should be excluded from the + multipath topology discovery. + ''; + }; + + blacklist_exceptions = mkOption { + type = nullOr str; + default = null; + description = '' + This section defines which devices should be included in the + multipath topology discovery, despite being listed in the + blacklist section. + ''; + }; + + overrides = mkOption { + type = nullOr str; + default = null; + description = '' + This section defines values for attributes that should override the + device-specific settings for all devices. + ''; + }; + + extraConfig = mkOption { + type = nullOr str; + default = null; + description = "Lines to append to default multipath.conf"; + }; + + extraConfigFile = mkOption { + type = nullOr str; + default = null; + description = "Append an additional file's contents to /etc/multipath.conf"; + }; + + pathGroups = mkOption { + example = literalExpression '' + [ + { + wwid = "360080e500043b35c0123456789abcdef"; + alias = 10001234; + array = "bigarray.example.com"; + fsType = "zfs"; # optional + options = "ro"; # optional + }, ... + ] + ''; + description = '' + This option allows you to define multipath groups as described + in http://christophe.varoqui.free.fr/usage.html. + ''; + type = listOf (submodule { + options = { + + alias = mkOption { + type = int; + example = 1001234; + description = "The name of the multipath device"; + }; + + wwid = mkOption { + type = hexStr; + example = "360080e500043b35c0123456789abcdef"; + description = "The identifier for the multipath device"; + }; + + array = mkOption { + type = str; + default = null; + example = "bigarray.example.com"; + description = "The DNS name of the storage array"; + }; + + fsType = mkOption { + type = nullOr str; + default = null; + example = "zfs"; + description = "Type of the filesystem"; + }; + + options = mkOption { + type = nullOr str; + default = null; + example = "ro"; + description = "Options used to mount the file system"; + }; + + }; + }); + }; + + }; + + config = mkIf cfg.enable { + environment.etc."multipath.conf".text = + let + inherit (cfg) defaults blacklist blacklist_exceptions overrides; + + mkDeviceBlock = cfg: let + nonNullCfg = lib.filterAttrs (k: v: v != null) cfg; + attrs = lib.mapAttrsToList (name: value: " ${name} ${toString value}") nonNullCfg; + in '' + device { + ${lib.concatStringsSep "\n" attrs} + } + ''; + devices = lib.concatMapStringsSep "\n" mkDeviceBlock cfg.devices; + + mkMultipathBlock = m: '' + multipath { + wwid ${m.wwid} + alias ${toString m.alias} + } + ''; + multipaths = lib.concatMapStringsSep "\n" mkMultipathBlock cfg.pathGroups; + + in '' + devices { + ${indentLines 2 devices} + } + + ${optionalString (!isNull defaults) '' + defaults { + ${indentLines 2 defaults} + multipath_dir ${cfg.package}/lib/multipath + } + ''} + ${optionalString (!isNull blacklist) '' + blacklist { + ${indentLines 2 blacklist} + } + ''} + ${optionalString (!isNull blacklist_exceptions) '' + blacklist_exceptions { + ${indentLines 2 blacklist_exceptions} + } + ''} + ${optionalString (!isNull overrides) '' + overrides { + ${indentLines 2 overrides} + } + ''} + multipaths { + ${indentLines 2 multipaths} + } + ''; + + systemd.packages = [ cfg.package ]; + + environment.systemPackages = [ cfg.package ]; + boot.kernelModules = [ "dm-multipath" "dm-service-time" ]; + + # We do not have systemd in stage-1 boot so must invoke `multipathd` + # with the `-1` argument which disables systemd calls. Invoke `multipath` + # to display the multipath mappings in the output of `journalctl -b`. + boot.initrd.kernelModules = [ "dm-multipath" "dm-service-time" ]; + boot.initrd.postDeviceCommands = '' + modprobe -a dm-multipath dm-service-time + multipathd -s + (set -x && sleep 1 && multipath -ll) + ''; + }; +} diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 192533e52de0..004b4f99670f 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -439,7 +439,7 @@ in mkdir -m 0755 -p /etc/ssh ${flip concatMapStrings cfg.hostKeys (k: '' - if ! [ -f "${k.path}" ]; then + if ! [ -s "${k.path}" ]; then ssh-keygen \ -t "${k.type}" \ ${if k ? bits then "-b ${toString k.bits}" else ""} \ diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 708ea28a9440..caf89c84397f 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -172,9 +172,15 @@ in ExecStart = "${(removeSuffix "\n" cmd)} start"; ExecStop = "${(removeSuffix "\n" cmd)} stop"; Restart = "on-failure"; + TimeoutSec = "5min"; User = "unifi"; UMask = "0077"; WorkingDirectory = "${stateDir}"; + # the stop command exits while the main process is still running, and unifi + # wants to manage its own child processes. this means we have to set KillSignal + # to something the main process ignores, otherwise every stop will have unifi.service + # fail with SIGTERM status. + KillSignal = "SIGCONT"; # Hardening AmbientCapabilities = ""; @@ -215,5 +221,5 @@ in }; - meta.maintainers = with lib.maintainers; [ erictapen ]; + meta.maintainers = with lib.maintainers; [ erictapen pennae ]; } diff --git a/nixos/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix deleted file mode 100644 index c6291366b0f1..000000000000 --- a/nixos/modules/services/networking/wakeonlan.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - interfaces = config.services.wakeonlan.interfaces; - - ethtool = "${pkgs.ethtool}/sbin/ethtool"; - - passwordParameter = password : if (password == "") then "" else - "sopass ${password}"; - - methodParameter = {method, password} : - if method == "magicpacket" then "wol g" - else if method == "password" then "wol s so ${passwordParameter password}" - else throw "Wake-On-Lan method not supported"; - - line = { interface, method ? "magicpacket", password ? "" }: '' - ${ethtool} -s ${interface} ${methodParameter {inherit method password;}} - ''; - - concatStrings = foldr (x: y: x + y) ""; - lines = concatStrings (map (l: line l) interfaces); - -in -{ - - ###### interface - - options = { - - services.wakeonlan.interfaces = mkOption { - default = [ ]; - type = types.listOf (types.submodule { options = { - interface = mkOption { - type = types.str; - description = "Interface to enable for Wake-On-Lan."; - }; - method = mkOption { - type = types.enum [ "magicpacket" "password"]; - description = "Wake-On-Lan method for this interface."; - }; - password = mkOption { - type = types.strMatching "[a-fA-F0-9]{2}:([a-fA-F0-9]{2}:){4}[a-fA-F0-9]{2}"; - description = "The password has the shape of six bytes in hexadecimal separated by a colon each."; - }; - };}); - example = [ - { - interface = "eth0"; - method = "password"; - password = "00:11:22:33:44:55"; - } - ]; - description = '' - Interfaces where to enable Wake-On-LAN, and how. Two methods available: - "magicpacket" and "password". The password has the shape of six bytes - in hexadecimal separated by a colon each. For more information, - check the ethtool manual. - ''; - }; - - }; - - - ###### implementation - - config.powerManagement.powerUpCommands = lines; - -} diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index e78c4383e4ba..05f4995cc416 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -272,7 +272,7 @@ in (mkIf cfg.ldap-proxy.enable { systemd.services.privacyidea-ldap-proxy = let - ldap-proxy-env = pkgs.python2.withPackages (ps: [ ps.privacyidea-ldap-proxy ]); + ldap-proxy-env = pkgs.python3.withPackages (ps: [ ps.privacyidea-ldap-proxy ]); in { description = "privacyIDEA LDAP proxy"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 34a5219c9594..b8cfcf391215 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -152,6 +152,8 @@ in install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}' '' + optionalString cfg.settings.incomplete-dir-enabled '' install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}' + '' + optionalString cfg.settings.watch-dir-enabled '' + install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}' ''; assertions = [ diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index b434f16e9bdc..e0c00fe67ea3 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -539,6 +539,69 @@ in Specify the OAuth token URL. ''; }; + baseURL = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify the OAuth base URL. + ''; + }; + userProfileURL = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify the OAuth userprofile URL. + ''; + }; + userProfileUsernameAttr = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify the name of the attribute for the username from the claim. + ''; + }; + userProfileDisplayNameAttr = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify the name of the attribute for the display name from the claim. + ''; + }; + userProfileEmailAttr = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify the name of the attribute for the email from the claim. + ''; + }; + scope = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify the OAuth scope. + ''; + }; + providerName = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify the name to be displayed for this strategy. + ''; + }; + rolesClaim = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify the role claim name. + ''; + }; + accessRole = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify role which should be included in the ID token roles claim to grant access + ''; + }; clientID = mkOption { type = types.str; description = '' diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index e4f31c3a9395..2eacd87ae6fd 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -144,6 +144,8 @@ in ''; }; + caddy.enable = mkEnableOption "Whether to enablle caddy reverse proxy to expose jitsi-meet"; + prosody.enable = mkOption { type = bool; default = true; @@ -322,6 +324,42 @@ in }; }; + services.caddy = mkIf cfg.caddy.enable { + enable = mkDefault true; + virtualHosts.${cfg.hostName} = { + extraConfig = + let + templatedJitsiMeet = pkgs.runCommand "templated-jitsi-meet" {} '' + cp -R ${pkgs.jitsi-meet}/* . + for file in *.html **/*.html ; do + ${pkgs.sd}/bin/sd '' '{{ include "$1" }}' $file + done + rm config.js + rm interface_config.js + cp -R . $out + cp ${overrideJs "${pkgs.jitsi-meet}/config.js" "config" (recursiveUpdate defaultCfg cfg.config) cfg.extraConfig} $out/config.js + cp ${overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig ""} $out/interface_config.js + cp ./libs/external_api.min.js $out/external_api.js + ''; + in '' + handle /http-bind { + header Host ${cfg.hostName} + reverse_proxy 127.0.0.1:5280 + } + handle /xmpp-websocket { + reverse_proxy 127.0.0.1:5280 + } + handle { + templates + root * ${templatedJitsiMeet} + try_files {path} {path} + try_files {path} /index.html + file_server + } + ''; + }; + }; + services.jitsi-videobridge = mkIf cfg.videobridge.enable { enable = true; xmppConfigs."localhost" = { diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 886e030b80c9..62ae763b69bc 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -6,6 +6,8 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; + inherit (cfg) datadir; + phpPackage = cfg.phpPackage.buildEnv { extensions = { enabled, all }: (with all; @@ -40,7 +42,7 @@ let if [[ "$USER" != nextcloud ]]; then sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS' fi - export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" + export NEXTCLOUD_CONFIG_DIR="${datadir}/config" $sudo \ ${phpPackage}/bin/php \ occ "$@" @@ -51,6 +53,12 @@ let in { imports = [ + (mkRemovedOptionModule [ "services" "nextcloud" "config" "adminpass" ] '' + Please use `services.nextcloud.config.adminpassFile' instead! + '') + (mkRemovedOptionModule [ "services" "nextcloud" "config" "dbpass" ] '' + Please use `services.nextcloud.config.dbpassFile' instead! + '') (mkRemovedOptionModule [ "services" "nextcloud" "nginx" "enable" ] '' The nextcloud module supports `nginx` as reverse-proxy by default and doesn't support other reverse-proxies officially. @@ -79,6 +87,59 @@ in { default = "/var/lib/nextcloud"; description = "Storage path of nextcloud."; }; + datadir = mkOption { + type = types.str; + defaultText = "config.services.nextcloud.home"; + description = '' + Data storage path of nextcloud. Will be by default. + This folder will be populated with a config.php and data folder which contains the state of the instance (excl the database)."; + ''; + example = "/mnt/nextcloud-file"; + }; + extraApps = mkOption { + type = types.attrsOf types.package; + default = { }; + description = '' + Extra apps to install. Should be an attrSet of appid to packages generated by fetchNextcloudApp. + The appid must be identical to the "id" value in the apps appinfo/info.xml. + Using this will disable the appstore to prevent Nextcloud from updating these apps (see ). + ''; + example = literalExpression '' + { + maps = pkgs.fetchNextcloudApp { + name = "maps"; + sha256 = "007y80idqg6b6zk6kjxg4vgw0z8fsxs9lajnv49vv1zjy6jx2i1i"; + url = "https://github.com/nextcloud/maps/releases/download/v0.1.9/maps-0.1.9.tar.gz"; + version = "0.1.9"; + }; + phonetrack = pkgs.fetchNextcloudApp { + name = "phonetrack"; + sha256 = "0qf366vbahyl27p9mshfma1as4nvql6w75zy2zk5xwwbp343vsbc"; + url = "https://gitlab.com/eneiluj/phonetrack-oc/-/wikis/uploads/931aaaf8dca24bf31a7e169a83c17235/phonetrack-0.6.9.tar.gz"; + version = "0.6.9"; + }; + } + ''; + }; + extraAppsEnable = mkOption { + type = types.bool; + default = true; + description = '' + Automatically enable the apps in every time nextcloud starts. + If set to false, apps need to be enabled in the Nextcloud user interface or with nextcloud-occ app:enable. + ''; + }; + appstoreEnable = mkOption { + type = types.nullOr types.bool; + default = null; + example = true; + description = '' + Allow the installation of apps and app updates from the store. + Enabled by default unless there are packages in . + Set to true to force enable the store even if is used. + Set to false to disable the installation of apps from the global appstore. App management is always enabled regardless of this setting. + ''; + }; logLevel = mkOption { type = types.ints.between 0 4; default = 2; @@ -206,14 +267,6 @@ in { default = "nextcloud"; description = "Database user."; }; - dbpass = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Database password. Use dbpassFile to avoid this - being world-readable in the /nix/store. - ''; - }; dbpassFile = mkOption { type = types.nullOr types.str; default = null; @@ -246,17 +299,8 @@ in { default = "root"; description = "Admin username."; }; - adminpass = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Admin password. Use adminpassFile to avoid this - being world-readable in the /nix/store. - ''; - }; adminpassFile = mkOption { - type = types.nullOr types.str; - default = null; + type = types.str; description = '' The full path to a file that contains the admin's password. Must be readable by user nextcloud. @@ -321,8 +365,8 @@ in { This mounts a bucket on an Amazon S3 object storage or compatible implementation into the virtual filesystem. - See nextcloud's documentation on "Object Storage as Primary - Storage" for more details. + Further details about this feature can be found in the + upstream documentation. ''; bucket = mkOption { type = types.str; @@ -389,9 +433,9 @@ in { Required for some non-Amazon S3 implementations. Ordinarily, requests will be made with - http://bucket.hostname.domain/, but with path style + http://bucket.hostname.domain/, but with path style enabled requests are made with - http://hostname.domain/bucket instead. + http://hostname.domain/bucket instead. ''; }; }; @@ -399,11 +443,11 @@ in { }; enableImagemagick = mkEnableOption '' - Whether to load the ImageMagick module into PHP. + the ImageMagick module for PHP. This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). You may want to disable it for increased security. In that case, previews will still be available for some images (e.g. JPEG and PNG). - See https://github.com/nextcloud/server/issues/13099 + See . '' // { default = true; }; @@ -464,13 +508,6 @@ in { config = mkIf cfg.enable (mkMerge [ { assertions = let acfg = cfg.config; in [ - { assertion = !(acfg.dbpass != null && acfg.dbpassFile != null); - message = "Please specify no more than one of dbpass or dbpassFile"; - } - { assertion = ((acfg.adminpass != null || acfg.adminpassFile != null) - && !(acfg.adminpass != null && acfg.adminpassFile != null)); - message = "Please specify exactly one of adminpass or adminpassFile"; - } { assertion = versionOlder cfg.package.version "21" -> cfg.config.defaultPhoneRegion == null; message = "The `defaultPhoneRegion'-setting is only supported for Nextcloud >=21!"; } @@ -542,6 +579,8 @@ in { else nextcloud22 ); + services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home; + services.nextcloud.phpPackage = if versionOlder cfg.package.version "21" then pkgs.php74 else pkgs.php80; @@ -581,6 +620,14 @@ in { ] ''; + showAppStoreSetting = cfg.appstoreEnable != null || cfg.extraApps != {}; + renderedAppStoreSetting = + let + x = cfg.appstoreEnable; + in + if x == null then "false" + else boolToString x; + overrideConfig = pkgs.writeText "nextcloud-config.php" '' [ + ${optionalString (cfg.extraApps != { }) "[ 'path' => '${cfg.home}/nix-apps', 'url' => '/nix-apps', 'writable' => false ],"} [ 'path' => '${cfg.home}/apps', 'url' => '/apps', 'writable' => false ], [ 'path' => '${cfg.home}/store-apps', 'url' => '/store-apps', 'writable' => true ], ], - 'datadirectory' => '${cfg.home}/data', + ${optionalString (showAppStoreSetting) "'appstoreenabled' => ${renderedAppStoreSetting},"} + 'datadirectory' => '${datadir}/data', 'skeletondirectory' => '${cfg.skeletonDirectory}', ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} 'log_type' => 'syslog', @@ -613,7 +662,6 @@ in { ${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"} ${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"} ${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"} - ${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"} ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_secret('${c.dbpassFile}'),"} 'dbtype' => '${c.dbtype}', 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)}, @@ -623,14 +671,17 @@ in { ]; ''; occInstallCmd = let - dbpass = if c.dbpassFile != null - then ''"$(<"${toString c.dbpassFile}")"'' - else if c.dbpass != null - then ''"${toString c.dbpass}"'' - else ''""''; - adminpass = if c.adminpassFile != null - then ''"$(<"${toString c.adminpassFile}")"'' - else ''"${toString c.adminpass}"''; + mkExport = { arg, value }: "export ${arg}=${value}"; + dbpass = { + arg = "DBPASS"; + value = if c.dbpassFile != null + then ''"$(<"${toString c.dbpassFile}")"'' + else ''""''; + }; + adminpass = { + arg = "ADMINPASS"; + value = ''"$(<"${toString c.adminpassFile}")"''; + }; installFlags = concatStringsSep " \\\n " (mapAttrsToList (k: v: "${k} ${toString v}") { "--database" = ''"${c.dbtype}"''; @@ -641,12 +692,14 @@ in { ${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"''; ${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"''; ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"''; - "--database-pass" = dbpass; + "--database-pass" = "\$${dbpass.arg}"; "--admin-user" = ''"${c.adminuser}"''; - "--admin-pass" = adminpass; - "--data-dir" = ''"${cfg.home}/data"''; + "--admin-pass" = "\$${adminpass.arg}"; + "--data-dir" = ''"${datadir}/data"''; }); in '' + ${mkExport dbpass} + ${mkExport adminpass} ${occ}/bin/nextcloud-occ maintenance:install \ ${installFlags} ''; @@ -673,22 +726,26 @@ in { exit 1 fi ''} - ${optionalString (c.adminpassFile != null) '' - if [ ! -r "${c.adminpassFile}" ]; then - echo "adminpassFile ${c.adminpassFile} is not readable by nextcloud:nextcloud! Aborting..." - exit 1 - fi - if [ -z "$(<${c.adminpassFile})" ]; then - echo "adminpassFile ${c.adminpassFile} is empty!" - exit 1 - fi - ''} + if [ ! -r "${c.adminpassFile}" ]; then + echo "adminpassFile ${c.adminpassFile} is not readable by nextcloud:nextcloud! Aborting..." + exit 1 + fi + if [ -z "$(<${c.adminpassFile})" ]; then + echo "adminpassFile ${c.adminpassFile} is empty!" + exit 1 + fi ln -sf ${cfg.package}/apps ${cfg.home}/ + # Install extra apps + ln -sfT \ + ${pkgs.linkFarm "nix-apps" + (mapAttrsToList (name: path: { inherit name path; }) cfg.extraApps)} \ + ${cfg.home}/nix-apps + # create nextcloud directories. # if the directories exist already with wrong permissions, we fix that - for dir in ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps; do + for dir in ${datadir}/config ${datadir}/data ${cfg.home}/store-apps ${cfg.home}/nix-apps; do if [ ! -e $dir ]; then install -o nextcloud -g nextcloud -d $dir elif [ $(stat -c "%G" $dir) != "nextcloud" ]; then @@ -696,23 +753,29 @@ in { fi done - ln -sf ${overrideConfig} ${cfg.home}/config/override.config.php + ln -sf ${overrideConfig} ${datadir}/config/override.config.php # Do not install if already installed - if [[ ! -e ${cfg.home}/config/config.php ]]; then + if [[ ! -e ${datadir}/config/config.php ]]; then ${occInstallCmd} fi ${occ}/bin/nextcloud-occ upgrade ${occ}/bin/nextcloud-occ config:system:delete trusted_domains + + ${optionalString (cfg.extraAppsEnable && cfg.extraApps != { }) '' + # Try to enable apps (don't fail when one of them cannot be enabled , eg. due to incompatible version) + ${occ}/bin/nextcloud-occ app:enable ${concatStringsSep " " (attrNames cfg.extraApps)} + ''} + ${occSetTrustedDomainsCmd} ''; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; }; nextcloud-cron = { - environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; + environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config"; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php"; @@ -731,7 +794,7 @@ in { group = "nextcloud"; phpPackage = phpPackage; phpEnv = { - NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; + NEXTCLOUD_CONFIG_DIR = "${datadir}/config"; PATH = "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"; }; settings = mapAttrs (name: mkDefault) { @@ -781,6 +844,10 @@ in { priority = 201; extraConfig = "root ${cfg.home};"; }; + "~ ^/nix-apps" = { + priority = 201; + extraConfig = "root ${cfg.home};"; + }; "^~ /.well-known" = { priority = 210; extraConfig = '' diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index ed84487d233a..9d9cb8dfb3f2 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -237,6 +237,12 @@ Some apps may require extra PHP extensions to be installed. This can be configured with the setting. + + + Alternatively, extra apps can also be declared with the setting. + When using this setting, apps can no longer be managed statefully because this can lead to Nextcloud updating apps + that are managed by Nix. If you want automatic updates it is recommended that you use web interface to install apps. +
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index e65e0164667a..1e316c379f5b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -372,7 +372,13 @@ in services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + xdg.portal.extraPortals = [ + pkgs.xdg-desktop-portal-gnome + (pkgs.xdg-desktop-portal-gtk.override { + # Do not build portals that we already have. + buildPortalsInGnome = false; + }) + ]; # Harmonize Qt5 application style and also make them use the portal for file chooser dialog. qt5 = { diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 10969a373bb3..112f493b811c 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -219,6 +219,7 @@ in ] config.environment.pantheon.excludePackages); programs.evince.enable = mkDefault true; + programs.evince.package = pkgs.pantheon.evince; programs.file-roller.enable = mkDefault true; # Settings from elementary-default-settings diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index e418195e1a74..11cb4d3b8a95 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -13,7 +13,6 @@ let pulseaudio = config.hardware.pulseaudio; pactl = "${getBin pulseaudio.package}/bin/pactl"; - startplasma-x11 = "${getBin plasma5.plasma-workspace}/bin/startplasma-x11"; sed = "${getBin pkgs.gnused}/bin/sed"; gtkrc2 = writeText "gtkrc-2.0" '' @@ -136,9 +135,6 @@ let fi fi - '' - + '' - exec "${startplasma-x11}" ''; in @@ -172,6 +168,12 @@ in disabled by default. ''; }; + + useQtScaling = mkOption { + type = types.bool; + default = false; + description = "Enable HiDPI scaling in Qt."; + }; }; }; @@ -183,6 +185,7 @@ in config = mkMerge [ (mkIf cfg.enable { + # Seed our configuration into nixos-generate-config system.nixos-generate-config.desktopConfiguration = ['' # Enable the Plasma 5 Desktop Environment. @@ -190,11 +193,7 @@ in services.xserver.desktopManager.plasma5.enable = true; '']; - services.xserver.desktopManager.session = singleton { - name = "plasma5"; - bgSupport = true; - start = startplasma; - }; + services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-workspace ]; security.wrappers = { kcheckpass = @@ -347,6 +346,8 @@ in environment.etc."X11/xkb".source = xcfg.xkbDir; + environment.sessionVariables.PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1"; + # Enable GTK applications to load SVG icons services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; @@ -389,6 +390,7 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; + services.xserver.displayManager.setupCommands = startplasma; nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; }) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 4f57f9abd06e..e036c684c886 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -26,7 +26,6 @@ let load-module module-udev-detect load-module module-native-protocol-unix load-module module-default-device-restore - load-module module-rescue-streams load-module module-always-sink load-module module-intended-roles load-module module-suspend-on-idle diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 053496441d81..e105502cf3a4 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -11,7 +11,6 @@ use Cwd 'abs_path'; my $out = "@out@"; -# FIXME: maybe we should use /proc/1/exe to get the current systemd. my $curSystemd = abs_path("/run/current-system/sw/bin"); # To be robust against interruption, record what units need to be started etc. @@ -19,13 +18,16 @@ my $startListFile = "/run/nixos/start-list"; my $restartListFile = "/run/nixos/restart-list"; my $reloadListFile = "/run/nixos/reload-list"; -# Parse restart/reload requests by the activation script +# Parse restart/reload requests by the activation script. +# Activation scripts may write newline-separated units to this +# file and switch-to-configuration will handle them. While +# `stopIfChanged = true` is ignored, switch-to-configuration will +# handle `restartIfChanged = false` and `reloadIfChanged = true`. +# This also works for socket-activated units. my $restartByActivationFile = "/run/nixos/activation-restart-list"; -my $reloadByActivationFile = "/run/nixos/activation-reload-list"; my $dryRestartByActivationFile = "/run/nixos/dry-activation-restart-list"; -my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list"; -make_path("/run/nixos", { mode => 0755 }); +make_path("/run/nixos", { mode => oct(755) }); my $action = shift @ARGV; @@ -147,6 +149,92 @@ sub fingerprintUnit { return abs_path($s) . (-f "${s}.d/overrides.conf" ? " " . abs_path "${s}.d/overrides.conf" : ""); } +sub handleModifiedUnit { + my ($unit, $baseName, $newUnitFile, $activePrev, $unitsToStop, $unitsToStart, $unitsToReload, $unitsToRestart, $unitsToSkip) = @_; + + if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target" || $unit =~ /\.slice$/ || $unit =~ /\.path$/) { + # Do nothing. These cannot be restarted directly. + # Slices and Paths don't have to be restarted since + # properties (resource limits and inotify watches) + # seem to get applied on daemon-reload. + } elsif ($unit =~ /\.mount$/) { + # Reload the changed mount unit to force a remount. + $unitsToReload->{$unit} = 1; + recordUnit($reloadListFile, $unit); + } else { + my $unitInfo = parseUnit($newUnitFile); + if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) { + $unitsToReload->{$unit} = 1; + recordUnit($reloadListFile, $unit); + } + elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { + $unitsToSkip->{$unit} = 1; + } else { + # If this unit is socket-activated, then stop it instead + # of restarting it to make sure the new version of it is + # socket-activated. + my $socketActivated = 0; + if ($unit =~ /\.service$/) { + my @sockets = split / /, ($unitInfo->{Sockets} // ""); + if (scalar @sockets == 0) { + @sockets = ("$baseName.socket"); + } + foreach my $socket (@sockets) { + if (-e "$out/etc/systemd/system/$socket") { + $socketActivated = 1; + $unitsToStop->{$unit} = 1; + # If the socket was not running previously, + # start it now. + if (not defined $activePrev->{$socket}) { + $unitsToStart->{$socket} = 1; + } + } + } + } + + # Don't do the rest of this for socket-activated units + # because we handled these above where we stop the unit. + # Since only services can be socket-activated, the + # following condition always evaluates to `true` for + # non-service units. + if ($socketActivated) { + return; + } + + # If we are restarting a socket, also stop the corresponding + # service. This is required because restarting a socket + # when the service is already activated fails. + if ($unit =~ /\.socket$/) { + my $service = $unitInfo->{Service} // ""; + if ($service eq "") { + $service = "$baseName.service"; + } + if (defined $activePrev->{$service}) { + $unitsToStop->{$service} = 1; + } + $unitsToRestart->{$unit} = 1; + recordUnit($restartListFile, $unit); + } else { + # Always restart non-services instead of stopping and starting them + # because it doesn't make sense to stop them with a config from + # the old evaluation. + if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes") || $unit !~ /\.service$/) { + # This unit should be restarted instead of + # stopped and started. + $unitsToRestart->{$unit} = 1; + recordUnit($restartListFile, $unit); + } else { + # We write to a file to ensure that the + # service gets restarted if we're interrupted. + $unitsToStart->{$unit} = 1; + recordUnit($startListFile, $unit); + $unitsToStop->{$unit} = 1; + } + } + } + } +} + # Figure out what units need to be stopped, started, restarted or reloaded. my (%unitsToStop, %unitsToSkip, %unitsToStart, %unitsToRestart, %unitsToReload); @@ -219,65 +307,7 @@ while (my ($unit, $state) = each %{$activePrev}) { } elsif (fingerprintUnit($prevUnitFile) ne fingerprintUnit($newUnitFile)) { - if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") { - # Do nothing. These cannot be restarted directly. - } elsif ($unit =~ /\.mount$/) { - # Reload the changed mount unit to force a remount. - $unitsToReload{$unit} = 1; - recordUnit($reloadListFile, $unit); - } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { - # FIXME: do something? - } else { - my $unitInfo = parseUnit($newUnitFile); - if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) { - $unitsToReload{$unit} = 1; - recordUnit($reloadListFile, $unit); - } - elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { - $unitsToSkip{$unit} = 1; - } else { - if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes")) { - # This unit should be restarted instead of - # stopped and started. - $unitsToRestart{$unit} = 1; - recordUnit($restartListFile, $unit); - } else { - # If this unit is socket-activated, then stop the - # socket unit(s) as well, and restart the - # socket(s) instead of the service. - my $socketActivated = 0; - if ($unit =~ /\.service$/) { - my @sockets = split / /, ($unitInfo->{Sockets} // ""); - if (scalar @sockets == 0) { - @sockets = ("$baseName.socket"); - } - foreach my $socket (@sockets) { - if (defined $activePrev->{$socket}) { - $unitsToStop{$socket} = 1; - # Only restart sockets that actually - # exist in new configuration: - if (-e "$out/etc/systemd/system/$socket") { - $unitsToStart{$socket} = 1; - recordUnit($startListFile, $socket); - $socketActivated = 1; - } - } - } - } - - # If the unit is not socket-activated, record - # that this unit needs to be started below. - # We write this to a file to ensure that the - # service gets restarted if we're interrupted. - if (!$socketActivated) { - $unitsToStart{$unit} = 1; - recordUnit($startListFile, $unit); - } - - $unitsToStop{$unit} = 1; - } - } - } + handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, %unitsToSkip); } } } @@ -362,8 +392,6 @@ sub filterUnits { } my @unitsToStopFiltered = filterUnits(\%unitsToStop); -my @unitsToStartFiltered = filterUnits(\%unitsToStart); - # Show dry-run actions. if ($action eq "dry-activate") { @@ -375,21 +403,44 @@ if ($action eq "dry-activate") { print STDERR "would activate the configuration...\n"; system("$out/dry-activate", "$out"); - $unitsToRestart{$_} = 1 foreach - split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // ""); + # Handle the activation script requesting the restart or reload of a unit. + my %unitsToAlsoStop; + my %unitsToAlsoSkip; + foreach (split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // "")) { + my $unit = $_; + my $baseUnit = $unit; + my $newUnitFile = "$out/etc/systemd/system/$baseUnit"; - $unitsToReload{$_} = 1 foreach - split('\n', read_file($dryReloadByActivationFile, err_mode => 'quiet') // ""); + # Detect template instances. + if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) { + $baseUnit = "$1\@.$2"; + $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + } + + my $baseName = $baseUnit; + $baseName =~ s/\.[a-z]*$//; + + handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToAlsoStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, %unitsToAlsoSkip); + } + unlink($dryRestartByActivationFile); + + my @unitsToAlsoStopFiltered = filterUnits(\%unitsToAlsoStop); + if (scalar(keys %unitsToAlsoStop) > 0) { + print STDERR "would stop the following units as well: ", join(", ", @unitsToAlsoStopFiltered), "\n" + if scalar @unitsToAlsoStopFiltered; + } + + print STDERR "would NOT restart the following changed units as well: ", join(", ", sort(keys %unitsToAlsoSkip)), "\n" + if scalar(keys %unitsToAlsoSkip) > 0; print STDERR "would restart systemd\n" if $restartSystemd; - print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" - if scalar(keys %unitsToRestart) > 0; - print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" - if scalar @unitsToStartFiltered; print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" if scalar(keys %unitsToReload) > 0; - unlink($dryRestartByActivationFile); - unlink($dryReloadByActivationFile); + print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" + if scalar(keys %unitsToRestart) > 0; + my @unitsToStartFiltered = filterUnits(\%unitsToStart); + print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" + if scalar @unitsToStartFiltered; exit 0; } @@ -400,7 +451,7 @@ if (scalar (keys %unitsToStop) > 0) { print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" if scalar @unitsToStopFiltered; # Use current version of systemctl binary before daemon is reexeced. - system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? + system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); } print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" @@ -414,12 +465,38 @@ system("$out/activate", "$out") == 0 or $res = 2; # Handle the activation script requesting the restart or reload of a unit. # We can only restart and reload (not stop/start) because the units to be -# stopped are already stopped before the activation script is run. -$unitsToRestart{$_} = 1 foreach - split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // ""); +# stopped are already stopped before the activation script is run. We do however +# make an exception for services that are socket-activated and that have to be stopped +# instead of being restarted. +my %unitsToAlsoStop; +my %unitsToAlsoSkip; +foreach (split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // "")) { + my $unit = $_; + my $baseUnit = $unit; + my $newUnitFile = "$out/etc/systemd/system/$baseUnit"; -$unitsToReload{$_} = 1 foreach - split('\n', read_file($reloadByActivationFile, err_mode => 'quiet') // ""); + # Detect template instances. + if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) { + $baseUnit = "$1\@.$2"; + $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + } + + my $baseName = $baseUnit; + $baseName =~ s/\.[a-z]*$//; + + handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToAlsoStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, %unitsToAlsoSkip); +} +unlink($restartByActivationFile); + +my @unitsToAlsoStopFiltered = filterUnits(\%unitsToAlsoStop); +if (scalar(keys %unitsToAlsoStop) > 0) { + print STDERR "stopping the following units as well: ", join(", ", @unitsToAlsoStopFiltered), "\n" + if scalar @unitsToAlsoStopFiltered; + system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToAlsoStop)); +} + +print STDERR "NOT restarting the following changed units as well: ", join(", ", sort(keys %unitsToAlsoSkip)), "\n" + if scalar(keys %unitsToAlsoSkip) > 0; # Restart systemd if necessary. Note that this is done using the # current version of systemd, just in case the new one has trouble @@ -460,14 +537,40 @@ if (scalar(keys %unitsToReload) > 0) { print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; unlink($reloadListFile); - unlink($reloadByActivationFile); } # Restart changed services (those that have to be restarted rather # than stopped and started). if (scalar(keys %unitsToRestart) > 0) { print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"; - system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4; + + # We split the units to be restarted into sockets and non-sockets. + # This is because restarting sockets may fail which is not bad by + # itself but which will prevent changes on the sockets. We usually + # restart the socket and stop the service before that. Restarting + # the socket will fail however when the service was re-activated + # in the meantime. There is no proper way to prevent that from happening. + my @unitsWithErrorHandling = grep { $_ !~ /\.socket$/ } sort(keys %unitsToRestart); + my @unitsWithoutErrorHandling = grep { $_ =~ /\.socket$/ } sort(keys %unitsToRestart); + + if (scalar(@unitsWithErrorHandling) > 0) { + system("@systemd@/bin/systemctl", "restart", "--", @unitsWithErrorHandling) == 0 or $res = 4; + } + if (scalar(@unitsWithoutErrorHandling) > 0) { + # Don't print warnings from systemctl + no warnings 'once'; + open(OLDERR, ">&", \*STDERR); + close(STDERR); + + my $ret = system("@systemd@/bin/systemctl", "restart", "--", @unitsWithoutErrorHandling); + + # Print stderr again + open(STDERR, ">&OLDERR"); + + if ($ret ne 0) { + print STDERR "warning: some sockets failed to restart. Please check your journal (journalctl -eb) and act accordingly.\n"; + } + } unlink($restartListFile); unlink($restartByActivationFile); } @@ -478,6 +581,7 @@ if (scalar(keys %unitsToRestart) > 0) { # that are symlinks to other units. We shouldn't start both at the # same time because we'll get a "Failed to add path to set" error from # systemd. +my @unitsToStartFiltered = filterUnits(\%unitsToStart); print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n" if scalar @unitsToStartFiltered; system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; @@ -485,7 +589,7 @@ unlink($startListFile); # Print failed and new units. -my (@failed, @new, @restarting); +my (@failed, @new); my $activeNew = getActiveUnits; while (my ($unit, $state) = each %{$activeNew}) { if ($state->{state} eq "failed") { @@ -501,7 +605,9 @@ while (my ($unit, $state) = each %{$activeNew}) { push @failed, $unit; } } - elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit}) { + # Ignore scopes since they are not managed by this script but rather + # created and managed by third-party services via the systemd dbus API. + elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit} && $unit !~ /\.scope$/) { push @new, $unit; } } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 026fd1791d33..68da910d29cc 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -84,6 +84,13 @@ let export localeArchive="${config.i18n.glibcLocales}/lib/locale/locale-archive" substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration chmod +x $out/bin/switch-to-configuration + ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' + if ! output=$($perl/bin/perl -c $out/bin/switch-to-configuration 2>&1); then + echo "switch-to-configuration syntax is not valid:" + echo "$output" + exit 1 + fi + ''} echo -n "${toString config.system.extraDependencies}" > $out/extra-dependencies diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 46f2e3fec04c..4a9da9394519 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -83,7 +83,10 @@ in }; boot.kernelParams = mkOption { - type = types.listOf types.str; + type = types.listOf (types.strMatching ''([^"[:space:]]|"[^"]*")+'' // { + name = "kernelParam"; + description = "string, with spaces inside double quotes"; + }); default = [ ]; description = "Parameters added to the kernel command line."; }; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 7134b4321630..6c26b4e0f87a 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -208,10 +208,15 @@ def main() -> None: if os.path.exists("@efiSysMountPoint@/loader/loader.conf"): os.unlink("@efiSysMountPoint@/loader/loader.conf") - if "@canTouchEfiVariables@" == "1": - subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "install"]) - else: - subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "--no-variables", "install"]) + flags = [] + + if "@canTouchEfiVariables@" != "1": + flags.append("--no-variables") + + if "@graceful@" == "1": + flags.append("--graceful") + + subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@"] + flags + ["install"]) else: # Update bootloader to latest if needed systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index ff304f570d35..0f76d7d6b24a 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -24,7 +24,7 @@ let configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; - inherit (cfg) consoleMode; + inherit (cfg) consoleMode graceful; inherit (efi) efiSysMountPoint canTouchEfiVariables; @@ -126,6 +126,22 @@ in { ''; }; }; + + graceful = mkOption { + default = false; + + type = types.bool; + + description = '' + Invoke bootctl install with the --graceful option, + which ignores errors when EFI variables cannot be written or when the EFI System Partition + cannot be found. Currently only applies to random seed operations. + + Only enable this option if systemd-boot otherwise fails to install, as the + scope or implication of the --graceful option may change in the future. + ''; + }; + }; config = mkIf cfg.enable { diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 51e105bf6276..662dfe2db989 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -250,6 +250,16 @@ let (assertRange "ERSPANIndex" 1 1048575) ]; + sectionFooOverUDP = checkUnitConfig "FooOverUDP" [ + (assertOnlyFields [ + "Port" + "Encapsulation" + "Protocol" + ]) + (assertPort "Port") + (assertValueOneOf "Encapsulation" ["FooOverUDP" "GenericUDPEncapsulation"]) + ]; + sectionPeer = checkUnitConfig "Peer" [ (assertOnlyFields [ "Name" @@ -919,6 +929,18 @@ let ''; }; + fooOverUDPConfig = mkOption { + default = { }; + example = { Port = 9001; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionFooOverUDP; + description = '' + Each attribute in this set specifies an option in the + [FooOverUDP] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + peerConfig = mkOption { default = {}; example = { Name = "veth2"; }; @@ -1449,6 +1471,10 @@ let [Tunnel] ${attrsToSection def.tunnelConfig} '' + + optionalString (def.fooOverUDPConfig != { }) '' + [FooOverUDP] + ${attrsToSection def.fooOverUDPConfig} + '' + optionalString (def.peerConfig != { }) '' [Peer] ${attrsToSection def.peerConfig} diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index bd7e955a6f42..adbed9d8d58e 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -137,6 +137,14 @@ let copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs ''} + # Copy multipath. + ${optionalString config.services.multipath.enable '' + copy_bin_and_libs ${config.services.multipath.package}/bin/multipath + copy_bin_and_libs ${config.services.multipath.package}/bin/multipathd + # Copy lib/multipath manually. + cp -rpv ${config.services.multipath.package}/lib/multipath $out/lib + ''} + # Copy secrets if needed. # # TODO: move out to a separate script; see #85000. @@ -199,6 +207,10 @@ let $out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:" LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep -q "LVM" $out/bin/mdadm --version + ${optionalString config.services.multipath.enable '' + ($out/bin/multipath || true) 2>&1 | grep -q 'need to be root' + ($out/bin/multipathd || true) 2>&1 | grep -q 'need to be root' + ''} ${config.boot.initrd.extraUtilsCommandsTest} fi @@ -338,7 +350,26 @@ let { object = pkgs.kmod-debian-aliases; symlink = "/etc/modprobe.d/debian.conf"; } - ]; + ] ++ lib.optionals config.services.multipath.enable [ + { object = pkgs.runCommand "multipath.conf" { + src = config.environment.etc."multipath.conf".text; + preferLocalBuild = true; + } '' + target=$out + printf "$src" > $out + substituteInPlace $out \ + --replace ${config.services.multipath.package}/lib ${extraUtils}/lib + ''; + symlink = "/etc/multipath.conf"; + } + ] ++ (lib.mapAttrsToList + (symlink: options: + { + inherit symlink; + object = options.source; + } + ) + config.boot.initrd.extraFiles); }; # Script to add secret files to the initrd at bootloader update time @@ -419,6 +450,22 @@ in ''; }; + boot.initrd.extraFiles = mkOption { + default = { }; + type = types.attrsOf + (types.submodule { + options = { + source = mkOption { + type = types.package; + description = "The object to make available inside the initrd."; + }; + }; + }); + description = '' + Extra files to link and copy in to the initrd. + ''; + }; + boot.initrd.prepend = mkOption { default = [ ]; type = types.listOf types.str; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 11bd159319a3..e8e2de090b32 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -61,6 +61,8 @@ let MACAddress = i.macAddress; } // optionalAttrs (i.mtu != null) { MTUBytes = toString i.mtu; + } // optionalAttrs (i.wakeOnLan.enable == true) { + WakeOnLan = "magic"; }; }; in listToAttrs (map createNetworkLink interfaces); @@ -464,6 +466,39 @@ let ''; }); + createFouEncapsulation = n: v: nameValuePair "${n}-fou-encap" + (let + # if we have a device to bind to we can wait for its addresses to be + # configured, otherwise external sequencing is required. + deps = optionals (v.local != null && v.local.dev != null) + (deviceDependency v.local.dev ++ [ "network-addresses-${v.local.dev}.service" ]); + fouSpec = "port ${toString v.port} ${ + if v.protocol != null then "ipproto ${toString v.protocol}" else "gue" + } ${ + optionalString (v.local != null) "local ${escapeShellArg v.local.address} ${ + optionalString (v.local.dev != null) "dev ${escapeShellArg v.local.dev}" + }" + }"; + in + { description = "FOU endpoint ${n}"; + wantedBy = [ "network-setup.service" (subsystemDevice n) ]; + bindsTo = deps; + partOf = [ "network-setup.service" ]; + after = [ "network-pre.target" ] ++ deps; + before = [ "network-setup.service" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + path = [ pkgs.iproute2 ]; + script = '' + # always remove previous incarnation since show can't filter + ip fou del ${fouSpec} >/dev/null 2>&1 || true + ip fou add ${fouSpec} + ''; + postStop = '' + ip fou del ${fouSpec} || true + ''; + }); + createSitDevice = n: v: nameValuePair "${n}-netdev" (let deps = deviceDependency v.dev; @@ -484,7 +519,12 @@ let ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ ${optionalString (v.ttl != null) "ttl ${toString v.ttl}"} \ - ${optionalString (v.dev != null) "dev \"${v.dev}\""} + ${optionalString (v.dev != null) "dev \"${v.dev}\""} \ + ${optionalString (v.encapsulation != null) + "encap ${v.encapsulation.type} encap-dport ${toString v.encapsulation.port} ${ + optionalString (v.encapsulation.sourcePort != null) + "encap-sport ${toString v.encapsulation.sourcePort}" + }"} ip link set "${n}" up ''; postStop = '' @@ -528,6 +568,7 @@ let // mapAttrs' createVswitchDevice cfg.vswitches // mapAttrs' createBondDevice cfg.bonds // mapAttrs' createMacvlanDevice cfg.macvlans + // mapAttrs' createFouEncapsulation cfg.fooOverUDP // mapAttrs' createSitDevice cfg.sits // mapAttrs' createVlanDevice cfg.vlans // { diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 225f9dc67fcc..ccfd7fd4132b 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -47,6 +47,9 @@ in } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; + }) ++ flip mapAttrsToList cfg.fooOverUDP (n: { local, ... }: { + assertion = local == null; + message = "networking.fooOverUDP.${n}.local is not supported by networkd."; }); networking.dhcpcd.enable = mkDefault false; @@ -194,6 +197,23 @@ in macvlan = [ name ]; } ]); }))) + (mkMerge (flip mapAttrsToList cfg.fooOverUDP (name: fou: { + netdevs."40-${name}" = { + netdevConfig = { + Name = name; + Kind = "fou"; + }; + # unfortunately networkd cannot encode dependencies of netdevs on addresses/routes, + # so we cannot specify Local=, Peer=, PeerPort=. this looks like a missing feature + # in networkd. + fooOverUDPConfig = { + Port = fou.port; + Encapsulation = if fou.protocol != null then "FooOverUDP" else "GenericUDPEncapsulation"; + } // (optionalAttrs (fou.protocol != null) { + Protocol = fou.protocol; + }); + }; + }))) (mkMerge (flip mapAttrsToList cfg.sits (name: sit: { netdevs."40-${name}" = { netdevConfig = { @@ -207,7 +227,17 @@ in Local = sit.local; }) // (optionalAttrs (sit.ttl != null) { TTL = sit.ttl; - }); + }) // (optionalAttrs (sit.encapsulation != null) ( + { + FooOverUDP = true; + Encapsulation = + if sit.encapsulation.type == "fou" + then "FooOverUDP" + else "GenericUDPEncapsulation"; + FOUDestinationPort = sit.encapsulation.port; + } // (optionalAttrs (sit.encapsulation.sourcePort != null) { + FOUSourcePort = sit.encapsulation.sourcePort; + }))); }; networks = mkIf (sit.dev != null) { "40-${sit.dev}" = (mkMerge [ (genericNetwork (mkOverride 999)) { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 47626bf030ac..4e20ec118464 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -10,6 +10,8 @@ let hasVirtuals = any (i: i.virtual) interfaces; hasSits = cfg.sits != { }; hasBonds = cfg.bonds != { }; + hasFous = cfg.fooOverUDP != { } + || filterAttrs (_: s: s.encapsulation != null) cfg.sits != { }; slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) @@ -284,6 +286,13 @@ let ''; }; + wakeOnLan = { + enable = mkOption { + type = types.bool; + default = false; + description = "Wether to enable wol on this interface."; + }; + }; }; config = { @@ -816,6 +825,71 @@ in }); }; + networking.fooOverUDP = mkOption { + default = { }; + example = + { + primary = { port = 9001; local = { address = "192.0.2.1"; dev = "eth0"; }; }; + backup = { port = 9002; }; + }; + description = '' + This option allows you to configure Foo Over UDP and Generic UDP Encapsulation + endpoints. See ip-fou + 8 for details. + ''; + type = with types; attrsOf (submodule { + options = { + port = mkOption { + type = port; + description = '' + Local port of the encapsulation UDP socket. + ''; + }; + + protocol = mkOption { + type = nullOr (ints.between 1 255); + default = null; + description = '' + Protocol number of the encapsulated packets. Specifying null + (the default) creates a GUE endpoint, specifying a protocol number will create + a FOU endpoint. + ''; + }; + + local = mkOption { + type = nullOr (submodule { + options = { + address = mkOption { + type = types.str; + description = '' + Local address to bind to. The address must be available when the FOU + endpoint is created, using the scripted network setup this can be achieved + either by setting dev or adding dependency information to + systemd.services.<name>-fou-encap; it isn't supported + when using networkd. + ''; + }; + + dev = mkOption { + type = nullOr str; + default = null; + example = "eth0"; + description = '' + Network device to bind to. + ''; + }; + }; + }); + default = null; + example = { address = "203.0.113.22"; }; + description = '' + Local address (and optionally device) to bind to using the given port. + ''; + }; + }; + }); + }; + networking.sits = mkOption { default = { }; example = literalExpression '' @@ -875,6 +949,44 @@ in ''; }; + encapsulation = with types; mkOption { + type = nullOr (submodule { + options = { + type = mkOption { + type = enum [ "fou" "gue" ]; + description = '' + Selects encapsulation type. See + ip-link + 8 for details. + ''; + }; + + port = mkOption { + type = port; + example = 9001; + description = '' + Destination port for encapsulated packets. + ''; + }; + + sourcePort = mkOption { + type = nullOr types.port; + default = null; + example = 9002; + description = '' + Source port for encapsulated packets. Will be chosen automatically by + the kernel if unset. + ''; + }; + }; + }); + default = null; + example = { type = "fou"; port = 9001; }; + description = '' + Configures encapsulation in UDP packets. + ''; + }; + }; }); @@ -1109,7 +1221,8 @@ in boot.kernelModules = [ ] ++ optional hasVirtuals "tun" ++ optional hasSits "sit" - ++ optional hasBonds "bonding"; + ++ optional hasBonds "bonding" + ++ optional hasFous "fou"; boot.extraModprobeConfig = # This setting is intentional as it prevents default bond devices diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix index b3bcfff19807..fb6502644b80 100644 --- a/nixos/modules/virtualisation/hyperv-guest.nix +++ b/nixos/modules/virtualisation/hyperv-guest.nix @@ -34,7 +34,7 @@ in { initrd.availableKernelModules = [ "hyperv_keyboard" ]; kernelParams = [ - "video=hyperv_fb:${cfg.videoMode} elevator=noop" + "video=hyperv_fb:${cfg.videoMode}" "elevator=noop" ]; }; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 77b43d9d843f..121e7286bc13 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -13,23 +13,140 @@ let ''; ovmfFilePrefix = if pkgs.stdenv.isAarch64 then "AAVMF" else "OVMF"; qemuConfigFile = pkgs.writeText "qemu.conf" '' - ${optionalString cfg.qemuOvmf '' + ${optionalString cfg.qemu.ovmf.enable '' nvram = [ "/run/libvirt/nix-ovmf/${ovmfFilePrefix}_CODE.fd:/run/libvirt/nix-ovmf/${ovmfFilePrefix}_VARS.fd" ] ''} - ${optionalString (!cfg.qemuRunAsRoot) '' + ${optionalString (!cfg.qemu.runAsRoot) '' user = "qemu-libvirtd" group = "qemu-libvirtd" ''} - ${cfg.qemuVerbatimConfig} + ${cfg.qemu.verbatimConfig} ''; dirName = "libvirt"; subDirs = list: [ dirName ] ++ map (e: "${dirName}/${e}") list; -in { + ovmfModule = types.submodule { + options = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Allows libvirtd to take advantage of OVMF when creating new + QEMU VMs with UEFI boot. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.OVMF; + defaultText = literalExpression "pkgs.OVMF"; + example = literalExpression "pkgs.OVMFFull"; + description = '' + OVMF package to use. + ''; + }; + }; + }; + + swtpmModule = types.submodule { + options = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Allows libvirtd to use swtpm to create an emulated TPM. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.swtpm; + defaultText = literalExpression "pkgs.swtpm"; + description = '' + swtpm package to use. + ''; + }; + }; + }; + + qemuModule = types.submodule { + options = { + package = mkOption { + type = types.package; + default = pkgs.qemu; + defaultText = literalExpression "pkgs.qemu"; + description = '' + Qemu package to use with libvirt. + `pkgs.qemu` can emulate alien architectures (e.g. aarch64 on x86) + `pkgs.qemu_kvm` saves disk space allowing to emulate only host architectures. + ''; + }; + + runAsRoot = mkOption { + type = types.bool; + default = true; + description = '' + If true, libvirtd runs qemu as root. + If false, libvirtd runs qemu as unprivileged user qemu-libvirtd. + Changing this option to false may cause file permission issues + for existing guests. To fix these, manually change ownership + of affected files in /var/lib/libvirt/qemu to qemu-libvirtd. + ''; + }; + + verbatimConfig = mkOption { + type = types.lines; + default = '' + namespaces = [] + ''; + description = '' + Contents written to the qemu configuration file, qemu.conf. + Make sure to include a proper namespace configuration when + supplying custom configuration. + ''; + }; + + ovmf = mkOption { + type = ovmfModule; + default = { }; + description = '' + QEMU's OVMF options. + ''; + }; + + swtpm = mkOption { + type = swtpmModule; + default = { }; + description = '' + QEMU's swtpm options. + ''; + }; + }; + }; +in +{ imports = [ (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ] - "Set the option `virtualisation.libvirtd.qemuPackage' instead.") + "Set the option `virtualisation.libvirtd.qemu.package' instead.") + (mkRenamedOptionModule + [ "virtualisation" "libvirtd" "qemuPackage" ] + [ "virtualisation" "libvirtd" "qemu" "package" ]) + (mkRenamedOptionModule + [ "virtualisation" "libvirtd" "qemuRunAsRoot" ] + [ "virtualisation" "libvirtd" "qemu" "runAsRoot" ]) + (mkRenamedOptionModule + [ "virtualisation" "libvirtd" "qemuVerbatimConfig" ] + [ "virtualisation" "libvirtd" "qemu" "verbatimConfig" ]) + (mkRenamedOptionModule + [ "virtualisation" "libvirtd" "qemuOvmf" ] + [ "virtualisation" "libvirtd" "qemu" "ovmf" "enable" ]) + (mkRenamedOptionModule + [ "virtualisation" "libvirtd" "qemuOvmfPackage" ] + [ "virtualisation" "libvirtd" "qemu" "ovmf" "package" ]) + (mkRenamedOptionModule + [ "virtualisation" "libvirtd" "qemuSwtpm" ] + [ "virtualisation" "libvirtd" "qemu" "swtpm" "enable" ]) ]; ###### interface @@ -56,17 +173,6 @@ in { ''; }; - qemuPackage = mkOption { - type = types.package; - default = pkgs.qemu; - defaultText = literalExpression "pkgs.qemu"; - description = '' - Qemu package to use with libvirt. - `pkgs.qemu` can emulate alien architectures (e.g. aarch64 on x86) - `pkgs.qemu_kvm` saves disk space allowing to emulate only host architectures. - ''; - }; - extraConfig = mkOption { type = types.lines; default = ""; @@ -76,39 +182,6 @@ in { ''; }; - qemuRunAsRoot = mkOption { - type = types.bool; - default = true; - description = '' - If true, libvirtd runs qemu as root. - If false, libvirtd runs qemu as unprivileged user qemu-libvirtd. - Changing this option to false may cause file permission issues - for existing guests. To fix these, manually change ownership - of affected files in /var/lib/libvirt/qemu to qemu-libvirtd. - ''; - }; - - qemuVerbatimConfig = mkOption { - type = types.lines; - default = '' - namespaces = [] - ''; - description = '' - Contents written to the qemu configuration file, qemu.conf. - Make sure to include a proper namespace configuration when - supplying custom configuration. - ''; - }; - - qemuOvmf = mkOption { - type = types.bool; - default = true; - description = '' - Allows libvirtd to take advantage of OVMF when creating new - QEMU VMs with UEFI boot. - ''; - }; - extraOptions = mkOption { type = types.listOf types.str; default = [ ]; @@ -119,7 +192,7 @@ in { }; onBoot = mkOption { - type = types.enum ["start" "ignore" ]; + type = types.enum [ "start" "ignore" ]; default = "start"; description = '' Specifies the action to be done to / on the guests when the host boots. @@ -131,7 +204,7 @@ in { }; onShutdown = mkOption { - type = types.enum ["shutdown" "suspend" ]; + type = types.enum [ "shutdown" "suspend" ]; default = "suspend"; description = '' When shutting down / restarting the host what method should @@ -149,6 +222,13 @@ in { ''; }; + qemu = mkOption { + type = qemuModule; + default = { }; + description = '' + QEMU related options. + ''; + }; }; @@ -161,13 +241,19 @@ in { assertion = config.security.polkit.enable; message = "The libvirtd module currently requires Polkit to be enabled ('security.polkit.enable = true')."; } + { + assertion = builtins.elem "fd" cfg.qemu.ovmf.package.outputs; + message = "The option 'virtualisation.libvirtd.qemuOvmfPackage' needs a package that has an 'fd' output."; + } ]; environment = { # this file is expected in /etc/qemu and not sysconfdir (/var/lib) - etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: - "allow ${e}") cfg.allowedBridges; - systemPackages = with pkgs; [ libressl.nc iptables cfg.package cfg.qemuPackage ]; + etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" + (e: + "allow ${e}") + cfg.allowedBridges; + systemPackages = with pkgs; [ libressl.nc iptables cfg.package cfg.qemu.package ]; etc.ethertypes.source = "${pkgs.ebtables}/etc/ethertypes"; }; @@ -209,17 +295,17 @@ in { cp -f ${qemuConfigFile} /var/lib/${dirName}/qemu.conf # stable (not GC'able as in /nix/store) paths for using in section of xml configs - for emulator in ${cfg.package}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do + for emulator in ${cfg.package}/libexec/libvirt_lxc ${cfg.qemu.package}/bin/qemu-kvm ${cfg.qemu.package}/bin/qemu-system-*; do ln -s --force "$emulator" /run/${dirName}/nix-emulators/ done for helper in libexec/qemu-bridge-helper bin/qemu-pr-helper; do - ln -s --force ${cfg.qemuPackage}/$helper /run/${dirName}/nix-helpers/ + ln -s --force ${cfg.qemu.package}/$helper /run/${dirName}/nix-helpers/ done - ${optionalString cfg.qemuOvmf '' - ln -s --force ${pkgs.OVMF.fd}/FV/${ovmfFilePrefix}_CODE.fd /run/${dirName}/nix-ovmf/ - ln -s --force ${pkgs.OVMF.fd}/FV/${ovmfFilePrefix}_VARS.fd /run/${dirName}/nix-ovmf/ + ${optionalString cfg.qemu.ovmf.enable '' + ln -s --force ${cfg.qemu.ovmf.package.fd}/FV/${ovmfFilePrefix}_CODE.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${cfg.qemu.ovmf.package.fd}/FV/${ovmfFilePrefix}_VARS.fd /run/${dirName}/nix-ovmf/ ''} ''; @@ -235,15 +321,20 @@ in { systemd.services.libvirtd = { requires = [ "libvirtd-config.service" ]; after = [ "libvirtd-config.service" ] - ++ optional vswitch.enable "ovs-vswitchd.service"; + ++ optional vswitch.enable "ovs-vswitchd.service"; environment.LIBVIRTD_ARGS = escapeShellArgs ( - [ "--config" configFile - "--timeout" "120" # from ${libvirt}/var/lib/sysconfig/libvirtd - ] ++ cfg.extraOptions); + [ + "--config" + configFile + "--timeout" + "120" # from ${libvirt}/var/lib/sysconfig/libvirtd + ] ++ cfg.extraOptions + ); - path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images - ++ optional vswitch.enable vswitch.package; + path = [ cfg.qemu.package ] # libvirtd requires qemu-img to manage disk images + ++ optional vswitch.enable vswitch.package + ++ optional cfg.qemu.swtpm.enable cfg.qemu.swtpm.package; serviceConfig = { Type = "notify"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1c44030eaab2..12b67008291e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -311,6 +311,7 @@ in nitter = handleTest ./nitter.nix {}; nix-serve = handleTest ./nix-ssh-serve.nix {}; nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; + nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; @@ -375,6 +376,7 @@ in prosody = handleTest ./xmpp/prosody.nix {}; prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {}; proxy = handleTest ./proxy.nix {}; + prowlarr = handleTest ./prowlarr.nix {}; pt2-clone = handleTest ./pt2-clone.nix {}; qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {}; quorum = handleTest ./quorum.nix {}; diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index e482223436fa..7110187e8d76 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -383,5 +383,18 @@ import ./make-test-python.nix ({ pkgs, ... }: { docker.succeed( "tar -tf ${examples.exportBash} | grep '\./bin/bash' > /dev/null" ) + + with subtest("Ensure bare paths in contents are loaded correctly"): + docker.succeed( + "docker load --input='${examples.build-image-with-path}'", + "docker run --rm build-image-with-path bash -c '[[ -e /hello.txt ]]'", + "docker rmi build-image-with-path", + ) + docker.succeed( + "${examples.layered-image-with-path} | docker load", + "docker run --rm layered-image-with-path bash -c '[[ -e /hello.txt ]]'", + "docker rmi layered-image-with-path", + ) + ''; }) diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index 55f9c90c20a0..b9ff5e682875 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -25,6 +25,21 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.desktopManager.gnome.debug = true; services.xserver.displayManager.defaultSession = "gnome-xorg"; + systemd.user.services = { + "org.gnome.Shell@x11" = { + serviceConfig = { + ExecStart = [ + # Clear the list before overriding it. + "" + # Eval API is now internal so Shell needs to run in unsafe mode. + # TODO: improve test driver so that it supports openqa-like manipulation + # that would allow us to drop this mess. + "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + ]; + }; + }; + }; + virtualisation.memorySize = 1024; }; diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index e8d18a41bd06..1da97f733cfd 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -30,6 +30,21 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }) ]; + systemd.user.services = { + "org.gnome.Shell@wayland" = { + serviceConfig = { + ExecStart = [ + # Clear the list before overriding it. + "" + # Eval API is now internal so Shell needs to run in unsafe mode. + # TODO: improve test driver so that it supports openqa-like manipulation + # that would allow us to drop this mess. + "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + ]; + }; + }; + }; + virtualisation.memorySize = 1024; }; diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix new file mode 100644 index 000000000000..a26fea503b62 --- /dev/null +++ b/nixos/tests/iscsi-multipath-root.nix @@ -0,0 +1,267 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + let + initiatorName = "iqn.2020-08.org.linux-iscsi.initiatorhost:example"; + targetName = "iqn.2003-01.org.linux-iscsi.target.x8664:sn.acf8fd9c23af"; + in + { + name = "iscsi"; + meta = { + maintainers = pkgs.lib.teams.deshaw.members; + }; + + nodes = { + target = { config, pkgs, lib, ... }: { + virtualisation.vlans = [ 1 2 ]; + services.target = { + enable = true; + config = { + fabric_modules = [ ]; + storage_objects = [ + { + dev = "/dev/vdb"; + name = "test"; + plugin = "block"; + write_back = true; + wwn = "92b17c3f-6b40-4168-b082-ceeb7b495522"; + } + ]; + targets = [ + { + fabric = "iscsi"; + tpgs = [ + { + enable = true; + attributes = { + authentication = 0; + generate_node_acls = 1; + }; + luns = [ + { + alias = "94dfe06967"; + alua_tg_pt_gp_name = "default_tg_pt_gp"; + index = 0; + storage_object = "/backstores/block/test"; + } + ]; + node_acls = [ + { + mapped_luns = [ + { + alias = "d42f5bdf8a"; + index = 0; + tpg_lun = 0; + write_protect = false; + } + ]; + node_wwn = initiatorName; + } + ]; + portals = [ + { + ip_address = "0.0.0.0"; + iser = false; + offload = false; + port = 3260; + } + ]; + tag = 1; + } + ]; + wwn = targetName; + } + ]; + }; + }; + + networking.firewall.allowedTCPPorts = [ 3260 ]; + networking.firewall.allowedUDPPorts = [ 3260 ]; + + virtualisation.memorySize = 2048; + virtualisation.emptyDiskImages = [ 2048 ]; + }; + + initiatorAuto = { nodes, config, pkgs, ... }: { + virtualisation.vlans = [ 1 2 ]; + + services.multipath = { + enable = true; + defaults = '' + find_multipaths yes + user_friendly_names yes + ''; + pathGroups = [ + { + alias = 123456; + wwid = "3600140592b17c3f6b404168b082ceeb7"; + } + ]; + }; + + services.openiscsi = { + enable = true; + enableAutoLoginOut = true; + discoverPortal = "target"; + name = initiatorName; + }; + + environment.systemPackages = with pkgs; [ + xfsprogs + ]; + + environment.etc."initiator-root-disk-closure".source = nodes.initiatorRootDisk.config.system.build.toplevel; + + nix.binaryCaches = lib.mkForce [ ]; + nix.extraOptions = '' + hashed-mirrors = + connect-timeout = 1 + ''; + }; + + initiatorRootDisk = { config, pkgs, modulesPath, lib, ... }: { + boot.initrd.network.enable = true; + boot.loader.grub.enable = false; + + boot.kernelParams = lib.mkOverride 5 ( + [ + "boot.shell_on_fail" + "console=tty1" + "ip=192.168.1.1:::255.255.255.0::ens9:none" + "ip=192.168.2.1:::255.255.255.0::ens10:none" + ] + ); + + # defaults to true, puts some code in the initrd that tries to mount an overlayfs on /nix/store + virtualisation.writableStore = false; + virtualisation.vlans = [ 1 2 ]; + + services.multipath = { + enable = true; + defaults = '' + find_multipaths yes + user_friendly_names yes + ''; + pathGroups = [ + { + alias = 123456; + wwid = "3600140592b17c3f6b404168b082ceeb7"; + } + ]; + }; + + fileSystems = lib.mkOverride 5 { + "/" = { + fsType = "xfs"; + device = "/dev/mapper/123456"; + options = [ "_netdev" ]; + }; + }; + + boot.initrd.extraFiles."etc/multipath/wwids".source = pkgs.writeText "wwids" "/3600140592b17c3f6b404168b082ceeb7/"; + + boot.iscsi-initiator = { + discoverPortal = "target"; + name = initiatorName; + target = targetName; + extraIscsiCommands = '' + iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login + ''; + }; + }; + + }; + + testScript = { nodes, ... }: '' + target.start() + target.wait_for_unit("iscsi-target.service") + + initiatorAuto.start() + + initiatorAuto.wait_for_unit("iscsid.service") + initiatorAuto.wait_for_unit("iscsi.service") + initiatorAuto.get_unit_info("iscsi") + + # Expecting this to fail since we should already know about 192.168.1.3 + initiatorAuto.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.1.3 --login") + # Expecting this to succeed since we don't yet know about 192.168.2.3 + initiatorAuto.succeed("iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login") + + # /dev/sda is provided by iscsi on target + initiatorAuto.succeed("set -x; while ! test -e /dev/sda; do sleep 1; done") + + initiatorAuto.succeed("mkfs.xfs /dev/sda") + initiatorAuto.succeed("mkdir /mnt") + + # Start by verifying /dev/sda and /dev/sdb are both the same disk + initiatorAuto.succeed("mount /dev/sda /mnt") + initiatorAuto.succeed("touch /mnt/hi") + initiatorAuto.succeed("umount /mnt") + + initiatorAuto.succeed("mount /dev/sdb /mnt") + initiatorAuto.succeed("test -e /mnt/hi") + initiatorAuto.succeed("umount /mnt") + + initiatorAuto.succeed("systemctl restart multipathd") + initiatorAuto.succeed("multipath -ll | systemd-cat") + + # Install our RootDisk machine to 123456, the alias to the device that multipath is now managing + initiatorAuto.succeed("mount /dev/mapper/123456 /mnt") + initiatorAuto.succeed("mkdir -p /mnt/etc/{multipath,iscsi}") + initiatorAuto.succeed("cp -r /etc/multipath/wwids /mnt/etc/multipath/wwids") + initiatorAuto.succeed("cp -r /etc/iscsi/{nodes,send_targets} /mnt/etc/iscsi") + initiatorAuto.succeed( + "nixos-install --no-bootloader --no-root-passwd --system /etc/initiator-root-disk-closure" + ) + initiatorAuto.succeed("umount /mnt") + initiatorAuto.shutdown() + + initiatorRootDisk.start() + initiatorRootDisk.wait_for_unit("multi-user.target") + initiatorRootDisk.wait_for_unit("iscsid") + + # Log in over both nodes + initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.1.3 --login") + initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login") + initiatorRootDisk.succeed("systemctl restart multipathd") + initiatorRootDisk.succeed("multipath -ll | systemd-cat") + + # Verify we can write and sync the root disk + initiatorRootDisk.succeed("mkdir /scratch") + initiatorRootDisk.succeed("touch /scratch/both-up") + initiatorRootDisk.succeed("sync /scratch") + + # Verify we can write to the root with ens9 (sda, 192.168.1.3) down + initiatorRootDisk.succeed("ip link set ens9 down") + initiatorRootDisk.succeed("touch /scratch/ens9-down") + initiatorRootDisk.succeed("sync /scratch") + initiatorRootDisk.succeed("ip link set ens9 up") + + # todo: better way to wait until multipath notices the link is back + initiatorRootDisk.succeed("sleep 5") + initiatorRootDisk.succeed("touch /scratch/both-down") + initiatorRootDisk.succeed("sync /scratch") + + # Verify we can write to the root with ens10 (sdb, 192.168.2.3) down + initiatorRootDisk.succeed("ip link set ens10 down") + initiatorRootDisk.succeed("touch /scratch/ens10-down") + initiatorRootDisk.succeed("sync /scratch") + initiatorRootDisk.succeed("ip link set ens10 up") + initiatorRootDisk.succeed("touch /scratch/ens10-down") + initiatorRootDisk.succeed("sync /scratch") + + initiatorRootDisk.succeed("ip link set ens9 up") + initiatorRootDisk.succeed("ip link set ens10 up") + initiatorRootDisk.shutdown() + + # Verify we can boot with the target's eth1 down, forcing + # it to multipath via the second link + target.succeed("ip link set eth1 down") + initiatorRootDisk.start() + initiatorRootDisk.wait_for_unit("multi-user.target") + initiatorRootDisk.wait_for_unit("iscsid") + initiatorRootDisk.succeed("test -e /scratch/both-up") + ''; + } +) + + diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 8b947ddf0cf4..647c8942b37d 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -380,12 +380,57 @@ let router.wait_until_succeeds("ping -c 1 192.168.1.3") ''; }; + fou = { + name = "foo-over-udp"; + nodes.machine = { ... }: { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = networkd; + useDHCP = false; + interfaces.eth1.ipv4.addresses = mkOverride 0 + [ { address = "192.168.1.1"; prefixLength = 24; } ]; + fooOverUDP = { + fou1 = { port = 9001; }; + fou2 = { port = 9002; protocol = 41; }; + fou3 = mkIf (!networkd) + { port = 9003; local.address = "192.168.1.1"; }; + fou4 = mkIf (!networkd) + { port = 9004; local = { address = "192.168.1.1"; dev = "eth1"; }; }; + }; + }; + systemd.services = { + fou3-fou-encap.after = optional (!networkd) "network-addresses-eth1.service"; + }; + }; + testScript = { ... }: + '' + import json + + machine.wait_for_unit("network.target") + fous = json.loads(machine.succeed("ip -json fou show")) + assert {"port": 9001, "gue": None, "family": "inet"} in fous, "fou1 exists" + assert {"port": 9002, "ipproto": 41, "family": "inet"} in fous, "fou2 exists" + '' + optionalString (!networkd) '' + assert { + "port": 9003, + "gue": None, + "family": "inet", + "local": "192.168.1.1", + } in fous, "fou3 exists" + assert { + "port": 9004, + "gue": None, + "family": "inet", + "local": "192.168.1.1", + "dev": "eth1", + } in fous, "fou4 exists" + ''; + }; sit = let node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; - firewall.enable = false; useDHCP = false; sits.sit = { inherit remote; @@ -400,8 +445,30 @@ let }; in { name = "Sit"; - nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; }; - nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; }; + # note on firewalling: the two nodes are explicitly asymmetric. + # client1 sends SIT packets in UDP, but accepts only proto-41 incoming. + # client2 does the reverse, sending in proto-41 and accepting only UDP incoming. + # that way we'll notice when either SIT itself or FOU breaks. + nodes.client1 = args@{ pkgs, ... }: + mkMerge [ + (node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; } args) + { + networking = { + firewall.extraCommands = "iptables -A INPUT -p 41 -j ACCEPT"; + sits.sit.encapsulation = { type = "fou"; port = 9001; }; + }; + } + ]; + nodes.client2 = args@{ pkgs, ... }: + mkMerge [ + (node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; } args) + { + networking = { + firewall.allowedUDPPorts = [ 9001 ]; + fooOverUDP.fou1 = { port = 9001; protocol = 41; }; + }; + } + ]; testScript = { ... }: '' start_all() diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 40ee9d5184cc..eb37470a4c7b 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -33,12 +33,17 @@ in { in { networking.firewall.allowedTCPPorts = [ 80 ]; + systemd.tmpfiles.rules = [ + "d /var/lib/nextcloud-data 0750 nextcloud nginx - -" + ]; + services.nextcloud = { enable = true; + datadir = "/var/lib/nextcloud-data"; hostName = "nextcloud"; config = { # Don't inherit adminuser since "root" is supposed to be the default - inherit adminpass; + adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! dbtableprefix = "nixos_"; }; package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; @@ -98,6 +103,7 @@ in { "${withRcloneEnv} ${copySharedFile}" ) client.wait_for_unit("multi-user.target") + nextcloud.succeed("test -f /var/lib/nextcloud-data/data/root/files/test-shared-file") client.succeed( "${withRcloneEnv} ${diffSharedFile}" ) diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index c0df773eaaa8..80cb63df5dbe 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -32,9 +32,9 @@ in { dbuser = "nextcloud"; dbhost = "127.0.0.1"; dbport = 3306; - dbpass = "hunter2"; + dbpassFile = "${pkgs.writeText "dbpass" "hunter2" }"; # Don't inherit adminuser since "root" is supposed to be the default - inherit adminpass; + adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! }; }; diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix new file mode 100644 index 000000000000..4520b426849b --- /dev/null +++ b/nixos/tests/nixops/default.nix @@ -0,0 +1,115 @@ +{ pkgs, ... }: +let + inherit (pkgs) lib; + + tests = { + # TODO: uncomment stable + # - Blocked on https://github.com/NixOS/nixpkgs/issues/138584 which has a + # PR in staging: https://github.com/NixOS/nixpkgs/pull/139986 + # - Alternatively, blocked on a NixOps 2 release + # https://github.com/NixOS/nixops/issues/1242 + # stable = testsLegacyNetwork { nixopsPkg = pkgs.nixops; }; + unstable = testsForPackage { nixopsPkg = pkgs.nixopsUnstable; }; + + # inherit testsForPackage; + }; + + testsForPackage = lib.makeOverridable (args: lib.recurseIntoAttrs { + legacyNetwork = testLegacyNetwork args; + }); + + testLegacyNetwork = { nixopsPkg }: pkgs.nixosTest ({ + nodes = { + deployer = { config, lib, nodes, pkgs, ... }: { + imports = [ ../../modules/installer/cd-dvd/channel.nix ]; + environment.systemPackages = [ nixopsPkg ]; + nix.binaryCaches = lib.mkForce [ ]; + users.users.person.isNormalUser = true; + virtualisation.writableStore = true; + virtualisation.memorySize = 1024 /*MiB*/; + virtualisation.pathsInNixDB = [ + pkgs.hello + pkgs.figlet + + # This includes build dependencies all the way down. Not efficient, + # but we do need build deps to an *arbitrary* depth, which is hard to + # determine. + (allDrvOutputs nodes.server.config.system.build.toplevel) + ]; + }; + server = { lib, ... }: { + imports = [ ./legacy/base-configuration.nix ]; + }; + }; + + testScript = { nodes }: + let + deployerSetup = pkgs.writeScript "deployerSetup" '' + #!${pkgs.runtimeShell} + set -eux -o pipefail + cp --no-preserve=mode -r ${./legacy} unicorn + cp --no-preserve=mode ${../ssh-keys.nix} unicorn/ssh-keys.nix + mkdir -p ~/.ssh + cp ${snakeOilPrivateKey} ~/.ssh/id_ed25519 + chmod 0400 ~/.ssh/id_ed25519 + ''; + serverNetworkJSON = pkgs.writeText "server-network.json" + (builtins.toJSON nodes.server.config.system.build.networkConfig); + in + '' + import shlex + + def deployer_do(cmd): + cmd = shlex.quote(cmd) + return deployer.succeed(f"su person -l -c {cmd} &>/dev/console") + + start_all() + + deployer_do("cat /etc/hosts") + + deployer_do("${deployerSetup}") + deployer_do("cp ${serverNetworkJSON} unicorn/server-network.json") + + # Establish that ssh works, regardless of nixops + # Easy way to accept the server host key too. + server.wait_for_open_port(22) + deployer.wait_for_unit("network.target") + + # Put newlines on console, to flush the console reader's line buffer + # in case nixops' last output did not end in a newline, as is the case + # with a status line (if implemented?) + deployer.succeed("while sleep 60s; do echo [60s passed] >/dev/console; done &") + + deployer_do("cd ~/unicorn; ssh -oStrictHostKeyChecking=accept-new root@server echo hi") + + # Create and deploy + deployer_do("cd ~/unicorn; nixops create") + + deployer_do("cd ~/unicorn; nixops deploy --confirm") + + deployer_do("cd ~/unicorn; nixops ssh server 'hello | figlet'") + ''; + }); + + inherit (import ../ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + + /* + Return a store path with a closure containing everything including + derivations and all build dependency outputs, all the way down. + */ + allDrvOutputs = pkg: + let name = lib.strings.sanitizeDerivationName "allDrvOutputs-${pkg.pname or pkg.name or "unknown"}"; + in + pkgs.runCommand name { refs = pkgs.writeReferencesToFile pkg.drvPath; } '' + touch $out + while read ref; do + case $ref in + *.drv) + cat $ref >>$out + ;; + esac + done <$refs + ''; + +in +tests diff --git a/nixos/tests/nixops/legacy/base-configuration.nix b/nixos/tests/nixops/legacy/base-configuration.nix new file mode 100644 index 000000000000..dba960f595c2 --- /dev/null +++ b/nixos/tests/nixops/legacy/base-configuration.nix @@ -0,0 +1,31 @@ +{ lib, modulesPath, pkgs, ... }: +let + ssh-keys = + if builtins.pathExists ../../ssh-keys.nix + then # Outside sandbox + ../../ssh-keys.nix + else # In sandbox + ./ssh-keys.nix; + + inherit (import ssh-keys pkgs) + snakeOilPrivateKey snakeOilPublicKey; +in +{ + imports = [ + (modulesPath + "/virtualisation/qemu-vm.nix") + (modulesPath + "/testing/test-instrumentation.nix") + ]; + virtualisation.writableStore = true; + nix.binaryCaches = lib.mkForce [ ]; + virtualisation.graphics = false; + documentation.enable = false; + services.qemuGuest.enable = true; + boot.loader.grub.enable = false; + + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [ + snakeOilPublicKey + ]; + security.pam.services.sshd.limits = + [{ domain = "*"; item = "memlock"; type = "-"; value = 1024; }]; +} diff --git a/nixos/tests/nixops/legacy/nixops.nix b/nixos/tests/nixops/legacy/nixops.nix new file mode 100644 index 000000000000..795dc2a71825 --- /dev/null +++ b/nixos/tests/nixops/legacy/nixops.nix @@ -0,0 +1,15 @@ +{ + network = { + description = "Legacy Network using and legacy state."; + # NB this is not really what makes it a legacy network; lack of flakes is. + storage.legacy = { }; + }; + server = { lib, pkgs, ... }: { + deployment.targetEnv = "none"; + imports = [ + ./base-configuration.nix + (lib.modules.importJSON ./server-network.json) + ]; + environment.systemPackages = [ pkgs.hello pkgs.figlet ]; + }; +} diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index f09859a055d5..7a5b7db94629 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ...} : imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.defaultSession = "plasma5"; + services.xserver.displayManager.defaultSession = "plasma"; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.autoLogin = { enable = true; diff --git a/nixos/tests/prowlarr.nix b/nixos/tests/prowlarr.nix new file mode 100644 index 000000000000..4cbca107568f --- /dev/null +++ b/nixos/tests/prowlarr.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "prowlarr"; + meta.maintainers = with maintainers; [ jdreaver ]; + + nodes.machine = + { pkgs, ... }: + { services.prowlarr.enable = true; }; + + testScript = '' + machine.wait_for_unit("prowlarr.service") + machine.wait_for_open_port("9696") + machine.succeed("curl --fail http://localhost:9696/") + ''; +}) diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix index d1d50caabfa5..252c3dd9c76e 100644 --- a/nixos/tests/samba.nix +++ b/nixos/tests/samba.nix @@ -20,6 +20,7 @@ import ./make-test-python.nix ({ pkgs, ... }: server = { ... }: { services.samba.enable = true; + services.samba.openFirewall = true; services.samba.shares.public = { path = "/public"; "read only" = true; @@ -27,8 +28,6 @@ import ./make-test-python.nix ({ pkgs, ... }: "guest ok" = "yes"; comment = "Public samba share."; }; - networking.firewall.allowedTCPPorts = [ 139 445 ]; - networking.firewall.allowedUDPPorts = [ 137 138 ]; }; }; diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 78adf7ffa7da..4caa7d98f47f 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -7,15 +7,224 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; nodes = { - machine = { ... }: { + machine = { config, pkgs, lib, ... }: { + environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff users.mutableUsers = false; + + specialisation = { + # A system with a simple socket-activated unit + simple-socket.configuration = { + systemd.services.socket-activated.serviceConfig = { + ExecStart = pkgs.writeScript "socket-test.py" /* python */ '' + #!${pkgs.python3}/bin/python3 + + from socketserver import TCPServer, StreamRequestHandler + import socket + + class Handler(StreamRequestHandler): + def handle(self): + self.wfile.write("hello".encode("utf-8")) + + class Server(TCPServer): + def __init__(self, server_address, handler_cls): + # Invoke base but omit bind/listen steps (performed by systemd activation!) + TCPServer.__init__( + self, server_address, handler_cls, bind_and_activate=False) + # Override socket + self.socket = socket.fromfd(3, self.address_family, self.socket_type) + + if __name__ == "__main__": + server = Server(("localhost", 1234), Handler) + server.serve_forever() + ''; + }; + systemd.sockets.socket-activated = { + wantedBy = [ "sockets.target" ]; + listenStreams = [ "/run/test.sock" ]; + socketConfig.SocketMode = lib.mkDefault "0777"; + }; + }; + + # The same system but the socket is modified + modified-socket.configuration = { + imports = [ config.specialisation.simple-socket.configuration ]; + systemd.sockets.socket-activated.socketConfig.SocketMode = "0666"; + }; + + # The same system but the service is modified + modified-service.configuration = { + imports = [ config.specialisation.simple-socket.configuration ]; + systemd.services.socket-activated.serviceConfig.X-Test = "test"; + }; + + # The same system but both service and socket are modified + modified-service-and-socket.configuration = { + imports = [ config.specialisation.simple-socket.configuration ]; + systemd.services.socket-activated.serviceConfig.X-Test = "some_value"; + systemd.sockets.socket-activated.socketConfig.SocketMode = "0444"; + }; + + # A system with a socket-activated service and some simple services + service-and-socket.configuration = { + imports = [ config.specialisation.simple-socket.configuration ]; + systemd.services.simple-service = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + }; + }; + + systemd.services.simple-restart-service = { + stopIfChanged = false; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + }; + }; + + systemd.services.simple-reload-service = { + reloadIfChanged = true; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + + systemd.services.no-restart-service = { + restartIfChanged = false; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + # The same system but with an activation script that restarts all services + restart-and-reload-by-activation-script.configuration = { + imports = [ config.specialisation.service-and-socket.configuration ]; + system.activationScripts.restart-and-reload-test = { + supportsDryActivation = true; + deps = []; + text = '' + if [ "$NIXOS_ACTION" = dry-activate ]; then + f=/run/nixos/dry-activation-restart-list + else + f=/run/nixos/activation-restart-list + fi + cat <> "$f" + simple-service.service + simple-restart-service.service + simple-reload-service.service + no-restart-service.service + socket-activated.service + EOF + ''; + }; + }; + + # A system with a timer + with-timer.configuration = { + systemd.timers.test-timer = { + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = "@1395716396"; # chosen by fair dice roll + }; + systemd.services.test-timer = { + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + # The same system but with another time + with-timer-modified.configuration = { + imports = [ config.specialisation.with-timer.configuration ]; + systemd.timers.test-timer.timerConfig.OnCalendar = lib.mkForce "Fri 2012-11-23 16:00:00"; + }; + + # A system with a systemd mount + with-mount.configuration = { + systemd.mounts = [ + { + description = "Testmount"; + what = "tmpfs"; + type = "tmpfs"; + where = "/testmount"; + options = "size=1M"; + wantedBy = [ "local-fs.target" ]; + } + ]; + }; + + # The same system but with another time + with-mount-modified.configuration = { + systemd.mounts = [ + { + description = "Testmount"; + what = "tmpfs"; + type = "tmpfs"; + where = "/testmount"; + options = "size=10M"; + wantedBy = [ "local-fs.target" ]; + } + ]; + }; + + # A system with a path unit + with-path.configuration = { + systemd.paths.test-watch = { + wantedBy = [ "paths.target" ]; + pathConfig.PathExists = "/testpath"; + }; + systemd.services.test-watch = { + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.coreutils}/bin/touch /testpath-modified"; + }; + }; + }; + + # The same system but watching another file + with-path-modified.configuration = { + imports = [ config.specialisation.with-path.configuration ]; + systemd.paths.test-watch.pathConfig.PathExists = lib.mkForce "/testpath2"; + }; + + # A system with a slice + with-slice.configuration = { + systemd.slices.testslice.sliceConfig.MemoryMax = "1"; # don't allow memory allocation + systemd.services.testservice = { + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + Slice = "testslice.slice"; + }; + }; + }; + + # The same system but the slice allows to allocate memory + with-slice-non-crashing.configuration = { + imports = [ config.specialisation.with-slice.configuration ]; + systemd.slices.testslice.sliceConfig.MemoryMax = lib.mkForce null; + }; + }; }; other = { ... }: { users.mutableUsers = true; }; }; - testScript = {nodes, ...}: let + testScript = { nodes, ... }: let originalSystem = nodes.machine.config.system.build.toplevel; otherSystem = nodes.other.config.system.build.toplevel; @@ -27,12 +236,182 @@ import ./make-test-python.nix ({ pkgs, ...} : { set -o pipefail exec env -i "$@" | tee /dev/stderr ''; - in '' + in /* python */ '' + def switch_to_specialisation(name, action="test"): + out = machine.succeed(f"${originalSystem}/specialisation/{name}/bin/switch-to-configuration {action} 2>&1") + assert_lacks(out, "switch-to-configuration line") # Perl warnings + return out + + def assert_contains(haystack, needle): + if needle not in haystack: + print("The haystack that will cause the following exception is:") + print("---") + print(haystack) + print("---") + raise Exception(f"Expected string '{needle}' was not found") + + def assert_lacks(haystack, needle): + if needle in haystack: + print("The haystack that will cause the following exception is:") + print("---") + print(haystack, end="") + print("---") + raise Exception(f"Unexpected string '{needle}' was found") + + machine.succeed( "${stderrRunner} ${originalSystem}/bin/switch-to-configuration test" ) machine.succeed( "${stderrRunner} ${otherSystem}/bin/switch-to-configuration test" ) + + with subtest("systemd sockets"): + machine.succeed("${originalSystem}/bin/switch-to-configuration test") + + # Simple socket is created + out = switch_to_specialisation("simple-socket") + assert_lacks(out, "stopping the following units:") + # not checking for reload because dbus gets reloaded + assert_lacks(out, "restarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: socket-activated.socket\n") + assert_lacks(out, "as well:") + machine.succeed("[ $(stat -c%a /run/test.sock) = 777 ]") + + # Changing the socket restarts it + out = switch_to_specialisation("modified-socket") + assert_lacks(out, "stopping the following units:") + #assert_lacks(out, "reloading the following units:") + assert_contains(out, "restarting the following units: socket-activated.socket\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + machine.succeed("[ $(stat -c%a /run/test.sock) = 666 ]") # change was applied + + # The unit is properly activated when the socket is accessed + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated") + + # Changing the socket restarts it and ignores the active service + out = switch_to_specialisation("simple-socket") + assert_contains(out, "stopping the following units: socket-activated.service\n") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "restarting the following units: socket-activated.socket\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + machine.succeed("[ $(stat -c%a /run/test.sock) = 777 ]") # change was applied + + # Changing the service does nothing when the service is not active + out = switch_to_specialisation("modified-service") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "restarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + + # Activating the service and modifying it stops it but leaves the socket untouched + machine.succeed("socat - UNIX-CONNECT:/run/test.sock") + out = switch_to_specialisation("simple-socket") + assert_contains(out, "stopping the following units: socket-activated.service\n") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "restarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + + # Activating the service and both the service and the socket stops the service and restarts the socket + machine.succeed("socat - UNIX-CONNECT:/run/test.sock") + out = switch_to_specialisation("modified-service-and-socket") + assert_contains(out, "stopping the following units: socket-activated.service\n") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "restarting the following units: socket-activated.socket\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + + with subtest("restart and reload by activation file"): + out = switch_to_specialisation("service-and-socket") + # Switch to a system where the example services get restarted + # by the activation script + out = switch_to_specialisation("restart-and-reload-by-activation-script") + assert_lacks(out, "stopping the following units:") + assert_contains(out, "stopping the following units as well: simple-service.service, socket-activated.service\n") + assert_contains(out, "reloading the following units: simple-reload-service.service\n") + assert_contains(out, "restarting the following units: simple-restart-service.service\n") + assert_contains(out, "\nstarting the following units: simple-service.service") + + # The same, but in dry mode + switch_to_specialisation("service-and-socket") + out = switch_to_specialisation("restart-and-reload-by-activation-script", action="dry-activate") + assert_lacks(out, "would stop the following units:") + assert_contains(out, "would stop the following units as well: simple-service.service, socket-activated.service\n") + assert_contains(out, "would reload the following units: simple-reload-service.service\n") + assert_contains(out, "would restart the following units: simple-restart-service.service\n") + assert_contains(out, "\nwould start the following units: simple-service.service") + + with subtest("mounts"): + switch_to_specialisation("with-mount") + out = machine.succeed("mount | grep 'on /testmount'") + assert_contains(out, "size=1024k") + + out = switch_to_specialisation("with-mount-modified") + assert_lacks(out, "stopping the following units:") + assert_contains(out, "reloading the following units: testmount.mount\n") + assert_lacks(out, "restarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + # It changed + out = machine.succeed("mount | grep 'on /testmount'") + assert_contains(out, "size=10240k") + + with subtest("timers"): + switch_to_specialisation("with-timer") + out = machine.succeed("systemctl show test-timer.timer") + assert_contains(out, "OnCalendar=2014-03-25 02:59:56 UTC") + + out = switch_to_specialisation("with-timer-modified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "restarting the following units: test-timer.timer\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + # It changed + out = machine.succeed("systemctl show test-timer.timer") + assert_contains(out, "OnCalendar=Fri 2012-11-23 16:00:00") + + with subtest("paths"): + switch_to_specialisation("with-path") + machine.fail("test -f /testpath-modified") + + # touch the file, unit should be triggered + machine.succeed("touch /testpath") + machine.wait_until_succeeds("test -f /testpath-modified") + + machine.succeed("rm /testpath /testpath-modified") + switch_to_specialisation("with-path-modified") + + machine.succeed("touch /testpath") + machine.fail("test -f /testpath-modified") + machine.succeed("touch /testpath2") + machine.wait_until_succeeds("test -f /testpath-modified") + + # This test ensures that changes to slice configuration get applied. + # We test this by having a slice that allows no memory allocation at + # all and starting a service within it. If the service crashes, the slice + # is applied and if we modify the slice to allow memory allocation, the + # service should successfully start. + with subtest("slices"): + machine.succeed("echo 0 > /proc/sys/vm/panic_on_oom") # allow OOMing + out = switch_to_specialisation("with-slice") + machine.fail("systemctl start testservice.service") + out = switch_to_specialisation("with-slice-non-crashing") + machine.succeed("systemctl start testservice.service") + machine.succeed("echo 1 > /proc/sys/vm/panic_on_oom") # disallow OOMing + ''; }) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 029710206f03..ab3267eae7f9 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,9 +14,6 @@ stdenv.mkDerivation rec { pname = "csound"; - # When updating, please check if https://github.com/csound/csound/issues/1078 - # has been fixed in the new version so we can use the normal fluidsynth - # version and remove fluidsynth 1.x from nixpkgs again. version = "6.16.2"; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 1e85d57c3f79..e1366d38bafa 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -16,6 +16,7 @@ , lilv , lsp-plugins , lv2 +, mda_lv2 , meson , ninja , nlohmann_json @@ -25,20 +26,20 @@ , rnnoise , rubberband , speexdsp -, wrapGAppsHook +, wrapGAppsHook4 , zam-plugins , zita-convolver }: stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.0.3"; + version = "6.1.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-GzqPC/m/HMthLMamhJ4EXX6fxZYscdX1QmXgqHOPEcg="; + sha256 = "sha256-1UfeqPJxY4YT98UdqTZtG+QUBOZlKfK+7WbszhO22A0="; }; nativeBuildInputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -74,17 +75,20 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py + # https://github.com/wwmm/easyeffects/pull/1205 + substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; preFixup = let lv2Plugins = [ - calf # limiter, compressor exciter, bass enhancer and others - lsp-plugins # delay + calf # compressor exciter, bass enhancer and others + lsp-plugins # delay, limiter, multiband compressor + mda_lv2 # loudness + zam-plugins # maximizer ]; ladspaPlugins = [ rubberband # pitch shifting - zam-plugins # maximizer ]; in '' diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 6f827cea9564..8dd43ead5914 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.30.5"; + version = "2.33.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-hfpMeUhv6FC9lnPCfdWnAFCaKiteplyrS/o3Lf7cQY4="; + sha256 = "sha256-gzkfLfNhJHg/jEhf/RQDhHnXxn3UI15eDZfutKt3yGk="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index f90cae115b4e..b6ce0daef0d2 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -24,7 +24,7 @@ , lrdf , lv2 , pkg-config -, python2 +, python3 , sassc , serd , sord @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { hicolor-icon-theme intltool pkg-config - python2 + python3 wafHook wrapGAppsHook ]; diff --git a/pkgs/applications/audio/hushboard/default.nix b/pkgs/applications/audio/hushboard/default.nix new file mode 100644 index 000000000000..e9d88d1f236f --- /dev/null +++ b/pkgs/applications/audio/hushboard/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, gobject-introspection +, gtk3 +, libappindicator +, libpulseaudio +, librsvg +, pycairo +, pygobject3 +, six +, wrapGAppsHook +, xlib +}: + +buildPythonApplication { + pname = "hushboard"; + version = "unstable-2021-03-17"; + + src = fetchFromGitHub { + owner = "stuartlangridge"; + repo = "hushboard"; + rev = "c16611c539be111891116a737b02c5fb359ad1fc"; + sha256 = "06jav6j0bsxhawrq31cnls8zpf80fpwk0cak5s82js6wl4vw2582"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libappindicator + libpulseaudio + ]; + + propagatedBuildInputs = [ + pycairo + pygobject3 + six + xlib + ]; + + postPatch = '' + substituteInPlace hushboard/_pulsectl.py \ + --replace "ctypes.util.find_library('libpulse') or 'libpulse.so.0'" "'${libpulseaudio}/lib/libpulse.so.0'" + substituteInPlace snap/gui/hushboard.desktop \ + --replace "\''${SNAP}/hushboard/icons/hushboard.svg" "hushboard" + ''; + + postInstall = '' + # Fix tray icon, see e.g. https://github.com/NixOS/nixpkgs/pull/43421 + wrapProgram $out/bin/hushboard \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + + mkdir -p $out/share/applications $out/share/icons/hicolor/{scalable,512x512}/apps + cp snap/gui/hushboard.desktop $out/share/applications + cp hushboard/icons/hushboard.svg $out/share/icons/hicolor/scalable/apps + cp hushboard-512.png $out/share/icons/hicolor/512x512/apps/hushboard.png + ''; + + # There are no tests + doCheck = false; + + meta = with lib; { + homepage = "https://kryogenix.org/code/hushboard/"; + license = licenses.mit; + description = "Mute your microphone while typing"; + platforms = platforms.linux; + maintainers = with maintainers; [ sersorrel ]; + }; +} diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix new file mode 100644 index 000000000000..7cf0fb8c1454 --- /dev/null +++ b/pkgs/applications/audio/in-formant/default.nix @@ -0,0 +1,45 @@ +{ stdenv, cmake, lib, fetchFromGitHub, qt5, fftw, libtorch-bin, portaudio, eigen +, xorg, pkg-config, autoPatchelfHook, soxr +}: + +stdenv.mkDerivation rec { + pname = "in-formant"; + version = "2021-06-30"; + + # no Qt6 yet, so we're stuck in the last Qt5-supporting commit: https://github.com/NixOS/nixpkgs/issues/108008 + src = fetchFromGitHub { + owner = "in-formant"; + repo = "in-formant"; + rev = "e28e628cf5ff0949a7b046d220cc884f6035f31a"; + sha256 = "sha256-YvtV0wGUNmI/+GGxrIfTk/l8tqUsWgc/LAI17X+AWGI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config qt5.wrapQtAppsHook autoPatchelfHook ]; + + buildInputs = [ + qt5.qtbase + qt5.qtquickcontrols + qt5.qtquickcontrols2 + qt5.qtcharts + fftw + libtorch-bin + portaudio + eigen + xorg.libxcb + soxr + ]; + + installPhase = '' + mkdir -p $out/bin + cp in-formant $out/bin + ''; + + meta = with lib; { + description = "A real-time pitch and formant tracking software"; + homepage = "https://github.com/in-formant/in-formant"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/pkgs/applications/audio/librespot/cargo-lock.patch b/pkgs/applications/audio/librespot/cargo-lock.patch deleted file mode 100644 index 0c2af8f80c60..000000000000 --- a/pkgs/applications/audio/librespot/cargo-lock.patch +++ /dev/null @@ -1,3817 +0,0 @@ ---- source/Cargo.lock 1970-01-01 01:00:01.000000000 +0100 -+++ ../nix-build-librespot-0.1.6.drv-0/source/Cargo.lock 2021-04-27 19:07:38.535244188 +0200 -@@ -4,2784 +4,2782 @@ - name = "aes" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9" - dependencies = [ -- "aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes-soft", -+ "aesni", -+ "block-cipher-trait", - ] - - [[package]] - name = "aes-ctr" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" - dependencies = [ -- "aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes-soft", -+ "aesni", -+ "ctr", -+ "stream-cipher", - ] - - [[package]] - name = "aes-soft" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" - dependencies = [ -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-cipher-trait", -+ "byteorder", -+ "opaque-debug", - ] - - [[package]] - name = "aesni" - version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" - dependencies = [ -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-cipher-trait", -+ "opaque-debug", -+ "stream-cipher", - ] - - [[package]] - name = "alga" - version = "0.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" - dependencies = [ -- "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "approx", -+ "num-complex", -+ "num-traits", - ] - - [[package]] - name = "alsa" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4a0d4ebc8b23041c5de9bc9aee13b4bad844a589479701f31a5934cfe4aeb32" - dependencies = [ -- "alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "alsa-sys", -+ "bitflags 0.9.1", -+ "libc", -+ "nix", - ] - - [[package]] - name = "alsa-sys" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "approx" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" - dependencies = [ -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits", - ] - - [[package]] - name = "arc-swap" - version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" - - [[package]] - name = "atty" - version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" - dependencies = [ -- "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hermit-abi", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "autocfg" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - - [[package]] - name = "autocfg" - version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - - [[package]] - name = "base64" - version = "0.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "safemem", - ] - - [[package]] - name = "base64" - version = "0.10.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", - ] - - [[package]] - name = "bindgen" - version = "0.53.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "cexpr 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "clang-sys 0.29.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "cexpr", -+ "cfg-if", -+ "clang-sys", -+ "lazy_static", -+ "lazycell", -+ "peeking_take_while", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "regex", -+ "rustc-hash", -+ "shlex", - ] - - [[package]] - name = "bit-set" - version = "0.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" - dependencies = [ -- "bit-vec 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bit-vec", - ] - - [[package]] - name = "bit-vec" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" - - [[package]] - name = "bitflags" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" - - [[package]] - name = "bitflags" - version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" - - [[package]] - name = "bitflags" - version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - - [[package]] - name = "block-buffer" - version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" - dependencies = [ -- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-padding", -+ "byte-tools", -+ "byteorder", -+ "generic-array", - ] - - [[package]] - name = "block-cipher-trait" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" - dependencies = [ -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "generic-array", - ] - - [[package]] - name = "block-modes" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529" - dependencies = [ -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-cipher-trait", -+ "block-padding", - ] - - [[package]] - name = "block-padding" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" - dependencies = [ -- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byte-tools", - ] - - [[package]] - name = "byte-tools" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - - [[package]] - name = "byteorder" - version = "1.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - - [[package]] - name = "bytes" - version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "iovec", - ] - - [[package]] - name = "cc" - version = "1.0.58" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" - - [[package]] - name = "cexpr" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" - dependencies = [ -- "nom 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nom", - ] - - [[package]] - name = "cfg-if" - version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - - [[package]] - name = "chrono" - version = "0.4.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" - dependencies = [ -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer", -+ "num-traits", -+ "time", - ] - - [[package]] - name = "clang-sys" - version = "0.29.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" - dependencies = [ -- "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glob", -+ "libc", -+ "libloading 0.5.2", - ] - - [[package]] - name = "cloudabi" - version = "0.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", - ] - - [[package]] - name = "core-foundation-sys" - version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "coreaudio-rs" - version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "coreaudio-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "coreaudio-sys", - ] - - [[package]] - name = "coreaudio-sys" - version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d6570ee6e089131e928d5ec9236db9e818aa3cf850f48b0eec6ef700571271d4" - dependencies = [ -- "bindgen 0.53.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bindgen", - ] - - [[package]] - name = "cpal" - version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d58ae1ed6536b1b233f5e3aeb6997a046ddb4d05e3f61701b58a92eb254a829e" - dependencies = [ -- "alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "alsa-sys", -+ "core-foundation-sys", -+ "coreaudio-rs", -+ "lazy_static", -+ "libc", -+ "stdweb", -+ "winapi 0.3.9", - ] - - [[package]] - name = "crossbeam-deque" - version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" - dependencies = [ -- "crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-epoch", -+ "crossbeam-utils 0.7.2", -+ "maybe-uninit", - ] - - [[package]] - name = "crossbeam-epoch" - version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "cfg-if", -+ "crossbeam-utils 0.7.2", -+ "lazy_static", -+ "maybe-uninit", -+ "memoffset", -+ "scopeguard", - ] - - [[package]] - name = "crossbeam-queue" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" - dependencies = [ -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6", - ] - - [[package]] - name = "crossbeam-queue" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "crossbeam-utils 0.7.2", -+ "maybe-uninit", - ] - - [[package]] - name = "crossbeam-utils" - version = "0.6.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "lazy_static", - ] - - [[package]] - name = "crossbeam-utils" - version = "0.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "cfg-if", -+ "lazy_static", - ] - - [[package]] - name = "crypto-mac" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" - dependencies = [ -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "generic-array", -+ "subtle", - ] - - [[package]] - name = "ctr" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" - dependencies = [ -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-cipher-trait", -+ "stream-cipher", - ] - - [[package]] - name = "digest" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" - dependencies = [ -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "generic-array", - ] - - [[package]] - name = "dns-sd" - version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d748509dea20228f63ba519bf142ce2593396386125b01f5b0d6412dab972087" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "env_logger" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" - dependencies = [ -- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty", -+ "humantime", -+ "log 0.4.11", -+ "termcolor", - ] - - [[package]] - name = "error-chain" - version = "0.12.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" - dependencies = [ -- "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check", - ] - - [[package]] - name = "fake-simd" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - - [[package]] - name = "fnv" - version = "1.0.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - - [[package]] - name = "fuchsia-cprng" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - - [[package]] - name = "fuchsia-zircon" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "fuchsia-zircon-sys", - ] - - [[package]] - name = "fuchsia-zircon-sys" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - - [[package]] - name = "futures" - version = "0.1.29" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" - - [[package]] - name = "futures-channel" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" - dependencies = [ -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-core", - ] - - [[package]] - name = "futures-core" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" - - [[package]] - name = "futures-cpupool" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "num_cpus", - ] - - [[package]] - name = "futures-executor" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" - dependencies = [ -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-core", -+ "futures-task", -+ "futures-util", - ] - - [[package]] - name = "futures-macro" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" - dependencies = [ -- "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro-hack", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "syn 1.0.35", - ] - - [[package]] - name = "futures-sink" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" - - [[package]] - name = "futures-task" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" - dependencies = [ -- "once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "once_cell", - ] - - [[package]] - name = "futures-util" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" - dependencies = [ -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "pin-project 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro-nested 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-core", -+ "futures-macro", -+ "futures-task", -+ "pin-project", -+ "pin-utils", -+ "proc-macro-hack", -+ "proc-macro-nested", -+ "slab 0.4.2", - ] - - [[package]] - name = "gcc" - version = "0.3.55" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - - [[package]] - name = "generic-array" - version = "0.12.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" - dependencies = [ -- "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "typenum", - ] - - [[package]] - name = "getopts" - version = "0.2.21" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" - dependencies = [ -- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width", - ] - - [[package]] - name = "getrandom" - version = "0.1.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", -+ "wasi", - ] - - [[package]] - name = "glib" - version = "0.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-task", -+ "futures-util", -+ "glib-sys", -+ "gobject-sys", -+ "lazy_static", -+ "libc", - ] - - [[package]] - name = "glib-sys" - version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "glob" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - - [[package]] - name = "gobject-sys" - version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" - dependencies = [ -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "gstreamer" - version = "0.15.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "muldiv 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "paste 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "cfg-if", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gstreamer-sys", -+ "lazy_static", -+ "libc", -+ "muldiv", -+ "num-rational", -+ "paste", - ] - - [[package]] - name = "gstreamer-app" - version = "0.15.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "789784e8d42f5add1e1e965cf9f7e2d09e21dd0756bae6148f971db9a761d6a9" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-app-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-base 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "futures-core", -+ "futures-sink", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gstreamer", -+ "gstreamer-app-sys", -+ "gstreamer-base", -+ "gstreamer-sys", -+ "lazy_static", -+ "libc", - ] - - [[package]] - name = "gstreamer-app-sys" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf869ce152c23bca5d761ab62146b47f750d0b28d4d499731857532897d48167" - dependencies = [ -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-base-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "gstreamer-base-sys", -+ "gstreamer-sys", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "gstreamer-base" - version = "0.15.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42552f75cc6c260b0be180d5c955f4cd74bd170289c622404c25f1210b521c12" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-base-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gstreamer", -+ "gstreamer-base-sys", -+ "gstreamer-sys", -+ "libc", - ] - - [[package]] - name = "gstreamer-base-sys" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba384f52174b3c586593fca32642680a9e67961fea9f4cd8419f678965023bed" - dependencies = [ -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "gobject-sys", -+ "gstreamer-sys", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "gstreamer-sys" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d18da01b97d0ab5896acd5151e4c155acefd0e6c03c3dd24dd133ba054053db" - dependencies = [ -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "hermit-abi" - version = "0.1.15" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "hex" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" - - [[package]] - name = "hmac" - version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" - dependencies = [ -- "crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crypto-mac", -+ "digest", - ] - - [[package]] - name = "hostname" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "match_cfg", -+ "winapi 0.3.9", - ] - - [[package]] - name = "httparse" - version = "1.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" - - [[package]] - name = "humantime" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" - dependencies = [ -- "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quick-error", - ] - - [[package]] - name = "hyper" - version = "0.11.27" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34a590ca09d341e94cddf8e5af0bbccde205d5fbc2fa3c09dd67c7f85cea59d7" - dependencies = [ -- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "base64 0.9.3", -+ "bytes", -+ "futures", -+ "futures-cpupool", -+ "httparse", -+ "iovec", -+ "language-tags", -+ "log 0.4.11", -+ "mime", -+ "net2", -+ "percent-encoding", -+ "relay", -+ "time", -+ "tokio-core", -+ "tokio-io", -+ "tokio-proto", -+ "tokio-service", -+ "unicase", -+ "want", - ] - - [[package]] - name = "hyper-proxy" - version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44f0925de2747e481e6e477dd212c25e8f745567f02f6182e04d27b97c3fbece" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "hyper", -+ "tokio-core", -+ "tokio-io", - ] - - [[package]] - name = "idna" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" - dependencies = [ -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-normalization 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", - ] - - [[package]] - name = "if-addrs" - version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48" - dependencies = [ -- "if-addrs-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "if-addrs-sys", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "if-addrs-sys" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" - dependencies = [ -- "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", -+ "libc", - ] - - [[package]] - name = "iovec" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "itoa" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - - [[package]] - name = "jack" - version = "0.5.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e15fc592e2e5a74a105ff507083c04db1aa20ba1b90d425362ba000e57422df" - dependencies = [ -- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "jack-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 0.7.0", -+ "jack-sys", -+ "lazy_static", -+ "libc", - ] - - [[package]] - name = "jack-sys" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0d4ca501477fd3cd93a36df581046e5d6338ed826cf7e9b8d302603521e6cc3" - dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static", -+ "libc", -+ "libloading 0.4.3", - ] - - [[package]] - name = "kernel32-sys" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" - dependencies = [ -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.2.8", -+ "winapi-build", - ] - - [[package]] - name = "language-tags" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - - [[package]] - name = "lazy_static" - version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "lazycell" - version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" - - [[package]] - name = "lewton" - version = "0.9.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "ogg", -+ "smallvec 0.6.13", - ] - - [[package]] - name = "libc" - version = "0.2.73" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9" - - [[package]] - name = "libloading" - version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9" - dependencies = [ -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys", -+ "lazy_static", -+ "winapi 0.2.8", - ] - - [[package]] - name = "libloading" - version = "0.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" - dependencies = [ -- "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "libm" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - - [[package]] - name = "libmdns" - version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d8582c174736c53633bc482ac709b24527c018356c3dc6d8e25a788b06b394e" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "hostname 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "if-addrs 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "multimap 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "futures", -+ "hostname", -+ "if-addrs", -+ "log 0.4.11", -+ "multimap", -+ "net2", -+ "quick-error", -+ "rand 0.7.3", -+ "tokio-core", - ] - - [[package]] - name = "libpulse-sys" - version = "0.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9bb11b06faf883500c1b625cf4453e6c7737e9df9c7ba01df3f84b22b083e4ac" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "librespot" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-audio 0.1.5", -- "librespot-connect 0.1.5", -- "librespot-core 0.1.5", -- "librespot-metadata 0.1.5", -- "librespot-playback 0.1.5", -- "librespot-protocol 0.1.5", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-process 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-signal 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "base64 0.10.1", -+ "env_logger", -+ "futures", -+ "getopts", -+ "hex", -+ "hyper", -+ "librespot-audio", -+ "librespot-connect", -+ "librespot-core", -+ "librespot-metadata", -+ "librespot-playback", -+ "librespot-protocol", -+ "log 0.4.11", -+ "num-bigint", -+ "protobuf", -+ "rand 0.7.3", -+ "rpassword", -+ "sha-1", -+ "tokio-core", -+ "tokio-io", -+ "tokio-process", -+ "tokio-signal", -+ "url", - ] - - [[package]] - name = "librespot-audio" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "bit-set 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-core 0.1.5", -- "librespot-tremor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "vorbis 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes-ctr", -+ "bit-set", -+ "byteorder", -+ "bytes", -+ "futures", -+ "lewton", -+ "librespot-core", -+ "librespot-tremor", -+ "log 0.4.11", -+ "num-bigint", -+ "num-traits", -+ "tempfile", -+ "vorbis", - ] - - [[package]] - name = "librespot-connect" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "block-modes 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "dns-sd 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "libmdns 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-core 0.1.5", -- "librespot-playback 0.1.5", -- "librespot-protocol 0.1.5", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes-ctr", -+ "base64 0.10.1", -+ "block-modes", -+ "dns-sd", -+ "futures", -+ "hmac", -+ "hyper", -+ "libmdns", -+ "librespot-core", -+ "librespot-playback", -+ "librespot-protocol", -+ "log 0.4.11", -+ "num-bigint", -+ "protobuf", -+ "rand 0.7.3", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "sha-1", -+ "tokio-core", -+ "url", - ] - - [[package]] - name = "librespot-core" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-protocol 0.1.5", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "shannon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "vergen 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes", -+ "base64 0.10.1", -+ "byteorder", -+ "bytes", -+ "error-chain", -+ "futures", -+ "hmac", -+ "httparse", -+ "hyper", -+ "hyper-proxy", -+ "lazy_static", -+ "librespot-protocol", -+ "log 0.4.11", -+ "num-bigint", -+ "num-integer", -+ "num-traits", -+ "pbkdf2", -+ "protobuf", -+ "rand 0.7.3", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "sha-1", -+ "shannon", -+ "tokio-codec", -+ "tokio-core", -+ "tokio-io", -+ "url", -+ "uuid", -+ "vergen", - ] - - [[package]] - name = "librespot-metadata" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-core 0.1.5", -- "librespot-protocol 0.1.5", -- "linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "futures", -+ "librespot-core", -+ "librespot-protocol", -+ "linear-map", -+ "log 0.4.11", -+ "protobuf", - ] - - [[package]] - name = "librespot-playback" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cpal 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-app 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "jack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-audio 0.1.5", -- "librespot-core 0.1.5", -- "librespot-metadata 0.1.5", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "portaudio-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "zerocopy 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "alsa", -+ "byteorder", -+ "cpal", -+ "futures", -+ "glib", -+ "gstreamer", -+ "gstreamer-app", -+ "jack", -+ "libc", -+ "libpulse-sys", -+ "librespot-audio", -+ "librespot-core", -+ "librespot-metadata", -+ "log 0.4.11", -+ "portaudio-rs", -+ "rodio", -+ "sdl2", -+ "shell-words", -+ "zerocopy", - ] - - [[package]] - name = "librespot-protocol" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf-codegen-pure 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glob", -+ "protobuf", -+ "protobuf-codegen", -+ "protobuf-codegen-pure", - ] - - [[package]] - name = "librespot-tremor" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97f525bff915d478a76940a7b988e5ea34911ba7280c97bd3a7673f54d68b4fe" - dependencies = [ -- "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", -+ "libc", -+ "ogg-sys", -+ "pkg-config", - ] - - [[package]] - name = "linear-map" - version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" - - [[package]] - name = "lock_api" - version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" - dependencies = [ -- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard", - ] - - [[package]] - name = "log" - version = "0.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" - dependencies = [ -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.11", - ] - - [[package]] - name = "log" - version = "0.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", - ] - - [[package]] - name = "match_cfg" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - - [[package]] - name = "matches" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - - [[package]] - name = "matrixmultiply" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4f7ec66360130972f34830bfad9ef05c6610a43938a467bcc9ab9369ab3478f" - dependencies = [ -- "rawpointer 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rawpointer", - ] - - [[package]] - name = "maybe-uninit" - version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - - [[package]] - name = "memchr" - version = "2.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - - [[package]] - name = "memoffset" - version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", - ] - - [[package]] - name = "mime" - version = "0.3.16" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - - [[package]] - name = "mio" - version = "0.6.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "fuchsia-zircon", -+ "fuchsia-zircon-sys", -+ "iovec", -+ "kernel32-sys", -+ "libc", -+ "log 0.4.11", -+ "miow 0.2.1", -+ "net2", -+ "slab 0.4.2", -+ "winapi 0.2.8", - ] - - [[package]] - name = "mio-named-pipes" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" - dependencies = [ -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "miow 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.11", -+ "mio", -+ "miow 0.3.5", -+ "winapi 0.3.9", - ] - - [[package]] - name = "mio-uds" - version = "0.6.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" - dependencies = [ -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -+ "iovec", -+ "libc", -+ "mio", - ] - - [[package]] - name = "miow" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" - dependencies = [ -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys", -+ "net2", -+ "winapi 0.2.8", -+ "ws2_32-sys", - ] - - [[package]] - name = "miow" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" - dependencies = [ -- "socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "socket2", -+ "winapi 0.3.9", - ] - - [[package]] - name = "muldiv" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" - - [[package]] - name = "multimap" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" - dependencies = [ -- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde", - ] - - [[package]] - name = "nalgebra" - version = "0.18.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2" - dependencies = [ -- "alga 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "matrixmultiply 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "alga", -+ "approx", -+ "generic-array", -+ "matrixmultiply", -+ "num-complex", -+ "num-rational", -+ "num-traits", -+ "rand 0.6.5", -+ "typenum", - ] - - [[package]] - name = "net2" - version = "0.2.34" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "nix" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" - dependencies = [ -- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 0.9.1", -+ "cfg-if", -+ "libc", -+ "void", - ] - - [[package]] - name = "nom" - version = "5.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" - dependencies = [ -- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr", -+ "version_check", - ] - - [[package]] - name = "num" - version = "0.1.42" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" - dependencies = [ -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-iter 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer", -+ "num-iter", -+ "num-traits", - ] - - [[package]] - name = "num-bigint" - version = "0.2.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-integer", -+ "num-traits", - ] - - [[package]] - name = "num-complex" - version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-traits", - ] - - [[package]] - name = "num-integer" - version = "0.1.43" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-traits", - ] - - [[package]] - name = "num-iter" - version = "0.1.41" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-integer", -+ "num-traits", - ] - - [[package]] - name = "num-rational" - version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-integer", -+ "num-traits", - ] - - [[package]] - name = "num-traits" - version = "0.2.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libm 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "libm", - ] - - [[package]] - name = "num_cpus" - version = "1.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" - dependencies = [ -- "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hermit-abi", -+ "libc", - ] - - [[package]] - name = "ogg" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", - ] - - [[package]] - name = "ogg-sys" - version = "0.0.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a95b8c172e17df1a41bf8d666301d3b2c4efeb90d9d0415e2a4dc0668b35fdb2" - dependencies = [ -- "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gcc", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "once_cell" - version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" - - [[package]] - name = "opaque-debug" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - - [[package]] - name = "parking_lot" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" - dependencies = [ -- "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lock_api", -+ "parking_lot_core", -+ "rustc_version", - ] - - [[package]] - name = "parking_lot_core" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "cloudabi", -+ "libc", -+ "redox_syscall", -+ "rustc_version", -+ "smallvec 0.6.13", -+ "winapi 0.3.9", - ] - - [[package]] - name = "paste" - version = "0.1.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" - dependencies = [ -- "paste-impl 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "paste-impl", -+ "proc-macro-hack", - ] - - [[package]] - name = "paste-impl" - version = "0.1.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" - dependencies = [ -- "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro-hack", - ] - - [[package]] - name = "pbkdf2" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" - dependencies = [ -- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "base64 0.9.3", -+ "byteorder", -+ "crypto-mac", -+ "hmac", -+ "rand 0.5.6", -+ "sha2", -+ "subtle", - ] - - [[package]] - name = "peeking_take_while" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - - [[package]] - name = "percent-encoding" - version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - - [[package]] - name = "pin-project" - version = "0.4.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" - dependencies = [ -- "pin-project-internal 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pin-project-internal", - ] - - [[package]] - name = "pin-project-internal" - version = "0.4.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" - dependencies = [ -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "syn 1.0.35", - ] - - [[package]] - name = "pin-utils" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - - [[package]] - name = "pkg-config" - version = "0.3.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" - - [[package]] - name = "portaudio-rs" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb6b5eff96ccc9bf44d34c379ab03ae944426d83d1694345bdf8159d561d562" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "portaudio-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "libc", -+ "portaudio-sys", - ] - - [[package]] - name = "portaudio-sys" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5194a4fa953b4ffd851c320ef6f0484cd7278cb7169ea9d6c433e49b23f7b7f5" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "ppv-lite86" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" - - [[package]] - name = "proc-macro-hack" - version = "0.5.16" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" - - [[package]] - name = "proc-macro-nested" - version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" - - [[package]] - name = "proc-macro2" - version = "0.4.30" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" - dependencies = [ -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.1.0", - ] - - [[package]] - name = "proc-macro2" - version = "1.0.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" - dependencies = [ -- "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.1", - ] - - [[package]] - name = "protobuf" - version = "2.14.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485" - - [[package]] - name = "protobuf-codegen" - version = "2.14.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c" - dependencies = [ -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "protobuf", - ] - - [[package]] - name = "protobuf-codegen-pure" - version = "2.14.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440" - dependencies = [ -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "protobuf", -+ "protobuf-codegen", - ] - - [[package]] - name = "quick-error" - version = "1.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - - [[package]] - name = "quote" - version = "0.6.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.30", - ] - - [[package]] - name = "quote" - version = "1.0.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" - dependencies = [ -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.19", - ] - - [[package]] - name = "rand" - version = "0.3.23" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "rand 0.4.6", - ] - - [[package]] - name = "rand" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" - dependencies = [ -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.3.1", -+ "rdrand", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand" - version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" - dependencies = [ -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cloudabi", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.3.1", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand" - version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "libc", -+ "rand_chacha 0.1.1", -+ "rand_core 0.4.2", -+ "rand_hc 0.1.0", -+ "rand_isaac", -+ "rand_jitter", -+ "rand_os", -+ "rand_pcg", -+ "rand_xorshift", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand" - version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" - dependencies = [ -- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "getrandom", -+ "libc", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", -+ "rand_hc 0.2.0", - ] - - [[package]] - name = "rand_chacha" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_chacha" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" - dependencies = [ -- "ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ppv-lite86", -+ "rand_core 0.5.1", - ] - - [[package]] - name = "rand_core" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" - dependencies = [ -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2", - ] - - [[package]] - name = "rand_core" - version = "0.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - - [[package]] - name = "rand_core" - version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" - dependencies = [ -- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "getrandom", - ] - - [[package]] - name = "rand_hc" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_hc" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" - dependencies = [ -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1", - ] - - [[package]] - name = "rand_isaac" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_jitter" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "rand_core 0.4.2", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand_os" - version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" - dependencies = [ -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cloudabi", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.4.2", -+ "rdrand", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand_pcg" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "rand_core 0.4.2", - ] - - [[package]] - name = "rand_xorshift" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rawpointer" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - - [[package]] - name = "rdrand" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "redox_syscall" - version = "0.1.57" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - - [[package]] - name = "regex" - version = "1.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" - dependencies = [ -- "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax", - ] - - [[package]] - name = "regex-syntax" - version = "0.6.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - - [[package]] - name = "relay" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", - ] - - [[package]] - name = "remove_dir_all" - version = "0.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" - dependencies = [ -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rodio" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d0f961b254e66d147a7b550c78b01308934c97d807a34b417fd0f5a0a0f3a2d" - dependencies = [ -- "cpal 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "nalgebra 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cpal", -+ "lazy_static", -+ "nalgebra", - ] - - [[package]] - name = "rpassword" - version = "3.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c34fa7bcae7fca3c8471e8417088bbc3ad9af8066b0ecf4f3c0d98a0d772716e" - dependencies = [ -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys", -+ "libc", -+ "winapi 0.2.8", - ] - - [[package]] - name = "rustc-hash" - version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - - [[package]] - name = "rustc_version" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" - dependencies = [ -- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver", - ] - - [[package]] - name = "ryu" - version = "1.0.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - - [[package]] - name = "safemem" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - - [[package]] - name = "scoped-tls" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" - - [[package]] - name = "scopeguard" - version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - - [[package]] - name = "sdl2" - version = "0.32.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "lazy_static", -+ "libc", -+ "num", -+ "rand 0.6.5", -+ "sdl2-sys", - ] - - [[package]] - name = "sdl2-sys" - version = "0.32.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", - ] - - [[package]] - name = "semver" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" - dependencies = [ -- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver-parser", - ] - - [[package]] - name = "semver-parser" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - - [[package]] - name = "serde" - version = "1.0.114" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" - - [[package]] - name = "serde_derive" - version = "1.0.114" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" - dependencies = [ -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "syn 1.0.35", - ] - - [[package]] - name = "serde_json" - version = "1.0.56" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" - dependencies = [ -- "itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa", -+ "ryu", -+ "serde", - ] - - [[package]] - name = "sha-1" - version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" - dependencies = [ -- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-buffer", -+ "digest", -+ "fake-simd", -+ "opaque-debug", - ] - - [[package]] - name = "sha2" - version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" - dependencies = [ -- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-buffer", -+ "digest", -+ "fake-simd", -+ "opaque-debug", - ] - - [[package]] - name = "shannon" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ea5b41c9427b56caa7b808cb548a04fb50bb5b9e98590b53f28064ff4174561" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", - ] - - [[package]] - name = "shell-words" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a" - - [[package]] - name = "shlex" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - - [[package]] - name = "signal-hook-registry" - version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" - dependencies = [ -- "arc-swap 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arc-swap", -+ "libc", - ] - - [[package]] - name = "slab" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" - - [[package]] - name = "slab" - version = "0.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - - [[package]] - name = "smallvec" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013" - - [[package]] - name = "smallvec" - version = "0.6.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" - dependencies = [ -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "maybe-uninit", - ] - - [[package]] - name = "socket2" - version = "0.3.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "winapi 0.3.9", - ] - - [[package]] - name = "stdweb" - version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" - - [[package]] - name = "stream-cipher" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" - dependencies = [ -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "generic-array", - ] - - [[package]] - name = "subtle" - version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - - [[package]] - name = "syn" - version = "0.15.44" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "unicode-xid 0.1.0", - ] - - [[package]] - name = "syn" - version = "1.0.35" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" - dependencies = [ -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "unicode-xid 0.2.1", - ] - - [[package]] - name = "synstructure" - version = "0.10.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "syn 0.15.44", -+ "unicode-xid 0.1.0", - ] - - [[package]] - name = "take" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" - - [[package]] - name = "tempfile" - version = "3.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)", -- "remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", -+ "rand 0.7.3", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi 0.3.9", - ] - - [[package]] - name = "termcolor" - version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" - dependencies = [ -- "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util", - ] - - [[package]] - name = "time" - version = "0.1.43" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "tinyvec" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" - - [[package]] - name = "tokio" - version = "0.1.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-fs 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-udp 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-uds 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "mio", -+ "num_cpus", -+ "tokio-codec", -+ "tokio-current-thread", -+ "tokio-executor", -+ "tokio-fs", -+ "tokio-io", -+ "tokio-reactor", -+ "tokio-sync", -+ "tokio-tcp", -+ "tokio-threadpool", -+ "tokio-timer", -+ "tokio-udp", -+ "tokio-uds", - ] - - [[package]] - name = "tokio-codec" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "tokio-io", - ] - - [[package]] - name = "tokio-core" - version = "0.1.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "iovec", -+ "log 0.4.11", -+ "mio", -+ "scoped-tls", -+ "tokio", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-reactor", -+ "tokio-timer", - ] - - [[package]] - name = "tokio-current-thread" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "tokio-executor", - ] - - [[package]] - name = "tokio-executor" - version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" - dependencies = [ -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.2", -+ "futures", - ] - - [[package]] - name = "tokio-fs" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "tokio-io", -+ "tokio-threadpool", - ] - - [[package]] - name = "tokio-io" - version = "0.1.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "log 0.4.11", - ] - - [[package]] - name = "tokio-process" - version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "382d90f43fa31caebe5d3bc6cfd854963394fff3b8cb59d5146607aaae7e7e43" - dependencies = [ -- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio-named-pipes 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-signal 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-queue 0.1.2", -+ "futures", -+ "lazy_static", -+ "libc", -+ "log 0.4.11", -+ "mio", -+ "mio-named-pipes", -+ "tokio-io", -+ "tokio-reactor", -+ "tokio-signal", -+ "winapi 0.3.9", - ] - - [[package]] - name = "tokio-proto" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "log 0.3.9", -+ "net2", -+ "rand 0.3.23", -+ "slab 0.3.0", -+ "smallvec 0.2.1", -+ "take", -+ "tokio-core", -+ "tokio-io", -+ "tokio-service", - ] - - [[package]] - name = "tokio-reactor" - version = "0.1.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" - dependencies = [ -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.2", -+ "futures", -+ "lazy_static", -+ "log 0.4.11", -+ "mio", -+ "num_cpus", -+ "parking_lot", -+ "slab 0.4.2", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-sync", - ] - - [[package]] - name = "tokio-service" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", - ] - - [[package]] - name = "tokio-signal" - version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "libc", -+ "mio", -+ "mio-uds", -+ "signal-hook-registry", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-reactor", -+ "winapi 0.3.9", - ] - - [[package]] - name = "tokio-sync" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" - dependencies = [ -- "fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fnv", -+ "futures", - ] - - [[package]] - name = "tokio-tcp" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "iovec", -+ "mio", -+ "tokio-io", -+ "tokio-reactor", - ] - - [[package]] - name = "tokio-threadpool" - version = "0.1.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" - dependencies = [ -- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-queue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-deque", -+ "crossbeam-queue 0.2.3", -+ "crossbeam-utils 0.7.2", -+ "futures", -+ "lazy_static", -+ "log 0.4.11", -+ "num_cpus", -+ "slab 0.4.2", -+ "tokio-executor", - ] - - [[package]] - name = "tokio-timer" - version = "0.2.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" - dependencies = [ -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.2", -+ "futures", -+ "slab 0.4.2", -+ "tokio-executor", - ] - - [[package]] - name = "tokio-udp" - version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "log 0.4.11", -+ "mio", -+ "tokio-codec", -+ "tokio-io", -+ "tokio-reactor", - ] - - [[package]] - name = "tokio-uds" - version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "iovec", -+ "libc", -+ "log 0.4.11", -+ "mio", -+ "mio-uds", -+ "tokio-codec", -+ "tokio-io", -+ "tokio-reactor", - ] - - [[package]] - name = "try-lock" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2" - - [[package]] - name = "typenum" - version = "1.12.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" - - [[package]] - name = "unicase" - version = "2.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" - dependencies = [ -- "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check", - ] - - [[package]] - name = "unicode-bidi" - version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" - dependencies = [ -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches", - ] - - [[package]] - name = "unicode-normalization" - version = "0.1.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" - dependencies = [ -- "tinyvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tinyvec", - ] - - [[package]] - name = "unicode-width" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - - [[package]] - name = "unicode-xid" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - - [[package]] - name = "unicode-xid" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - - [[package]] - name = "url" - version = "1.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" - dependencies = [ -- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "idna", -+ "matches", -+ "percent-encoding", - ] - - [[package]] - name = "uuid" - version = "0.7.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" - dependencies = [ -- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.6.5", - ] - - [[package]] - name = "vergen" - version = "3.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "chrono", - ] - - [[package]] - name = "version_check" - version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" - - [[package]] - name = "void" - version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - - [[package]] - name = "vorbis" - version = "0.0.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e8a194457075360557b82dac78f7ca2d65bbb6679bccfabae5f7c8c706cc776" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "vorbisfile-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "ogg-sys", -+ "vorbis-sys", -+ "vorbisfile-sys", - ] - - [[package]] - name = "vorbis-sys" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3a0a8d7034313748da1d84b0adfa501f83f9ec83250f37fbacfa92a3580327c4" - dependencies = [ -- "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gcc", -+ "libc", -+ "ogg-sys", -+ "pkg-config", - ] - - [[package]] - name = "vorbisfile-sys" - version = "0.0.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f4306d7e1ac4699b55e20de9483750b90c250913188efd7484db6bfbe9042d1" - dependencies = [ -- "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -- "vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gcc", -+ "libc", -+ "ogg-sys", -+ "pkg-config", -+ "vorbis-sys", - ] - - [[package]] - name = "want" - version = "0.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "log 0.4.11", -+ "try-lock", - ] - - [[package]] - name = "wasi" - version = "0.9.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - - [[package]] - name = "winapi" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - - [[package]] - name = "winapi" - version = "0.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" - dependencies = [ -- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", - ] - - [[package]] - name = "winapi-build" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - - [[package]] - name = "winapi-i686-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - - [[package]] - name = "winapi-util" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" - dependencies = [ -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9", - ] - - [[package]] - name = "winapi-x86_64-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "ws2_32-sys" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" - dependencies = [ -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.2.8", -+ "winapi-build", - ] - - [[package]] - name = "zerocopy" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "992b9b31f80fd4a167f903f879b8ca43d6716cc368ea01df90538baa2dd34056" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "zerocopy-derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "zerocopy-derive", - ] - - [[package]] - name = "zerocopy-derive" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b090467ecd0624026e8a6405d343ac7382592530d54881330b3fc8e400280fa5" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -- "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[metadata] --"checksum aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9" --"checksum aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" --"checksum aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" --"checksum aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" --"checksum alga 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" --"checksum alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a0d4ebc8b23041c5de9bc9aee13b4bad844a589479701f31a5934cfe4aeb32" --"checksum alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58" --"checksum approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" --"checksum arc-swap 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" --"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" --"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" --"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" --"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" --"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" --"checksum bindgen 0.53.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" --"checksum bit-set 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" --"checksum bit-vec 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" --"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" --"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" --"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" --"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" --"checksum block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" --"checksum block-modes 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529" --"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" --"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" --"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" --"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" --"checksum cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" --"checksum cexpr 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" --"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" --"checksum chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" --"checksum clang-sys 0.29.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" --"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" --"checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" --"checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491" --"checksum coreaudio-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d6570ee6e089131e928d5ec9236db9e818aa3cf850f48b0eec6ef700571271d4" --"checksum cpal 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58ae1ed6536b1b233f5e3aeb6997a046ddb4d05e3f61701b58a92eb254a829e" --"checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" --"checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" --"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" --"checksum crossbeam-queue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" --"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" --"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" --"checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" --"checksum ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" --"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" --"checksum dns-sd 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d748509dea20228f63ba519bf142ce2593396386125b01f5b0d6412dab972087" --"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" --"checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" --"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" --"checksum fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" --"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" --"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" --"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" --"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" --"checksum futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" --"checksum futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" --"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" --"checksum futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" --"checksum futures-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" --"checksum futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" --"checksum futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" --"checksum futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" --"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" --"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" --"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" --"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" --"checksum glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" --"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" --"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" --"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" --"checksum gstreamer 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163" --"checksum gstreamer-app 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)" = "789784e8d42f5add1e1e965cf9f7e2d09e21dd0756bae6148f971db9a761d6a9" --"checksum gstreamer-app-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf869ce152c23bca5d761ab62146b47f750d0b28d4d499731857532897d48167" --"checksum gstreamer-base 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "42552f75cc6c260b0be180d5c955f4cd74bd170289c622404c25f1210b521c12" --"checksum gstreamer-base-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ba384f52174b3c586593fca32642680a9e67961fea9f4cd8419f678965023bed" --"checksum gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d18da01b97d0ab5896acd5151e4c155acefd0e6c03c3dd24dd133ba054053db" --"checksum hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" --"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" --"checksum hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" --"checksum hostname 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" --"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" --"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" --"checksum hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)" = "34a590ca09d341e94cddf8e5af0bbccde205d5fbc2fa3c09dd67c7f85cea59d7" --"checksum hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44f0925de2747e481e6e477dd212c25e8f745567f02f6182e04d27b97c3fbece" --"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" --"checksum if-addrs 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48" --"checksum if-addrs-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" --"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" --"checksum itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" --"checksum jack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1e15fc592e2e5a74a105ff507083c04db1aa20ba1b90d425362ba000e57422df" --"checksum jack-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4ca501477fd3cd93a36df581046e5d6338ed826cf7e9b8d302603521e6cc3" --"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" --"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" --"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" --"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" --"checksum lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0" --"checksum libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)" = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9" --"checksum libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9" --"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" --"checksum libm 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" --"checksum libmdns 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5d8582c174736c53633bc482ac709b24527c018356c3dc6d8e25a788b06b394e" --"checksum libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9bb11b06faf883500c1b625cf4453e6c7737e9df9c7ba01df3f84b22b083e4ac" --"checksum librespot-tremor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97f525bff915d478a76940a7b988e5ea34911ba7280c97bd3a7673f54d68b4fe" --"checksum linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" --"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" --"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" --"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" --"checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" --"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" --"checksum matrixmultiply 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f7ec66360130972f34830bfad9ef05c6610a43938a467bcc9ab9369ab3478f" --"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" --"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" --"checksum memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" --"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" --"checksum mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)" = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" --"checksum mio-named-pipes 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" --"checksum mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" --"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" --"checksum miow 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" --"checksum muldiv 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" --"checksum multimap 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" --"checksum nalgebra 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2" --"checksum net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" --"checksum nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" --"checksum nom 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" --"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" --"checksum num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" --"checksum num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" --"checksum num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" --"checksum num-iter 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" --"checksum num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" --"checksum num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" --"checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" --"checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15" --"checksum ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "a95b8c172e17df1a41bf8d666301d3b2c4efeb90d9d0415e2a4dc0668b35fdb2" --"checksum once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" --"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" --"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" --"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" --"checksum paste 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" --"checksum paste-impl 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" --"checksum pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" --"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" --"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" --"checksum pin-project 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)" = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" --"checksum pin-project-internal 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" --"checksum pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" --"checksum pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" --"checksum portaudio-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cdb6b5eff96ccc9bf44d34c379ab03ae944426d83d1694345bdf8159d561d562" --"checksum portaudio-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5194a4fa953b4ffd851c320ef6f0484cd7278cb7169ea9d6c433e49b23f7b7f5" --"checksum ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" --"checksum proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)" = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" --"checksum proc-macro-nested 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" --"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" --"checksum proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" --"checksum protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485" --"checksum protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c" --"checksum protobuf-codegen-pure 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440" --"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" --"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" --"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" --"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" --"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" --"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" --"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" --"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" --"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" --"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" --"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" --"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" --"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" --"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" --"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" --"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" --"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" --"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" --"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" --"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" --"checksum rawpointer 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" --"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" --"checksum redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)" = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" --"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" --"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" --"checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" --"checksum remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" --"checksum rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d0f961b254e66d147a7b550c78b01308934c97d807a34b417fd0f5a0a0f3a2d" --"checksum rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c34fa7bcae7fca3c8471e8417088bbc3ad9af8066b0ecf4f3c0d98a0d772716e" --"checksum rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" --"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" --"checksum ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" --"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" --"checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" --"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" --"checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b" --"checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86" --"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" --"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" --"checksum serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" --"checksum serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" --"checksum serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)" = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" --"checksum sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" --"checksum sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" --"checksum shannon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ea5b41c9427b56caa7b808cb548a04fb50bb5b9e98590b53f28064ff4174561" --"checksum shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a" --"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" --"checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" --"checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" --"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" --"checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013" --"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" --"checksum socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" --"checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" --"checksum stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" --"checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" --"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" --"checksum syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" --"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" --"checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" --"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" --"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" --"checksum time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" --"checksum tinyvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" --"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" --"checksum tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" --"checksum tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71" --"checksum tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" --"checksum tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" --"checksum tokio-fs 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" --"checksum tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" --"checksum tokio-process 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "382d90f43fa31caebe5d3bc6cfd854963394fff3b8cb59d5146607aaae7e7e43" --"checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389" --"checksum tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" --"checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" --"checksum tokio-signal 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12" --"checksum tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" --"checksum tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" --"checksum tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" --"checksum tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" --"checksum tokio-udp 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" --"checksum tokio-uds 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" --"checksum try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2" --"checksum typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" --"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" --"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" --"checksum unicode-normalization 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" --"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" --"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" --"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" --"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" --"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" --"checksum vergen 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb" --"checksum version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" --"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" --"checksum vorbis 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "5e8a194457075360557b82dac78f7ca2d65bbb6679bccfabae5f7c8c706cc776" --"checksum vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0a8d7034313748da1d84b0adfa501f83f9ec83250f37fbacfa92a3580327c4" --"checksum vorbisfile-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f4306d7e1ac4699b55e20de9483750b90c250913188efd7484db6bfbe9042d1" --"checksum want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" --"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" --"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" --"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" --"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" --"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" --"checksum winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" --"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" --"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" --"checksum zerocopy 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "992b9b31f80fd4a167f903f879b8ca43d6716cc368ea01df90538baa2dd34056" --"checksum zerocopy-derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b090467ecd0624026e8a6405d343ac7382592530d54881330b3fc8e400280fa5" -+ "proc-macro2 0.4.30", -+ "syn 0.15.44", -+ "synstructure", -+] diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 61f709b33e15..de1952b99128 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -4,17 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "librespot"; - version = "0.1.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "librespot-org"; repo = "librespot"; rev = "v${version}"; - sha256 = "153i9n3qwmmwc29f62cz8nbqrlry16iygvibm1sdnvpf0s6wk5f3"; + sha256 = "0n7h690gplpp47gdj038g6ncgwr7wvwfkg00cbrbvxhv7kzqqa1f"; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "11d64rpq4b5rdxk5wx0hhzgc6mvs6h2br0w3kfncfklp67vn3v4v"; + cargoSha256 = "0qakvpxvn84ppgs3qlsfan4flqkmjcgs698w25jasx9ymiv8wc3s"; cargoBuildFlags = with lib; [ "--no-default-features" diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index f791ad51bf9c..4830476af2c8 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cmake, pkg-config, alsa-lib ? null, fftwFloat, fltk13 -, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null +, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: @@ -21,7 +21,7 @@ mkDerivation rec { alsa-lib fftwFloat fltk13 - fluidsynth_1 + fluidsynth lame libgig libjack2 diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index cd24bec3035e..870584d357eb 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { version = "1.3.0.1"; src = fetchFromGitHub { - rev = version; - repo = "mimic1"; owner = "MycroftAI"; + repo = "mimic1"; + rev = version; sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id"; }; diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index 7ae8e17c78e5..ecb8128032e5 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,29 +1,56 @@ -{ lib, python3Packages, mopidy }: +{ lib +, fetchFromGitHub +, python3 +, mopidy +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "mopidy-youtube"; version = "3.4"; - src = python3Packages.fetchPypi { - inherit version; - pname = "Mopidy-YouTube"; - sha256 = "sha256-996MNByMcKq1woDGK6jsmAHS9TOoBrwSGgPmcShvTRw="; + disabled = python3.pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "natumbri"; + repo = pname; + rev = "v${version}"; + sha256 = "0lm6nn926qkrwzvj64yracdixfrnv5zk243msjskrnlzkhgk01rk"; }; - postPatch = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; - - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 cachetools + pykka + requests youtube-dl ytmusicapi - ] ++ [ mopidy ]; + ] ++ [ + mopidy + ]; - doCheck = false; + checkInputs = with python3.pkgs; [ + vcrpy + pytestCheckHook + ]; + + disabledTests = [ + # Test requires a YouTube API key + "test_get_default_config" + ]; + + disabledTestPaths = [ + # Fails with an import error + "tests/test_backend.py" + ]; + + pythonImportsCheck = [ + "mopidy_youtube" + ]; meta = with lib; { description = "Mopidy extension for playing music from YouTube"; + homepage = "https://github.com/natumbri/mopidy-youtube"; license = licenses.asl20; - maintainers = [ maintainers.spwhitt ]; + maintainers = with maintainers; [ spwhitt ]; }; } diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 9044d201c457..f61b7c5b7b94 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, substituteAll , appstream-glib , desktop-file-utils , gettext @@ -13,12 +14,13 @@ , meson , ninja , pkg-config +, pulseaudio , wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "mousai"; - version = "0.4.2"; + version = "0.6.6"; format = "other"; @@ -26,9 +28,16 @@ python3.pkgs.buildPythonApplication rec { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - sha256 = "sha256-zH++GGFIz3oxkKOYB4zhY6yL3vENEXxtrv8mZZ+41kU="; + sha256 = "sha256-nCbFVFg+nVF8BOBfdzQVgdTRXR5UF18PJFC266yTFwg="; }; + patches = [ + (substituteAll { + src = ./paths.patch; + pactl = "${lib.getBin pulseaudio}/bin/pactl"; + }) + ]; + postPatch = '' patchShebangs build-aux/meson ''; @@ -53,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { gtk4 libadwaita librsvg + pulseaudio ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/mousai/paths.patch b/pkgs/applications/audio/mousai/paths.patch new file mode 100644 index 000000000000..35b328ad0ea3 --- /dev/null +++ b/pkgs/applications/audio/mousai/paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/backend/utils.py b/src/backend/utils.py +index cebc009..0087c09 100644 +--- a/src/backend/utils.py ++++ b/src/backend/utils.py +@@ -79,7 +79,7 @@ class Utils: + @staticmethod + def get_default_audio_sources(): + pactl_output = subprocess.run( +- ['/usr/bin/pactl', 'info'], ++ ['@pactl@', 'info'], + stdout=subprocess.PIPE, + text=True + ).stdout.splitlines() diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 81912379de1d..c542517797e7 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -8,7 +8,7 @@ let src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "n+ZFfKYUx6silpH4bGNRdh5JJPchjKNzFLAhZQPecK2DkmygY35/ZYUNSBioqxuGKax+I/mY5podmQ5iD95ohQ=="; + sha512 = "jKuuM1vQANGYE2W0OGl+35mB1ve5K/xPcBTk2O1azPRBDlRVU0DHRSQy2T71kwhxES1ASRt91qAV/dATk6oUkw=="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index 74ed00dc5aea..ffc2d72891dc 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-bFFWPl7yaTwCKz7/f9Vk6mg0roUnig0dFERS4IE4R7g="; + sha256 = "sha256-sN3O8m+ib6Chb/RXTFbNWW6PnrolCHpmC/avRX93AH4="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 773560c83cad..a7063b9f3e25 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,12 +17,14 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.29"; + version = "6.38"; src = fetchurl { - url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.targetPlatform.qemuArch}.tar.xz"; - hash = if stdenv.isx86_64 then "sha256-DOul6J2Y7szy4+Q4SeO0uG6PSuU+MELE7ky8W3mSpTQ=" - else "sha256-67iTi6bFlbQtyCjnPIjK8K/3aV+zaCsWBRCWmgYonM4="; + url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz"; + hash = { + x86_64-linux = "sha256-K5EnrmzP8pyW9dR1fbMzkPzpS6aHm8JF1+m3afnH4rU="; + aarch64-linux = "sha256-6wNWDXjQNyfU2l9Xi9JtmAuoKtHuIY5cvNMjYkwh2Sk="; + }.${stdenv.hostPlatform.system}; }; nativeBuildInputs = [ @@ -76,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://www.reaper.fm/"; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ jfrankenau ilian ]; + maintainers = with maintainers; [ jfrankenau ilian orivej ]; }; } diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 9c810036199e..a5d9432b143b 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-6ktlnbYb+pOXwl52QmnqDsPlXaiF1ghjQg1yfznulqo="; + sha256 = "sha256-vjNJ08twsJ036TTFF6srOGshDpP7ZwWCGN0XjrtFT/g="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/dogecoin/default.nix b/pkgs/applications/blockchains/dogecoin/default.nix index 9985113b08a8..16ac7a787fb7 100644 --- a/pkgs/applications/blockchains/dogecoin/default.nix +++ b/pkgs/applications/blockchains/dogecoin/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "sha256-kozUnIislQDtgjeesYHKu4sB1j9juqaWvyax+Lb/0pc="; + sha256 = "sha256-uITX5DSyC/m0ynwCkkbGgUj8kMuNgnsNo8H8RQSGPEA="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index ae06fe7ff2ba..d37ace710734 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "04dqbn2nfzllxfcn3v9vkfy2hn2syihijr575621r1pj65pcgf8y"; + hash = "sha256-GDO8iGntQncvdJiDMBJk9GrGF9JToasbLRzju3S0TS0="; }; - cargoSha256 = "0hl8q62lankrab8gq9vxmkn68drs0hw5pk0q6aiq8fxsb63dzsw0"; + cargoHash = "sha256-Ms785+3Z4xEUW8FRRu1FIHk7HSWYLBThKlJDFjW6j0I="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; diff --git a/pkgs/applications/blockchains/electrs/update.sh b/pkgs/applications/blockchains/electrs/update.sh new file mode 100755 index 000000000000..3e4d90db59de --- /dev/null +++ b/pkgs/applications/blockchains/electrs/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl jq git gnupg common-updater-scripts +set -euo pipefail + +# Fetch latest release, GPG-verify the tag, update derivation + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +nixpkgs=$(realpath "$scriptDir"/../../../..) + +oldVersion=$(nix-instantiate --eval -E "(import \"$nixpkgs\" { config = {}; overlays = []; }).electrs.version" | tr -d '"') +version=$(curl -s --show-error "https://api.github.com/repos/romanz/electrs/releases/latest" | jq -r '.tag_name' | tail -c +2) + +if [[ $version == $oldVersion ]]; then + echo "Already at latest version $version" + exit 0 +fi +echo "New version: $version" + +tmpdir=$(mktemp -d /tmp/electrs-verify-gpg.XXX) +repo=$tmpdir/repo +trap "rm -rf $tmpdir" EXIT + +git clone --depth 1 --branch v${version} -c advice.detachedHead=false https://github.com/romanz/electrs $repo + +export GNUPGHOME=$tmpdir +echo +echo "Fetching romanz's key" +gpg --keyserver hkps://keys.openpgp.org --recv-keys 15c8c3574ae4f1e25f3f35c587cae5fa46917cbb 2> /dev/null +echo +echo "Verifying commit" +git -C $repo verify-tag v${version} + +rm -rf $repo/.git +hash=$(nix hash path $repo) + +(cd "$nixpkgs" && update-source-version electrs "$version" "$hash") +sed -i 's|cargoHash = .*|cargoHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";|' "$scriptDir/default.nix" +echo +echo "electrs: $oldVersion -> $version" diff --git a/pkgs/applications/blockchains/lightning-pool/default.nix b/pkgs/applications/blockchains/lightning-pool/default.nix index 978509cc2379..f33ede49398a 100644 --- a/pkgs/applications/blockchains/lightning-pool/default.nix +++ b/pkgs/applications/blockchains/lightning-pool/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-pool"; - version = "0.5.0-alpha"; + version = "0.5.1-alpha"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "pool"; rev = "v${version}"; - sha256 = "0i8qkxnrx3a89aw3v0mx7przlldl8kc0ng6g1m435366y6nzdarb"; + sha256 = "147s0p4arfxl2akzm267p8zfy6hgssym5rwxv78kp8i39mfinpkn"; }; - vendorSha256 = "04v2788w8l734n5xz6fwjbwkqlbk8q77nwncjpn7890mw75yd3rn"; + vendorSha256 = "0zd3bwqi0hnk0562x9hd62cwjw1xj386m83jagg41kzz0cpcr7zl"; subPackages = [ "cmd/pool" "cmd/poold" ]; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index a0f1cfe87ee7..c55965054b7e 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.2.5"; + version = "2.2.11"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-EWT/1fQpqEyKBEDHvmguHV/8s30DxweYswy0QvMDzcQ="; + sha256 = "sha256-ZDqzkANGMdvv3e5gWCYcacUYKLJRquXRHLr8RAzT9hY="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index fe34d99f1d89..d53e784ea118 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -1,8 +1,8 @@ { fetchNuGet }: [ (fetchNuGet { name = "DBTrie"; - version = "1.0.38"; - sha256 = "09n9f2j0pha2np9cpbgjfs19jwvfmrglws89izarq71gl8jia6d9"; + version = "1.0.39"; + sha256 = "0kbvl3kf73hrh1w2n3d2wshlxpqsv1pwydhwv2wxigmvs70fn1xp"; }) (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; @@ -181,23 +181,18 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "3.0.4"; - sha256 = "03aia31sznw81jjr9k6dkwgvm9dc38fgp1z8y5i45vlkf5fp89pb"; + version = "3.0.7"; + sha256 = "0nrkdbsc4k9fd4588axnkfa9gmif9b59wxw8fnmpg0nf4x8scm4n"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "3.0.3"; - sha256 = "1j3ajj4jrwqzlhzhkg7vicwab0aq2y50x53rindd8cq09jxvzk62"; + version = "3.0.5"; + sha256 = "09cgjzbkxvsi65qzns0ignp0x89z630vqacsgwj3b1h30dycwqdr"; }) (fetchNuGet { name = "NBitcoin"; - version = "6.0.6"; - sha256 = "1kf2rjrnh97zlh00affsv95f94bwgr2h7b00njqac4qgv9cac7sa"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "6.0.8"; - sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; + version = "6.0.10"; + sha256 = "00m0j74pqyjqal1wc28j6734rfd9zd7ajqb1p3fsdpqr16kfg56s"; }) (fetchNuGet { name = "NETStandard.Library"; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index a0adc22af7b7..10418c418f6d 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.9.2"; + version = "21.10.2"; name = "${pname}-${version}"; suffix = { @@ -18,9 +18,9 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | rg ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-mgip818sGkrKwF4v2mj/JeTNxBoj7DgdNPoxZ8sp8OvojHB2sa0hm4YXfrzAdPf8CP6d5ChUmwccQyYilGUiOQ=="; - x86_64-linux = "sha512-f02m8Q6ITYhIXH1FS2BA/QYYsdtxklDDNYBXBarj8b1kA+yhDFZ3VL9vy+nZNdPQHQ2yMQreDzpcToXBQ67XyQ=="; + sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' + aarch64-linux = "sha512-+qXN9cQk1u18ZzeMecPNfhkTTsw61iM/IJYksPJl9+zx2AKldv9tAFUnnmKZ65LabiaIXI+emN185SRRcaOndw=="; + x86_64-linux = "sha512-WpiG8VOEODqsQ1/jERiEEGwVqR0zbMqERGjOysEVYorA0p3xZyl7OSpWOSWaUjPBZpQtJIBdqhSXeoSRcvfJgg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 2fe128f1d294..0b90fc10bbc1 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -2,7 +2,7 @@ , fetchurl , makeDesktopItem , curl -, dotnet-netcore +, dotnetCorePackages , fontconfig , krb5 , openssl @@ -11,9 +11,10 @@ }: let + dotnet-runtime = dotnetCorePackages.runtime_5_0; libPath = lib.makeLibraryPath [ curl - dotnet-netcore + dotnet-runtime fontconfig.lib krb5 openssl diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 5a3cd7b13f65..9cee6485500a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,12 +13,12 @@ let sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l"; }; betaVersion = { - version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" - sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; + version = "2021.1.1.14"; # "Android Studio Bumblebee (2021.1.1) Beta 1" + sha256Hash = "1j1fxl4vzq3bln2z9ycxn9imjgy55yd1nbl7ycmsi90bdp96pzj0"; }; latestVersion = { # canary & dev - version = "2021.1.1.13"; # "Android Studio Bumblebee (2021.1.1) Canary 13" - sha256Hash = "04w5jw79fkxk4gy1n9iy8kjxg6k3zcl59z76f04rh556n12f01gm"; + version = "2021.2.1.1"; # "Android Studio Chipmunk (2021.2.1) Canary 1" + sha256Hash = "1fn0jv6ybgdhgpwhamw16fjqbg2961ir9jhbjzanysi7y3935nbv"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix index c0fb5680461a..0d9028e59fc9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix @@ -7,13 +7,13 @@ trivialBuild rec { pname = "apheleia"; - version = "0.pre+unstable=2021-08-08"; + version = "1.1.2+unstable=2021-10-03"; src = fetchFromGitHub { owner = "raxod502"; repo = pname; - rev = "8e022c67fea4248f831c678b31c19646cbcbbf6f"; - hash = "sha256-Put/BBQ7V423C18UIVfaM17T+TDWtAxRZi7WI8doPJw="; + rev = "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd"; + hash = "sha256-QwGlCdHBll16mbfQxGw1EORZFUxYCZSt8ThYTTGjRpo="; }; buildInputs = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 8d6ba3540bda..7eb9f12a5a05 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -369,10 +369,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.0.2.tar"; - sha256 = "07m832kn4d6njfz21qfmh12gzd35d17v29pqlxfq9v03cazww4lr"; + url = "https://elpa.gnu.org/packages/boxy-1.0.4.tar"; + sha256 = "0cwzjyj8yjg13b63va6pnj01m6kc5g3zx69c9w2ysl2wk24zn6dz"; }; packageRequires = [ emacs ]; meta = { @@ -380,18 +380,18 @@ license = lib.licenses.free; }; }) {}; - boxy-headlines = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }: + boxy-headings = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { - pname = "boxy-headlines"; - ename = "boxy-headlines"; - version = "1.0.2"; + pname = "boxy-headings"; + ename = "boxy-headings"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headlines-1.0.2.tar"; - sha256 = "1j8j2vc318mb4i116qs9zj6cvkiy1fips09mkzj6lqr25qk5fi31"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.0.tar"; + sha256 = "021w4ic028jsq7vxz1jgnfny9dymcz6v112b3b3nwyw3g3dnc62f"; }; - packageRequires = [ boxy emacs ]; + packageRequires = [ boxy emacs org ]; meta = { - homepage = "https://elpa.gnu.org/packages/boxy-headlines.html"; + homepage = "https://elpa.gnu.org/packages/boxy-headings.html"; license = lib.licenses.free; }; }) {}; @@ -666,10 +666,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.11.tar"; - sha256 = "14zjhsfhq5g9257maivyzpj5qxi1kprcsdk1qalwybyylyb4q4kk"; + url = "https://elpa.gnu.org/packages/consult-0.12.tar"; + sha256 = "0xcr7jki9m30hppy24z74nrw7xv5nahm1yrjilcck32mxfkrc69x"; }; packageRequires = [ emacs ]; meta = { @@ -696,10 +696,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.11"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.11.tar"; - sha256 = "1sf7ll25ry7vwff4bvqgdh84zviqj6wifmqdb2z8hf12awz63icz"; + url = "https://elpa.gnu.org/packages/corfu-0.13.tar"; + sha256 = "0psvkxr7fjqq7gkqdzl0ma367zjlxgixk563vpv9hmwfwymddyyb"; }; packageRequires = [ emacs ]; meta = { @@ -1086,10 +1086,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.5.tar"; - sha256 = "1p2chzj5hnaiqhammvdp82ck5pi6h1rl9r782zaqxrhrqsp3vg09"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.6.tar"; + sha256 = "0amr1s1q5w4513qw31qsr8gpsfgj5b2j7qn017rmwbaf1mj0k6z0"; }; packageRequires = [ emacs seq ]; meta = { @@ -1146,10 +1146,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20211006"; + version = "20211011"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20211006.tar"; - sha256 = "08z9q5y46fqm7r1gwiv0ir2hcybwfrvh0b7pxsrppjs1gvclyazn"; + url = "https://elpa.gnu.org/packages/eev-20211011.tar"; + sha256 = "1a71qam6z5s3zl7fvxpsnabbqxh8a7llm1524nxs2353pb6ksfra"; }; packageRequires = [ emacs ]; meta = { @@ -1325,6 +1325,21 @@ license = lib.licenses.free; }; }) {}; + erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "erc"; + ename = "erc"; + version = "5.4.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/erc-5.4.1.tar"; + sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/erc.html"; + license = lib.licenses.free; + }; + }) {}; ergoemacs-mode = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -2084,16 +2099,16 @@ license = lib.licenses.free; }; }) {}; - kiwix = callPackage ({ elpaBuild, elquery, emacs, fetchurl, lib, request }: + kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: elpaBuild { pname = "kiwix"; ename = "kiwix"; - version = "1.1.0"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kiwix-1.1.0.tar"; - sha256 = "1clp0q34bs395d0hrqdyvm9ds665hgf5qrdiqa14k31h4lbv2wsn"; + url = "https://elpa.gnu.org/packages/kiwix-1.1.4.tar"; + sha256 = "1ls11a7fc6d4gj85g8m09r95fvc4ppc0k0fs28d1hzybmgl89rgl"; }; - packageRequires = [ elquery emacs request ]; + packageRequires = [ emacs request ]; meta = { homepage = "https://elpa.gnu.org/packages/kiwix.html"; license = lib.licenses.free; @@ -2268,10 +2283,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.8.tar"; - sha256 = "0afry11i7kgfa0q83p63hmahl7jzsqhn4sl1rnkjy98pnikwv9kd"; + url = "https://elpa.gnu.org/packages/marginalia-0.9.tar"; + sha256 = "0jnw9ys7p2rhi7sx2wxi3xs95ryg9vr34xb2jdfiz0p1xv04a300"; }; packageRequires = [ emacs ]; meta = { @@ -2577,14 +2592,29 @@ license = lib.licenses.free; }; }) {}; + nano-agenda = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "nano-agenda"; + ename = "nano-agenda"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nano-agenda-0.1.tar"; + sha256 = "1bylgd4ly6dybpg66ndgsmgs5w0y5ymfq3s2pbwjnl46fnrmggz0"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nano-agenda.html"; + license = lib.licenses.free; + }; + }) {}; nano-modeline = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-modeline-0.1.tar"; - sha256 = "10hnxgjp56dqydf39mbn9zmwwvnwzi89lwnam5k3x6d6p2cnfgcx"; + url = "https://elpa.gnu.org/packages/nano-modeline-0.2.tar"; + sha256 = "13m8j8jnd33wwv1siv6frzdbs7bhspg859sflq58vimv444zjzac"; }; packageRequires = [ emacs ]; meta = { @@ -2596,10 +2626,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.2"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.2.tar"; - sha256 = "0kcirnl1fg9kvavw8aq9l16jv4rrxv5w62i7wrsjn7np697sm0s6"; + url = "https://elpa.gnu.org/packages/nano-theme-0.2.1.tar"; + sha256 = "0m98kq40dhbrn55x4bp2x5d5j1gps4y7z4086mgnj8wr1y3w8kdl"; }; packageRequires = [ emacs ]; meta = { @@ -2791,16 +2821,16 @@ license = lib.licenses.free; }; }) {}; - org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }: + org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.1.tar"; - sha256 = "0rklzp32v30ndyqli3fjcsqvvpiz3klsz26b7zn2bai2ldx6016s"; + url = "https://elpa.gnu.org/packages/org-real-1.0.4.tar"; + sha256 = "0bn9vyx74lki2nggzir02mcrww94dnqpbkryjr7a4i6am0ylf705"; }; - packageRequires = [ boxy emacs ]; + packageRequires = [ boxy emacs org ]; meta = { homepage = "https://elpa.gnu.org/packages/org-real.html"; license = lib.licenses.free; @@ -3020,10 +3050,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.8.0.tar"; - sha256 = "05q2zr661bn2h6pdvyv3apdajfxnsx0rb0n5np8cg98a7gw4zyxd"; + url = "https://elpa.gnu.org/packages/project-0.8.1.tar"; + sha256 = "1x3zkbjsi04v5ny3yxqrb75vcacrj9kxmpm9mvkp0n07j5g34f68"; }; packageRequires = [ emacs xref ]; meta = { @@ -3095,10 +3125,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.27.1"; + version = "0.28"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.27.1.el"; - sha256 = "0jygl2w8x73v22w0rzq75i2hnm3f46dzgg5x1ckz720nznvwwkka"; + url = "https://elpa.gnu.org/packages/python-0.28.tar"; + sha256 = "1pvhsdjla1rvw223h7irmbzzsrixnpy1rsskiq9xmkpkc688b6pm"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3546,10 +3576,10 @@ elpaBuild { pname = "shelisp"; ename = "shelisp"; - version = "0.9.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shelisp-0.9.1.el"; - sha256 = "15z8rpx8nhx53q77z5fqcpww255di80lb5mm28mnn2myalrr8b59"; + url = "https://elpa.gnu.org/packages/shelisp-1.0.0.tar"; + sha256 = "05r26gy1ajl47ir0yz5gn62xw2f31vdq04n3r8ywlzxbqyvzlc0d"; }; packageRequires = []; meta = { @@ -3561,10 +3591,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.1.tar"; - sha256 = "1dmi7fn4g55va5ljpyswr3dpgj471747kkdixfyp8zpsbhvr5yf6"; + url = "https://elpa.gnu.org/packages/shell-command+-2.3.1.tar"; + sha256 = "0g8pcrkkh3bxcxxbasnz834gi3pvhlkpf011fvmlhwzswypcyqmy"; }; packageRequires = [ emacs ]; meta = { @@ -4574,10 +4604,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.2.2.tar"; - sha256 = "14kdy8blhs6lwg349l9lmv0bbpybgi9nsg2iic3v87j4jyi41ljm"; + url = "https://elpa.gnu.org/packages/xref-1.3.0.tar"; + sha256 = "0bw2cbxmjavzhmpd9gyl41d4c201p535jrfz3b7jb5zw12jdnppl"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index be3c69e1140d..ac2fdc4b373b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -155,14 +155,29 @@ license = lib.licenses.free; }; }) {}; + flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "flymake-kondor"; + ename = "flymake-kondor"; + version = "0.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.0.tar"; + sha256 = "0fn9vnrqy5nmv07jv2ry0xs90rkb92qhrh7j5pdikw7zykcwlbdd"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-kondor.html"; + license = lib.licenses.free; + }; + }) {}; geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.16"; + version = "0.18"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.16.tar"; - sha256 = "1mhngb1ik3qsc3w466cs61rbz3nn08ag29m5vfbd6adk60xmhnfk"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.18.tar"; + sha256 = "131j4f82hl4pqj07qsl1f2dz4105v5fyll3bc97ggayzvrdiy58i"; }; packageRequires = [ emacs ]; meta = { @@ -330,10 +345,10 @@ elpaBuild { pname = "git-commit"; ename = "git-commit"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/git-commit-3.2.1.tar"; - sha256 = "1jndc8ppj4r2s62idabygj4q0qbpk4gwifn8jrd6pa61d7dlvp28"; + url = "https://elpa.nongnu.org/nongnu/git-commit-3.3.0.tar"; + sha256 = "0lp6r4w1k0idvfc2h0chlplap2i4x2slva9cw3iw1rhhxbcvlmdx"; }; packageRequires = [ dash emacs transient with-editor ]; meta = { @@ -416,6 +431,21 @@ license = lib.licenses.free; }; }) {}; + haskell-tng-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, popup }: + elpaBuild { + pname = "haskell-tng-mode"; + ename = "haskell-tng-mode"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar"; + sha256 = "1dndnxb9bdjnixyl09025065wdrk0h8q721rbwvransq308fijwy"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html"; + license = lib.licenses.free; + }; + }) {}; highlight-parentheses = callPackage ({ elpaBuild , emacs , fetchurl @@ -560,10 +590,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-3.2.1.tar"; - sha256 = "0yyf16605bp5q8jl2vbljxx04ja0ljvs775dnnawlc3mvn13zd9n"; + url = "https://elpa.nongnu.org/nongnu/magit-3.3.0.tar"; + sha256 = "0ihrds45z12z155c1y7haz1mxc95w6v4rynh0izm159xhz44121z"; }; packageRequires = [ dash @@ -582,10 +612,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-3.2.1.tar"; - sha256 = "1ppinys8rfa38ac8grcx16hlaw33p03pif4ya6bbw280kq8c73rv"; + url = "https://elpa.nongnu.org/nongnu/magit-section-3.3.0.tar"; + sha256 = "08ac10vips6f2gy4x4w2wkz2ki3q0d6dhynkmlpdinsdmgagziny"; }; packageRequires = [ dash emacs ]; meta = { @@ -657,10 +687,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.1"; + version = "0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-contrib-0.1.tar"; - sha256 = "07hzywvgj11wd21dw4lbkvqv32da03407f9qynlzgg1qa7wknm2k"; + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.3.tar"; + sha256 = "0fqhyby7624drskfsasgvzyxbgjb42rd6vw8l6xgb3h22kaprl0q"; }; packageRequires = [ emacs org ]; meta = { @@ -683,6 +713,21 @@ license = lib.licenses.free; }; }) {}; + popup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "popup"; + ename = "popup"; + version = "0.5.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/popup-0.5.8.tar"; + sha256 = "1amwxsymzvzmj8696fa6i0cqx4ac581rvr4dwkri7akkr7amh3yh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/popup.html"; + license = lib.licenses.free; + }; + }) {}; projectile = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "projectile"; @@ -841,10 +886,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.0.tar"; - sha256 = "1pfp1nvq2gny6kbiq3q0dcms0ysw43zq0aayfwqdj0llkf025dfp"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.1.tar"; + sha256 = "0f87bjgva0iv818bh2dqvc1svrwh5zm134jpxcmvmzr1yqazx4qp"; }; packageRequires = [ emacs seq ]; meta = { @@ -882,6 +927,21 @@ license = lib.licenses.free; }; }) {}; + vc-fossil = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "vc-fossil"; + ename = "vc-fossil"; + version = "20210928"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/vc-fossil-20210928.tar"; + sha256 = "0n4h1cj1336mv5cswq0139bkry5gnv4hrrwzd4bqhrxp5kbhqa5y"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-fossil.html"; + license = lib.licenses.free; + }; + }) {}; web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "web-mode"; @@ -916,10 +976,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.4.tar"; - sha256 = "032i954rzn8sg1qp6vjhz6j8j1fl6mpvhfnmd3va8k9q9m27k4an"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.5.tar"; + sha256 = "0bri6jr99133k9w0d754rw2f6hgjzndczngfw2lf2rvxks448krm"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 663510d92e6a..5b2372f634f5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1878,25 +1878,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20211006, - 1629 + 20211011, + 725 ], "deps": [ "consult" ], - "commit": "ccf486a902cd573d79b43ca61a4ba855fd056567", - "sha256": "07zhp5a4bfi7nyjsr84a7yp9rasn9yk08m445iwjcrjxxy230qlg" + "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", + "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "consult" ], - "commit": "be08c4ec49681474cbebaf0957568f27e42c4b3c", - "sha256": "0lpqpy33bmsh84ib1i278sr8ldn8y9ydqdikch1xi56via4ic2x2" + "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", + "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" } }, { @@ -1962,8 +1962,8 @@ "annotation", "eri" ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "070d0c841788d3a09e4557d92fd954bb1b6a7e9e", + "sha256": "055cyxcanmj29yphvw7g6k022bj8gs19xrhamxm4xii7bwbd5imv" }, "stable": { "version": [ @@ -2344,20 +2344,20 @@ "deps": [ "flycheck" ], - "commit": "0508d5a0e6e18cd6e489506d98730a9aaa6541a2", - "sha256": "1fn12zdsdn0ssj88ziyqw97ibkzvvql90dxf0x1a02mjqzkqviif" + "commit": "bddc1dc5757bd6ef308f21ed70811281a2ad5298", + "sha256": "1vpsddfjxpvylq70r7ip6c0iaqn10jdkxmwd93r1zzkxg30hzsf3" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], "deps": [ "flycheck" ], - "commit": "ef9b4d4653c95388b9e0b242bc24fea9922cfcbb", - "sha256": "0w6p5qy3cdlngrn1nv79gbgv97idkpxmw47xfcw8fn615wa5j9q4" + "commit": "bddc1dc5757bd6ef308f21ed70811281a2ad5298", + "sha256": "1vpsddfjxpvylq70r7ip6c0iaqn10jdkxmwd93r1zzkxg30hzsf3" } }, { @@ -2476,14 +2476,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20210728, - 2119 + 20211009, + 2207 ], "deps": [ "all-the-icons" ], - "commit": "96500418541b7376cd0b3e4583b9509c0dd92b27", - "sha256": "0sn5jxmhdpnnjn8x99vc9m9d31kw9alkkdr0xc345aa0ssjlkf6f" + "commit": "a0f34d68cc12330ab3992a7521f9caa1de3b8470", + "sha256": "18dd37p1vh8ixc2q07jqwzpc82qq31m89nzps192pdgkfffhdp8r" } }, { @@ -2495,13 +2495,13 @@ "unstable": { "version": [ 20211007, - 1405 + 1729 ], "deps": [ "all-the-icons" ], - "commit": "46ca70416391c1bf3a2b148c4a636dee249aa1b3", - "sha256": "1b2w6bkdc5f02xhgvl37gh7x0d2vjl6kdwnxh87qwscd68mc11qy" + "commit": "5e9b097f9950cc9f86de922b07903a4e5fefc733", + "sha256": "0p09rdq97hshg9gaivsqz9zvi2ba2p1a2ja1i8z6f896xv5jqs98" }, "stable": { "version": [ @@ -3246,8 +3246,8 @@ 20200914, 644 ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "070d0c841788d3a09e4557d92fd954bb1b6a7e9e", + "sha256": "055cyxcanmj29yphvw7g6k022bj8gs19xrhamxm4xii7bwbd5imv" }, "stable": { "version": [ @@ -3567,11 +3567,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20211004, - 527 + 20211014, + 612 ], - "commit": "48c66a669523d45de7e066d42933c1c7ca965bf4", - "sha256": "07hf143fzwnxj6a0l9yhy5s48zdsmlbmfjwy73pqbqfpi16739s2" + "commit": "30616b0924d85a99ca381f21d4717cb6eccc9f95", + "sha256": "09jb6xagdiyr0qvigsr4ij9kqgmm3qrq37z1djrh1r95qlq9b6wf" }, "stable": { "version": [ @@ -3598,6 +3598,30 @@ "sha256": "1b4ljzq4qyslwxxl6n2izghbl20wwzxxvcq5wk111blnwap4kddw" } }, + { + "ename": "apheleia", + "commit": "74ef92045e0f64b34cdb1ca686c9159b0623e61f", + "sha256": "0dmjvj7gw8qd8vh9m8ibs5pqgs63f5pv02686k97sawbkav7mg1r", + "fetcher": "github", + "repo": "raxod502/apheleia", + "unstable": { + "version": [ + 20211003, + 1818 + ], + "commit": "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd", + "sha256": "16j6lcqlsn1qy6nr82aq9hamkr0h6mnc9l5pk5x5v5n1s44sa0a3" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "53ac964e53e75b9a35a7bd173f23290d0f42d95c", + "sha256": "0f2dqid4h0psdyx3p18c7xn7nf8zr6y4qq98yvyjfbwq5lcjk4rn" + } + }, { "ename": "apib-mode", "commit": "dc2ebb04f975d8226a76260895399c937d6a1940", @@ -3658,11 +3682,11 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20201213, - 1118 + 20211014, + 2319 ], - "commit": "8c0c20b6896bba65c7f6cfe0a21e22b21a12c5f9", - "sha256": "1pr2qpvwfmqd0qysbdvaz0r0y7zznifridy0jyd8lwkddyi8jypf" + "commit": "9d1937af52cd8ecfeec27185644ea8cbf0dc1c08", + "sha256": "1kzvqxz0m2lgcm0whb121g1580vi7bvk4fj780d5xqqqlv0091a0" } }, { @@ -5579,8 +5603,8 @@ "avy", "embark" ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -7053,15 +7077,15 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20211002, - 1322 + 20211014, + 2143 ], "deps": [ "bibtex-completion", "parsebib" ], - "commit": "e84804e6f88747d39b36d9d18765ac0de99e95f5", - "sha256": "0ll6p81ijfrmivy0x4z07zyfgnw43x1l6y2rhlj9g3jrp2jrcwlx" + "commit": "b96728a7ccaa578360f7275bb01080c28bebd216", + "sha256": "17mif19zax6xhx0qbiwimfq1q3m18rka28nv6c9x5g3l6f0hby4i" }, "stable": { "version": [ @@ -8329,11 +8353,11 @@ "repo": "topikettunen/brutal-emacs", "unstable": { "version": [ - 20211007, - 926 + 20211014, + 2212 ], - "commit": "0d7d3133b80a2f37abcc67daf608c418e6372543", - "sha256": "19775jb6dknplafmy0gishi25x5i3rzfi096v6i069kwnn8g0wch" + "commit": "ce00e434baec93bdf846195516f083190edf3662", + "sha256": "0ax0qy597xknrqg8bp4sf7ag4nl7pdlgg1zicfis25xbdanyg9ar" } }, { @@ -8587,30 +8611,30 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210927, - 1513 + 20211008, + 1508 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", - "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" + "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", + "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" }, "stable": { "version": [ 0, 3, - 2 + 3 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", - "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" + "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", + "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" } }, { @@ -9775,8 +9799,8 @@ 20210707, 2310 ], - "commit": "d47d5871e2bce25aaab117cea3cdb7a41d9b0822", - "sha256": "1l3c8wpzif1cw94rdrj7ds6dp6av3yk44gxpv2nknq3gvx49n3av" + "commit": "cd6587efb64f58dc0e542f08734c875b93e63968", + "sha256": "094flwbwvvdr8asx5wgr07gbxz4n3fxb8ywbg13f69c9wagk6rkp" }, "stable": { "version": [ @@ -9886,11 +9910,11 @@ "repo": "fritzgrabo/cascading-dir-locals", "unstable": { "version": [ - 20210221, - 1516 + 20211013, + 1955 ], - "commit": "53967a3f4b2ac742ab8fd6b639c87cbb0229d5f8", - "sha256": "0pvvwxi7qbbg9h9hax6ispz69h0wk4c0adc26dyj1a2dpdxz2r5p" + "commit": "345d4b70e837d45ee84014684127e7399932d5e6", + "sha256": "160ay9rf1s4hm9xmmsd7z0mkhqrj9wpm8dpd49hhibcng8hv6z6a" } }, { @@ -10464,8 +10488,8 @@ 20171115, 2108 ], - "commit": "c2ab9b7ca6e0f23cfa359d69aba11f146bffa64d", - "sha256": "1ipyjli65sm09rns4yjmj92mrzs8gwgqspviz05df3rfw731b42c" + "commit": "ffa981bace8ab7dc1166c335b4b906b3bc0c6d32", + "sha256": "0ly2mnxpr27axvr4rxrk9a45jl0frfp190i86azd3sb9fj2klvq7" }, "stable": { "version": [ @@ -10583,16 +10607,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20211006, - 1711 + 20211013, + 1802 ], "deps": [ "dash", "posframe", "s" ], - "commit": "894d889a68a482d369010fe25da16c75f13f7cdb", - "sha256": "1698nnchw0i8xmar0v2lccn418w7snd3l0jarklk0xh33dq2klzr" + "commit": "c1f639d7bfd3e728cf85dbe224b06a4be76158f4", + "sha256": "1bic67769xvjdhinq88jqxnb4dql8gssmnx1wvrl69338zjqqjzg" }, "stable": { "version": [ @@ -11255,8 +11279,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20211003, - 947 + 20211013, + 2024 ], "deps": [ "clojure-mode", @@ -11267,8 +11291,8 @@ "sesman", "spinner" ], - "commit": "2b8bde358063e782771f2f12bdf32374d68a7174", - "sha256": "13x1wdxra3qqrsmxw1dqvc5d54za08yz4q4faprajs82h94vkifd" + "commit": "0a9d0ef429e76ee36c34e116c4633c69cea96c67", + "sha256": "06hzm7dpb7gsdrbxn3v3zjdci6qdm6mcnm7f03bgij3qcjg0isky" }, "stable": { "version": [ @@ -11537,8 +11561,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20211005, - 1943 + 20211014, + 1115 ], "deps": [ "dash", @@ -11549,8 +11573,8 @@ "s", "string-inflection" ], - "commit": "34e66583d95a8d80fb5b9f2960f3382ca0e6d3ab", - "sha256": "0y5apy2r657pzszgsc6vbxfy0l9qgxrwz2r4kj76fah4mf9g251b" + "commit": "c8ff95862823cdff067e8cc9bb7f5ef537e8f1d9", + "sha256": "1dqs5slpd9i8dj6fgryg46zabd6c134qrdq8dkj1i5n0k17ni0h1" }, "stable": { "version": [ @@ -11616,11 +11640,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210929, - 1422 + 20211010, + 1654 ], - "commit": "442a840a96e7103ef1873ffa253f8a83c79b2eec", - "sha256": "1xwb7vp5a576n8cfjixqpgyiiaqq1lv4d21pxda4yn4mvk4cjfa4" + "commit": "047aece5a6d8e1ed267e542c53f5f013293fce21", + "sha256": "09szz5m8gw3j86c3pd449wghrff1zbs1nxypbxxagry59kvsdxkf" }, "stable": { "version": [ @@ -12564,17 +12588,19 @@ 20210104, 1831 ], - "commit": "24fb43e3e757ad963082d9e92362242efb6ad265", - "sha256": "0amg5677g9ik40nsr2p2icny8vh7hw98gmp97ysz7if4yw928zd6" + "commit": "c5ae200d94333600117fc93e50c66bdd50994bbc", + "sha256": "0pay9ly2vzjb69a1aah1h6jkmixhrkps31i3mgk8frxyanlgjkgd" }, "stable": { "version": [ 3, - 21, - 3 + 22, + 0, + -1, + 1 ], - "commit": "7612abd52f192a13848a4d74191633a008892449", - "sha256": "1sg0vishbwhyxvw9p8vaqbfyaqaybv4bdkb32448irgsi382jp7w" + "commit": "167060303b6d9ffb56b2785cec0f7e363f0876c6", + "sha256": "0zaw4zjxsrjfm4rajqlh4wff158crbxyjpajbmh4yckd3gnz1swr" } }, { @@ -12726,11 +12752,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210925, - 1531 + 20211014, + 738 ], - "commit": "031f726941994d4a98649631eceeebb44b515b1b", - "sha256": "1rdrzrflnvskv41jg92zl5l99m3rzh1a7gwm325bmmi5fvsgsndd" + "commit": "68148cfc1f0723e554a09cbae4c732cfc348ecfd", + "sha256": "07y8ry0rwlxqdw39fi2maw114yyga8yzlbrxypw6irhnpm8mscjw" } }, { @@ -14070,30 +14096,30 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20210924, - 1159 + 20211015, + 1239 ], "deps": [ "company", "ht", "s" ], - "commit": "371d32ae7b488f76905fe98f3063ae30a72010fd", - "sha256": "1r3l2z6lagfj5piibph3n9lsb8fl3w5l8q6qg9z4fqfqrl9xclxi" + "commit": "493fe05fa81ba680fd44c5d05256a2ae788dabbe", + "sha256": "0fysg6fc20z8ymay27g6s1b3jcq0ndfcv5wynwjdfgvv2f5aay6z" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "company", "ht", "s" ], - "commit": "4d6d56a8b92af72aa3b1e0af1a7e7add965bf468", - "sha256": "1yr050zgygjvhwjmm2yd5p889y24vars90cr4pyqc4zhmgzrdkw5" + "commit": "ea577f13d0a47b6efbe2974a5a347a87d27c0c42", + "sha256": "1g6p5868qb2001ippdcnsscsm15d1fwl0iyilq7jk3ys68j30pr3" } }, { @@ -15004,16 +15030,16 @@ "repo": "Alexander-Miller/company-shell", "unstable": { "version": [ - 20170518, - 541 + 20211013, + 1725 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "52f3bf26b74adc30a275f5f4290a1fc72a6876ff", - "sha256": "0nv8vwmqgdb33cl1wfdbmncbrpfdciid48f6w8vmw39ks53i2z32" + "commit": "a77f4de75912aa87314cde92c603b831d5050246", + "sha256": "1mh93l6xn9frfvw86vbvs1fz544c7ylja118iaccfl42gr2ypsw9" }, "stable": { "version": [ @@ -15745,19 +15771,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20211007, - 848 + 20211014, + 1752 ], - "commit": "1af9ad3483f2ad2e52d03db3c1ee9bf6074a9669", - "sha256": "0wyz72579la8j5qd1xlwnpnpwr9z03yb8ckl081f4n9s6g4rb4qf" + "commit": "3715f7378bf1ea54af3878d118da1222bbf4bfa0", + "sha256": "1a3zg2nv2i2lgyvzn7l2y6d65s2jcrsmkz7j92gdv9zgmg4dbw7w" }, "stable": { "version": [ 0, - 11 + 12 ], - "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", - "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" + "commit": "ebb62563127a4b9442148372f897efb7baef61d2", + "sha256": "1bzlqn7k5akhyl763q29853yh5s8rmk6y1ncmy3am940wfypxjic" } }, { @@ -15775,8 +15801,8 @@ "company", "consult" ], - "commit": "9cd7987ebbcc7411404799639a88f24b690d8e16", - "sha256": "1djfb3dwg9yjx4kz37n1dd7i5pr9ks27c951yfijjhqcfr9m97aw" + "commit": "914c51c7d983e36869dd27bf21c80a8cac96a41f", + "sha256": "1wpq468mqzjq1c9ixks4hqik9yhli2p31x7mfmfqx3lw5rnc74cy" } }, { @@ -15787,15 +15813,15 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20210917, - 435 + 20211007, + 2352 ], "deps": [ "consult", "project" ], - "commit": "d3bb96abb5ccca29f4b04c6f623818386167a2b2", - "sha256": "1pqzc45g5db69nx5vq3qm48i47f3gjrdkq81pnh705vh4q7qgpky" + "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", + "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" } }, { @@ -15813,8 +15839,8 @@ "consult", "eglot" ], - "commit": "28a09cc839a9010df1a00a55528697ab34e1b259", - "sha256": "0vfr9cj2xzkpias7p25bl1yjbykg1lpphmn4a3p3sdmyh32zjy2s" + "commit": "f93c571dc392a8b11d35541bffde30bd9f411d30", + "sha256": "1jqg6sg6iaqxpfn7symiy221mg9sn4y1rn0l1rw9rj9xmcnng7s0" }, "stable": { "version": [ @@ -16009,8 +16035,8 @@ "consult", "yasnippet" ], - "commit": "9700eacab1ae7cabfacf1504db1b695b28a780b8", - "sha256": "1jzac2k9wx5wirz1m89a7fyhk4bi4vjfhlvkp618999dbfcqdx2q" + "commit": "bf6b496e00cecfd6475ebaa374a0c7c407963a8a", + "sha256": "0wgighq6r2vn9nxnisx7ci6xrxcpzhn19vaqs5xp2ig2gsm1andp" } }, { @@ -16102,6 +16128,36 @@ "sha256": "0pqdh9bx2j9kla57sn349m90azk02wajapmazdm26cjdc2npw7jh" } }, + { + "ename": "conventional-changelog", + "commit": "edbcd5c7d573bb4cb83260cd312144e707bfe897", + "sha256": "0bwyla7v8jvdm1xysg25fv0srpsn5wpi4dzqv6gz22z6rz4l3mp5", + "fetcher": "github", + "repo": "liuyinz/emacs-conventional-changelog", + "unstable": { + "version": [ + 20211012, + 1322 + ], + "deps": [ + "transient" + ], + "commit": "ba6285674d12d1eab6624ebf7a3bae7e72d56f99", + "sha256": "13l3h3akismyfgsw1l47df56lx3myr1zjqimhfzcl1jk4qg2579q" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "deps": [ + "transient" + ], + "commit": "ba6285674d12d1eab6624ebf7a3bae7e72d56f99", + "sha256": "13l3h3akismyfgsw1l47df56lx3myr1zjqimhfzcl1jk4qg2579q" + } + }, { "ename": "copy-as-format", "commit": "42fe8a2113d1c15701abe7a7e0a68e939c3d789b", @@ -16528,14 +16584,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210930, - 1140 + 20211010, + 1332 ], "deps": [ "counsel" ], - "commit": "dc7b9f9b381dffd19c79cb7ee53b79034590d309", - "sha256": "1zmx7vfi02c8k9wnbsmka5yx3ci8fv9wl8r0cc28jn40vgrivn8c" + "commit": "98860e5981b07952b5c15361cdb996741e5842c5", + "sha256": "056zqa9rq32vrmqq7i1yi37l5ypjdk2dgcd0yl9wlcl339cdzwsq" }, "stable": { "version": [ @@ -17195,11 +17251,11 @@ "repo": "kijimaD/create-link", "unstable": { "version": [ - 20210601, - 1327 + 20211014, + 1617 ], - "commit": "b2c24f42f2fae63433787150f77b397d69ce0e5b", - "sha256": "1c0smqhc87fzg7db20k92k938p8dkqiig59krwylkqgagsi7hbg4" + "commit": "e765b1067ced891a90ba0478af7fe675cff9b713", + "sha256": "1nr5dsbmhn9bs0v0h6v7d8a0pkgg859cm677nz7br2xaibdz0z47" }, "stable": { "version": [ @@ -18199,8 +18255,8 @@ 20190111, 2150 ], - "commit": "72c18e73679fc3b74d2acd037b4de2cbfff25257", - "sha256": "1ks9sr3r0kx7yi6dbwas6ncd9pn0ncgd9mqhriw5zxyd9c0b92ch" + "commit": "c129b15e8ee249a33ca9a5dc82a3defe509ad5c0", + "sha256": "0lg75np90niwj2ajqvla8s4dsgg8jr8k5bhgqsry6v6kx549rzvs" }, "stable": { "version": [ @@ -18407,8 +18463,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20211005, - 2006 + 20211013, + 1936 ], "deps": [ "bui", @@ -18420,8 +18476,8 @@ "posframe", "s" ], - "commit": "a225e73026f28b67f1837e80497fe3ec641373f4", - "sha256": "1bv19jpgk4h6rk8kzfnf29m4xpa8s2wgljqy4im184jhl4x2qg3c" + "commit": "1cddcedf9ab57a2c14a5ec50b6907b866920f42e", + "sha256": "0g67m40y4giill6sild7d9iaz5dis666wlxpcdl89vyvj2ys8hqd" }, "stable": { "version": [ @@ -21265,26 +21321,26 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20210419, - 1851 + 20211011, + 1804 ], "deps": [ "dash" ], - "commit": "4b94393a9adf677c7c037215e233eef5fbca553d", - "sha256": "14whrhi6hgzadrw9z9k2sh2800483xs1h611avz4x68c8d2jfj5k" + "commit": "bd161f38621d1a9e4d70c9bafab9b7e3520f00b2", + "sha256": "0cf5npgksl9a03mnfdhfdhlf46gr9qz9adjxz3dbckq9b1vl0dfc" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "dash" ], - "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576", - "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d" + "commit": "bd161f38621d1a9e4d70c9bafab9b7e3520f00b2", + "sha256": "0cf5npgksl9a03mnfdhfdhlf46gr9qz9adjxz3dbckq9b1vl0dfc" } }, { @@ -22040,8 +22096,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210930, - 556 + 20211011, + 824 ], "deps": [ "dash", @@ -22051,8 +22107,8 @@ "tablist", "transient" ], - "commit": "e1c0c99047a9835b8751b1d9f544ef0bc16c77a9", - "sha256": "0y54fg1i84k8avb9wnbn77wfl935z6d84xrqd7af13pdwndl2jjm" + "commit": "9d845e1eaed663ccc811c0a9ede3b3c61859e9e4", + "sha256": "01rnsyqrxvyc3kbfa4nmvxqxw261sc9b6jhqsnx14s3qfhy9w51l" }, "stable": { "version": [ @@ -22276,11 +22332,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20210923, - 1515 + 20211014, + 244 ], - "commit": "fe7ec7cf99608412073d2d68885577b9135a94ac", - "sha256": "1kjv2sh9pcmvciay1y6kp5k9lqm3mqm90qqlwh5g844bc5p7dgbh" + "commit": "6e20848a2786e8e9a5fecf27b6f29a7954635ff7", + "sha256": "1wdk4m117x9vidin1n5kr8a33znf08r4j096pnqhwm5axq5s3ciz" } }, { @@ -22413,16 +22469,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20211001, - 1049 + 20211013, + 644 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "257b9cd6deae367d0a167f0b634d39deb846aef6", - "sha256": "07i3rnrqwl99zpmrbhq0mq5p6l4jzkchg515hn6m8n04slfai59d" + "commit": "56876e64d92fa1aa2d569831a126e1a26ce06849", + "sha256": "1vpqa95ibw5srisrypfnmf3rkkspiq7crk72yf3sghpcancl7b50" }, "stable": { "version": [ @@ -22466,14 +22522,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210916, - 2120 + 20211011, + 1314 ], "deps": [ "cl-lib" ], - "commit": "e716ddbb882a3a06744faa74decb2fea1569c921", - "sha256": "02gp36hbmxcadp4567mnsj29b2ql9favhdcr9sm4pyp9bszm75ns" + "commit": "3e6f5d9ce129ac6fc0f466eb6f5518593625578f", + "sha256": "1ar9nb67hppqhbdl6l6mv1y6zl48mcdl91bmsc49bjpzp9a38y5b" }, "stable": { "version": [ @@ -23129,8 +23185,8 @@ 20210909, 1010 ], - "commit": "64f3f710e7238bab9164e75b3fe2e7d17918e6e3", - "sha256": "1jwrcxjld82xs97vx9s5laamg8l4s5hpz314x3rvcb5q6mrd7h07" + "commit": "87a2d25e56caf65600e9d3f647bcb4999556ecb4", + "sha256": "0g7vwfcbv88kbsxz7qzwj7wdxf88ir22wwlglxryaf5249fzzln5" }, "stable": { "version": [ @@ -23895,14 +23951,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210930, - 1217 + 20211014, + 1059 ], "deps": [ "parsebib" ], - "commit": "63b0700eefc982276002ae8d618e8a7fa1f68732", - "sha256": "14qiy68q60na9llh81kj3n4bqxn0car1431sdmfv3jjv2h176qv0" + "commit": "b829aac34b90471cb53960ac0c0186603d032946", + "sha256": "0fp2nbr3zrq62mj83qwfh7x358mpkicphh9ha0yq64pd6a4l0ivd" }, "stable": { "version": [ @@ -24604,11 +24660,19 @@ "repo": "suntsov/efar", "unstable": { "version": [ - 20210604, - 503 + 20211014, + 728 ], - "commit": "afc19e212a6f1227b5747b42407226b8222f92c5", - "sha256": "04ld4sk52hm6w4bqlsfd5b1633nb7waf0cmm6rpkgidnzlwv4fxm" + "commit": "1823b9301f552a6944a42f49a0a136a2861ffb88", + "sha256": "0fvdybwda6p09frlij7imqljmnlpa16p03wv45f6w1gsi4akqzy8" + }, + "stable": { + "version": [ + 1, + 23 + ], + "commit": "a9ff16e8994f525086e72d1e6a827e5fe90d1326", + "sha256": "0wv351ajzdy1srsbfmg33az2fdns96zc1jxygxfyzja0y2r9q065" } }, { @@ -24759,8 +24823,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210905, - 1905 + 20211009, + 1931 ], "deps": [ "eldoc", @@ -24769,8 +24833,8 @@ "project", "xref" ], - "commit": "c17bdf6c98d6bf0f1a85f1175556e1038654402f", - "sha256": "10liic4skqd5qr1zw18k0kx50i2m5pa90vc4yypli5c6bpadsyq4" + "commit": "9665359bb6bfb6a96b0c3b307d4abea9fcbff7a5", + "sha256": "154wf1ps7s00vpmdxgj2pw36gcda1w82f5yw0zhl9c7gi05g3xn3" }, "stable": { "version": [ @@ -24920,8 +24984,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210809, - 2101 + 20211012, + 347 ], "deps": [ "anaphora", @@ -24932,8 +24996,8 @@ "websocket", "with-editor" ], - "commit": "0600c286bd7b0812f4908d7df1be279b6b65923f", - "sha256": "0cwqngw05fg8rs6vz65wzji6h4fv2smp7xlh1xjbw03nrrz41bc2" + "commit": "e354ea77c29e8c20b6b1a9ee00d86e6a9512bc0d", + "sha256": "1ny4gjawwsq7gx1ih7f37p24pyyjv9jbp702v1sl6wfnk6r7ll9c" }, "stable": { "version": [ @@ -25382,11 +25446,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210524, - 1611 + 20211011, + 158 ], - "commit": "64545671174f9ae307c0bd0aa9f1304d04236421", - "sha256": "10hjqva6xpilnsfsi8z7w3mjmii4hzf53cmccv1w3076ccvcpq62" + "commit": "f4a45e47e58414da0984f9ac1328be207a897ba9", + "sha256": "1s1i665a3bknjchg47jsaxydmmq4fqyb59i18np7w0zhhzzpjxxs" } }, { @@ -25886,26 +25950,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210925, - 2 + 20211008, + 2330 ], "deps": [ "elfeed" ], - "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", - "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" + "commit": "973b337d7104a7adb519b7b74a91fc21f8757731", + "sha256": "16a0whgx47irgp3p17xwdwfiaylrv85f26dynh5ba2sy7l0d0irq" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "elfeed" ], - "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", - "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" + "commit": "d97c813d472b68c977569b14761c242cb33345e1", + "sha256": "1drgv16555cyn7w6g44z23yhi1i0cy1b9h1ri3lz6h814px0wj0z" } }, { @@ -26160,15 +26224,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20210615, - 1624 + 20211009, + 1531 ], "deps": [ "dash", "s" ], - "commit": "fdde21e34b1272783d566d8230b5ed2dc4749048", - "sha256": "15g3xp3w8lrshjf812c8v50y396zx7107fcyc59kljhsc257j62y" + "commit": "c06aec4486c034d0d4efae98cb7054749f9cc0ec", + "sha256": "0dhflhgc1px9kj2bhv9m646ab08a6qjcqdd1a6wd5psj047bkj9p" }, "stable": { "version": [ @@ -26236,11 +26300,11 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20211005, - 1542 + 20211013, + 1408 ], - "commit": "e44d5bfd68d735c4d93df9d2ae8e78ed9cb52d31", - "sha256": "0f0q6mn7zxwpsnln3k15911kskfp0gf1vyn2mdlzx13ql616a3r1" + "commit": "907ef434a0ce0f94dbd0c77f09bdfcdc779bca73", + "sha256": "0sri7m0n0wafc9dyffi5myvv2vawkfwx6lgmfrj7kikbds0l5s4c" }, "stable": { "version": [ @@ -26629,11 +26693,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20211007, - 915 + 20211008, + 1217 ], - "commit": "02fade7fc9a6b642359552694cc7bed95132cf18", - "sha256": "0428hhz57gb0sfxzfa34zm7c4m1njglc27sq9mbdmma8hk9by91p" + "commit": "81e107a26924747c10c671882032d341ca6d77c4", + "sha256": "1psvfqk71bi9p5mq99r2ihpk4h80sb7p8398fg2zb33a3j3g52b7" }, "stable": { "version": [ @@ -27216,8 +27280,8 @@ "deps": [ "emacsql" ], - "commit": "50aa9bdd76b0d18bf80526cff13a69fe306ee29c", - "sha256": "1jzvvsvi8jm2ws3y49nmpmwd3zlvf8j83rl2vwizd1aplwwdnmd6" + "commit": "209fd0c2649db0c7532e543ec12e7ba881a3325c", + "sha256": "0zr56gwn8rcgvaa9halhfxpxnn0x6yqc66z6r7vqzx5jbj7d6q46" }, "stable": { "version": [ @@ -27336,11 +27400,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211004, - 1250 + 20211013, + 119 ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -27359,15 +27423,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210829, - 1334 + 20211012, + 1921 ], "deps": [ "consult", "embark" ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -27534,16 +27598,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210911, - 2031 + 20211013, + 1353 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "c42fab572846b1dd76d82c5293ccfb6ee2c45991", - "sha256": "1jb4di2v1fxjd7qw8mjwzqpr3j8jcbli4jx7236b7kmcid9zfds7" + "commit": "f0da8453ae94aec630ad5b3395d6bc882ef0ae57", + "sha256": "098lx63narp2drx0bq6bni20z0mi6nwr80cb4gc358ry7zy4m9rn" }, "stable": { "version": [ @@ -28885,15 +28949,14 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20210402, - 1642 + 20211012, + 142 ], "deps": [ - "cl-lib", - "undo-tree" + "cl-lib" ], - "commit": "f9d6e3f7d99b877a63fa6f5ab61e6ba05a7075c8", - "sha256": "0xw99i47mmry205aps4mha1ninnnzir652s7jh81fdsys8y5j7w1" + "commit": "3f961db491f572b7f0637e09fd113c43a1061617", + "sha256": "1519y2q6mqvjncd8axdimajb12z7xmzmgxr8c021iq8s2ikf65bs" }, "stable": { "version": [ @@ -28940,8 +29003,8 @@ 20200914, 644 ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "d281edeac893db140ab2a0ec9f42a4c1dd2efecb", + "sha256": "089z3mgpgsb7gx6v7ysmvi8nc2fzbhd72av1yh2m4lc1alxw711a" }, "stable": { "version": [ @@ -28964,8 +29027,8 @@ 20210315, 1640 ], - "commit": "818bfab3463cf5f289a4d7be5a77667d673207d8", - "sha256": "0ab8g4p4ak49pzbigcn69657v19wx34v66hl8rqiwd9gmwji0d74" + "commit": "e782c0305e2fcdff0b9ea9c2b365878e602df04a", + "sha256": "1vfy86wsv8mx1w7lawxp7h7lc7iyqn9jsddi8006f8ccqsndbbzc" }, "stable": { "version": [ @@ -29826,11 +29889,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20211006, - 2210 + 20211011, + 2049 ], - "commit": "5691859d4edc4387165e561a2a06527c85e795ec", - "sha256": "1ja7ppw65n20kjfnij71fxf5nnvbdly4hk74wmdhvsr220vkc90n" + "commit": "569dca1f4ff939a93c7be97c34577666d9af8b3a", + "sha256": "086nl0486l28n1zmw9jxqh63d7bqanzlqwh9nm4a4aw1fyjy7pda" }, "stable": { "version": [ @@ -29994,15 +30057,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20211001, - 1717 + 20211009, + 55 ], "deps": [ "csv-mode", "ess" ], - "commit": "9be3d4566426264acea459f24428e1d0c868c6fe", - "sha256": "1bs2awcmmxzcdhqlyizgrhxgrgh80jl8a6jbkk5zspl838cq4n39" + "commit": "6fd97a89c73815672de7df21d1ecd362a66126b5", + "sha256": "1vbq9xnspbmykbz4axrxskfsb30bzcnfkymiyfy82shb65r53fn4" }, "stable": { "version": [ @@ -30421,15 +30484,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20211006, - 1559 + 20211011, + 2205 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "ebae35360c9be4828b7a9069396bd6a5ef3e9fdf", - "sha256": "0nq7sw7j6nwv44ynhgr6jjkxvlg0cy4ps77y12q9f4g0nx6sj5ga" + "commit": "44f75e93c6db89de882a0eb1d8bcc7c4ebb8e94e", + "sha256": "12r45djpmdhf4ygc9wdxj1jmxwcag300a8skfhkpiqimapnm8k5k" }, "stable": { "version": [ @@ -30573,28 +30636,28 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20210818, - 1228 + 20211011, + 1752 ], "deps": [ "evil", "evil-snipe" ], - "commit": "db01118a76112c61b7617aa44aa8c438d8f1871f", - "sha256": "15ihz0wwc7gzqsmzbrr48zzh3rw3bmbf2ghnhcy13pdq42wridcv" + "commit": "05c023740f3d95805533081894bfd87f06401af5", + "sha256": "1fnzrwr53h18wp4wkb834j39xg8bv7yqcmilb41bc81npfmi2mn1" }, "stable": { "version": [ 2, - 1, - 0 + 2, + 1 ], "deps": [ "evil", "evil-snipe" ], - "commit": "7844079b47f47bb1dc24c885b0ac2e67524fa960", - "sha256": "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2" + "commit": "05c023740f3d95805533081894bfd87f06401af5", + "sha256": "1fnzrwr53h18wp4wkb834j39xg8bv7yqcmilb41bc81npfmi2mn1" } }, { @@ -30623,15 +30686,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20211003, - 1458 + 20211007, + 1722 ], "deps": [ "annalist", "evil" ], - "commit": "bc5a02ed8572e7d40d04a78f17abc08061dfc37e", - "sha256": "1y5sw51k86sravaspmyg4j0986yldfsyl21cwcr9cvapsp46ba52" + "commit": "6709c1ec4118c8721df43ea6708ae45ebbc01fd3", + "sha256": "1wcjrqvirymwfn0f5sv8axw7ycfjff3h0x5f1cadakbpa96jrc9g" }, "stable": { "version": [ @@ -31324,11 +31387,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210719, - 1305 + 20211014, + 455 ], - "commit": "6bc41317ba4b8710d713a62e1b78047c3cc2d2d5", - "sha256": "14s2zrl2rpnqpfp647naa80qzb2x4c6jflvs1nhxsvn43s0gdfj9" + "commit": "63baf2d1c796edd11bbec5fe1dee711173d4155d", + "sha256": "0kk9l9wvvb40hric4wdzvccp98mbipln7ah9h8grl5ayb9kw6xxg" }, "stable": { "version": [ @@ -31363,14 +31426,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20210808, - 1424 + 20211011, + 103 ], "deps": [ "evil" ], - "commit": "8ce0066fa4889c9a43db5917d116baa9497837b7", - "sha256": "04dls5fmr4a8b8j3802nm0cf4rngr01bgpsa25rgdq1cdv9x9zb6" + "commit": "08f0c1ee93b8a563770eaefaf21ab9087fca7bdb", + "sha256": "0pcacrfvvk6ra9dgq84fdcsh5ziwk78k8dmr2c442fvr2lzch4yn" }, "stable": { "version": [ @@ -31949,8 +32012,8 @@ "deps": [ "evil" ], - "commit": "ebae35360c9be4828b7a9069396bd6a5ef3e9fdf", - "sha256": "0nq7sw7j6nwv44ynhgr6jjkxvlg0cy4ps77y12q9f4g0nx6sj5ga" + "commit": "44f75e93c6db89de882a0eb1d8bcc7c4ebb8e94e", + "sha256": "12r45djpmdhf4ygc9wdxj1jmxwcag300a8skfhkpiqimapnm8k5k" }, "stable": { "version": [ @@ -32141,15 +32204,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20211001, - 1457 + 20211008, + 1630 ], "deps": [ "evil", "tree-sitter" ], - "commit": "5b8dd1d1803e69dc7e7812841df6bfe772396f43", - "sha256": "0r4q1cn0wv7g8krmp8a3pflq1bfz9hp69wz0pzgvlnag55zmavps" + "commit": "ebde473af5a484959cda97483453d855c7bab89b", + "sha256": "1x30il32l57pmqiqj872z83w1v7g87scsaaspn05i4wd8x7y30qp" } }, { @@ -33260,19 +33323,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210602, - 1952 + 20211013, + 1554 ], - "commit": "cb8803355e20812d84195b1b7c9b0578c3262e68", - "sha256": "0wx2k9262p712aasn3ha8si250yzhcqz513apna8lp5gri2rxsg8" + "commit": "3c13ae4d694025207ba7eb43f174f90bb49395d4", + "sha256": "1iv9i1j39wj29y86z49yyw1a22wgyafdybjizmji60hi7x4r66az" }, "stable": { "version": [ 2, - 20 + 21 ], - "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", - "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" + "commit": "3c13ae4d694025207ba7eb43f174f90bb49395d4", + "sha256": "1iv9i1j39wj29y86z49yyw1a22wgyafdybjizmji60hi7x4r66az" } }, { @@ -33391,14 +33454,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20211006, - 842 + 20211015, + 1502 ], "deps": [ "s" ], - "commit": "4deddb48b5c9798bdb68a341a9cd23056b4fb2c4", - "sha256": "0vsfjk912n24j46ivlkfw8vlqi913qnvy8hixfcf13f68ak8cbav" + "commit": "d6913c8a8dff0711d3e3dc42ba1b63fb0a39ece5", + "sha256": "1pk7mfmfzxi1saaq2g76bgps9w4gcdbj1ck74hkhiv5a166w3fi8" } }, { @@ -33888,15 +33951,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20211006, - 2239 + 20211008, + 2353 ], "deps": [ "dash", "helm" ], - "commit": "65ec7d5c10115f3670b7488825922494e749d34a", - "sha256": "0hwimg57lwny3n2jz0m224blbhrjdd3qjfa5xmcvwsnw5lp54i48" + "commit": "1f0bcf009bf124c213d64dd2726061db6af981b5", + "sha256": "1wsqddl48shi2815zmx609g39bpc9kn28hv26vpjljap8qxpxpzw" } }, { @@ -34201,8 +34264,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20210919, - 929 + 20211015, + 937 ], "deps": [ "async", @@ -34213,8 +34276,8 @@ "s", "transient" ], - "commit": "77421f62e6e616ada9d6ee1bb2b7a920aeb51726", - "sha256": "12089lm3h70igfxasvjw8ccm1iag0p3159w2pn661awnv9nplwl0" + "commit": "21a492d3e67e5e3ab59b75107d345142a4c3ac02", + "sha256": "02n3h2zvdf24jxmcpp0cjcfba54cs0isymcd4k4j68zywszwzp36" }, "stable": { "version": [ @@ -36468,8 +36531,8 @@ "flycheck", "keg" ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -39407,8 +39470,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20211006, - 2025 + 20211014, + 1707 ], "deps": [ "closql", @@ -39421,14 +39484,14 @@ "transient", "yaml" ], - "commit": "8264234db61b8a7f427b972aaef6235f9f6a13fa", - "sha256": "0fw2v05bxjkya78jms7n3jdzf04plr1piwh9z92an7421m7mjkdj" + "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", + "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], "deps": [ "closql", @@ -39438,10 +39501,11 @@ "let-alist", "magit", "markdown-mode", - "transient" + "transient", + "yaml" ], - "commit": "e7d0d759440492549db331f3c39c3cc62880118f", - "sha256": "0j28vc0q1h36pk0y2nidnlsc2y7n0vpfrd8civiv1zp8z0jwfyc9" + "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", + "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" } }, { @@ -39476,15 +39540,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210929, - 2019 + 20211011, + 1029 ], "deps": [ "inheritenv", "language-id" ], - "commit": "772beb9acc3152cce10767ebba545c7af52b76e4", - "sha256": "1k70lrkbrj7g071nknqili0lga971fdyn52fzgjb8qwgr90j9fmp" + "commit": "88e095ab6f8eee9537ffad23f068ebbdee3cea31", + "sha256": "1z1sar005454b8lnfwmnnncpsdli13g4b1f2hvwl8c5w4z30n4g9" }, "stable": { "version": [ @@ -39621,26 +39685,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211007, - 846 + 20211015, + 607 ], "deps": [ "seq" ], - "commit": "f672b9af16184597747424543b87cbc6910e8ab8", - "sha256": "0xx67c8vbnqzdcyfsqv725xxj493hd9b3p3bqzl6an7v75v6bpi1" + "commit": "f370f8f2e57805b94ab61ea6997ad31e13f81f5c", + "sha256": "0ghxg54n09syxfnngiiil3hf1m566ajxkwi051i0m3pwfqcg6nwa" }, "stable": { "version": [ 3, 5, - 1 + 3 ], "deps": [ "seq" ], - "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", - "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" + "commit": "16bc2a6a817b53ed3306a3ff3cebd271e7bf8746", + "sha256": "13k84dzjar67fa1ixicl6h8gxzblszd0ik8vi11bvipysgp3j3ws" } }, { @@ -39702,15 +39766,14 @@ "repo": "alphapapa/frame-purpose.el", "unstable": { "version": [ - 20201219, - 1340 + 20211011, + 1518 ], "deps": [ - "dash", - "dash-functional" + "dash" ], - "commit": "b4a259fa077671e2dcf33d11b42955c91e395b8b", - "sha256": "033vbvv4rrjbsfw0bbhhzx2754r96vy9h4n1y8jmxrqzs9wi5mmq" + "commit": "7d498147445cc0afb87b922a8225d2e163e5ed5a", + "sha256": "03qalcx8hbf6r0jmh7hf1r4san13fbgaaabcs4c50cam7kdv525r" }, "stable": { "version": [ @@ -41171,6 +41234,25 @@ "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" } }, + { + "ename": "gemini-write", + "commit": "e97c45cafc44a4b2f08e577325e375c6312f6557", + "sha256": "039rdjsyx9lw7lh21ps84agm1rpinbylzlks6iv1h5pn341s67nd", + "fetcher": "git", + "url": "https://alexschroeder.ch/cgit/gemini-write", + "unstable": { + "version": [ + 20211009, + 2110 + ], + "deps": [ + "elpher", + "gemini-mode" + ], + "commit": "7e1fe7d4f2c65c0854eb571edc78e5a45d7078de", + "sha256": "0p1ch44w7sn73p87a7k47drgdj4sam961arfr4k0ii4fny54cyip" + } + }, { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", @@ -41179,14 +41261,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20210918, - 1525 + 20211008, + 1651 ], "deps": [ "cl-lib" ], - "commit": "a78da8f74fddb84412b98b9a8c881af4dce7ab24", - "sha256": "11rx5i0fmigjydpm2w4gwgrsf74a4xa856i17i6056mw1sjsjwaq" + "commit": "26f1d4c4e258c40e6b70ce831a04800c914f29b3", + "sha256": "16rjsmmhjjx4mch1aygrxqj3pr5c4xxqzf21qvr6s4c9yk6ayx1f" } }, { @@ -41412,11 +41494,11 @@ "repo": "leoliu/ggtags", "unstable": { "version": [ - 20190320, - 2208 + 20211008, + 528 ], - "commit": "1c43705753e639b34b58c9bf961a80b6610a7109", - "sha256": "15hv3d4wc32nidi0pl73i2v673s2lipzsy8llqy6asls2y268qgz" + "commit": "1442ab8c7f02d246f14150207534fba4a42201ba", + "sha256": "0bibr36b9cxxx5qgi27srfj21mv272npy5w1krrgmn0521qd07w1" }, "stable": { "version": [ @@ -41947,22 +42029,22 @@ }, { "ename": "git-commit", - "commit": "2571aed58ce9c4df998588cbcffdde704f4dce54", - "sha256": "171spbjdgnphv1d108y2ivf09yaqfpg61sjc7gs62cwld4krk4l6", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "0j4z9pmkbn366gqc9521dix5g5capqw4r6prjfxc6g0vlnzan30g", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211006, - 1626 + 20211010, + 1635 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -42059,8 +42141,8 @@ 20211002, 2345 ], - "commit": "c7fd6010ae223a1acde42260302b0be1ec11bdc3", - "sha256": "1r3pssix4g23adxxq5jf2v51dnk65xj4xr0zs31jnm5xj9z0qx1v" + "commit": "c1e51865eb26739052035177846f53476c8605da", + "sha256": "00rldkgmrjzr8nc3mngfh4vjscsdswqfqzrdwxmwmc0m3kx2yppz" }, "stable": { "version": [ @@ -42696,8 +42778,8 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20211003, - 1704 + 20211011, + 1933 ], "deps": [ "a", @@ -42706,8 +42788,8 @@ "ghub", "s" ], - "commit": "4d91dd6c56be1ae2b93b6b9e50c73f657cc461b6", - "sha256": "1j3qd7i1pjirzjfar29m6iyngj75jn13b08ba56mapp37jkzgavk" + "commit": "2a24e75dfc2d9f37789ff60b4c10deb7c96f3f88", + "sha256": "1mahd3kg5rr6jf1x3ixjvhgkv9c8fq8mxvikrmpjciari05sd58y" } }, { @@ -43370,11 +43452,11 @@ "repo": "lokedhs/gnu-apl-mode", "unstable": { "version": [ - 20210907, - 223 + 20211012, + 1139 ], - "commit": "f66273ba34a6f1d2bbb39bec9a6b4e38dc8d48f1", - "sha256": "1540z31hkz4mg9kkxkl7ii1pz1hy446j23r42la1qbchif6q0zpz" + "commit": "5d998206a963f2205dc6c4eddb41fb34187cb527", + "sha256": "1yzyq8k770j78f2gkkr1n1d5jpdfmj9l3w40pjd7fmn94xg3qw9a" } }, { @@ -43742,26 +43824,26 @@ "repo": "benma/go-dlv.el", "unstable": { "version": [ - 20200713, - 1202 + 20211015, + 816 ], "deps": [ "go-mode" ], - "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", - "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" + "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", + "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "go-mode" ], - "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", - "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" + "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", + "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" } }, { @@ -44239,19 +44321,19 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20211007, - 1403 + 20211014, + 1322 ], - "commit": "ae83654b4cdd752047674232290e7ca5c566748f", - "sha256": "07bjzs0w8b0spcksa2v5h20cnb8dvya1840xnagrpvcb1qfa49sk" + "commit": "ce730f126a63eae77bc9585f75fe1dce968d9a2f", + "sha256": "1r4x1v5j67k7idsy6vidc367kn2iznwdmlhx6h6lpnqv0l36n6py" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "27d9218aa10dc361aa89f666f91aea7fdfb43d1f", - "sha256": "0jgicsv8102pk340fn122w0hbhvac2nqcpr16lj7ccjg44qmnrdw" + "commit": "b3174e09a03954b1423c4ea2f2936f9fcd94f381", + "sha256": "054l7m9slhznpfkixrnk6n5h8rc9x7gjsahizxvkd73q0jvgqxgn" } }, { @@ -44864,14 +44946,14 @@ "magit-popup", "s" ], - "commit": "d6bd701aca21e3481213fc3769c5b220a2215826", - "sha256": "0irmk67zh0w890vy0cljqb6mcykimkjdjw410nlhl8hmvzykx5yn" + "commit": "086bb561d0544da01690d1028e6fd23c7c943573", + "sha256": "1ad9q4rv7c13ls1c9z5vdshcj8y6723phlkpzgq0aicw9fxvi36m" }, "stable": { "version": [ 0, - 26, - 1 + 27, + 0 ], "deps": [ "dash", @@ -44879,8 +44961,8 @@ "magit-popup", "s" ], - "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", - "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" + "commit": "086bb561d0544da01690d1028e6fd23c7c943573", + "sha256": "1ad9q4rv7c13ls1c9z5vdshcj8y6723phlkpzgq0aicw9fxvi36m" } }, { @@ -45646,11 +45728,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210617, - 1028 + 20211008, + 1720 ], - "commit": "7efb041b826f15b10aa9cfb67b971fdc41064980", - "sha256": "175gfhi1621pclwvhbz2a8rramfb47v353x5hxjys1b0p848yk1l" + "commit": "856d66a65a75fd9906c47a930a8ee584bdef4077", + "sha256": "1w4qcvmkwqz0kmzrqidrlr6mga8fi6khwdq2w5nzr31g915n2cv0" }, "stable": { "version": [ @@ -46011,11 +46093,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20210923, - 2359 + 20211015, + 1752 ], - "commit": "b5c7121a4a6e67c7e90bb6d8363936e50876093f", - "sha256": "0iccr1sjkbaw4lb3dja9bgyix6gwknvbmkk7xdn3misphl0fvnk1" + "commit": "e530afd2e42bc560b3236cebeabdeaef0e33faca", + "sha256": "10x8k19sf4jgbwxl0akzm3s47z8h78r83yb7512l62s2an3wi2g7" } }, { @@ -46962,16 +47044,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211007, - 1355 + 20211013, + 727 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "d8e433cac4ec2c594740f6d040e5fbfdec7a0bb5", - "sha256": "1hs3psdb69vc16jg49mnfy89gvhhc21ci9q3v8kjk0f26gvh5k6j" + "commit": "a86bcc99dcd45cd898a497715b4333d118a3c6f2", + "sha256": "0bf3cx7w11h7dwjys3gb62p8mfl586qnf86jlsrzhvsg0dm56b5f" }, "stable": { "version": [ @@ -47870,14 +47952,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211004, - 1655 + 20211013, + 445 ], "deps": [ "async" ], - "commit": "d8e433cac4ec2c594740f6d040e5fbfdec7a0bb5", - "sha256": "1hs3psdb69vc16jg49mnfy89gvhhc21ci9q3v8kjk0f26gvh5k6j" + "commit": "a86bcc99dcd45cd898a497715b4333d118a3c6f2", + "sha256": "0bf3cx7w11h7dwjys3gb62p8mfl586qnf86jlsrzhvsg0dm56b5f" }, "stable": { "version": [ @@ -49500,26 +49582,26 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20211004, - 857 + 20211013, + 430 ], "deps": [ "helm" ], - "commit": "11d9f8ca48f2ae638250b61ad8d7ef3741b07fbb", - "sha256": "1y0wqr8ic78n5a3fl205r9ss34lqm5mggncwxl240fckyzf2ibgq" + "commit": "ae2202fbbbe11873ad4b393a6959da50ac250c1e", + "sha256": "01j41pidn8aipz1c0x17p88rzr15bg7ij5fr1q2kf8qhky07xfvx" }, "stable": { "version": [ 1, 9, - 2 + 3 ], "deps": [ "helm" ], - "commit": "563f664df4076ec214035c8c1f8cee47841565de", - "sha256": "07jgkc8csnc2hcg4csy07zy3wjbm4fbk4lqiy82rdlxp1vad25vi" + "commit": "312392b786a7ea322914b60760e2693b53772ad6", + "sha256": "1bqk0z6zd3aza7ibb8h0ghya5kid4m6z01gs7jf4sr6p49rzp7hd" } }, { @@ -50004,8 +50086,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201213, - 837 + 20211011, + 1519 ], "deps": [ "dash", @@ -50014,8 +50096,8 @@ "org-recent-headings", "s" ], - "commit": "5da516a1586675992c0122ed32978c18dda06318", - "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" + "commit": "97418d581ea030f0718794e50b005e9bae44582e", + "sha256": "1y11rlnhi36lzhc1cagninv6hlcwbvj88xfr0g0xzpbzy7hys021" } }, { @@ -51555,14 +51637,25 @@ "repo": "brotzeit/helm-xref", "unstable": { "version": [ - 20201004, - 1817 + 20211013, + 1538 ], "deps": [ "helm" ], - "commit": "23f1174cfca7667d95828dcd388c655a4a9c877d", - "sha256": "0v0lkabpi1n4hgnp28jk19f7b78yk93ssm0gr0fr25yqx5zskdnk" + "commit": "9764eabd50c40b009073c7ef64e3a71d0d066d0b", + "sha256": "0v0wm1x11r1h9p139c5rl0r4s5q6092bmwrsnr2140ddbq34mnvy" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "helm" + ], + "commit": "9764eabd50c40b009073c7ef64e3a71d0d066d0b", + "sha256": "0v0wm1x11r1h9p139c5rl0r4s5q6092bmwrsnr2140ddbq34mnvy" } }, { @@ -54240,11 +54333,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20211007, - 308 + 20211011, + 557 ], - "commit": "ca48999554e720d20be46f194f69919fb2894a82", - "sha256": "10n6fnxnsg6xmgj07h172g9sqwqwldp6cw31zrylgirz5nk3vn4r" + "commit": "0916be7075e792773440c3bdb5cf9c153691846b", + "sha256": "0817y99zm1x01nya6lnhby96da2w9kivw4p59bbaxm7hi0ycrsfz" }, "stable": { "version": [ @@ -57628,14 +57721,14 @@ "repo": "alexmurray/ivy-xref", "unstable": { "version": [ - 20211006, - 1043 + 20211008, + 1103 ], "deps": [ "ivy" ], - "commit": "45df80767104dd8f4fe957156c82f1d8b77d64d5", - "sha256": "1c0k1in2hpfwfd7m5r8623d58kxsrfl6pwpgdrkk3077vdgbwiip" + "commit": "a82e8e117d2dd62c28b6a3e3d6e4cfb11c0bda38", + "sha256": "0h4cnhfqgrzm63kfrlz2mhgsk20jkcq18gjx9pvbbhhg59xvvnaj" } }, { @@ -59094,28 +59187,26 @@ "repo": "joshwnj/json-mode", "unstable": { "version": [ - 20190123, - 422 + 20211011, + 630 ], "deps": [ - "json-reformat", "json-snatcher" ], - "commit": "0e819e519ae17a2686e0881c4ca51fa873fa9b83", - "sha256": "0m4i6b5qmakdc0h8npsyajdp06jq03cb1c5rkj6x0khnjw9fv2fl" + "commit": "eedb4560034f795a7950fa07016bd4347c368873", + "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" }, "stable": { "version": [ 1, - 7, + 8, 0 ], "deps": [ - "json-reformat", "json-snatcher" ], - "commit": "9ba01b868a6b138feeff82b9eb0abd331d29325f", - "sha256": "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy" + "commit": "eedb4560034f795a7950fa07016bd4347c368873", + "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" } }, { @@ -60060,15 +60151,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20211007, - 1037 + 20211014, + 318 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "7fc3bb521cdb691067838acf756ce4579b727d9b", - "sha256": "0vgahjgdvggg2scif18msw8ddsbkdxw988j2ki5ipclil9qfz8h4" + "commit": "fd6f154ac96309ff56220c595f80e9126ec566c6", + "sha256": "1a8fy48xg4bbz3qf9dxvxh8xhvig5w8wkdvy9prn5fd456bn58hj" }, "stable": { "version": [ @@ -60210,14 +60301,14 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20210226, - 2246 + 20211008, + 1702 ], "deps": [ "cl-lib" ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -60231,8 +60322,8 @@ 20200601, 333 ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -60360,8 +60451,8 @@ 20200226, 2129 ], - "commit": "1ee67f3f8977d95785e021f7896685de1979137e", - "sha256": "0cv0naq2g8z52vgf1p4mb55ww30bp2kpj1jp5cjnql1hxsvbx0mm" + "commit": "6d31fcf78a1ab1841f735dfb5cbd2bf6b2ed25db", + "sha256": "19cszpr5m6j5xj18wl4myn7ifw27rrwbmhd0wcsds28b4czw2mhm" } }, { @@ -60893,8 +60984,8 @@ 20210318, 2106 ], - "commit": "9a1794e8c3e020252f7e41bc2d6ed78c461a69b0", - "sha256": "0yqgq71kfi68iy1f90yxlg0iar3z88ngs166s5rwp3m2yal9fdan" + "commit": "6430e1356248313f5cdd3a96c8861b17b12c0be7", + "sha256": "01rzf8v9psihzpg0s5ar2svkxccmb32ypwsms3863c67ag9d9818" }, "stable": { "version": [ @@ -60914,26 +61005,26 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210909, - 30 + 20211013, + 1558 + ], + "deps": [ + "request" + ], + "commit": "cb843349c10b1a492ceb59da20bfcef3ef02f4b5", + "sha256": "08dkxjrpdy3i6j0zgfa7bqdk8cykjfzybrfwrrf9848fxy96n4pb" + }, + "stable": { + "version": [ + 1, + 1, + 4 ], "deps": [ "request" ], "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" - }, - "stable": { - "version": [ - 1, - 1, - 3 - ], - "deps": [ - "request" - ], - "commit": "7d6039fa5d5d7561f42c4c2a93c698468ed34e70", - "sha256": "0g99qkch22ws3d8qwp91v0mysjh295bag1ak3bdl8q7rl015p9ik" } }, { @@ -61269,8 +61360,8 @@ "transient", "with-editor" ], - "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", - "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" + "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", + "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" }, "stable": { "version": [ @@ -61304,8 +61395,8 @@ "evil", "kubernetes" ], - "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", - "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" + "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", + "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" }, "stable": { "version": [ @@ -61530,8 +61621,8 @@ 20211005, 1517 ], - "commit": "6609581a58ae9c0124de785b056f4f5bbcec3b61", - "sha256": "12bav2dd0q6b47sxnqfv6ibrhzd6i74wwqz7zvm7lp9s4mpqscsa" + "commit": "3ef4c22982119674861ed61e3302ac3e0f05be2b", + "sha256": "0m05qyy0w5k9ycb2ywv222cy99brw2d1gmcan6b4311r04fv9k70" }, "stable": { "version": [ @@ -61580,16 +61671,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210520, - 1737 + 20211008, + 1231 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "2aeeb4cf1dcdc47ada963634731dde0b7a9e4948", - "sha256": "189mmxxdwyc8w94rqpg7f4hd0fhk973mrszvlw92xpca1i9825cq" + "commit": "933a1b37b86685bb1f2df2a2185741b0d21aaa78", + "sha256": "0mxsqf78y4chm4yyxbfz69p56m3n35c5sv4agdwg6griaf0s5f59" } }, { @@ -62314,8 +62405,8 @@ 20211003, 1412 ], - "commit": "a3cf051632d48d95eb0d3bafb6f79d61170c0755", - "sha256": "14j9c3i1vv5wq240j2q7b818cg1xm425nnhncrawizajj4wk2ri3" + "commit": "ac6ef9cbd39f7d9ac0019e28da09aad5bc2cfae5", + "sha256": "1gsv9yir8l53qfz280ji7307vawrifxx80g7bb5kyq7s0k5zfsan" } }, { @@ -62947,20 +63038,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20210303, - 1751 + 20211011, + 954 ], - "commit": "2eeb1dabf6b3105561233250063abf1d066a0df3", - "sha256": "13rb8wf8lihqwnpzbzxx5wzxv0qayix0qgjg2540mfsgzgsy7rd3" + "commit": "972179180b6a09791737b1af75a6f653a7146047", + "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" }, "stable": { "version": [ 0, - 26, + 27, 0 ], - "commit": "d48098c6724bc0a62170c2f9ff73c792c71c8452", - "sha256": "15vvpa4jqqxv8vffq86dh44qn0lij7hv6mbgizwz9bssbq1cdgsb" + "commit": "d5d3a30e724a4ba2d5a96b51180e1fd907e57d32", + "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" } }, { @@ -62971,15 +63062,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20210715, - 839 + 20211015, + 511 ], "deps": [ "fringe-helper", + "ht", "indicators" ], - "commit": "97494f705c0208ccc8dd51d8c0366cb2bd5f228e", - "sha256": "023kx8v7phaw3why3zkh1q7n6igqb0zgf37zkli6gi8y4spzlbns" + "commit": "c78bbb33c1f120da517ccd11f0681321bca17647", + "sha256": "114afr2b41yk60s4r1068nambkhj19k6pn6dn2v94i4gbq8p37bb" }, "stable": { "version": [ @@ -63111,14 +63203,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20210926, - 1333 + 20211008, + 1652 ], "deps": [ "avy" ], - "commit": "4326da5617e5d04715538536b93c44a085f5dad1", - "sha256": "024cyywz38bpb9szqjnnc0pjrl7cxi7k59bbgpa740r7713qybs4" + "commit": "83cd0489b16f013647d0507ef20905a0a91db433", + "sha256": "0kwaia6i0asr7yqcw1anzq6lf93357cc1fphkvp0llbmxizmkzb3" } }, { @@ -63212,6 +63304,30 @@ "sha256": "06rnma2xj2vnbvy1bnls59cagk6qsf862bj1zp6xbmpr1a5l9m4z" } }, + { + "ename": "liquidmetal", + "commit": "9aa2004e04ef2f1fbfdd722b271c7cdcbdc8ad10", + "sha256": "0f7xp490nd4ff43pi5g911hsbcvlxzj5wx26b6lflhhnljkh5fsv", + "fetcher": "github", + "repo": "jcs-elpa/liquidmetal", + "unstable": { + "version": [ + 20211004, + 1429 + ], + "commit": "e42baf790629cc3a7310194c4f00d9dafa34f933", + "sha256": "1p3bgfcp1pqilmc4jxs3y182mcddrqd7m0l9b2k2wbdcar1fphpf" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "commit": "32ddd9b52875a6fa403104ed271e15d86d215463", + "sha256": "1czyiy26wxkxc2lbrrblz8hzpf8p71fyp4hh63vsdf2fyimyl1cw" + } + }, { "ename": "liso-theme", "commit": "27b849f3a41a5ae3d497cef02a95c92fd479b93b", @@ -63315,8 +63431,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210914, - 1209 + 20211014, + 1136 ], "deps": [ "ace-window", @@ -63325,8 +63441,8 @@ "iedit", "zoutline" ], - "commit": "9568ee1aa5ac12e0ed03b9904b77c7a5bc4bb2e2", - "sha256": "1ysprqpha2nxf3zak0lssls66asfl95qn58q90k57p1hpf0qbs06" + "commit": "8ddcf0c8f69e2a669f197c50a701dc6aea74d7c5", + "sha256": "1z9z8225bb5ih9bf2d0nzwl6258wk327dky91z247jddv5mzj4m5" }, "stable": { "version": [ @@ -63763,8 +63879,8 @@ 20210701, 1955 ], - "commit": "aa92fa4aa2e41acb45bc697187036407f953ab03", - "sha256": "0x2s1xvdgmw7w6dr1kfvybqfwq6i1mvn2ijwbzi2sil8l5hb73a6" + "commit": "a1a02199a73e0d4edf50f977203eb40a1797e366", + "sha256": "0k2ya743k6ghkxnx0pyb3brsrbx8a31il62bj01ax4p17gq1w902" }, "stable": { "version": [ @@ -64514,8 +64630,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210929, - 1620 + 20211009, + 2036 ], "deps": [ "dap-mode", @@ -64525,14 +64641,14 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "38906bb3e69c16b3e8d328fd6ae764f1d4369b9f", - "sha256": "03ppi015i1fkq30vx401x4fny3jz6msqzy5lg5jyqrym3s6gfml7" + "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", + "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" }, "stable": { "version": [ 1, 20, - 0 + 1 ], "deps": [ "dap-mode", @@ -64542,8 +64658,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "1a839dcdedac47c90b4f82f456fea0a7cacf2940", - "sha256": "0m1bccpamxvasimdg6pq28lnbwy2v2xnzjradbl93x7c2drsvnik" + "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", + "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" } }, { @@ -64946,8 +65062,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20211006, - 1954 + 20211013, + 1655 ], "deps": [ "dash", @@ -64957,8 +65073,8 @@ "markdown-mode", "spinner" ], - "commit": "237363939b2630a807261f31614ac98fad29b785", - "sha256": "1x436jki9wqxjzp2j1p0kx8waw71glxbfh8zlcw31nyiwk7znb4i" + "commit": "b5d9b3b2c8638e223ba1524c76c16d0f616d73ce", + "sha256": "07ngkr86zgpi7xp1h9nx68gwpfvk5ffdk69m0mb4xn2zkjpd2d58" }, "stable": { "version": [ @@ -65292,16 +65408,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20211003, - 402 + 20211009, + 1545 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "69880741041d5c61abcef941d06234f7cbd545b0", - "sha256": "05awyfzwgzv8d3qjpmaxrkgxhh7njfqj72lkxlij6l5snng24bgz" + "commit": "d08c5528ba0a63433a466c2fa1265ec3250fcef1", + "sha256": "0p12arjl03y2ax8b6g36ppnb1qqkkc2pvv415wsgxydqias775mq" }, "stable": { "version": [ @@ -65806,14 +65922,14 @@ }, { "ename": "magit", - "commit": "4158066a2c75cf0bff128bd2dc1073472c32b1f4", - "sha256": "1hrh90qd47s6q6grr6rp2y7kfqq8bzhdfpyq2saihrric91s1rqz", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "0n327xp6zdyp5bbqr84qp0f779qqv6jrlr2kaf00whkgp59g5kf4", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211005, - 1646 + 20211011, + 1635 ], "deps": [ "dash", @@ -65822,8 +65938,8 @@ "transient", "with-editor" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -66157,21 +66273,21 @@ }, { "ename": "magit-libgit", - "commit": "0580362be495894c61b99b7efb4cfa435cc0dd72", - "sha256": "0fi3w2f79qn3hf5rw5jp8128xbk5r0xwwwb56zcjn2na02dynfb1", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "1hh7d1ii3aw9ghmidc6pifaa0ci230vm17sadl3xlq7snpghlrhi", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ 20211004, - 1955 + 1956 ], "deps": [ "libgit", "magit" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -66326,20 +66442,20 @@ }, { "ename": "magit-section", - "commit": "92cab05cc5ba4153be97648d6fcd95417871e9c7", - "sha256": "1v9g8y9r0lmp54hgaxgjqr3x86l7cz4wvrrjbpij7aai40ddqdp3", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "13dxx1rjpj465h1ns2nki7wfsmnfh9m1gzlm49jkka38iwnqr81j", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211004, - 1955 + 20211012, + 1845 ], "deps": [ "dash" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -67134,19 +67250,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20211006, - 724 + 20211012, + 1606 ], - "commit": "c9444d790d75c7cfaab1046570a05125f62576f0", - "sha256": "0si3wiacczqychsfc0dppnmwrcgjsb1n7rh555nn5jk1hsl0a0j5" + "commit": "9cd762b6c3f2714375f47993e9a6384d3bc16ebf", + "sha256": "05w8c4rlbdbiwpwirkpnkixifjki6rfgcz8myh0i4kyb1ayfrq2c" }, "stable": { "version": [ 0, - 8 + 9 ], - "commit": "b65d66e9301f9a0e3012568ca6721ae4ec276ebc", - "sha256": "1d6xbidxcxd5gxs5cjxbx1i1wdcmgdnn3hh7fxz0sgf1gaxyp5kv" + "commit": "37e24b798afca98da0d0364dde3fa63a42c5853e", + "sha256": "19l3fwh6phd17rssxk30v2380bs04x7w6cb3hjy4mx7vkc7w6ymv" } }, { @@ -67769,20 +67885,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20210917, - 1715 + 20211013, + 611 ], - "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", - "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" + "commit": "f6b608db585231eee231d5473edcf4183bb678fe", + "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" }, "stable": { "version": [ 0, - 6, - 1 + 7, + 0 ], - "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", - "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" + "commit": "f6b608db585231eee231d5473edcf4183bb678fe", + "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" } }, { @@ -68677,8 +68793,8 @@ 20210131, 2152 ], - "commit": "88516546fa25f3a629dc6729403328b6edc29109", - "sha256": "080m42ck7gdaa545vra02gkvx0prav43xspp5hwhx30mzkb77n5m" + "commit": "e9791ff92c27bc7df18f238a29f05fc164da2f51", + "sha256": "1j7ni3qjcy0fikzhhm4xwwwskdm6qnb1c1kshh8xrd9c06kmfrv7" }, "stable": { "version": [ @@ -69683,15 +69799,15 @@ "repo": "damon-kwok/modern-sh", "unstable": { "version": [ - 20210917, - 748 + 20211015, + 335 ], "deps": [ "eval-in-repl", "hydra" ], - "commit": "1905cc0c5fe7a306abb4e862c36f00471ce9d0cf", - "sha256": "1xmv6wkbrra3prdm2s3c6hjw5fzp082w15mha60638i3rfmj6sm8" + "commit": "e88d83958ab43e17b9763b3220e0dde862b49a83", + "sha256": "0x2j9i3kns5w9b6bklvmf077dbc5mdim3f4l68nbl0l6kcmlb68k" } }, { @@ -69741,11 +69857,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20211007, - 1358 + 20211015, + 456 ], - "commit": "86ce981066010f4f17de567546ed7151ce5aa4cc", - "sha256": "1934i9is9fdsgv20cp8v8g5jmi9gh51mq3mvg5qzizixslwp8pcv" + "commit": "5ea090b223e8a83f7f3800a96bd4ed3ac9d62230", + "sha256": "1dw6v1sz3b8xf28ly17vsf9j5r9ylwd1p1hz26c05zf9dygiwp45" }, "stable": { "version": [ @@ -70376,8 +70492,8 @@ 20210306, 1053 ], - "commit": "7a2decc75a4b9b1e08ed994c0e675b21e2b0f81a", - "sha256": "06zgjibyd8j0mnyf6cymrb5qhl26kg64z5jizrh2p841wija426v" + "commit": "aa48b23dcf92ea1d85d8e8dbca8c0a0c37e159f8", + "sha256": "181l8l2bihvsg3y652qhfjza5vp0irwdc6q6h1bl8zj0by66p859" }, "stable": { "version": [ @@ -71298,14 +71414,14 @@ "repo": "zevlg/multitran.el", "unstable": { "version": [ - 20210701, - 2153 + 20211008, + 826 ], "deps": [ "cl-lib" ], - "commit": "c34536186088f29d4e85631825e7c6d557a8d0fa", - "sha256": "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx" + "commit": "3a3f3561dba816f580cc21526d4f7a231a30bb51", + "sha256": "1s3iavcbbbb4rf70qay4maf7fvfm8i69smyxl2771vb7dj5fjk48" }, "stable": { "version": [ @@ -72522,11 +72638,11 @@ "repo": "danielsz/newspeak-mode", "unstable": { "version": [ - 20210913, - 1029 + 20211011, + 1425 ], - "commit": "4bfef8f834b021d65cf6f920b02c082a719a302f", - "sha256": "1ng024c5qw38p9qlmldh9r08wcvivs17vw2kl8y17z6d233xrgnw" + "commit": "7ae89edd0f72c2dc005933fada5ddaf48ec97dd6", + "sha256": "0fnl27phpmdgg3ja2jpm846x1pq47fqi3yjngxr32fag86hjamvw" } }, { @@ -72751,11 +72867,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20210929, - 2219 + 20211014, + 1848 ], - "commit": "e5d12e26bc98f99b3b1e4b5af452f3079a98e0ff", - "sha256": "0i02r2kvji7dkmkr5waix7bjzlqrjxmvbx53k3ywb9268pi9yv2j" + "commit": "b9e383b4fcc7a3232f9943aed29586a760602a1d", + "sha256": "1kmcpndqh4072nkkji2vxd2br0wyp4ih3b7r4rx90mrimpdvcbrm" } }, { @@ -73487,17 +73603,18 @@ 20210920, 2339 ], - "commit": "3e2e724d53a1dce3ba00a20c71b2e6f735678136", - "sha256": "0hx8l131qwy5cmxii22lhr48lnwni2i7sd025h12gjala6z78jfz" + "commit": "0f196b5659c8a66af4357fee3d4b3a169044472d", + "sha256": "0h068mfry2gllr8gy836a7i8zpkd6bqljnwfcm7yssfv3flrw3z3" }, "stable": { "version": [ 0, - 33, - 2 + 34, + -1, + 0 ], - "commit": "3c60a25c6dcc4d594b66c0f8acd3e84b82a6f42d", - "sha256": "0cqwvs8035rcnwjl92wx0gi4idnfq93n1k04gf19s0609409kbxw" + "commit": "0f196b5659c8a66af4357fee3d4b3a169044472d", + "sha256": "0h068mfry2gllr8gy836a7i8zpkd6bqljnwfcm7yssfv3flrw3z3" } }, { @@ -75364,8 +75481,8 @@ 20210923, 1348 ], - "commit": "3e4d68c726ff8f1baf04ee8076be57d712d2373e", - "sha256": "17r5k0kyvmmnj8g0zqhar0y0zm06q7rqjq4bd1n1cvr5f1zp9gg1" + "commit": "aa673e27f6d7cbc882ab6109cfbcca2ba0864507", + "sha256": "0xv9hmj7girdb4c1xqlk5nj4snhvl34yaz7k28jny50frkszvfca" }, "stable": { "version": [ @@ -75558,26 +75675,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210915, - 1404 + 20211015, + 1032 ], "deps": [ "org-re-reveal" ], - "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", - "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" + "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", + "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" }, "stable": { "version": [ 3, - 24, + 25, 0 ], "deps": [ "org-re-reveal" ], - "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", - "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" + "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", + "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" } }, { @@ -76565,14 +76682,14 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20210214, - 917 + 20211010, + 958 ], "deps": [ "async" ], - "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a", - "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja" + "commit": "50292af50d275846baa28e52d94eb8ef69c8d00b", + "sha256": "0n0divfnk4635aanjm0b3swdjkcj4qxr0x95q05pdlb67s6lfp5d" }, "stable": { "version": [ @@ -77490,8 +77607,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210805, - 2225 + 20211007, + 1843 ], "deps": [ "alert", @@ -77499,8 +77616,8 @@ "request", "request-deferred" ], - "commit": "db3072adc3f1a57c7a459a3ee911a40db0fc6a8e", - "sha256": "02jfcgl8schra7ir89ajzvnyc9ql208vfasa3qm27vr3yyxvykaj" + "commit": "8b6df4b727339e3933c68045e104b6b1d99816f7", + "sha256": "0gkdh32cfmqbmvvqd67i2x9i1fm5yfmhw6i5yvrb9swsl24kv194" }, "stable": { "version": [ @@ -78909,28 +79026,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20211005, - 1608 + 20211008, + 1310 ], "deps": [ "htmlize", "org" ], - "commit": "36d0973c6c3110a71bc27f8464f4d4b6a798e467", - "sha256": "146hnd1jd9j2bgpn951k7m8kh6ncvcfqvvs4rdhmsk1w426ah5vb" + "commit": "33d226ff707a31804ff3e6ba22416c3f0b463ad7", + "sha256": "0hi8lq9rj6i2m14dh75dzq7lq41i4f6qj4xbp2b8krqw6mk9xg7z" }, "stable": { "version": [ 3, 12, - 0 + 1 ], "deps": [ "htmlize", "org" ], - "commit": "36d0973c6c3110a71bc27f8464f4d4b6a798e467", - "sha256": "146hnd1jd9j2bgpn951k7m8kh6ncvcfqvvs4rdhmsk1w426ah5vb" + "commit": "33d226ff707a31804ff3e6ba22416c3f0b463ad7", + "sha256": "0hi8lq9rj6i2m14dh75dzq7lq41i4f6qj4xbp2b8krqw6mk9xg7z" } }, { @@ -78973,18 +79090,17 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201213, - 747 + 20211011, + 1519 ], "deps": [ "dash", - "dash-functional", "frecency", "org", "s" ], - "commit": "5da516a1586675992c0122ed32978c18dda06318", - "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" + "commit": "97418d581ea030f0718794e50b005e9bae44582e", + "sha256": "1y11rlnhi36lzhc1cagninv6hlcwbvj88xfr0g0xzpbzy7hys021" }, "stable": { "version": [ @@ -79014,8 +79130,8 @@ "deps": [ "org" ], - "commit": "093c1726ffe4358d60fbb97c1bcf01b785827098", - "sha256": "004g7av1dx3i25lr0r33dd2ch4i9r5mcgjh7gjm6rj6nbyh1gqhb" + "commit": "5662cc897ab1533b39e3e93b2150dacbe699d591", + "sha256": "0fq8ns5f0k9mg9dz1w778jp0icpjkx62fa3a51yrsqisycl3cl6y" }, "stable": { "version": [ @@ -79052,8 +79168,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210913, - 1445 + 20211008, + 1334 ], "deps": [ "bibtex-completion", @@ -79068,8 +79184,8 @@ "pdf-tools", "s" ], - "commit": "8c503e61681a39cfb104793b35f2f7b801c6830f", - "sha256": "1pz4gwi8gwlbnxa003hk2k0arzic8700xsj0bhpnh2d0zarghcj0" + "commit": "9556a6c9639f6b32124ec2b8059975b0538625c2", + "sha256": "0g7ldyxy1p5r2xrw51h0h4r3kcxncvfb5c0dfaw174r0g2vw4j5d" }, "stable": { "version": [ @@ -79216,8 +79332,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20211003, - 557 + 20211013, + 1624 ], "deps": [ "dash", @@ -79227,8 +79343,8 @@ "magit-section", "org" ], - "commit": "54d17cc50f03f22ca44f4d88f7e589a00c59d05c", - "sha256": "1j2nv3c424x88riqy3m0kb9qinpa15ixrpzqa0zizcnx2dj4iqmn" + "commit": "e9299297f9cc1aafda62deb8af7957dc8d56dc04", + "sha256": "0cg8kywg8qwr3079k2863gmlpjns6s61r38pc0p4iys1ry02bgxm" }, "stable": { "version": [ @@ -80071,11 +80187,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20210915, - 335 + 20211009, + 1707 ], - "commit": "571ff333084dad83a535becfc1fdd601ead2da02", - "sha256": "0k1lg3rc6x6alxhjwggh3fdlmpbx8qni8d6qakp6i1ba7459d0mj" + "commit": "27f8bb6a9676e1c0b500e75799e3b5c37a9156af", + "sha256": "0751qlg8xxwx7mldgdry1gfrarvhzg2smjzxd3382i6j63mpala9" }, "stable": { "version": [ @@ -80731,15 +80847,15 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20211006, - 1626 + 20211010, + 2105 ], "deps": [ "org", "seq" ], - "commit": "657d655caf408283cc1c6fcf437f33b25166244b", - "sha256": "1y2lav5dk67k4yy67kc0hxyd46x9mdg0kkzmc4sw5vvr9jgjk1in" + "commit": "05df4989c987dece40a450bd5cfbbd6cda0f2e7a", + "sha256": "184hag1kjbzfc7k7c1nd1y9w3gimgxjgkkyqawjzv00sph3mnvd4" }, "stable": { "version": [ @@ -81952,8 +82068,8 @@ "ox-gfm", "s" ], - "commit": "e79c4c4429f64fe61cfa673dcd33273bba30f9db", - "sha256": "153sr1pnnlglzmsz9kx8d8h604j01anf85n57pdz2dnbh6wr2wak" + "commit": "4adf97dd195f0a777b952b97888b77cdd9479629", + "sha256": "0yxzhgjkipy632jhw83l8cz5s7727m87sj6ldpzdh57w1abklidq" } }, { @@ -82131,14 +82247,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210902, - 1452 + 20211010, + 357 ], "deps": [ "org" ], - "commit": "624dee4ee2300315eb1a32b17e8831ce6677fc72", - "sha256": "1n49iwrfzxx9ad399sm5q1phzlv5890i3vacxci6hpmi26bnqb89" + "commit": "d99311fc5be0a7f0acf2ce9ae2d012a651e1c31d", + "sha256": "1ayqi6s4ympskn7iklk2kplnciryfr32yq3r6zm6x091vlayck69" } }, { @@ -83470,20 +83586,20 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20210930, - 540 + 20211013, + 453 ], - "commit": "fcebf650759929256ec9c4bb83b677240622be8a", - "sha256": "15aar5fsci2y8hy045ypdrig4z4kqrd8318im3yzyyf40y1xrz1d" + "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", + "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" }, "stable": { "version": [ 1, 0, - 4 + 6 ], - "commit": "5809ae74cd7f5217ae29dc3bae2dba4c1c2c855a", - "sha256": "15aar5fsci2y8hy045ypdrig4z4kqrd8318im3yzyyf40y1xrz1d" + "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", + "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" } }, { @@ -83494,28 +83610,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20210930, - 1615 + 20211013, + 452 ], "deps": [ "map", "parseclj" ], - "commit": "b00eb42a1c10f19ba0f6ff5f8cb9e3ac05285dbf", - "sha256": "1drlhsnqvqyxdw8k9dlfjnzqxgx1m5kpda1cjkanz1s0jq1dxgcl" + "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", + "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" }, "stable": { "version": [ 1, 0, - 4 + 6 ], "deps": [ "map", "parseclj" ], - "commit": "3b1bea14257fe2acd067b6644e0d916cfaa806ba", - "sha256": "1cz2bgaddlrcqzra8q50yh90rdl0kpyf5js2vxccdsq6ngr8bnmv" + "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", + "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" } }, { @@ -86018,11 +86134,11 @@ "repo": "thomasluquet/playerctl.el", "unstable": { "version": [ - 20210411, - 1442 + 20211014, + 856 ], - "commit": "41564d453c9f936a4ce2699afacc6d1dff974f1c", - "sha256": "0fbnfxhfyam5zvf2ild5bxq489dnpyrzclnfwq0lhzgswjj70hw6" + "commit": "4c3a6132616fd28f902590bf6e63332e6055492b", + "sha256": "18b59kcni6xp46r8lkwb8baz2mic9n4zyndib10dvfs6gwjmas2p" } }, { @@ -86996,8 +87112,8 @@ "repo": "ponylang/ponylang-mode", "unstable": { "version": [ - 20210118, - 1325 + 20211015, + 331 ], "deps": [ "company-ctags", @@ -87009,8 +87125,8 @@ "yafolding", "yasnippet" ], - "commit": "d3b108338219ff275e4ed2c67a2c5f2ce334bb94", - "sha256": "0klpwchiaqrg9gclpbc4ya4kkf33bl6h7khp1b4pjx6zg28qk8ih" + "commit": "1abf04bc8f4f09a6add4b587c7cf5ca23735e7c0", + "sha256": "1iv04dj2nc9cyyslhir7aj5sligwan1yyclsiarn86lik7b9lmwn" }, "stable": { "version": [ @@ -87087,11 +87203,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20211003, - 1054 + 20211011, + 435 ], - "commit": "918306c2afbb09e92f7cc704ddbabe9701bef6f8", - "sha256": "1rk9lzcjhkqvaxjgwj0gsfwnzh9q1kmlwiy1jvp3wzi81j42zdf2" + "commit": "6a2ddcb35432afb56f32e11518c2b6ae7795e8c0", + "sha256": "0sv8bi34fbg0awi8maah5fs13s0wmzbvalq13z2zx9ybb8ivrsfi" }, "stable": { "version": [ @@ -88176,11 +88292,11 @@ "repo": "fritzgrabo/project-mode-line-tag", "unstable": { "version": [ - 20210615, - 1825 + 20211013, + 1954 ], - "commit": "ed6adf9287d2aa526d85451623f1aa281cfa7e0a", - "sha256": "0xryvjsb2r4rj22wgjpixa31kg4sp7xww63hldnf7c1cvcc9g305" + "commit": "e411432a33cd82f8a9ff95471c91e9fe1833841c", + "sha256": "03aiv70shxhcjcldahny7xxclnqdw5bf37f8496dxmzz0zx0v98j" } }, { @@ -88693,11 +88809,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210918, - 2238 + 20211013, + 1911 ], - "commit": "38ae8fdf23f37af71b8a4f9717ba48c52653db63", - "sha256": "1x5d0rki2lsyg85srldwg34jaiq14l1nw58bab74n7xhp426pvyw" + "commit": "fd04605af1b07684da522c32d83ac346050926bb", + "sha256": "017j3vcwlg6k2h76wbads6jxmnmxj19g4c42zs3mi2vwqhfvgdqx" }, "stable": { "version": [ @@ -88797,11 +88913,11 @@ "repo": "google/protobuf", "unstable": { "version": [ - 20200619, - 1742 + 20211013, + 1726 ], - "commit": "b7cc13068dc198e480271e98b53cbeed195e9d05", - "sha256": "1lfy5p2akjnmpssc92jfx5j88q53s35338zhsafc2k4s650dc4f2" + "commit": "c01cd6ec794fd91b316cb236663c81eefa1efa4e", + "sha256": "1rqsg37dxglxddipfpph5xv6mlsh73hgy66vlirrvcs0ijiyjj8g" }, "stable": { "version": [ @@ -89212,11 +89328,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20210928, - 703 + 20211011, + 1529 ], - "commit": "a076d32f281d2984c6072461d034688c41eae3c1", - "sha256": "106qvdspwahyahd4my5wby02ffykbwb04ahlqcrbdapw6aflnv19" + "commit": "825952d0a4a1d5eebf849280ffd4e1e44e1a847c", + "sha256": "1w3iz542v83n6vc4j0nhqmkp21h0m42rqgp6648jlx7q0n4qmdz6" } }, { @@ -89876,8 +89992,8 @@ 20210411, 1931 ], - "commit": "c4ed76d3948afdb0176835c1fa6eb48f54bfd54f", - "sha256": "0m9ksp59bl9lkhrzgkjivnwkl3lv5lgg1zhs47q2gc0sl66xrknz" + "commit": "ab775f6f4507a1f0cd9dab0fd027c2f08be06928", + "sha256": "0js9addqxk2dchgrjnz2wdxxp7sszq95zvga8j1igihx7w83xp7f" }, "stable": { "version": [ @@ -90157,11 +90273,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210930, - 836 + 20211013, + 1620 ], - "commit": "c0ca60e1a83c635d96a76d36e912904e6d0e3446", - "sha256": "1c7w6bl9lccx96i9vyrxg714lwmfhdd3lar5rvf4k6an0vifqzc8" + "commit": "e92d0e800b494c1dfcca109154a6b7eb6fad0e4e", + "sha256": "1lxi1iwckpfk6966sgcdj3sz9bcbylsm3nqv9wbbzkqbjlyd28y4" }, "stable": { "version": [ @@ -90312,11 +90428,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20210527, - 829 + 20211014, + 707 ], - "commit": "045ff9476dac26086a04538d9b7ba186aa8f0fd1", - "sha256": "1y5jqqqh0df75qydw3h7rx24pv5z628ci8ymdksn5khl1qp5041x" + "commit": "31ea715f2164dd611e7fc77b26390ef3ca93509b", + "sha256": "1708xh2sq7xvs4z5zkik9ircxvzimhzi6phc2j43fvvxgglcgrk5" }, "stable": { "version": [ @@ -90382,12 +90498,10 @@ "stable": { "version": [ 1, - 1, - -2, 1 ], - "commit": "eb2d5bad076b17a8c431200be7357460a7d3c088", - "sha256": "1y7xd2lr88z47s70xaxkd9zl3aqna2d87ad2ism3ywncb1sqmd24" + "commit": "76de0de6449031ef5dd3e73ea4ab820e0d58a0e2", + "sha256": "1b7z3nxwrgkw1p7dp6ibsvhvpyl2m881w9yr9qcmdrkf78cqlpvx" } }, { @@ -90803,11 +90917,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20211005, - 1559 + 20211015, + 1650 ], - "commit": "46df4d9ecbaa7da1f48e55e5769d05e4ffdbd8b1", - "sha256": "0c4h86vxv9gwq7cy4jd446zxnp7kbkfj9h58m29i1hhwz056pk6j" + "commit": "46bb0bf29f6b2fb571374e1aaf4252bf5f54281f", + "sha256": "0hkshj2kf23pqnmwc6d1glcg7my402qqngcn4iliy89rp56xdgqs" } }, { @@ -93387,8 +93501,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20210723, - 1236 + 20211014, + 548 ], "deps": [ "cl-lib", @@ -93396,8 +93510,8 @@ "popup", "posframe" ], - "commit": "1d9bcc6dad4182e9b6a5839f8261b260e57be2fc", - "sha256": "157hndsslfxyi4n927y67shnk2xwhwz0idxwkdhcd4zl9jjzwpqr" + "commit": "b296856c21d32e700005110328fb6a1d48dcbf8d", + "sha256": "1x3v18hwxj56zhn4437nklyni4d3chk84c82a8y1z1flcayjipvy" }, "stable": { "version": [ @@ -94430,8 +94544,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210830, - 1944 + 20211014, + 2241 ], "deps": [ "dash", @@ -94444,8 +94558,8 @@ "spinner", "xterm-color" ], - "commit": "804ebfe0295a6bf37870e06f84a8d35f55c9f1a6", - "sha256": "0ya7l8yfbax74lrwvcr3lxaffb238m3yk8y37msvsk1pvwcjfkr7" + "commit": "4f25042b12a782c0acd87fc436de2a1a9140322e", + "sha256": "1aq79dijx62y1h8g5kgdbi5xh4w6wdq47m6g5w64c0rr2igziixg" } }, { @@ -94934,8 +95048,8 @@ 20200830, 301 ], - "commit": "dc045a7670c3f6a6b7c59cf38fd58d980c70e0f4", - "sha256": "1yhfa2f5yrhq9wbq5mshd1cnwks9pwx27isbi1v6gp32lzfwi1jq" + "commit": "dd7f6c0256ccfbd1e6efa6c06b9a12ef3565c29c", + "sha256": "0b5rkj75yxhcdbl7zy008g1n7lwivpnaz78434wb1ljn3l0s56yi" } }, { @@ -96825,8 +96939,8 @@ 20210924, 445 ], - "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", - "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" + "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", + "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" } }, { @@ -99269,6 +99383,36 @@ "sha256": "1y1z4lyv1b56sfimfpxzix5zww97hbci8a9q4cphx65hwkgbfa0d" } }, + { + "ename": "soccer", + "commit": "5111fad0a1dfc8b1e2254ace7907e5ce1be038ca", + "sha256": "1gzfqfgzfwkj85mxzrz83i13v6jrqldcbzcwfcz6bg49agh244bk", + "fetcher": "github", + "repo": "md-arif-shaikh/soccer", + "unstable": { + "version": [ + 20211015, + 934 + ], + "deps": [ + "dash" + ], + "commit": "8547a36789be66ac32caf4c80a330e7bdf9bb5dd", + "sha256": "0kddpbha5mlih9rmygkxqm8gs9719ics749p18p2np02pvka3x06" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "dash" + ], + "commit": "c486cad32f07db9bd55af08c6b4a6bb0cd481d67", + "sha256": "0gsd4mi1nddxn4z9jayi0fhn3bvk9rpj6615ssb5426k0zfhwjsz" + } + }, { "ename": "socyl", "commit": "774b3006f5b6b781594257f1d9819068becbbcc1", @@ -100200,11 +100344,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20211007, - 305 + 20211008, + 106 ], - "commit": "4e7ad5c5efadee670e29fa009c9026222a5bd3e3", - "sha256": "1m9biqvahmdigdf2iz3c2vns0jhrjsr60q444q9aa7l7k509lf35" + "commit": "f38bebefea9d23c2bd4293ecf7100211c1410cd4", + "sha256": "0wvg4c1z5y62icagfwl2vb329jprf6si804726mqka92zj4nnn77" } }, { @@ -101216,8 +101360,8 @@ 20200606, 1308 ], - "commit": "689689adb35f984f9fd833a6b92d4bf50ac565b3", - "sha256": "1iighf4kx2azakrqjf4s08nnsafzp6bh66d15qd68k5z1lkgljsl" + "commit": "ef629fd74c5d963f5b68507179896169a34a078e", + "sha256": "1wnx8s8cabg8zja0w0cvk6jfsqbkgbszdx624v1bl6g5iiv2im1j" }, "stable": { "version": [ @@ -101727,14 +101871,14 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210909, - 1003 + 20211008, + 1439 ], "deps": [ "transient" ], - "commit": "a4eb0da98a3909d301a7c07ae2e64197f8db22a0", - "sha256": "1pwy3h7k8y8hwb2dhpcx22sc5qzyk22r6hvvs4yd2gyjd4lw77vi" + "commit": "de3d4539dd8dd33c9b9d1a982cfc47c452c612de", + "sha256": "0xhggrjq3f9wq5aq69ib2bny36295aw678avgdib2vp1bf9xd73n" }, "stable": { "version": [ @@ -102037,11 +102181,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20210222, - 1037 + 20211011, + 607 ], - "commit": "839f579fa881467149e77d0e096a4a4a6c5d9878", - "sha256": "18hhl6x3xg5lykfq01iw2p03lj248x7rqaygq8nj64hbw46nzn0v" + "commit": "282acf8c01c37899955afe3dc32d9cbfb18065e2", + "sha256": "1kjnc7nl5kshy8wjppvjzavv94h4ynwas610g1xqbzfbpirsnz2p" } }, { @@ -102290,26 +102434,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20210925, - 430 + 20211009, + 635 ], "deps": [ "seq" ], - "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", - "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" + "commit": "babe36ca93e72c34b2a3856d8fac7e3fc9884f21", + "sha256": "133r7isdnz7r7y7pbf239928kjmk9ps2i8zqnxnma9zcmncw88ld" }, "stable": { "version": [ 8, 4, - 0 + 1 ], "deps": [ "seq" ], - "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", - "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" + "commit": "babe36ca93e72c34b2a3856d8fac7e3fc9884f21", + "sha256": "133r7isdnz7r7y7pbf239928kjmk9ps2i8zqnxnma9zcmncw88ld" } }, { @@ -102621,16 +102765,16 @@ "repo": "bgwines/symbol-navigation-hydra", "unstable": { "version": [ - 20211003, - 1859 + 20211010, + 2353 ], "deps": [ "auto-highlight-symbol", "hydra", "multiple-cursors" ], - "commit": "2744210b04fb8f5ee8c7948f5f36c8b2df1ea76d", - "sha256": "1a3gv2jpax1y5k1p7kmns9gnd7paqbllnm0gbmzxkh8p7yc0lrak" + "commit": "b3b1257e676514d93cd2d71a10a485bf00b5375f", + "sha256": "0ic6i589y8g41mpi9vzsd76rzcskxaxicfwwpw8d9g44p8zfghfz" } }, { @@ -103104,11 +103248,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20210525, - 2204 + 20211013, + 1942 ], - "commit": "2196e76cb6f11e6ae0f35ac8259dfb755ea60336", - "sha256": "1xifgdwqpf0ccmdxhdr9zxzqsa769984xs4343v657171f53flz4" + "commit": "d0d51ecbc5929eb7752b387c5bdfe4d879e78224", + "sha256": "1p3ikc776mr18r5py0sw098ahsj9w45ikqns4wbgr2fsjmgcgksr" } }, { @@ -103119,14 +103263,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210615, - 1915 + 20211013, + 2012 ], "deps": [ "s" ], - "commit": "a2e456097322d0b1cfdb7aa37c32a628bcca3bf0", - "sha256": "19ni9bl34hzmqsb9wiznbghw67m7g9zz3z5m3wgndn9zsj37ccka" + "commit": "a0389d87d2e793055dd74ae85b4593aa1d2720fd", + "sha256": "040nl3yn0vfhk5nbll2jpxz7qcjf8kdlkzqa44lz0gvc6d9414yv" } }, { @@ -103137,11 +103281,11 @@ "repo": "fritzgrabo/tab-bar-lost-commands", "unstable": { "version": [ - 20210215, - 1412 + 20211013, + 1945 ], - "commit": "e587cdb5d6d2c8d509c43db4b5bb285415916c4e", - "sha256": "1bnpcfh0lzjz4f1lbj2jqz7ly6d3bv8jhi4lxr5pj3g21437xf4y" + "commit": "989e03dc3d1057264b21b9a5d241fcba86cd297a", + "sha256": "047261v8nvi67h9yils2f1jilmbxc55n31v98qlqxmf56jkzz158" } }, { @@ -103588,28 +103732,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20211007, - 616 + 20211014, + 927 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "dcf5f041d30f5dd407e54f014f281e368d755529", - "sha256": "02d34p14yjqvaypirmr63h1vldmsvzpgkm0c18q2gfxbki6bj9f5" + "commit": "744d3698dd27a58822b2edcd4fe9689a701d0c37", + "sha256": "1hciz2anrjjrm1nw1j657zgglg4ggf9pkzby96a41s7l6d1qi10a" }, "stable": { "version": [ 0, 7, - 30 + 31 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "26fee82fac70d55ade55381b475e865d99dde496", - "sha256": "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9" + "commit": "c07f310552643dfeb6bed98860bd63b965baf262", + "sha256": "05j82796s4k3yr0igl6hir3p8qj0cw66vvhbpbcy28d6q9v9vjjz" } }, { @@ -104694,18 +104838,18 @@ 20200212, 1903 ], - "commit": "dd17e81e813e8e6604b870be0e1ba547ac9fa1dc", - "sha256": "1961wkf50w6qyqdqdnplhjhzqs40m76kflg9vbybr0gqz23abspc" + "commit": "9e70d608bf5f80e8ec0132953b91b7fa3d30ca26", + "sha256": "0x7hsy9v2py8b5i7pn8v5xymgjg8rixkmsxaxvvsbmr771blpkqm" }, "stable": { "version": [ 2021, 10, - 4, + 11, 0 ], - "commit": "6563eeda0cbcc599e0b9fffb665759e5b159b8ec", - "sha256": "1kmcnffdpl44bx80m1ybrssfqbgalw8x00gs9zqnfbyaqcxf0mqr" + "commit": "77016aea52af2156be7c8ebde55b821fe46b7849", + "sha256": "1lmh733m0anfny0izi2lc5njqaqdvr2z96lqfkyzsf0ln73ipb9b" } }, { @@ -104761,8 +104905,8 @@ "deps": [ "haskell-mode" ], - "commit": "991d5c7d1b53bc1b51b44e0560b9074ffdfd941c", - "sha256": "1sy74xi8j8v1bxc1y65j9f4bjhdbc2ym6n70zll9czzqa34g600g" + "commit": "5bc0b35756ab14af950aafa5f3d76bae568d3095", + "sha256": "13pryqrqk1y9qb5h2pg45hi62w17xnzrlrg471b6ga9r4zwn8vfz" }, "stable": { "version": [ @@ -105010,11 +105154,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210925, - 1118 + 20210930, + 1521 ], - "commit": "ed7f90d74d87e629dded6bfe0de2d04a856c5d61", - "sha256": "0lfj2ncygp7fzxcw1kswh75zhx5cdkdyrpd7ms4dfk8j8h7ra09j" + "commit": "e7655e95ad48418a3784de4e8a7dc45ed69540ed", + "sha256": "05bdavm4a1d0p176b8cnipv6byxlchbbp1fcma67ly5px4wxn0ld" }, "stable": { "version": [ @@ -105779,11 +105923,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210920, - 1038 + 20211013, + 2148 ], - "commit": "57942fe961d261360e61a72e47c676172ba7963f", - "sha256": "0d8mnvjbwnghh2yz7ys8r9395cy69mx5wjsm2kg8msi4kgk6yfjj" + "commit": "45975c24e1ab08bb32e9bdc06f5c5efe7c256e16", + "sha256": "0prx06z35fdvwbn1k18khw74phvfsa64pfsh4kpyihldj2k5f69j" }, "stable": { "version": [ @@ -106163,8 +106307,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211006, - 1837 + 20211015, + 1613 ], "deps": [ "ace-window", @@ -106176,14 +106320,14 @@ "pfuture", "s" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "ace-window", @@ -106195,8 +106339,8 @@ "pfuture", "s" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106214,21 +106358,21 @@ "all-the-icons", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106239,28 +106383,28 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210927, - 1735 + 20211007, + 1608 ], "deps": [ "evil", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "evil", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106271,26 +106415,26 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210630, - 1953 + 20211011, + 1824 ], "deps": [ "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106301,30 +106445,30 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210906, - 1653 + 20211010, + 1005 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106343,22 +106487,22 @@ "persp-mode", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106377,22 +106521,22 @@ "perspective", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106410,21 +106554,21 @@ "projectile", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "projectile", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -108385,11 +108529,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20211006, - 1337 + 20211008, + 454 ], - "commit": "b55e265735cb89f384ae51d903a59cda3e52509a", - "sha256": "1xa0p3q5n96rp85knj686argg2yx6302i9g9rc50zrc43lznvgl9" + "commit": "e6e3dd50fb7e3b20e38db555950b2f417a12c993", + "sha256": "0iri2836zxadqdvivkmm0rz2ai4wxb1khnfxjmk8k8q274w1lslf" } }, { @@ -108468,15 +108612,15 @@ "repo": "damon-kwok/v-mode", "unstable": { "version": [ - 20210608, - 629 + 20211015, + 309 ], "deps": [ "dash", "hydra" ], - "commit": "3afbd72180417ada6aeeec861081495aca962124", - "sha256": "0is9hdh8w87l9x84ihhcd040z8m7cy2321q2rmbfmpffaaja90cl" + "commit": "a5f39031a3391d0044c716425eb28645af51c79c", + "sha256": "0k0100fxhhzfyl2pcsrwblj1h7j0x9fzfnpcxqd751yvwihgrsb6" } }, { @@ -109594,11 +109738,11 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20210419, - 857 + 20211014, + 2141 ], - "commit": "bd78372bd3d8f3e90508e1eb0c9d1a53948dcc2b", - "sha256": "18ynnvz7an3bg33pd4fhkk0y85j2v48bgxny163ya6nbk0xp074s" + "commit": "2df643827a4fd82b732ea93042916c61078d4206", + "sha256": "1j8x044s4xzmfmqrsabim9gv435scj2yhym3f3p9bf5vq5ds2smj" }, "stable": { "version": [ @@ -110160,11 +110304,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210923, - 2248 + 20211009, + 252 ], - "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", - "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" + "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", + "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" } }, { @@ -110385,16 +110529,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20210629, - 1252 + 20211008, + 1118 ], "deps": [ "apel", "flim", "semi" ], - "commit": "769699d60aa033049804083b459ee562b82db77e", - "sha256": "0mgl28xsvc0421pysy6hh0hymr0li8iayaa330r41cbqsk3gz4nw" + "commit": "92ded1534ce7143f379b92a4029db275f3e22ee8", + "sha256": "0ai48j19dpyny1mmf81wjwmr5i5i5rnaj4d5n0hfchs4dcng0xrq" } }, { @@ -111921,11 +112065,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20211001, - 2220 + 20211015, + 1917 ], - "commit": "0c37fea45603257435294e2e01a403627da23abe", - "sha256": "1pynm4ng4rki2b2ka5dz01p66ygghk69mldsfbxs81d52jqfnx8f" + "commit": "8d52f933e50624c7bca3880f57297ac17ba4ac2d", + "sha256": "0k0k7mbsizsbgyjb92qj9hp5f2jbwbkzmfbxjhbmniw87q1flmmp" }, "stable": { "version": [ @@ -112241,8 +112385,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210913, - 1123 + 20211014, + 1207 ], "deps": [ "ace-link", @@ -112250,8 +112394,8 @@ "swiper", "zoutline" ], - "commit": "238b7c89229e4b56b36e81f06a2a49488940212a", - "sha256": "06qlkxkdq316habdxvhyyrf6d25i9pdxwjc4dmk3l83sg61rlg79" + "commit": "d22146bae521d4eeefd0bc2d95c7b64796760faa", + "sha256": "1vakix6pdv4ssmwzw7p7iaprp5kyiqjiw8gpi41hn7l3dsgmi4iq" }, "stable": { "version": [ @@ -112670,11 +112814,15 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210925, - 1643 + 20211008, + 707 ], - "commit": "0e834f351733fcae07e1cbd1a47d6330f17a8d74", - "sha256": "1gs5iynyljvjcwxjgvm7xj4zjk5ca59bpxgm016lmxkmdnr68fy5" + "commit": "eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://github.com/xahlee/xah-css-mode/archive/eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba.tar.gz': Couldn't resolve host name (6); retrying in 269 ms\nerror: unable to download 'https://github.com/xahlee/xah-css-mode/archive/eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba.tar.gz': HTTP error 404\n" + ] } }, { @@ -112685,11 +112833,15 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20211001, - 1536 + 20211008, + 717 ], - "commit": "bfd1d20e39d80ff00d3aefdf18c711df0685b022", - "sha256": "1v2i56ny5isvkdgac663g8c67r632fvvz6hkcyyy0fv9l0rzdmsl" + "commit": "de43714d9d4993b744afc4829d2f29ad1e806342", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nerror: unable to download 'https://github.com/xahlee/xah-elisp-mode/archive/de43714d9d4993b744afc4829d2f29ad1e806342.tar.gz': HTTP error 404\n" + ] } }, { @@ -112715,11 +112867,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210919, - 1355 + 20211009, + 1810 ], - "commit": "de9df16b79ec7e2caa81d7d53c8312a54bd52100", - "sha256": "13n4h58nqlxyfjwz4lq32lig73imvq4jk87w72j8cin5hgvnsv30" + "commit": "de43f45e5adc5342937a9bb66f5d00b2c02c16a7", + "sha256": "01wj3ii4lacns3ly8f0812sc53spvkqkwf9g7nqyda1laxqsgnic" } }, { @@ -112745,11 +112897,15 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20210925, - 1653 + 20211008, + 659 ], - "commit": "d99cce539d82cb4f0e10b7c02b5500561b13ff09", - "sha256": "07mlhsxhb3l3xawlvzx76jy4z6q52znjapmpj47w8hllnaibmhmy" + "commit": "f9c3fda86930bebf718da6e39649500be5628cc5", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nerror: unable to download 'https://github.com/xahlee/lookup-word-on-internet/archive/f9c3fda86930bebf718da6e39649500be5628cc5.tar.gz': HTTP error 404\n" + ] } }, { @@ -114691,14 +114847,14 @@ "repo": "schmir/zimports.el", "unstable": { "version": [ - 20200809, - 2035 + 20211011, + 2059 ], "deps": [ "projectile" ], - "commit": "4067b20a2ea25327504b0a42f443903728aa7966", - "sha256": "01ljp3cpslkmp8kxm24ayp5jlg6r431vpk6dm1b9ylr4x4p1klgx" + "commit": "76cf76bdc871cb0454a6fc555aeb1aa94f1b6e57", + "sha256": "1vx4j9n5q4gmc63lk1l4gbz5j5qn2423cyfibqcbynkkbwgas11z" } }, { @@ -115010,30 +115166,30 @@ "repo": "fvdbeek/emacs-zotero", "unstable": { "version": [ - 20211006, - 2051 + 20211008, + 2207 ], "deps": [ "ht", "oauth", "s" ], - "commit": "e63eba9deed272e4d8f4426949b9a5743db3c511", - "sha256": "0266hxdsi74pp2l5higyrqg8hdrmda2x1l63c4yi2x1w351i4jlb" + "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", + "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "ht", "oauth", "s" ], - "commit": "15eb7a8d099c93440f0a8920499633103f00fc83", - "sha256": "13mrssrkcjrrpc470rjpb3mwjfdsyvr4i8niqza54rzk0zxj2m95" + "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", + "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" } }, { diff --git a/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix b/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix index ea871ccf414f..73fee0dcf398 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix @@ -2,14 +2,11 @@ trivialBuild { pname = "sv-kalender"; - version = "1.9"; + version = "1.11"; src = fetchurl { url = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; - sha256 = "0kilp0nyhj67qscy13s0g07kygz2qwmddklhan020sk7z7jv3lpi"; - postFetch = '' - echo "(provide 'sv-kalender)" >> $out - ''; + sha256 = "0mcx7g1pg6kfp0i4b9rh3q9csgdf3054ijswy368bxwdxsjgfz2m"; }; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index bcd55258a49d..db043140e77a 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -198,7 +198,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { description = "The extensible, customizable GNU text editor"; homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti jwiegley adisbladis ]; + maintainers = with maintainers; [ lovek323 jwiegley adisbladis ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index e77b63218c37..4f2b3f1eb332 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "geany"; - version = "1.37.1"; + version = "1.38"; outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://download.geany.org/${pname}-${version}.tar.bz2"; - sha256 = "060sachn33xpx3a609f09y97qq5ky17gvv686zbvrn618ij7bi8q"; + sha256 = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 998341d6bb52..38f38ae3a51b 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv +{ stdenv +, lib , ctags +, cmark , appstream-glib , desktop-file-utils -, docbook_xsl -, docbook_xml_dtd_43 , fetchurl , flatpak , gnome , libgit2-glib +, gi-docgen , gobject-introspection , glade , gspell -, gtk-doc , gtk3 , gtksourceview4 , json-glib @@ -39,20 +39,20 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.40.2"; + version = "41.1"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "XVXkqqKkdYpGJj0cf9AJyz20RV4O1/nkTDoWNIYfo4o="; }; nativeBuildInputs = [ appstream-glib desktop-file-utils - docbook_xsl - docbook_xml_dtd_43 + gi-docgen gobject-introspection - gtk-doc meson ninja pkg-config @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags + cmark flatpak gnome.devhelp glade @@ -92,8 +93,6 @@ stdenv.mkDerivation rec { xvfb-run ]; - outputs = [ "out" "devdoc" ]; - prePatch = '' patchShebangs build-aux/meson/post_install.py ''; @@ -134,9 +133,13 @@ stdenv.mkDerivation rec { done ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libide "$devdoc" + ''; + passthru.updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; }; meta = with lib; { diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index db2d36e338f7..05ee956e4679 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -242,12 +242,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0knl0ca15cj0nggyfhd7s0szxr2vp7xvvp3nna3mplssfn59zf9d"; /* updated by script */ + sha256 = "09qbzkxyk435s4n04s12ncjyri024wj9pwz8wgjjsswpfa69dhr5"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.4"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "18dammsvd43x8cx0plzwgankmzfv7j79z0nsdagd540v99c2r2v3"; /* updated by script */ + sha256 = "1vj9ihzw07bh30ngy8mj027ljq9zzd904k61f8jbfpw75vknh8f6"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0ayqvyd24klafm09kls4fdp2acqsvh0zhm4wsrmrshlpmdqd5vjk"; /* updated by script */ + sha256 = "1n0yrk05xv4pard82b6z349ksiw8k75s9525pnpa2ny1ay1klhdg"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1af43c51ryvqc7c9r3kz2266j0nvz50xw1vhfjbd74c3ycj8a1zz"; /* updated by script */ + sha256 = "166rhssyizn40rlar7ym7gkwz2aawp58qqvrs60w3cwwvjvb0bjq"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1257a9d9h3ybdsnm74jmgzp1rfi1629gv9kr0w2nhmxj7ghhbx4w"; /* updated by script */ + sha256 = "1d0kk2yydrbzvdy6dy9jqr182panidmbf2hy80gvi5ph2r5rv1qd"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -307,13 +307,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.1.3"; /* updated by script */ - versionMajorMinor = "2021.1"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ + versionMajorMinor = "2021.2"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "0w1nchaa2d3z3mdp43mvifnbibl1ribyc98dm7grnwvrqk72pabf"; /* updated by script */ + sha256 = "1yawjc5xwga1mmlsl3068ml532941mq08i9ji3dhj1nwdkyav2jz"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -321,12 +321,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1iqnq38d71wbl1iqhqr5as1802s53m3220vq4g42mdjgdj296bdk"; /* updated by script */ + sha256 = "1avcm4fnkn0jkw85s505yz5kjbxzk038463sjdsca04pv5yhsdp0"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -334,12 +334,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1z59yvk3wrqn0c9581vvv62wxf4fyybha426ipyqml8c405z27y4"; /* updated by script */ + sha256 = "0s9kk3n5ac6lvqi2yw9gvvm45865jchiwyrs8pq2dgdkgaligrjv"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -347,12 +347,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0sh9kdr53dhhq171p9lmsvci3qzlds4vzyqx12mzfvfs7svri1w2"; /* updated by script */ + sha256 = "0mgmmf926n3ipr8fxn6f9hsa5vkil8yrw5qlixi8nwnx7chmkp56"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -360,12 +360,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1b5ih6q8kyds8px7gldfz1m9ap3kk27yswwxy1735c83094l2nlm"; /* updated by script */ + sha256 = "17xx8mz3dr5iqlr0lsiy8a6cxz3wp5vg8z955cdv0hf8b5rncqfa"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -373,12 +373,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "09blnm6han2rmdvjbr1va081zndzvjr1i0m3njaiwcb9rf2axm32"; /* updated by script */ + sha256 = "0bbq5ya1dxrgaqqqsc4in4rgv7v292hww3bb0vpzwz6dmc2jly1i"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -386,12 +386,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "12i9f5sw02gcgviflfs6gwmnxvzhgmm4v4447am0syl4nq8nyv1s"; /* updated by script */ + sha256 = "1a3vlqza9nbc4a2qxrzdckmq003zx1db9dy7wx462amc8sbh6v92"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index bd61933b38d7..f7fb1b5bfc6a 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.8"; + version = "5.9"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "133nhxg4xfxisjzi85rn2l575hdbvcax1s13l4m6wcvq5zdn6fz4"; + sha256 = "dX24zaS7KHNZnkd4OvRj47VHpiewyrsw6nv3H7TCSTc="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 75d20a12a0d9..a40ff76eea34 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -22,16 +22,16 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "unstable-2021-08-08"; + version = "unstable-2021-10-09"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; - rev = "725f12cafd4a26babd0d6bbcbca9a99c181991ac"; - sha256 = "sha256-ThMobWKe3wHhR15TmmKrI6Gp1wvGVfJ52MzibK0ubkc="; + rev = "7f76ad4764197ba75bb9263d25b265d801563ccf"; + sha256 = "sha256-kcP0WSk3quTaWCGQYN4zYlDQ9jhx/Vu6AamSLGFszwQ="; }; - cargoSha256 = "sha256-5lOGncnyA8DwetY5bU6k2KXNClFgp+xIBEeA0/iwGF0="; + cargoSha256 = "sha256-TQEhz9FtvIb/6Qtyz018dPle0+nub1oMZMFtKAqYcoI="; SKIA_SOURCE_DIR = let diff --git a/pkgs/applications/editors/rstudio/clang-location.patch b/pkgs/applications/editors/rstudio/clang-location.patch index 700ed754d2bb..8e4a7e3d84c2 100644 --- a/pkgs/applications/editors/rstudio/clang-location.patch +++ b/pkgs/applications/editors/rstudio/clang-location.patch @@ -1,25 +1,61 @@ -diff --git i/src/cpp/core/libclang/LibClang.cpp w/src/cpp/core/libclang/LibClang.cpp -index ec12a3a1ff..8c81b633ae 100644 ---- i/src/cpp/core/libclang/LibClang.cpp -+++ w/src/cpp/core/libclang/LibClang.cpp -@@ -54,7 +54,7 @@ std::vector defaultCompileArgs(LibraryVersion version) +diff --git a/src/cpp/core/libclang/LibClang.cpp b/src/cpp/core/libclang/LibClang.cpp +index 1186f3a..58e8cc7 100644 +--- a/src/cpp/core/libclang/LibClang.cpp ++++ b/src/cpp/core/libclang/LibClang.cpp +@@ -58,7 +58,7 @@ std::vector defaultCompileArgs(LibraryVersion version) // we need to add in the associated libclang headers as // they are not discovered / used by default during compilation -- FilePath llvmPath = s_libraryPath.parent().parent(); +- FilePath llvmPath = s_libraryPath.getParent().getParent(); + FilePath llvmPath("@libclang@"); boost::format fmt("%1%/lib/clang/%2%/include"); - fmt % llvmPath.absolutePath() % version.asString(); + fmt % llvmPath.getAbsolutePath() % version.asString(); std::string includePath = fmt.str(); -@@ -77,10 +77,7 @@ std::vector systemClangVersions() - #elif defined(__unix__) - // default set of versions - clangVersions = { +@@ -70,46 +70,7 @@ std::vector defaultCompileArgs(LibraryVersion version) + + std::vector systemClangVersions() + { +- std::vector clangVersions; +- +-#if defined(__APPLE__) +- // NOTE: the version of libclang.dylib bundled with Xcode +- // doesn't seem to work well when loaded as a library +- // (there seems to be extra orchestration required to get +- // include paths set up; easier to just depend on command +- // line tools since we request their installation in other +- // contexts as well) +- clangVersions = { +- "/Library/Developer/CommandLineTools/usr/lib/libclang.dylib" +- }; +-#elif defined(__unix__) +- // default set of versions +- clangVersions = { - "/usr/lib/libclang.so", - "/usr/lib/llvm/libclang.so", - "/usr/lib64/libclang.so", - "/usr/lib64/llvm/libclang.so", -+ "@libclang.so@" - }; - - // iterate through the set of available 'llvm' directories +- }; +- +- // iterate through the set of available 'llvm' directories +- for (const char* prefix : {"/usr/lib", "/usr/lib64"}) +- { +- FilePath prefixPath(prefix); +- if (!prefixPath.exists()) +- continue; +- +- std::vector directories; +- Error error = prefixPath.getChildren(directories); +- if (error) +- LOG_ERROR(error); +- +- // generate a path for each 'llvm' directory +- for (const FilePath& path : directories) +- if (path.getFilename().find("llvm") == 0) +- clangVersions.push_back(path.completePath("lib/libclang.so.1").getAbsolutePath()); +- } +-#endif +- ++ std::vector clangVersions = { "@libclang.so@" }; + return clangVersions; + } + diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 56c33621390f..3ccdd70c455c 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,141 +1,209 @@ -{ lib, mkDerivation, fetchurl, fetchpatch, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib -, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel -, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc +{ lib +, mkDerivation +, fetchurl +, fetchpatch +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, cmake +, boost +, zlib +, openssl +, R +, qtbase +, qtxmlpatterns +, qtsensors +, qtwebengine +, qtwebchannel +, libuuid +, hunspellDicts +, unzip +, ant +, jdk +, gnumake +, makeWrapper +, pandoc , llvmPackages +, libyamlcpp +, soci +, postgresql +, nodejs +, mkYarnModules +, qmake }: -with lib; let - verMajor = "1"; - verMinor = "2"; - verPatch = "5042"; - version = "${verMajor}.${verMinor}.${verPatch}"; - ginVer = "2.1.2"; - gwtVer = "2.8.1"; -in -mkDerivation rec { pname = "RStudio"; - inherit version; - - nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - - buildInputs = [ boost zlib openssl R qtbase qtxmlpatterns qtsensors - qtwebengine qtwebchannel libuuid ]; + version = "1.4.1717"; + RSTUDIO_VERSION_MAJOR = lib.versions.major version; + RSTUDIO_VERSION_MINOR = lib.versions.minor version; + RSTUDIO_VERSION_PATCH = lib.versions.patch version; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "1n67fa357v51j3z1ma8v2ydfsx3y8n10k2svmfcf4mdzsi8w0kc5"; + sha256 = "sha256-9c1bNsf8kJjpcZ2cMV/pPNtXQkFOntX29a1cdnXpllE="; }; - # Hack RStudio to only use the input R and provided libclang. - patches = [ ./r-location.patch ./clang-location.patch - (fetchpatch { - # Fetch a patch to ensure Rstudio compiles against R - # 4.0.0, should be removed next 1.2.X Rstudio update - # or possibly 1.3.X - url = "https://github.com/rstudio/rstudio/commit/3fb2397c2f208bb8ace0bbaf269481ccb96b5b20.patch"; - sha256 = "0qpgjy6aash0fc0xbns42cwpj3nsw49nkbzwyq8az01xwg81g0f3"; - }) - ]; - postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} - substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@libclang@' ${llvmPackages.libclang.lib} \ - --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so - ''; - - ginSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; - sha256 = "16jzmljravpz6p2rxa87k5f7ir8vs7ya75lnfybfajzmci0p13mr"; - }; - - gwtSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; - sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; - }; - - hunspellDictionaries = filter isDerivation (unique (attrValues hunspellDicts)); - # These dicts contain identically-named dict files, so we only keep the - # -large versions in case of clashes - largeDicts = filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; - otherDicts = filter (d: !(hasAttr "dictFileName" d && - elem d.dictFileName (map (d: d.dictFileName) largeDicts))) hunspellDictionaries; - dictionaries = largeDicts ++ otherDicts; - mathJaxSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip"; - sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; + url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; + sha256 = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY="; }; rsconnectSrc = fetchFromGitHub { owner = "rstudio"; repo = "rsconnect"; - rev = "984745d8"; - sha256 = "037z0y32k1gdda192y5qn5hi7wp8wyap44mkjlklrgcqkmlcylb9"; + rev = "f5854bb71464f6e3017da9855f058fe3d5b32efd"; + sha256 = "sha256-ULyWdSgGPSAwMt0t4QPuzeUE6Bo6IJh+5BMgW1bFN+Y="; }; - preConfigure = - '' - export RSTUDIO_VERSION_MAJOR=${verMajor} - export RSTUDIO_VERSION_MINOR=${verMinor} - export RSTUDIO_VERSION_PATCH=${verPatch} - - GWT_LIB_DIR=src/gwt/lib - - mkdir -p $GWT_LIB_DIR/gin/${ginVer} - unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer} - - unzip ${gwtSrc} - mkdir -p $GWT_LIB_DIR/gwt - mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer} - - mkdir dependencies/common/dictionaries - for dict in ${builtins.concatStringsSep " " dictionaries}; do - for i in "$dict/share/hunspell/"*; do - ln -sv $i dependencies/common/dictionaries/ - done - done - - unzip ${mathJaxSrc} -d dependencies/common/mathjax-26 - - mkdir -p dependencies/common/pandoc - cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ - - cp -r ${rsconnectSrc} dependencies/common/rsconnect - pushd dependencies/common - ${R}/bin/R CMD build -d --no-build-vignettes rsconnect - popd - ''; - - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; - - desktopItem = makeDesktopItem { - name = "${pname}-${version}"; - exec = "rstudio %F"; - icon = "rstudio"; - desktopName = "RStudio"; - genericName = "IDE"; - comment = meta.description; - categories = "Development;"; - mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + panmirrorModules = mkYarnModules { + inherit pname version; + packageJSON = ./package.json; + yarnLock = ./yarn.lock; + yarnNix = ./yarndeps.nix; }; - qtWrapperArgs = [ "--suffix PATH : ${gnumake}/bin" ]; +in +mkDerivation rec { + inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH; - postInstall = '' - mkdir $out/share - cp -r ${desktopItem}/share/applications $out/share - mkdir $out/share/icons - ln $out/rstudio.png $out/share/icons + nativeBuildInputs = [ + cmake + unzip + ant + jdk + makeWrapper + pandoc + nodejs + copyDesktopItems + ]; + + buildInputs = [ + boost + zlib + openssl + R + qtbase + qtxmlpatterns + qtsensors + qtwebengine + qtwebchannel + libuuid + libyamlcpp + soci + postgresql + ]; + + cmakeFlags = [ + "-DRSTUDIO_TARGET=Desktop" + "-DCMAKE_BUILD_TYPE=Release" + "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake" + "-DRSTUDIO_USE_SYSTEM_SOCI=ON" + "-DRSTUDIO_USE_SYSTEM_BOOST=ON" + "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" + "-DPANDOC_VERSION=${pandoc.version}" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio" + ]; + + # Hack RStudio to only use the input R and provided libclang. + patches = [ + ./r-location.patch + ./clang-location.patch + # postFetch doesn't work with this | error: unexpected end-of-file + # replacing /usr/bin/node is done in postPatch + # https://src.fedoraproject.org/rpms/rstudio/tree/rawhide + (fetchpatch { + name = "system-node.patch"; + url = "https://src.fedoraproject.org/rpms/rstudio/raw/5bda2e290c9e72305582f2011040938d3e356906/f/0004-use-system-node.patch"; + sha256 = "sha256-P1Y07RB/ceFNa749nyBUWSE41eiiZgt43zVcmahvfZM="; + }) + ]; + + postPatch = '' + substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} + + substituteInPlace src/cpp/CMakeLists.txt \ + --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' + + substituteInPlace src/gwt/build.xml \ + --replace '/usr/bin/node' '${nodejs}/bin/node' + + substituteInPlace src/cpp/core/libclang/LibClang.cpp \ + --replace '@libclang@' ${llvmPackages.libclang.lib} \ + --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + + substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ + --replace "bin/pandoc" "${pandoc}/bin/pandoc" ''; - meta = with lib; - { description = "Set of integrated tools for the R language"; - homepage = "https://www.rstudio.com/"; - license = licenses.agpl3; - maintainers = with maintainers; [ ciil ]; - platforms = platforms.linux; - }; + hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); + # These dicts contain identically-named dict files, so we only keep the + # -large versions in case of clashes + largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; + otherDicts = with lib; filter + (d: !(hasAttr "dictFileName" d && + elem d.dictFileName (map (d: d.dictFileName) largeDicts))) + hunspellDictionaries; + dictionaries = largeDicts ++ otherDicts; + + preConfigure = '' + mkdir dependencies/dictionaries + for dict in ${builtins.concatStringsSep " " dictionaries}; do + for i in "$dict/share/hunspell/"*; do + ln -s $i dependencies/dictionaries/ + done + done + + unzip -q ${mathJaxSrc} -d dependencies/mathjax-27 + + mkdir -p dependencies/pandoc/${pandoc.version} + cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc + + cp -r ${rsconnectSrc} dependencies/rsconnect + ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect ) + + cp -r "${panmirrorModules}" src/gwt/panmirror/src/editor/node_modules + ''; + + postInstall = '' + mkdir -p $out/share/icons $out/bin + ln $out/lib/rstudio/rstudio.png $out/share/icons + + for f in {diagnostics,rpostback,rstudio}; do + ln -s $out/lib/rstudio/bin/$f $out/bin + done + + for f in .gitignore .Rbuildignore LICENSE README; do + find . -name $f -delete + done + rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} + rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc} + ''; + + qtWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ gnumake ]}" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "${pname}"; + exec = "rstudio %F"; + icon = "rstudio"; + desktopName = "RStudio"; + genericName = "IDE"; + comment = meta.description; + categories = "Development;"; + mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + }) + ]; + + meta = with lib; { + description = "Set of integrated tools for the R language"; + homepage = "https://www.rstudio.com/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ciil ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/editors/rstudio/package.json b/pkgs/applications/editors/rstudio/package.json new file mode 100644 index 000000000000..31943987a522 --- /dev/null +++ b/pkgs/applications/editors/rstudio/package.json @@ -0,0 +1,83 @@ +{ + "name": "panmirror", + "version": "0.1.0", + "private": true, + "license": "agpl-3.0", + "dependencies": { + "@types/ace": "^0.0.43", + "@types/clipboard": "^2.0.1", + "@types/diff-match-patch": "^1.0.32", + "@types/js-yaml": "^3.12.3", + "@types/lodash.debounce": "^4.0.6", + "@types/lodash.uniqby": "^4.7.6", + "@types/orderedmap": "^1.0.0", + "@types/prosemirror-commands": "^1.0.3", + "@types/prosemirror-dev-tools": "^2.1.0", + "@types/prosemirror-dropcursor": "^1.0.0", + "@types/prosemirror-gapcursor": "^1.0.1", + "@types/prosemirror-history": "^1.0.1", + "@types/prosemirror-inputrules": "^1.0.3", + "@types/prosemirror-keymap": "^1.0.3", + "@types/prosemirror-model": "^1.7.2", + "@types/prosemirror-schema-list": "^1.0.1", + "@types/prosemirror-state": "^1.2.5", + "@types/prosemirror-tables": "^0.9.1", + "@types/prosemirror-transform": "^1.1.1", + "@types/react": "^16.9.32", + "@types/react-dom": "^16.9.6", + "@types/react-window": "^1.8.2", + "@types/zenscroll": "^4.0.0", + "biblatex-csl-converter": "^1.9.1", + "clipboard": "^2.0.6", + "diff-match-patch": "^1.0.4", + "fuse.js": "^6.0.4", + "js-yaml": "^3.13.1", + "lodash.debounce": "^4.0.8", + "lodash.uniqby": "^4.7.0", + "orderedmap": "^1.0.0", + "prosemirror-changeset": "^2.1.2", + "prosemirror-commands": "^1.1.4", + "prosemirror-dev-tools": "^2.1.1", + "prosemirror-dropcursor": "^1.3.2", + "prosemirror-gapcursor": "^1.1.5", + "prosemirror-history": "^1.1.3", + "prosemirror-inputrules": "^1.1.2", + "prosemirror-keymap": "^1.1.4", + "prosemirror-model": "^1.11.0", + "prosemirror-schema-list": "^1.1.4", + "prosemirror-state": "^1.3.3", + "prosemirror-tables": "^1.1.1", + "prosemirror-transform": "^1.2.8", + "prosemirror-utils": "^0.9.6", + "prosemirror-view": "^1.15.6", + "react": "^16.13.1", + "react-dom": "^16.13.1", + "react-window": "^1.8.5", + "sentence-splitter": "^3.2.0", + "thenby": "^1.3.3", + "tlite": "^0.1.9", + "typescript": "3.8.3", + "zenscroll": "^4.0.2" + }, + "scripts": { + "format": "prettier --write \"src/**/*.ts\" \"src/**/*.tsx\"", + "lint": "tslint -c tslint.json 'src/**/*.{ts,tsx}'", + "watch": "tsc --watch --noEmit --project './tsconfig.json'", + "generate-symbols": "ts-node tools/generate-symbols.ts" + }, + "devDependencies": { + "@types/node": "^14.0.4", + "@types/unzip": "^0.1.1", + "fast-xml-parser": "^3.17.1", + "fuse-box": "^3.7.1", + "prettier": "^1.18.2", + "terser": "^4.6.2", + "ts-node": "^8.10.2", + "tslint": "^5.20.0", + "tslint-config-prettier": "^1.18.0", + "tslint-react": "^5.0.0", + "typescript-tslint-plugin": "^0.5.5", + "uglify-js": "^3.7.4", + "unzip": "^0.1.11" + } +} diff --git a/pkgs/applications/editors/rstudio/r-location.patch b/pkgs/applications/editors/rstudio/r-location.patch index 24cb6a246977..44e54b36e0c4 100644 --- a/pkgs/applications/editors/rstudio/r-location.patch +++ b/pkgs/applications/editors/rstudio/r-location.patch @@ -1,19 +1,23 @@ -diff -ur rstudio-1.1.216-old/src/cpp/core/CMakeLists.txt rstudio-1.1.216-new/src/cpp/core/CMakeLists.txt ---- rstudio-1.1.216-old/src/cpp/core/r_util/REnvironmentPosix.cpp 2017-04-30 03:37:26.669418665 -0400 -+++ rstudio-1.1.216-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2017-04-30 03:36:33.590726185 -0400 -@@ -87,10 +87,7 @@ +diff --git a/src/cpp/core/r_util/REnvironmentPosix.cpp b/src/cpp/core/r_util/REnvironmentPosix.cpp +index dbc9a9a1..9a526a86 100644 +--- a/src/cpp/core/r_util/REnvironmentPosix.cpp ++++ b/src/cpp/core/r_util/REnvironmentPosix.cpp +@@ -107,12 +107,9 @@ FilePath systemDefaultRScript(std::string* pErrMsg) { - // define potential paths - std::vector rScriptPaths; -- rScriptPaths.push_back("/usr/bin/R"); -- rScriptPaths.push_back("/usr/local/bin/R"); -- rScriptPaths.push_back("/opt/local/bin/R"); -- rScriptPaths.push_back("/Library/Frameworks/R.framework/Resources/bin/R"); -+ rScriptPaths.push_back("@R@/bin/R"); - return scanForRScript(rScriptPaths, pErrMsg); - } + // check fallback paths + std::vector rScriptPaths = { +- "/usr/bin/R", +- "/usr/local/bin/R", +- "/opt/local/bin/R", ++ "@R@/bin/R" + #ifdef __APPLE__ +- "/opt/homebrew/bin/R", +- "/Library/Frameworks/R.framework/Resources/bin/R", ++ "@R@/bin/R", + #endif + }; -@@ -226,8 +223,7 @@ +@@ -225,8 +222,7 @@ FilePath systemDefaultRScript(std::string* pErrMsg) // scan in standard locations as a fallback std::string scanErrMsg; std::vector rScriptPaths; @@ -21,5 +25,6 @@ diff -ur rstudio-1.1.216-old/src/cpp/core/CMakeLists.txt rstudio-1.1.216-new/src - rScriptPaths.push_back("/usr/bin/R"); + rScriptPaths.push_back("@R@/bin/R"); FilePath scriptPath = scanForRScript(rScriptPaths, &scanErrMsg); - if (scriptPath.empty()) + if (scriptPath.isEmpty()) { + diff --git a/pkgs/applications/editors/rstudio/yarn.lock b/pkgs/applications/editors/rstudio/yarn.lock new file mode 100644 index 000000000000..d1717012db47 --- /dev/null +++ b/pkgs/applications/editors/rstudio/yarn.lock @@ -0,0 +1,3835 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.0.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" + integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== + dependencies: + "@babel/highlight" "^7.8.3" + +"@babel/helper-module-imports@^7.0.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498" + integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg== + dependencies: + "@babel/types" "^7.8.3" + +"@babel/highlight@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" + integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^4.0.0" + +"@babel/runtime@^7.0.0": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" + integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308" + integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ== + dependencies: + regenerator-runtime "^0.13.2" + +"@babel/types@^7.8.3": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01" + integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA== + dependencies: + esutils "^2.0.2" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + +"@emotion/babel-utils@^0.6.4": + version "0.6.10" + resolved "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz#83dbf3dfa933fae9fc566e54fbb45f14674c6ccc" + integrity sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow== + dependencies: + "@emotion/hash" "^0.6.6" + "@emotion/memoize" "^0.6.6" + "@emotion/serialize" "^0.9.1" + convert-source-map "^1.5.1" + find-root "^1.1.0" + source-map "^0.7.2" + +"@emotion/hash@^0.6.2", "@emotion/hash@^0.6.6": + version "0.6.6" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44" + integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ== + +"@emotion/is-prop-valid@^0.6.1": + version "0.6.8" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz#68ad02831da41213a2089d2cab4e8ac8b30cbd85" + integrity sha512-IMSL7ekYhmFlILXcouA6ket3vV7u9BqStlXzbKOF9HBtpUPMMlHU+bBxrLOa2NvleVwNIxeq/zL8LafLbeUXcA== + dependencies: + "@emotion/memoize" "^0.6.6" + +"@emotion/memoize@^0.6.1", "@emotion/memoize@^0.6.6": + version "0.6.6" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b" + integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ== + +"@emotion/serialize@^0.9.1": + version "0.9.1" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145" + integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ== + dependencies: + "@emotion/hash" "^0.6.6" + "@emotion/memoize" "^0.6.6" + "@emotion/unitless" "^0.6.7" + "@emotion/utils" "^0.8.2" + +"@emotion/stylis@^0.7.0": + version "0.7.1" + resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5" + integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ== + +"@emotion/unitless@^0.6.2", "@emotion/unitless@^0.6.7": + version "0.6.7" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397" + integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg== + +"@emotion/utils@^0.8.2": + version "0.8.2" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc" + integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw== + +"@textlint/ast-node-types@^4.2.5": + version "4.3.4" + resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.3.4.tgz#f6596c45c32c85dc06915c3077bb7686033efd32" + integrity sha512-Grq+vJuNH7HCa278eFeiqJvowrD+onMCoG2ctLyoN+fXYIQGIr1/8fo8AcIg+VM16Kga+N6Y1UWNOWPd8j1nFg== + +"@types/ace@^0.0.43": + version "0.0.43" + resolved "https://registry.yarnpkg.com/@types/ace/-/ace-0.0.43.tgz#9f0916174b6060dabbccd36ba4868ea769a1c633" + integrity sha512-eQdX8AQ7CfSHym07MZMBQ8FKUj9AZ2Wcc26W5Ct8J4KOMjFY6SFUaf2YA8YHBut0Fwl//2kZ+0GLZNp+NQNRIA== + +"@types/clipboard@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.1.tgz#75a74086c293d75b12bc93ff13bc7797fef05a40" + integrity sha512-gJJX9Jjdt3bIAePQRRjYWG20dIhAgEqonguyHxXuqALxsoDsDLimihqrSg8fXgVTJ4KZCzkfglKtwsh/8dLfbA== + +"@types/diff-match-patch@^1.0.32": + version "1.0.32" + resolved "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz#d9c3b8c914aa8229485351db4865328337a3d09f" + integrity sha512-bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A== + +"@types/js-yaml@^3.12.3": + version "3.12.3" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.3.tgz#abf383c5b639d0aa8b8c4a420d6a85f703357d6c" + integrity sha512-otRe77JNNWzoVGLKw8TCspKswRoQToys4tuL6XYVBFxjgeM0RUrx7m3jkaTdxILxeGry3zM8mGYkGXMeQ02guA== + +"@types/lodash.debounce@^4.0.6": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@types/lodash.debounce/-/lodash.debounce-4.0.6.tgz#c5a2326cd3efc46566c47e4c0aa248dc0ee57d60" + integrity sha512-4WTmnnhCfDvvuLMaF3KV4Qfki93KebocUF45msxhYyjMttZDQYzHkO639ohhk8+oco2cluAFL3t5+Jn4mleylQ== + dependencies: + "@types/lodash" "*" + +"@types/lodash.uniqby@^4.7.6": + version "4.7.6" + resolved "https://registry.yarnpkg.com/@types/lodash.uniqby/-/lodash.uniqby-4.7.6.tgz#672827a701403f07904fe37f0721ae92abfa80e8" + integrity sha512-9wBhrm1y6asW50Joj6tsySCNUgzK2tCqL7vtKIej0E9RyeBFdcte7fxUosmFuMoOU0eHqOMK76kCCrK99jxHgg== + dependencies: + "@types/lodash" "*" + +"@types/lodash@*": + version "4.14.154" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.154.tgz#069e3c703fdb264e67be9e03b20a640bc0198ecc" + integrity sha512-VoDZIJmg3P8vPEnTldLvgA+q7RkIbVkbYX4k0cAVFzGAOQwUehVgRHgIr2/wepwivDst/rVRqaiBSjCXRnoWwQ== + +"@types/node@*", "@types/node@^14.0.4": + version "14.0.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.4.tgz#43a63fc5edce226bed106b31b875165256271107" + integrity sha512-k3NqigXWRzQZVBDS5D1U70A5E8Qk4Kh+Ha/x4M8Bt9pF0X05eggfnC9+63Usc9Q928hRUIpIhTQaXsZwZBl4Ew== + +"@types/orderedmap@*", "@types/orderedmap@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/orderedmap/-/orderedmap-1.0.0.tgz#807455a192bba52cbbb4517044bc82bdbfa8c596" + integrity sha512-dxKo80TqYx3YtBipHwA/SdFmMMyLCnP+5mkEqN0eMjcTBzHkiiX0ES118DsjDBjvD+zeSsSU9jULTZ+frog+Gw== + +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/prop-types@*": + version "15.7.3" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" + integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== + +"@types/prosemirror-commands@*", "@types/prosemirror-commands@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.3.tgz#e9fa5653cffd1c75c260594cf3ec5244c9004dbf" + integrity sha512-AjFCJqBvAhQ4gOzXPgUcnEZwu4jd7se7ani3dYAv8p4L+cWEPD6Pshrpp5uJDI5/pzvNXLWQ/4c2Qk4h9IML1w== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-dev-tools@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.0.tgz#91e2ef4f36129f5155f924296e306de187e86bdb" + integrity sha512-OhnSaC4yrrEMLPRUkEWcHAIPVqgKlLkE4kISqL3cHeAYxASouSPvPMLqhBIbWkGwaozy43DjjVC1OXkxTo+y5Q== + dependencies: + "@types/prosemirror-state" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-dropcursor@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.0.tgz#2df872bc6431a9f06bc1a4a0eac7c2dc527e7f12" + integrity sha512-S2ndHt94M64avSqjBcgIblaF3YeC3RfcmpY9/WIdfqU7aoJxuOh4RJk5emdmQPHZT1wbczMHFmFSsRqgErK0EQ== + dependencies: + "@types/prosemirror-state" "*" + +"@types/prosemirror-gapcursor@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.1.tgz#56a6274ef39f62c339adcc64305294b800211a5e" + integrity sha512-ruA7FK9NJv+bn5s55SZYFf9SwaN3wk/MkBvqRmhIqIHvowTTa7nzIGWbUdWZMga1DDTk+GrwdcQaEHunAFjFsQ== + dependencies: + "@types/prosemirror-state" "*" + +"@types/prosemirror-history@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.1.tgz#b8d7595f73788b63fc9f2b57a763ba8375abfe87" + integrity sha512-BYyPJlWDo3VEnWS5X2DCHXrrAKEjdbCe1DUjGL6R/8hmwMFe3iMJGYdBkOXU1FfkTpw7Z+PlwY/pMyeelVydmg== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + +"@types/prosemirror-inputrules@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.3.tgz#3f8f07921f692b6c7e4781fa426aee3e76b9018c" + integrity sha512-cxMkCcu/di8//68jWc/NrRpvpCbizgq9vqv4rCRsAiuSiJ8L5hf4aFlCBUYCffuQnrY98uOfJ8YAUY3dbtaF9A== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + +"@types/prosemirror-keymap@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.3.tgz#09cc469a69222a4c8a3d415d02eeb459bb74269c" + integrity sha512-iCYUtt0u8y6qeDZVsidEWJGbw2Kas+jtHD1QY374W/N2jASYp+8auucFLXe0UvoOy9jiWcGcqcecec1R+vkzgw== + dependencies: + "@types/prosemirror-commands" "*" + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-model@*", "@types/prosemirror-model@^1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.2.tgz#9c7aff2fd62f0f56eb76e2e0eb27bf6996e6c28a" + integrity sha512-2l+yXvidg3AUHN07mO4Jd8Q84fo6ksFsy7LHUurLYrZ74uTahBp2fzcO49AKZMzww2EulXJ40Kl/OFaQ/7A1fw== + dependencies: + "@types/orderedmap" "*" + +"@types/prosemirror-schema-list@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz#7f53e3c0326b1359755f3971b8c448d98b722f21" + integrity sha512-+iUYq+pj2wVHSThj0MjNDzkkGwq8aDQ6j0UJK8a0cNCL8v44Ftcx1noGPtBIEUJgitH960VnfBNoTWfQoQZfRA== + dependencies: + "@types/orderedmap" "*" + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + +"@types/prosemirror-state@*": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.3.tgz#7f5f871acf7b8c22e1862ff0068f9bf7e9682c0e" + integrity sha512-6m433Hubix9bx+JgcLW7zzyiZuzwjq5mBdSMYY4Yi5c5ZpV2RiVmg7Cy6f9Thtts8vuztilw+PczJAgDm1Frfw== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-transform" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-state@^1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.5.tgz#a91304e9aab6e71f868e23b3a1ae514a75033f8f" + integrity sha512-a5DxAifiF6vmdSJ5jsDMkpykUgUJUy+T5Q5hCjFOKJ4cfd3m3q1lsFKr7Bc4r91Qb7rfqyiKCMDnASS8LIHrKw== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-transform" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-tables@^0.9.1": + version "0.9.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-tables/-/prosemirror-tables-0.9.1.tgz#d2203330f0fa1161c04152bf02c39e152082d408" + integrity sha512-zoY1qcAC6kG4UjnaQQXuoyYQdDJMQmY9uzRKdyUppP8rWRR5/kXBHOd84CD9ZvrYUBo3uDmS20qQnc3knr2j9A== + dependencies: + prosemirror-tables "*" + +"@types/prosemirror-transform@*", "@types/prosemirror-transform@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.1.tgz#5a0de16e8e0123b4c3d9559235e19f39cee85e5c" + integrity sha512-yYCYSoiRH+Wcbl8GJc0PFCzeyMzNQ1vL2xrHHSXZuNcIlH75VoiKrZFeZ6BS9cl8mYXjZrlmdBe8YOxYvyKM6A== + dependencies: + "@types/prosemirror-model" "*" + +"@types/prosemirror-view@*": + version "1.11.2" + resolved "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.11.2.tgz#58af5dcb7de20b7de874de99147552d5627209a1" + integrity sha512-EKcQmR4KdkFZU13wS5pWrkSojRCPGqz/l/uzpZFfW5cgdr7fQsftf2/ttvIjpk1a94ISifEY4UZwflVJ+uL4Rg== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + "@types/prosemirror-transform" "*" + +"@types/react-dom@^16.9.6": + version "16.9.6" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.6.tgz#9e7f83d90566521cc2083be2277c6712dcaf754c" + integrity sha512-S6ihtlPMDotrlCJE9ST1fRmYrQNNwfgL61UB4I1W7M6kPulUKx9fXAleW5zpdIjUQ4fTaaog8uERezjsGUj9HQ== + dependencies: + "@types/react" "*" + +"@types/react-window@^1.8.2": + version "1.8.2" + resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.2.tgz#a5a6b2762ce73ffaab7911ee1397cf645f2459fe" + integrity sha512-gP1xam68Wc4ZTAee++zx6pTdDAH08rAkQrWm4B4F/y6hhmlT9Mgx2q8lTCXnrPHXsr15XjRN9+K2DLKcz44qEQ== + dependencies: + "@types/react" "*" + +"@types/react@*", "@types/react@^16.9.32": + version "16.9.32" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383" + integrity sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ== + dependencies: + "@types/prop-types" "*" + csstype "^2.2.0" + +"@types/unzip@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@types/unzip/-/unzip-0.1.1.tgz#96e80dc5e2917a769c8be01aa49c4fe660e7bab3" + integrity sha512-skD6Um7Pk2l7y+tVOKSgOA9vXViyhk/qJYmr17Ek4Uw3Zgo/DWPScphTPztPbApTIngyYSJnkEW87xrHzRYaew== + dependencies: + "@types/node" "*" + +"@types/zenscroll@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.0.tgz#9acc7df6c87cc9e064f5a6230df499835dee1972" + integrity sha512-n9np/qsr3HBH3VBVfviHhQPmGP1+D01+VI/40QFq/7LyJqDoIlcaaABu/qPAVats/oNuUJ/dhrjrOjVaqos+4A== + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +acorn-jsx@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e" + integrity sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw== + dependencies: + acorn "^5.0.3" + +acorn@^5.0.3, acorn@^5.7.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" + integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + +ajax-request@^1.2.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/ajax-request/-/ajax-request-1.2.3.tgz#99fcbec1d6d2792f85fa949535332bd14f5f3790" + integrity sha1-mfy+wdbSeS+F+pSVNTMr0U9fN5A= + dependencies: + file-system "^2.1.1" + utils-extend "^1.0.7" + +ajv@^6.5.5: + version "6.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7" + integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-escapes@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" + integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= + +anymatch@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" + integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== + dependencies: + micromatch "^2.1.5" + normalize-path "^2.0.0" + +app-root-path@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-1.4.0.tgz#6335d865c9640d0fad99004e5a79232238e92dfa" + integrity sha1-YzXYZclkDQ+tmQBOWnkjIjjpLfo= + +app-root-path@^2.0.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a" + integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA== + +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" + integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= + dependencies: + arr-flatten "^1.0.1" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + +arr-flatten@^1.0.1, arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-unique@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + +async-each@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" + integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== + +babel-plugin-emotion@^9.2.11: + version "9.2.11" + resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz#319c005a9ee1d15bb447f59fe504c35fd5807728" + integrity sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@emotion/babel-utils" "^0.6.4" + "@emotion/hash" "^0.6.2" + "@emotion/memoize" "^0.6.1" + "@emotion/stylis" "^0.7.0" + babel-plugin-macros "^2.0.0" + babel-plugin-syntax-jsx "^6.18.0" + convert-source-map "^1.5.0" + find-root "^1.1.0" + mkdirp "^0.5.1" + source-map "^0.5.7" + touch "^2.0.1" + +babel-plugin-macros@^2.0.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" + integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== + dependencies: + "@babel/runtime" "^7.7.2" + cosmiconfig "^6.0.0" + resolve "^1.12.0" + +babel-plugin-syntax-jsx@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" + integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= + +babel-runtime@^6.6.1: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +base16@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70" + integrity sha1-4pf2DX7BAUp6lxo568ipjAtoHnA= + +base64-img@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/base64-img/-/base64-img-1.0.4.tgz#3e22d55d6c74a24553d840d2b1bc12a7db078d35" + integrity sha1-PiLVXWx0okVT2EDSsbwSp9sHjTU= + dependencies: + ajax-request "^1.2.0" + file-system "^2.1.0" + +base64-js@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" + integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +biblatex-csl-converter@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-1.9.1.tgz#50aacfef172997f1c98d72837ffdd3b19c62f8c4" + integrity sha512-M7HkWas8NbiFoNdS/lZOfup5A83Scw4iWFoPn9r84zh9DzaG/gHU86qH1QHMgUc2dSaquuIBQZRHC9wCs7k92g== + +binary-extensions@^1.0.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== + +"binary@>= 0.3.0 < 1": + version "0.3.0" + resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" + integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= + dependencies: + buffers "~0.1.1" + chainsaw "~0.1.0" + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +body-parser@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +boundary@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz#4d67dc2602c0cc16dd9bce7ebf87e948290f5812" + integrity sha1-TWfcJgLAzBbdm85+v4fpSCkPWBI= + +bowser@^2.0.0-beta.3: + version "2.9.0" + resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz#3bed854233b419b9a7422d9ee3e85504373821c9" + integrity sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^1.8.2: + version "1.8.5" + resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" + integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= + dependencies: + expand-range "^1.8.1" + preserve "^0.2.0" + repeat-element "^1.1.2" + +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +buffers@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" + integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= + +builtin-modules@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +chain-able@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/chain-able/-/chain-able-1.0.1.tgz#b48ac9bdc18f2192ec730abc66609f90aab5605f" + integrity sha1-tIrJvcGPIZLscwq8ZmCfkKq1YF8= + +chain-able@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chain-able/-/chain-able-3.0.0.tgz#dcffe8b04f3da210941a23843bc1332bb288ca9f" + integrity sha512-26MoELhta86n7gCsE2T1hGRyncZvPjFXTkB/DEp4+i/EJVSxXQNwXMDZZb2+SWcbPuow18wQtztaW7GXOel9DA== + +chainsaw@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" + integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= + dependencies: + traverse ">=0.3.0 <0.4" + +chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chardet@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" + integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I= + +chokidar@^1.6.1: + version "1.7.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" + integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= + dependencies: + anymatch "^1.3.0" + async-each "^1.0.0" + glob-parent "^2.0.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^2.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + optionalDependencies: + fsevents "^1.0.0" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +clean-css@^4.1.9: + version "4.2.3" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" + integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== + dependencies: + source-map "~0.6.0" + +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + dependencies: + restore-cursor "^2.0.0" + +cli-width@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" + integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= + +clipboard@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376" + integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg== + dependencies: + good-listener "^1.2.2" + select "^1.1.2" + tiny-emitter "^2.0.0" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@^2.12.1, commander@^2.20.0, commander@~2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.4.7: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +concat-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" + integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.0.2" + typedarray "^0.0.6" + +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +convert-source-map@^1.5.0, convert-source-map@^1.5.1: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + +core-js@^2.4.0: + version "2.6.11" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" + integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +cosmiconfig@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.7.2" + +create-emotion-styled@^9.2.8: + version "9.2.8" + resolved "https://registry.yarnpkg.com/create-emotion-styled/-/create-emotion-styled-9.2.8.tgz#c0050e768ba439609bec108600467adf2de67cc3" + integrity sha512-2LrNM5MREWzI5hZK+LyiBHglwE18WE3AEbBQgpHQ1+zmyLSm/dJsUZBeFAwuIMb+TjNZP0KsMZlV776ufOtFdg== + dependencies: + "@emotion/is-prop-valid" "^0.6.1" + +create-emotion@^9.2.12: + version "9.2.12" + resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz#0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f" + integrity sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA== + dependencies: + "@emotion/hash" "^0.6.2" + "@emotion/memoize" "^0.6.1" + "@emotion/stylis" "^0.7.0" + "@emotion/unitless" "^0.6.2" + csstype "^2.5.2" + stylis "^3.5.0" + stylis-rule-sheet "^0.0.10" + +create-react-context@^0.1.5: + version "0.1.6" + resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.1.6.tgz#0f425931d907741127acc6e31acb4f9015dd9fdc" + integrity sha512-eCnYYEUEc5i32LHwpE/W7NlddOB9oHwsPaWtWzYtflNkkwa3IfindIcoXdVWs12zCbwaMCavKNu84EXogVIWHw== + +csstype@^2.2.0: + version "2.6.10" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b" + integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w== + +csstype@^2.5.2: + version "2.6.9" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098" + integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q== + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + +deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + +define-properties@^1.1.2, define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +delegate@^3.1.2: + version "3.2.0" + resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" + integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +diff-match-patch@^1.0.0, diff-match-patch@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1" + integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg== + +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +emotion@^9.2.5: + version "9.2.12" + resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz#53925aaa005614e65c6e43db8243c843574d1ea9" + integrity sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ== + dependencies: + babel-plugin-emotion "^9.2.11" + create-emotion "^9.2.12" + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es-abstract@^1.17.0-next.1, es-abstract@^1.17.5: + version "1.17.6" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a" + integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.0" + is-regex "^1.1.0" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +es6-object-assign@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" + integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw= + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escodegen@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" + integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +exec-sh@^0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36" + integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw== + dependencies: + merge "^1.2.0" + +expand-brackets@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" + integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= + dependencies: + is-posix-bracket "^0.1.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expand-range@^1.8.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" + integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= + dependencies: + fill-range "^2.1.0" + +express@^4.14.0: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +external-editor@^2.0.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" + integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A== + dependencies: + chardet "^0.4.0" + iconv-lite "^0.4.17" + tmp "^0.0.33" + +extglob@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" + integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= + dependencies: + is-extglob "^1.0.0" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" + integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fast-xml-parser@^3.17.1: + version "3.17.1" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.17.1.tgz#579fa64346cc891ce240d378268c6216e74aab10" + integrity sha512-jZ0EVn1iBuZtx/sbQnfvhSaaUltz+0+yfR+6QRyzrlt5yMiU+8ZfGj9i3/hoXJxm+aFri7dycBWbncox7frCAQ== + +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + dependencies: + escape-string-regexp "^1.0.5" + +file-match@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/file-match/-/file-match-1.0.2.tgz#c9cad265d2c8adf3a81475b0df475859069faef7" + integrity sha1-ycrSZdLIrfOoFHWw30dYWQafrvc= + dependencies: + utils-extend "^1.0.6" + +file-system@^2.1.0, file-system@^2.1.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/file-system/-/file-system-2.2.2.tgz#7d65833e3a2347dcd956a813c677153ed3edd987" + integrity sha1-fWWDPjojR9zZVqgTxncVPtPt2Yc= + dependencies: + file-match "^1.0.1" + utils-extend "^1.0.4" + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +filename-regex@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" + integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= + +fill-range@^2.1.0: + version "2.2.4" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" + integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== + dependencies: + is-number "^2.1.0" + isobject "^2.0.0" + randomatic "^3.0.0" + repeat-element "^1.1.2" + repeat-string "^1.5.2" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-root@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" + integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== + +fliplog@^0.3.13: + version "0.3.13" + resolved "https://registry.yarnpkg.com/fliplog/-/fliplog-0.3.13.tgz#dd0d786e821822aae272e0ddc84012596a96154c" + integrity sha512-R504CdX+mdhMYpmyrdiQ9PW6ncAyZnxyeA85fS1/P/Y9qmbMiQsqt6QzsYhq5kbqMb84PibVOcS1oz98GJl6EQ== + dependencies: + chain-able "^1.0.1" + +for-in@^1.0.1, for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + +for-own@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" + integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= + dependencies: + for-in "^1.0.1" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +forwarded@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +fs-extra@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@^1.0.0: + version "1.2.11" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" + integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw== + dependencies: + bindings "^1.5.0" + nan "^2.12.1" + +"fstream@>= 0.1.30 < 1": + version "0.1.31" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz#7337f058fbbbbefa8c9f561a28cab0849202c988" + integrity sha1-czfwWPu7vvqMn1YaKMqwhJICyYg= + dependencies: + graceful-fs "~3.0.2" + inherits "~2.0.0" + mkdirp "0.5" + rimraf "2" + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +fuse-box@^3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-3.7.1.tgz#d32879ceee4c8bcec9bbd8fcfe5b29e7142371cd" + integrity sha512-aM7t9bUcRpNNQu9M+YjXXzx9JSJQVPWeY+8iTyv7OhvJNWHrqqEWPzbn9OfcyFa2AfPwAUyC/uzWexBbjtTvsA== + dependencies: + acorn "^5.7.3" + acorn-jsx "^4.0.1" + ansi "^0.3.1" + app-root-path "^2.0.1" + base64-img "^1.0.3" + base64-js "^1.2.0" + bowser "^2.0.0-beta.3" + chokidar "^1.6.1" + clean-css "^4.1.9" + escodegen "^1.8.1" + express "^4.14.0" + fliplog "^0.3.13" + fs-extra "^7.0.0" + fuse-concat-with-sourcemaps "^1.0.5" + getopts "^2.1.1" + glob "^7.1.1" + ieee754 "^1.1.8" + inquirer "^3.0.6" + lego-api "^1.0.7" + mustache "^2.3.0" + postcss "^6.0.1" + pretty-time "^0.2.0" + prettysize "0.0.3" + realm-utils "^1.0.9" + regexpu-core "^4.1.3" + request "^2.79.0" + shorthash "0.0.2" + source-map "^0.7.1" + sourcemap-blender "1.0.5" + stream-browserify "^2.0.1" + tslib "^1.8.0" + watch "^1.0.1" + ws "^1.1.1" + +fuse-concat-with-sourcemaps@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/fuse-concat-with-sourcemaps/-/fuse-concat-with-sourcemaps-1.0.5.tgz#9c6a521f675cff5cdbb48db1ca9c181ae49a7b97" + integrity sha512-tKsRJIxn9tU3IH8JHMwFhGbObqkDKXhNKOvcM+QyflAlYb2EgOvIQe8D6WB/cocA3puldHatsp9SN5SKryasrw== + dependencies: + source-map "^0.6.1" + +fuse.js@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.0.4.tgz#9f5af976f836247ad5d2c338090d6ce13cf9a4d2" + integrity sha512-XAeQaT+DV8dxqohN911+Qzkb4iMzTzae04mdb9/XSQbMjbsFasQxe0+UwM+3UWP+8vO7svz1Rj0KuQw6xJ45Ww== + +get-caller-file@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" + integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + +getopts@^2.1.1: + version "2.2.5" + resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b" + integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA== + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +glob-base@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" + integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= + dependencies: + glob-parent "^2.0.0" + is-glob "^2.0.0" + +glob-parent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" + integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= + dependencies: + is-glob "^2.0.0" + +glob@^7.1.1, glob@^7.1.3: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +good-listener@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" + integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA= + dependencies: + delegate "^3.1.2" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + +graceful-fs@~3.0.2: + version "3.0.12" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz#0034947ce9ed695ec8ab0b854bc919e82b1ffaef" + integrity sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg== + dependencies: + natives "^1.1.3" + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" + integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + dependencies: + ajv "^6.5.5" + har-schema "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-symbols@^1.0.0, has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +html@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz#a544fa9ea5492bfb3a2cca8210a10be7b5af1f61" + integrity sha1-pUT6nqVJK/s6LMqCEKEL57WvH2E= + dependencies: + concat-stream "^1.4.7" + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +iconv-lite@0.4.24, iconv-lite@^0.4.17: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ie-array-find-polyfill@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ie-array-find-polyfill/-/ie-array-find-polyfill-1.1.0.tgz#5078e533f026831da22bd7476513d9460d65a142" + integrity sha1-UHjlM/Amgx2iK9dHZRPZRg1loUI= + +ieee754@^1.1.8: + version "1.1.13" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" + integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== + +import-fresh@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +inquirer@^3.0.6: + version "3.3.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" + integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ== + dependencies: + ansi-escapes "^3.0.0" + chalk "^2.0.0" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^2.0.4" + figures "^2.0.0" + lodash "^4.3.0" + mute-stream "0.0.7" + run-async "^2.2.0" + rx-lite "^4.0.8" + rx-lite-aggregates "^4.0.8" + string-width "^2.1.0" + strip-ansi "^4.0.0" + through "^2.3.6" + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-callable@^1.1.4, is-callable@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" + integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-date-object@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-dotfile@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" + integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= + +is-equal-shallow@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" + integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= + dependencies: + is-primitive "^2.0.0" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" + integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-glob@^2.0.0, is-glob@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" + integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= + dependencies: + is-extglob "^1.0.0" + +is-number@^2.0.2, is-number@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= + dependencies: + kind-of "^3.0.2" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + dependencies: + kind-of "^3.0.2" + +is-number@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" + integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== + +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-posix-bracket@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= + +is-primitive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" + integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= + +is-promise@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" + integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + +is-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" + integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw== + dependencies: + has-symbols "^1.0.1" + +is-symbol@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + dependencies: + has-symbols "^1.0.1" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + +json-parse-better-errors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +jsondiffpatch@^0.3.11: + version "0.3.11" + resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.3.11.tgz#43f9443a0d081b5f79d413fe20f302079e493201" + integrity sha512-Xi3Iygdt/BGhml6bdUFhgDki1TgOsp3hG3iiH3KtzP+CahtGcdPfKRLlnZbSw+3b1umZkhmKrqXUgUcKenyhtA== + dependencies: + chalk "^2.3.0" + diff-match-patch "^1.0.0" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +lego-api@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/lego-api/-/lego-api-1.0.8.tgz#5e26be726c5e11d540f89e7c6b1abf8c5834bd01" + integrity sha512-pZD0mf32+RL1bUMJztRcXiNBB1gE8gd/h4MDLWdZp7vaMZyjPiYK/zNpNNGoJvmoa7D/wf9dll+5z7pDObdLFg== + dependencies: + chain-able "^3.0.0" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +lodash._getnative@^3.0.0: + version "3.9.1" + resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" + integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= + +lodash.curry@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170" + integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA= + +lodash.debounce@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5" + integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU= + dependencies: + lodash._getnative "^3.0.0" + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + +lodash.flow@^3.3.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a" + integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o= + +lodash.uniqby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" + integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= + +lodash@^4.17.13, lodash@^4.3.0: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + +loose-envify@^1.1.0, loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +make-error@^1.1.1: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + dependencies: + object-visit "^1.0.0" + +"match-stream@>= 0.0.2 < 1": + version "0.0.2" + resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf" + integrity sha1-mesFAJOzTf+t5CG5rAtBCpz6F88= + dependencies: + buffers "~0.1.1" + readable-stream "~1.0.0" + +math-random@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" + integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +"memoize-one@>=3.1.1 <6": + version "5.1.1" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0" + integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA== + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" + integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^2.1.5: + version "2.3.11" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" + integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= + dependencies: + arr-diff "^2.0.0" + array-unique "^0.2.1" + braces "^1.8.2" + expand-brackets "^0.1.4" + extglob "^0.3.1" + filename-regex "^2.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.1" + kind-of "^3.0.2" + normalize-path "^2.0.1" + object.omit "^2.0.0" + parse-glob "^3.0.4" + regex-cache "^0.4.2" + +micromatch@^3.1.10: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +mime-db@1.43.0: + version "1.43.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" + integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== + +mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: + version "2.1.26" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" + integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== + dependencies: + mime-db "1.43.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= + +minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp@0.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mkdirp@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + dependencies: + minimist "0.0.8" + +mock-require@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946" + integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg== + dependencies: + get-caller-file "^1.0.2" + normalize-path "^2.1.1" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +mustache@^2.3.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" + integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== + +mute-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + +nan@^2.12.1: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +nanoseconds@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/nanoseconds/-/nanoseconds-0.1.0.tgz#69ec39fcd00e77ab3a72de0a43342824cd79233a" + integrity sha1-aew5/NAOd6s6ct4KQzQoJM15Izo= + +natives@^1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb" + integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA== + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" + integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= + dependencies: + abbrev "1" + +normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + dependencies: + remove-trailing-separator "^1.0.1" + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-inspect@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" + integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== + +object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + dependencies: + isobject "^3.0.0" + +object.assign@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" + integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== + dependencies: + define-properties "^1.1.2" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" + +object.omit@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" + integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= + dependencies: + for-own "^0.1.4" + is-extendable "^0.1.1" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + dependencies: + isobject "^3.0.1" + +object.values@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + dependencies: + mimic-fn "^1.0.0" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +options@>=0.0.5: + version "0.0.6" + resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" + integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= + +orderedmap@^1.0.0, orderedmap@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz#c618e77611b3b21d0fe3edc92586265e0059c789" + integrity sha512-3Ux8um0zXbVacKUkcytc0u3HgC0b0bBLT+I60r2J/En72cI0nZffqrA7Xtf2Hqs27j1g82llR5Mhbd0Z1XW4AQ== + +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +"over@>= 0.0.5 < 1": + version "0.0.5" + resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708" + integrity sha1-8phS5w/X4l82DgE6jsRMgq7bVwg= + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-glob@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" + integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= + dependencies: + glob-base "^0.3.0" + is-dotfile "^1.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.0" + +parse-json@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" + integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + lines-and-columns "^1.1.6" + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + +postcss@^6.0.1: + version "6.0.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" + integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== + dependencies: + chalk "^2.4.1" + source-map "^0.6.1" + supports-color "^5.4.0" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +preserve@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" + integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= + +prettier@^1.18.2: + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== + +pretty-time@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-0.2.0.tgz#7a3bdec4049c620cd7c42b7f342b74d56e73d74e" + integrity sha1-ejvexAScYgzXxCt/NCt01W5z104= + dependencies: + is-number "^2.0.2" + nanoseconds "^0.1.0" + +prettysize@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/prettysize/-/prettysize-0.0.3.tgz#14afff6a645e591a4ddf1c72919c23b4146181a1" + integrity sha1-FK//amReWRpN3xxykZwjtBRhgaE= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +prop-types@^15.5.8, prop-types@^15.6.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.8.1" + +prosemirror-changeset@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.1.2.tgz#91dee900eb4618b21ed0c38c8d41dc7539303864" + integrity sha512-/eeAM2XeOFmtiPsFVfVkM3Iq4xfNlFuDB6MlC8Hqch/ibq3YlH3YxDi8fqg78fT8fkrfvN6zRu9EE0HkSmH8PA== + dependencies: + prosemirror-transform "^1.0.0" + +prosemirror-commands@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.4.tgz#991563e67623acab4f8c510fad1570f8b4693780" + integrity sha512-kj4Qi+8h3EpJtZuuEDwZ9h2/QNGWDsIX/CzjmClxi9GhxWyBUMVUvIFk0mgdqHyX20lLeGmOpc0TLA5aPzgpWg== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-dev-tools@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.1.tgz#0c4304b05b437608b3666b72fdb4b21e24fa29fc" + integrity sha512-d9MG4PF82meg5Ru64ox6WCKPkQNsiZEaG5xR5a+l88RJ0VRButMZq5JzPh28vUlTBq+TXnpdTJRlPQIgTOtpqg== + dependencies: + emotion "^9.2.5" + es6-object-assign "^1.1.0" + html "^1.0.0" + ie-array-find-polyfill "^1.1.0" + jsondiffpatch "^0.3.11" + prop-types "^15.6.2" + prosemirror-model ">=1.0.0" + prosemirror-state ">=1.0.0" + react-dock "^0.2.4" + react-emotion "^9.2.5" + react-json-tree "^0.11.0" + unstated "^2.1.1" + +prosemirror-dropcursor@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz#28738c4ed7102e814d7a8a26d70018523fc7cd6d" + integrity sha512-4c94OUGyobGnwcQI70OXyMhE/9T4aTgjU+CHxkd5c7D+jH/J0mKM/lk+jneFVKt7+E4/M0D9HzRPifu8U28Thw== + dependencies: + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + prosemirror-view "^1.1.0" + +prosemirror-gapcursor@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz#0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246" + integrity sha512-SjbUZq5pgsBDuV3hu8GqgIpZR5eZvGLM+gPQTqjVVYSMUCfKW3EGXTEYaLHEl1bGduwqNC95O3bZflgtAb4L6w== + dependencies: + prosemirror-keymap "^1.0.0" + prosemirror-model "^1.0.0" + prosemirror-state "^1.0.0" + prosemirror-view "^1.0.0" + +prosemirror-history@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz#4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489" + integrity sha512-zGDotijea+vnfnyyUGyiy1wfOQhf0B/b6zYcCouBV8yo6JmrE9X23M5q7Nf/nATywEZbgRLG70R4DmfSTC+gfg== + dependencies: + prosemirror-state "^1.2.2" + prosemirror-transform "^1.0.0" + rope-sequence "^1.3.0" + +prosemirror-inputrules@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz#487e46c763e1212a4577397aba7706139084f012" + integrity sha512-Ja5Z3BWestlHYGvtSGqyvxMeB8QEuBjlHM8YnKtLGUXMDp965qdDV4goV8lJb17kIWHk7e7JNj6Catuoa3302g== + dependencies: + prosemirror-state "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.3.tgz#be22d6108df2521608e9216a87b1a810f0ed361e" + integrity sha512-PRA4NzkUMzV/NFf5pyQ6tmlIHiW/qjQ1kGWUlV2rF/dvlOxtpGpTEjIMhWgLuMf+HiDEFnUEP7uhYXu+t+491g== + dependencies: + prosemirror-state "^1.0.0" + w3c-keyname "^2.2.0" + +prosemirror-keymap@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz#8b481bf8389a5ac40d38dbd67ec3da2c7eac6a6d" + integrity sha512-Al8cVUOnDFL4gcI5IDlG6xbZ0aOD/i3B17VT+1JbHWDguCgt/lBHVTHUBcKvvbSg6+q/W4Nj1Fu6bwZSca3xjg== + dependencies: + prosemirror-state "^1.0.0" + w3c-keyname "^2.2.0" + +prosemirror-model@>=1.0.0, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz#8c08cf556f593c5f015548d2c1a6825661df087f" + integrity sha512-Qblh8pm1c7Ll64sYLauwwzjimo/tFg1zW3Q3IWhKRhvfOEgRKqa6dC5pRrAa+XHOIjBFEYrqbi52J5bqA2dV8Q== + dependencies: + orderedmap "^1.1.0" + +prosemirror-model@^1.11.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.0.tgz#dc36cdb3ad6442b9f6325c7d89170c624f9dc520" + integrity sha512-GqoAz/mIYjdv8gVYJ8mWFKpHoTxn/lXq4tXJ6bTVxs+rem2LzMYXrNVXfucGtfsgqsJlRIgng/ByG9j7Q8XDrg== + dependencies: + orderedmap "^1.1.0" + +prosemirror-schema-list@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz#471f9caf2d2bed93641d2e490434c0d2d4330df1" + integrity sha512-pNTuZflacFOBlxrTcWSdWhjoB8BaucwfJVp/gJNxztOwaN3wQiC65axclXyplf6TKgXD/EkWfS/QAov3/Znadw== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-state@>=1.0.0, prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.2.tgz#1b910b0dc01c1f00926bb9ba1589f7b7ac0d658b" + integrity sha512-t/JqE3aR0SV9QrzFVkAXsQwsgrQBNs/BDbcFH20RssW0xauqNNdjTXxy/J/kM7F+0zYi6+BRmz7cMMQQFU3mwQ== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-state@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.3.tgz#b2862866b14dec2b3ae1ab18229f2bd337651a2c" + integrity sha512-PLXh2VJsIgvlgSTH6I2Yg6vk1CzPDp21DFreVpQtDMY2S6WaMmrQgDTLRcsrD8X38v8Yc873H7+ogdGzyIPn+w== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-tables@*: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.0.0.tgz#ec3d0b11e638c6a92dd14ae816d0a2efd1719b70" + integrity sha512-zFw5Us4G5Vdq0yIj8GiqZOGA6ud5UKpMKElux9O0HrfmhkuGa1jf1PCpz2R5pmIQJv+tIM24H1mox/ODBAX37Q== + dependencies: + prosemirror-keymap "^1.1.2" + prosemirror-model "^1.8.1" + prosemirror-state "^1.3.1" + prosemirror-transform "^1.2.1" + prosemirror-view "^1.13.3" + +prosemirror-tables@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz#ad66300cc49500455cf1243bb129c9e7d883321e" + integrity sha512-LmCz4jrlqQZRsYRDzCRYf/pQ5CUcSOyqZlAj5kv67ZWBH1SVLP2U9WJEvQfimWgeRlIz0y0PQVqO1arRm1+woA== + dependencies: + prosemirror-keymap "^1.1.2" + prosemirror-model "^1.8.1" + prosemirror-state "^1.3.1" + prosemirror-transform "^1.2.1" + prosemirror-view "^1.13.3" + +prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1: + version "1.2.3" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.3.tgz#239d17591af24d39ef3f1999daa09e1f1c76b06a" + integrity sha512-PUfayeskQfuUBXktvL6207ZWRwHBFNPNPiek4fR+LgCPnBofuEb2+L0FfbNtrAwffHVs6M3DaFvJB1W2VQdV0A== + dependencies: + prosemirror-model "^1.0.0" + +prosemirror-transform@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.8.tgz#4b86544fa43637fe381549fb7b019f4fb71fe65c" + integrity sha512-hKqceqv9ZmMQXNQkhFjr0KFGPvkhygaWND+uIM0GxRpALrKfxP97SsgHTBs3OpJhDmh5N+mB4D/CksB291Eavg== + dependencies: + prosemirror-model "^1.0.0" + +prosemirror-utils@^0.9.6: + version "0.9.6" + resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz#3d97bd85897e3b535555867dc95a51399116a973" + integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA== + +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3: + version "1.14.2" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.14.2.tgz#23eb89f6101e9671b5e0c19d82ee0ad9de5608de" + integrity sha512-9yPVH6OLyaEraHjWHbSk2DB0R/1TsEE6AA1LI+vmCypXXA+zTzNrktUFzBhSJHehXDoEJcQfnl1Wdp5GPSh2+g== + dependencies: + prosemirror-model "^1.1.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + +prosemirror-view@^1.15.6: + version "1.15.6" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.6.tgz#446bf7662235300c5f47362af2db805c6df3ad24" + integrity sha512-9FBFB+rK5pvvzHsHOacy0T/Jf+OxZSzY8tSlQiur3SZwAVaNVQm+fl23V/6gU2dHBnreGxjYx9jK+F3XPsPCGw== + dependencies: + prosemirror-model "^1.1.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + +proxy-addr@~2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" + integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== + dependencies: + forwarded "~0.1.2" + ipaddr.js "1.9.1" + +psl@^1.1.28: + version "1.7.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" + integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== + +"pullstream@>= 0.4.1 < 1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz#d6fb3bf5aed697e831150eb1002c25a3f8ae1314" + integrity sha1-1vs79a7Wl+gxFQ6xACwlo/iuExQ= + dependencies: + over ">= 0.0.5 < 1" + readable-stream "~1.0.31" + setimmediate ">= 1.0.2 < 2" + slice-stream ">= 1.0.0 < 2" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +pure-color@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e" + integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4= + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +randomatic@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" + integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== + dependencies: + is-number "^4.0.0" + kind-of "^6.0.0" + math-random "^1.0.1" + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +react-base16-styling@^0.5.1: + version "0.5.3" + resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.5.3.tgz#3858f24e9c4dd8cbd3f702f3f74d581ca2917269" + integrity sha1-OFjyTpxN2MvT9wLz901YHKKRcmk= + dependencies: + base16 "^1.0.0" + lodash.curry "^4.0.1" + lodash.flow "^3.3.0" + pure-color "^1.2.0" + +react-dock@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/react-dock/-/react-dock-0.2.4.tgz#e727dc7550b3b73116635dcb9c0e04d0b7afe17c" + integrity sha1-5yfcdVCztzEWY13LnA4E0Lev4Xw= + dependencies: + lodash.debounce "^3.1.1" + prop-types "^15.5.8" + +react-dom@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" + integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.19.1" + +react-emotion@^9.2.5: + version "9.2.12" + resolved "https://registry.yarnpkg.com/react-emotion/-/react-emotion-9.2.12.tgz#74d1494f89e22d0b9442e92a33ca052461955c83" + integrity sha512-qt7XbxnEKX5sZ73rERJ92JMbEOoyOwG3BuCRFRkXrsJhEe+rFBRTljRw7yOLHZUCQC4GBObZhjXIduQ8S0ZpYw== + dependencies: + babel-plugin-emotion "^9.2.11" + create-emotion-styled "^9.2.8" + +react-is@^16.8.1: + version "16.13.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" + integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA== + +react-json-tree@^0.11.0: + version "0.11.2" + resolved "https://registry.yarnpkg.com/react-json-tree/-/react-json-tree-0.11.2.tgz#af70199fcbc265699ade2aec492465c51608f95e" + integrity sha512-aYhUPj1y5jR3ZQ+G3N7aL8FbTyO03iLwnVvvEikLcNFqNTyabdljo9xDftZndUBFyyyL0aK3qGO9+8EilILHUw== + dependencies: + babel-runtime "^6.6.1" + prop-types "^15.5.8" + react-base16-styling "^0.5.1" + +react-window@^1.8.5: + version "1.8.5" + resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz#a56b39307e79979721021f5d06a67742ecca52d1" + integrity sha512-HeTwlNa37AFa8MDZFZOKcNEkuF2YflA0hpGPiTT9vR7OawEt+GZbfM6wqkBahD3D3pUjIabQYzsnY/BSJbgq6Q== + dependencies: + "@babel/runtime" "^7.0.0" + memoize-one ">=3.1.1 <6" + +react@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" + integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + +readable-stream@^2.0.2, readable-stream@^2.2.2: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.2: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@~1.0.0, readable-stream@~1.0.31: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readdirp@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +realm-utils@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/realm-utils/-/realm-utils-1.0.9.tgz#5c76a5ff39e4816af2c133a161f4221d6628eff4" + integrity sha1-XHal/znkgWrywTOhYfQiHWYo7/Q= + dependencies: + app-root-path "^1.3.0" + mkdirp "^0.5.1" + +regenerate-unicode-properties@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" + integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA== + dependencies: + regenerate "^1.4.0" + +regenerate@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" + integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + +regenerator-runtime@^0.13.2: + version "0.13.3" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" + integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== + +regenerator-runtime@^0.13.4: + version "0.13.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" + integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== + +regex-cache@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" + integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== + dependencies: + is-equal-shallow "^0.1.3" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +regexpu-core@^4.1.3: + version "4.6.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" + integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== + dependencies: + regenerate "^1.4.0" + regenerate-unicode-properties "^8.1.0" + regjsgen "^0.5.0" + regjsparser "^0.6.0" + unicode-match-property-ecmascript "^1.0.4" + unicode-match-property-value-ecmascript "^1.1.0" + +regjsgen@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" + integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== + +regjsparser@^0.6.0: + version "0.6.3" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460" + integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA== + dependencies: + jsesc "~0.5.0" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +repeat-element@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + +repeat-string@^1.5.2, repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + +request@^2.79.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + +resolve@^1.12.0, resolve@^1.3.2: + version "1.15.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" + integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== + dependencies: + path-parse "^1.0.6" + +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +rimraf@2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rope-sequence@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b" + integrity sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg== + +run-async@^2.2.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8" + integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg== + dependencies: + is-promise "^2.1.0" + +rx-lite-aggregates@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" + integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74= + dependencies: + rx-lite "*" + +rx-lite@*, rx-lite@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" + integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ= + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@^5.0.1, safe-buffer@^5.1.2: + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + +safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" + integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +select@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" + integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= + +semver@^5.3.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +sentence-splitter@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.0.tgz#fb2cd2f61f40006643ba83d9acf4609233c1c68c" + integrity sha512-lKX2tZ1rsA9Tu0gW8vRmMDmIEJoZ1d7cKpzcbFZdUrSpCR6gy/7OPPh7jjT/6Oc6Z79ToUmC2l8tyTEGanVmiA== + dependencies: + "@textlint/ast-node-types" "^4.2.5" + concat-stream "^2.0.0" + object.values "^1.1.0" + structured-source "^3.0.2" + +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +"setimmediate@>= 1.0.1 < 2", "setimmediate@>= 1.0.2 < 2": + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +shorthash@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/shorthash/-/shorthash-0.0.2.tgz#59b268eecbde59038b30da202bcfbddeb2c4a4eb" + integrity sha1-WbJo7sveWQOLMNogK8+93rLEpOs= + +signal-exit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + +"slice-stream@>= 1.0.0 < 2": + version "1.0.0" + resolved "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz#5b33bd66f013b1a7f86460b03d463dec39ad3ea0" + integrity sha1-WzO9ZvATsaf4ZGCwPUY97DmtPqA= + dependencies: + readable-stream "~1.0.31" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-support@^0.5.17: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@~0.5.12: + version "0.5.16" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" + integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + +source-map@^0.5.6, source-map@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@^0.7.1, source-map@^0.7.2, source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +sourcemap-blender@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sourcemap-blender/-/sourcemap-blender-1.0.5.tgz#d361f3d12381c4e477178113878fdf984a91bdbc" + integrity sha512-GPhjCmDtJ8YY6zt1L6kP6WtBg6WrdWt5hw2Wmgt9rwC3yiwLo9vEuabh/YYSZ5KmFV20hVkGdkTwpXtT2E65TA== + dependencies: + source-map "^0.7.3" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stream-browserify@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" + integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== + dependencies: + inherits "~2.0.1" + readable-stream "^2.0.2" + +string-width@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string.prototype.trimend@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" + integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +string.prototype.trimstart@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" + integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +structured-source@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz#dd802425e0f53dc4a6e7aca3752901a1ccda7af5" + integrity sha1-3YAkJeD1PcSm56yjdSkBoczaevU= + dependencies: + boundary "^1.0.1" + +stylis-rule-sheet@^0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" + integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw== + +stylis@^3.5.0: + version "3.5.4" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe" + integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q== + +supports-color@^5.3.0, supports-color@^5.4.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +terser@^4.6.2: + version "4.6.4" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz#40a0b37afbe5b57e494536815efa68326840fc00" + integrity sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + +thenby@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.3.3.tgz#016c3427772a284bbfef982d978f7574fd15ee9d" + integrity sha512-vCzp0TxrQ+2bfRJoWNhMwk6RNfboOUN2S+nbEfhJfj7RwJHD6PlgtXH/hXiSmv6UJs35IQDtVqiI45J+cAgLqg== + +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +tiny-emitter@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" + integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== + +tlite@^0.1.9: + version "0.1.9" + resolved "https://registry.yarnpkg.com/tlite/-/tlite-0.1.9.tgz#e886e4a305b7522242e2453b7ca4fb84f2d9de0f" + integrity sha512-5QOBAvDxZZwW1i+2YXMgF6/PuV/KhA0LyE9PyVi8Ywr3bfIPziZcQD+RpdJaQurCU8zIGtBo/XuPCEHdvyeFuQ== + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +touch@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz#ca0b2a3ae3211246a61b16ba9e6cbf1596287164" + integrity sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A== + dependencies: + nopt "~1.0.10" + +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +"traverse@>=0.3.0 <0.4": + version "0.3.9" + resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" + integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= + +ts-node@^8.10.2: + version "8.10.2" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" + integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA== + dependencies: + arg "^4.1.0" + diff "^4.0.1" + make-error "^1.1.1" + source-map-support "^0.5.17" + yn "3.1.1" + +tslib@^1.8.0, tslib@^1.8.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" + integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== + +tslint-config-prettier@^1.18.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" + integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg== + +tslint-react@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-5.0.0.tgz#d0ae644e8163bdd3e134012e9353094904e8dd44" + integrity sha512-/IbcSmoBPlFic8kQaRfQ4knTY4mivwo5LVzvozvX6Dyu2ynEnrh1dIcR2ujjyp/IodXqY/H5GbxFxSMo/Kf2Hg== + dependencies: + tsutils "^3.17.1" + +tslint@^5.20.0: + version "5.20.1" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d" + integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg== + dependencies: + "@babel/code-frame" "^7.0.0" + builtin-modules "^1.1.1" + chalk "^2.3.0" + commander "^2.12.1" + diff "^4.0.1" + glob "^7.1.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + mkdirp "^0.5.1" + resolve "^1.3.2" + semver "^5.3.0" + tslib "^1.8.0" + tsutils "^2.29.0" + +tsutils@^2.29.0: + version "2.29.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" + integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== + dependencies: + tslib "^1.8.1" + +tsutils@^3.17.1: + version "3.17.1" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" + integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== + dependencies: + tslib "^1.8.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +typescript-tslint-plugin@^0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c" + integrity sha512-tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA== + dependencies: + minimatch "^3.0.4" + mock-require "^3.0.3" + vscode-languageserver "^5.2.1" + +typescript@3.8.3: + version "3.8.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" + integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== + +uglify-js@^3.7.4: + version "3.8.0" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz#f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805" + integrity sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ== + dependencies: + commander "~2.20.3" + source-map "~0.6.1" + +ultron@1.0.x: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" + integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po= + +unicode-canonical-property-names-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" + integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== + +unicode-match-property-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" + integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== + dependencies: + unicode-canonical-property-names-ecmascript "^1.0.4" + unicode-property-aliases-ecmascript "^1.0.4" + +unicode-match-property-value-ecmascript@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277" + integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g== + +unicode-property-aliases-ecmascript@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" + integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +unstated@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/unstated/-/unstated-2.1.1.tgz#36b124dfb2e7a12d39d0bb9c46dfb6e51276e3a2" + integrity sha512-fORlTWMZxq7NuMJDxyIrrYIZKN7wEWYQ9SiaJfIRcSpsowr6Ph/JIfK2tgtXLW614JfPG/t5q9eEIhXRCf55xg== + dependencies: + create-react-context "^0.1.5" + +unzip@^0.1.11: + version "0.1.11" + resolved "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz#89749c63b058d7d90d619f86b98aa1535d3b97f0" + integrity sha1-iXScY7BY19kNYZ+GuYqhU107l/A= + dependencies: + binary ">= 0.3.0 < 1" + fstream ">= 0.1.30 < 1" + match-stream ">= 0.0.2 < 1" + pullstream ">= 0.4.1 < 1" + readable-stream "~1.0.31" + setimmediate ">= 1.0.1 < 2" + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +utils-extend@^1.0.4, utils-extend@^1.0.6, utils-extend@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/utils-extend/-/utils-extend-1.0.8.tgz#ccfd7b64540f8e90ee21eec57769d0651cab8a5f" + integrity sha1-zP17ZFQPjpDuIe7Fd2nQZRyril8= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +uuid@^3.3.2: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +vscode-jsonrpc@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" + integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg== + +vscode-languageserver-protocol@3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f" + integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g== + dependencies: + vscode-jsonrpc "^4.0.0" + vscode-languageserver-types "3.14.0" + +vscode-languageserver-types@3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" + integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== + +vscode-languageserver@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb" + integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A== + dependencies: + vscode-languageserver-protocol "3.14.1" + vscode-uri "^1.0.6" + +vscode-uri@^1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" + integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== + +w3c-keyname@^2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.2.tgz#7ea63170454bb19f1a3c6b628fc3dc8889276e91" + integrity sha512-8Vs/aVwcy0IJACaPm4tyzh1fzehZE70bGSjEl3dDms5UXtWnaBElrSHC8lDDeak0Gk5jxKOFstL64/65o7Ge2A== + +watch@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz#340a717bde765726fa0aa07d721e0147a551df0c" + integrity sha1-NApxe952Vyb6CqB9ch4BR6VR3ww= + dependencies: + exec-sh "^0.2.0" + minimist "^1.2.0" + +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@^1.1.1: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51" + integrity sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w== + dependencies: + options ">=0.0.5" + ultron "1.0.x" + +yaml@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" + integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw== + dependencies: + "@babel/runtime" "^7.6.3" + +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + +zenscroll@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/zenscroll/-/zenscroll-4.0.2.tgz#e8d5774d1c0738a47bcfa8729f3712e2deddeb25" + integrity sha1-6NV3TRwHOKR7z6hynzcS4t7d6yU= diff --git a/pkgs/applications/editors/rstudio/yarndeps.nix b/pkgs/applications/editors/rstudio/yarndeps.nix new file mode 100644 index 000000000000..be4480a67c66 --- /dev/null +++ b/pkgs/applications/editors/rstudio/yarndeps.nix @@ -0,0 +1,4373 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; + sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; + }; + } + { + name = "_babel_highlight___highlight_7.8.3.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; + sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; + }; + } + { + name = "_babel_runtime___runtime_7.9.6.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; + sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + }; + } + { + name = "_babel_runtime___runtime_7.8.4.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz"; + sha1 = "d79f5a2040f7caa24d53e563aad49cbc05581308"; + }; + } + { + name = "_babel_types___types_7.8.6.tgz"; + path = fetchurl { + name = "_babel_types___types_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz"; + sha1 = "629ecc33c2557fcde7126e58053127afdb3e6d01"; + }; + } + { + name = "_emotion_babel_utils___babel_utils_0.6.10.tgz"; + path = fetchurl { + name = "_emotion_babel_utils___babel_utils_0.6.10.tgz"; + url = "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz"; + sha1 = "83dbf3dfa933fae9fc566e54fbb45f14674c6ccc"; + }; + } + { + name = "_emotion_hash___hash_0.6.6.tgz"; + path = fetchurl { + name = "_emotion_hash___hash_0.6.6.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz"; + sha1 = "62266c5f0eac6941fece302abad69f2ee7e25e44"; + }; + } + { + name = "_emotion_is_prop_valid___is_prop_valid_0.6.8.tgz"; + path = fetchurl { + name = "_emotion_is_prop_valid___is_prop_valid_0.6.8.tgz"; + url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz"; + sha1 = "68ad02831da41213a2089d2cab4e8ac8b30cbd85"; + }; + } + { + name = "_emotion_memoize___memoize_0.6.6.tgz"; + path = fetchurl { + name = "_emotion_memoize___memoize_0.6.6.tgz"; + url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz"; + sha1 = "004b98298d04c7ca3b4f50ca2035d4f60d2eed1b"; + }; + } + { + name = "_emotion_serialize___serialize_0.9.1.tgz"; + path = fetchurl { + name = "_emotion_serialize___serialize_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz"; + sha1 = "a494982a6920730dba6303eb018220a2b629c145"; + }; + } + { + name = "_emotion_stylis___stylis_0.7.1.tgz"; + path = fetchurl { + name = "_emotion_stylis___stylis_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz"; + sha1 = "50f63225e712d99e2b2b39c19c70fff023793ca5"; + }; + } + { + name = "_emotion_unitless___unitless_0.6.7.tgz"; + path = fetchurl { + name = "_emotion_unitless___unitless_0.6.7.tgz"; + url = "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz"; + sha1 = "53e9f1892f725b194d5e6a1684a7b394df592397"; + }; + } + { + name = "_emotion_utils___utils_0.8.2.tgz"; + path = fetchurl { + name = "_emotion_utils___utils_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz"; + sha1 = "576ff7fb1230185b619a75d258cbc98f0867a8dc"; + }; + } + { + name = "_textlint_ast_node_types___ast_node_types_4.3.4.tgz"; + path = fetchurl { + name = "_textlint_ast_node_types___ast_node_types_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.3.4.tgz"; + sha1 = "f6596c45c32c85dc06915c3077bb7686033efd32"; + }; + } + { + name = "_types_ace___ace_0.0.43.tgz"; + path = fetchurl { + name = "_types_ace___ace_0.0.43.tgz"; + url = "https://registry.yarnpkg.com/@types/ace/-/ace-0.0.43.tgz"; + sha1 = "9f0916174b6060dabbccd36ba4868ea769a1c633"; + }; + } + { + name = "_types_clipboard___clipboard_2.0.1.tgz"; + path = fetchurl { + name = "_types_clipboard___clipboard_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.1.tgz"; + sha1 = "75a74086c293d75b12bc93ff13bc7797fef05a40"; + }; + } + { + name = "_types_diff_match_patch___diff_match_patch_1.0.32.tgz"; + path = fetchurl { + name = "_types_diff_match_patch___diff_match_patch_1.0.32.tgz"; + url = "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz"; + sha1 = "d9c3b8c914aa8229485351db4865328337a3d09f"; + }; + } + { + name = "_types_js_yaml___js_yaml_3.12.3.tgz"; + path = fetchurl { + name = "_types_js_yaml___js_yaml_3.12.3.tgz"; + url = "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.3.tgz"; + sha1 = "abf383c5b639d0aa8b8c4a420d6a85f703357d6c"; + }; + } + { + name = "_types_lodash.debounce___lodash.debounce_4.0.6.tgz"; + path = fetchurl { + name = "_types_lodash.debounce___lodash.debounce_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/lodash.debounce/-/lodash.debounce-4.0.6.tgz"; + sha1 = "c5a2326cd3efc46566c47e4c0aa248dc0ee57d60"; + }; + } + { + name = "_types_lodash.uniqby___lodash.uniqby_4.7.6.tgz"; + path = fetchurl { + name = "_types_lodash.uniqby___lodash.uniqby_4.7.6.tgz"; + url = "https://registry.yarnpkg.com/@types/lodash.uniqby/-/lodash.uniqby-4.7.6.tgz"; + sha1 = "672827a701403f07904fe37f0721ae92abfa80e8"; + }; + } + { + name = "_types_lodash___lodash_4.14.154.tgz"; + path = fetchurl { + name = "_types_lodash___lodash_4.14.154.tgz"; + url = "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.154.tgz"; + sha1 = "069e3c703fdb264e67be9e03b20a640bc0198ecc"; + }; + } + { + name = "_types_node___node_14.0.4.tgz"; + path = fetchurl { + name = "_types_node___node_14.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.0.4.tgz"; + sha1 = "43a63fc5edce226bed106b31b875165256271107"; + }; + } + { + name = "_types_orderedmap___orderedmap_1.0.0.tgz"; + path = fetchurl { + name = "_types_orderedmap___orderedmap_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/orderedmap/-/orderedmap-1.0.0.tgz"; + sha1 = "807455a192bba52cbbb4517044bc82bdbfa8c596"; + }; + } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } + { + name = "_types_prop_types___prop_types_15.7.3.tgz"; + path = fetchurl { + name = "_types_prop_types___prop_types_15.7.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz"; + sha1 = "2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"; + }; + } + { + name = "_types_prosemirror_commands___prosemirror_commands_1.0.3.tgz"; + path = fetchurl { + name = "_types_prosemirror_commands___prosemirror_commands_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.3.tgz"; + sha1 = "e9fa5653cffd1c75c260594cf3ec5244c9004dbf"; + }; + } + { + name = "_types_prosemirror_dev_tools___prosemirror_dev_tools_2.1.0.tgz"; + path = fetchurl { + name = "_types_prosemirror_dev_tools___prosemirror_dev_tools_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.0.tgz"; + sha1 = "91e2ef4f36129f5155f924296e306de187e86bdb"; + }; + } + { + name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.0.tgz"; + path = fetchurl { + name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.0.tgz"; + sha1 = "2df872bc6431a9f06bc1a4a0eac7c2dc527e7f12"; + }; + } + { + name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.1.tgz"; + sha1 = "56a6274ef39f62c339adcc64305294b800211a5e"; + }; + } + { + name = "_types_prosemirror_history___prosemirror_history_1.0.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_history___prosemirror_history_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.1.tgz"; + sha1 = "b8d7595f73788b63fc9f2b57a763ba8375abfe87"; + }; + } + { + name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.3.tgz"; + path = fetchurl { + name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.3.tgz"; + sha1 = "3f8f07921f692b6c7e4781fa426aee3e76b9018c"; + }; + } + { + name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.3.tgz"; + path = fetchurl { + name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.3.tgz"; + sha1 = "09cc469a69222a4c8a3d415d02eeb459bb74269c"; + }; + } + { + name = "_types_prosemirror_model___prosemirror_model_1.7.2.tgz"; + path = fetchurl { + name = "_types_prosemirror_model___prosemirror_model_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.2.tgz"; + sha1 = "9c7aff2fd62f0f56eb76e2e0eb27bf6996e6c28a"; + }; + } + { + name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz"; + sha1 = "7f53e3c0326b1359755f3971b8c448d98b722f21"; + }; + } + { + name = "_types_prosemirror_state___prosemirror_state_1.2.3.tgz"; + path = fetchurl { + name = "_types_prosemirror_state___prosemirror_state_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.3.tgz"; + sha1 = "7f5f871acf7b8c22e1862ff0068f9bf7e9682c0e"; + }; + } + { + name = "_types_prosemirror_state___prosemirror_state_1.2.5.tgz"; + path = fetchurl { + name = "_types_prosemirror_state___prosemirror_state_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.5.tgz"; + sha1 = "a91304e9aab6e71f868e23b3a1ae514a75033f8f"; + }; + } + { + name = "_types_prosemirror_tables___prosemirror_tables_0.9.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_tables___prosemirror_tables_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-tables/-/prosemirror-tables-0.9.1.tgz"; + sha1 = "d2203330f0fa1161c04152bf02c39e152082d408"; + }; + } + { + name = "_types_prosemirror_transform___prosemirror_transform_1.1.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_transform___prosemirror_transform_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.1.tgz"; + sha1 = "5a0de16e8e0123b4c3d9559235e19f39cee85e5c"; + }; + } + { + name = "_types_prosemirror_view___prosemirror_view_1.11.2.tgz"; + path = fetchurl { + name = "_types_prosemirror_view___prosemirror_view_1.11.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.11.2.tgz"; + sha1 = "58af5dcb7de20b7de874de99147552d5627209a1"; + }; + } + { + name = "_types_react_dom___react_dom_16.9.6.tgz"; + path = fetchurl { + name = "_types_react_dom___react_dom_16.9.6.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.6.tgz"; + sha1 = "9e7f83d90566521cc2083be2277c6712dcaf754c"; + }; + } + { + name = "_types_react_window___react_window_1.8.2.tgz"; + path = fetchurl { + name = "_types_react_window___react_window_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.2.tgz"; + sha1 = "a5a6b2762ce73ffaab7911ee1397cf645f2459fe"; + }; + } + { + name = "_types_react___react_16.9.32.tgz"; + path = fetchurl { + name = "_types_react___react_16.9.32.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz"; + sha1 = "f6368625b224604148d1ddf5920e4fefbd98d383"; + }; + } + { + name = "_types_unzip___unzip_0.1.1.tgz"; + path = fetchurl { + name = "_types_unzip___unzip_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/unzip/-/unzip-0.1.1.tgz"; + sha1 = "96e80dc5e2917a769c8be01aa49c4fe660e7bab3"; + }; + } + { + name = "_types_zenscroll___zenscroll_4.0.0.tgz"; + path = fetchurl { + name = "_types_zenscroll___zenscroll_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.0.tgz"; + sha1 = "9acc7df6c87cc9e064f5a6230df499835dee1972"; + }; + } + { + name = "abbrev___abbrev_1.1.1.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + }; + } + { + name = "acorn_jsx___acorn_jsx_4.1.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz"; + sha1 = "e8e41e48ea2fe0c896740610ab6a4ffd8add225e"; + }; + } + { + name = "acorn___acorn_5.7.3.tgz"; + path = fetchurl { + name = "acorn___acorn_5.7.3.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; + sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + }; + } + { + name = "ajax_request___ajax_request_1.2.3.tgz"; + path = fetchurl { + name = "ajax_request___ajax_request_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/ajax-request/-/ajax-request-1.2.3.tgz"; + sha1 = "99fcbec1d6d2792f85fa949535332bd14f5f3790"; + }; + } + { + name = "ajv___ajv_6.12.0.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz"; + sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7"; + }; + } + { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi___ansi_0.3.1.tgz"; + path = fetchurl { + name = "ansi___ansi_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz"; + sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; + }; + } + { + name = "anymatch___anymatch_1.3.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz"; + sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a"; + }; + } + { + name = "app_root_path___app_root_path_1.4.0.tgz"; + path = fetchurl { + name = "app_root_path___app_root_path_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/app-root-path/-/app-root-path-1.4.0.tgz"; + sha1 = "6335d865c9640d0fad99004e5a79232238e92dfa"; + }; + } + { + name = "app_root_path___app_root_path_2.2.1.tgz"; + path = fetchurl { + name = "app_root_path___app_root_path_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz"; + sha1 = "d0df4a682ee408273583d43f6f79e9892624bc9a"; + }; + } + { + name = "arg___arg_4.1.3.tgz"; + path = fetchurl { + name = "arg___arg_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz"; + sha1 = "269fc7ad5b8e42cb63c896d5666017261c144089"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "arr_diff___arr_diff_2.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + }; + } + { + name = "arr_diff___arr_diff_4.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + } + { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + path = fetchurl { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + }; + } + { + name = "arr_union___arr_union_3.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_unique___array_unique_0.2.1.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz"; + sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + }; + } + { + name = "array_unique___array_unique_0.3.2.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + } + { + name = "asn1___asn1_0.2.4.tgz"; + path = fetchurl { + name = "asn1___asn1_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + path = fetchurl { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + } + { + name = "async_each___async_each_1.0.3.tgz"; + path = fetchurl { + name = "async_each___async_each_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; + sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "atob___atob_2.1.2.tgz"; + path = fetchurl { + name = "atob___atob_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; + sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + }; + } + { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + path = fetchurl { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + { + name = "aws4___aws4_1.9.1.tgz"; + path = fetchurl { + name = "aws4___aws4_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; + sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; + }; + } + { + name = "babel_plugin_emotion___babel_plugin_emotion_9.2.11.tgz"; + path = fetchurl { + name = "babel_plugin_emotion___babel_plugin_emotion_9.2.11.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz"; + sha1 = "319c005a9ee1d15bb447f59fe504c35fd5807728"; + }; + } + { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + path = fetchurl { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; + }; + } + { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + path = fetchurl { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; + }; + } + { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "base16___base16_1.0.0.tgz"; + path = fetchurl { + name = "base16___base16_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz"; + sha1 = "e297f60d7ec1014a7a971a39ebc8a98c0b681e70"; + }; + } + { + name = "base64_img___base64_img_1.0.4.tgz"; + path = fetchurl { + name = "base64_img___base64_img_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/base64-img/-/base64-img-1.0.4.tgz"; + sha1 = "3e22d55d6c74a24553d840d2b1bc12a7db078d35"; + }; + } + { + name = "base64_js___base64_js_1.3.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; + sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; + }; + } + { + name = "base___base_0.11.2.tgz"; + path = fetchurl { + name = "base___base_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; + sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + }; + } + { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + path = fetchurl { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + { + name = "biblatex_csl_converter___biblatex_csl_converter_1.9.1.tgz"; + path = fetchurl { + name = "biblatex_csl_converter___biblatex_csl_converter_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-1.9.1.tgz"; + sha1 = "50aacfef172997f1c98d72837ffdd3b19c62f8c4"; + }; + } + { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; + }; + } + { + name = "binary___binary_0.3.0.tgz"; + path = fetchurl { + name = "binary___binary_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + }; + } + { + name = "boundary___boundary_1.0.1.tgz"; + path = fetchurl { + name = "boundary___boundary_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz"; + sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; + }; + } + { + name = "bowser___bowser_2.9.0.tgz"; + path = fetchurl { + name = "bowser___bowser_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz"; + sha1 = "3bed854233b419b9a7422d9ee3e85504373821c9"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_1.8.5.tgz"; + path = fetchurl { + name = "braces___braces_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + }; + } + { + name = "braces___braces_2.3.2.tgz"; + path = fetchurl { + name = "braces___braces_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; + sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "buffers___buffers_0.1.1.tgz"; + path = fetchurl { + name = "buffers___buffers_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz"; + sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; + }; + } + { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + path = fetchurl { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + name = "cache_base___cache_base_1.0.1.tgz"; + path = fetchurl { + name = "cache_base___cache_base_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; + sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "chain_able___chain_able_1.0.1.tgz"; + path = fetchurl { + name = "chain_able___chain_able_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/chain-able/-/chain-able-1.0.1.tgz"; + sha1 = "b48ac9bdc18f2192ec730abc66609f90aab5605f"; + }; + } + { + name = "chain_able___chain_able_3.0.0.tgz"; + path = fetchurl { + name = "chain_able___chain_able_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chain-able/-/chain-able-3.0.0.tgz"; + sha1 = "dcffe8b04f3da210941a23843bc1332bb288ca9f"; + }; + } + { + name = "chainsaw___chainsaw_0.1.0.tgz"; + path = fetchurl { + name = "chainsaw___chainsaw_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chardet___chardet_0.4.2.tgz"; + path = fetchurl { + name = "chardet___chardet_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; + }; + } + { + name = "chokidar___chokidar_1.7.0.tgz"; + path = fetchurl { + name = "chokidar___chokidar_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz"; + sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; + }; + } + { + name = "class_utils___class_utils_0.3.6.tgz"; + path = fetchurl { + name = "class_utils___class_utils_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; + sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + }; + } + { + name = "clean_css___clean_css_4.2.3.tgz"; + path = fetchurl { + name = "clean_css___clean_css_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; + sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; + }; + } + { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + } + { + name = "cli_width___cli_width_2.2.0.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + } + { + name = "clipboard___clipboard_2.0.6.tgz"; + path = fetchurl { + name = "clipboard___clipboard_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz"; + sha1 = "52921296eec0fdf77ead1749421b21c968647376"; + }; + } + { + name = "collection_visit___collection_visit_1.0.0.tgz"; + path = fetchurl { + name = "collection_visit___collection_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "concat_stream___concat_stream_2.0.0.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz"; + sha1 = "414cf5af790a48c60ab9be4527d56d5e41133cb1"; + }; + } + { + name = "content_disposition___content_disposition_0.5.3.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + }; + } + { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } + { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + path = fetchurl { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + } + { + name = "core_js___core_js_2.6.11.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.11.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; + sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + }; + } + { + name = "create_emotion_styled___create_emotion_styled_9.2.8.tgz"; + path = fetchurl { + name = "create_emotion_styled___create_emotion_styled_9.2.8.tgz"; + url = "https://registry.yarnpkg.com/create-emotion-styled/-/create-emotion-styled-9.2.8.tgz"; + sha1 = "c0050e768ba439609bec108600467adf2de67cc3"; + }; + } + { + name = "create_emotion___create_emotion_9.2.12.tgz"; + path = fetchurl { + name = "create_emotion___create_emotion_9.2.12.tgz"; + url = "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz"; + sha1 = "0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f"; + }; + } + { + name = "create_react_context___create_react_context_0.1.6.tgz"; + path = fetchurl { + name = "create_react_context___create_react_context_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.1.6.tgz"; + sha1 = "0f425931d907741127acc6e31acb4f9015dd9fdc"; + }; + } + { + name = "csstype___csstype_2.6.10.tgz"; + path = fetchurl { + name = "csstype___csstype_2.6.10.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz"; + sha1 = "e63af50e66d7c266edb6b32909cfd0aabe03928b"; + }; + } + { + name = "csstype___csstype_2.6.9.tgz"; + path = fetchurl { + name = "csstype___csstype_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz"; + sha1 = "05141d0cd557a56b8891394c1911c40c8a98d098"; + }; + } + { + name = "dashdash___dashdash_1.14.1.tgz"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "define_property___define_property_0.2.5.tgz"; + path = fetchurl { + name = "define_property___define_property_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + } + { + name = "define_property___define_property_1.0.0.tgz"; + path = fetchurl { + name = "define_property___define_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + } + { + name = "define_property___define_property_2.0.2.tgz"; + path = fetchurl { + name = "define_property___define_property_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; + sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "delegate___delegate_3.2.0.tgz"; + path = fetchurl { + name = "delegate___delegate_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz"; + sha1 = "b66b71c3158522e8ab5744f720d8ca0c2af59166"; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "diff_match_patch___diff_match_patch_1.0.4.tgz"; + path = fetchurl { + name = "diff_match_patch___diff_match_patch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz"; + sha1 = "6ac4b55237463761c4daf0dc603eb869124744b1"; + }; + } + { + name = "diff___diff_4.0.2.tgz"; + path = fetchurl { + name = "diff___diff_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; + sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; + }; + } + { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + path = fetchurl { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + { + name = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "emotion___emotion_9.2.12.tgz"; + path = fetchurl { + name = "emotion___emotion_9.2.12.tgz"; + url = "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz"; + sha1 = "53925aaa005614e65c6e43db8243c843574d1ea9"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es_abstract___es_abstract_1.17.6.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.17.6.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; + sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + }; + } + { + name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; + path = fetchurl { + name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz"; + sha1 = "c2c3582656247c39ea107cb1e6652b6f9f24523c"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escodegen___escodegen_1.14.1.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; + sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "exec_sh___exec_sh_0.2.2.tgz"; + path = fetchurl { + name = "exec_sh___exec_sh_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz"; + sha1 = "2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"; + }; + } + { + name = "expand_brackets___expand_brackets_0.1.5.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + }; + } + { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + } + { + name = "expand_range___expand_range_1.8.2.tgz"; + path = fetchurl { + name = "expand_range___expand_range_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + }; + } + { + name = "express___express_4.17.1.tgz"; + path = fetchurl { + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + }; + } + { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + } + { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "external_editor___external_editor_2.2.0.tgz"; + path = fetchurl { + name = "external_editor___external_editor_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz"; + sha1 = "045511cfd8d133f3846673d1047c154e214ad3d5"; + }; + } + { + name = "extglob___extglob_0.3.2.tgz"; + path = fetchurl { + name = "extglob___extglob_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + }; + } + { + name = "extglob___extglob_2.0.4.tgz"; + path = fetchurl { + name = "extglob___extglob_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; + sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + }; + } + { + name = "extsprintf___extsprintf_1.3.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + { + name = "extsprintf___extsprintf_1.4.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; + sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "fast_xml_parser___fast_xml_parser_3.17.1.tgz"; + path = fetchurl { + name = "fast_xml_parser___fast_xml_parser_3.17.1.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.17.1.tgz"; + sha1 = "579fa64346cc891ce240d378268c6216e74aab10"; + }; + } + { + name = "figures___figures_2.0.0.tgz"; + path = fetchurl { + name = "figures___figures_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + } + { + name = "file_match___file_match_1.0.2.tgz"; + path = fetchurl { + name = "file_match___file_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/file-match/-/file-match-1.0.2.tgz"; + sha1 = "c9cad265d2c8adf3a81475b0df475859069faef7"; + }; + } + { + name = "file_system___file_system_2.2.2.tgz"; + path = fetchurl { + name = "file_system___file_system_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/file-system/-/file-system-2.2.2.tgz"; + sha1 = "7d65833e3a2347dcd956a813c677153ed3edd987"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "filename_regex___filename_regex_2.0.1.tgz"; + path = fetchurl { + name = "filename_regex___filename_regex_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + }; + } + { + name = "fill_range___fill_range_2.2.4.tgz"; + path = fetchurl { + name = "fill_range___fill_range_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz"; + sha1 = "eb1e773abb056dcd8df2bfdf6af59b8b3a936565"; + }; + } + { + name = "fill_range___fill_range_4.0.0.tgz"; + path = fetchurl { + name = "fill_range___fill_range_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + }; + } + { + name = "find_root___find_root_1.1.0.tgz"; + path = fetchurl { + name = "find_root___find_root_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; + sha1 = "abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"; + }; + } + { + name = "fliplog___fliplog_0.3.13.tgz"; + path = fetchurl { + name = "fliplog___fliplog_0.3.13.tgz"; + url = "https://registry.yarnpkg.com/fliplog/-/fliplog-0.3.13.tgz"; + sha1 = "dd0d786e821822aae272e0ddc84012596a96154c"; + }; + } + { + name = "for_in___for_in_1.0.2.tgz"; + path = fetchurl { + name = "for_in___for_in_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + } + { + name = "for_own___for_own_0.1.5.tgz"; + path = fetchurl { + name = "for_own___for_own_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + }; + } + { + name = "forever_agent___forever_agent_0.6.1.tgz"; + path = fetchurl { + name = "forever_agent___forever_agent_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + { + name = "form_data___form_data_2.3.3.tgz"; + path = fetchurl { + name = "form_data___form_data_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + { + name = "forwarded___forwarded_0.1.2.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + } + { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + path = fetchurl { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + } + { + name = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "fs_extra___fs_extra_7.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; + sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_1.2.11.tgz"; + path = fetchurl { + name = "fsevents___fsevents_1.2.11.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz"; + sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3"; + }; + } + { + name = "fstream___fstream_0.1.31.tgz"; + path = fetchurl { + name = "fstream___fstream_0.1.31.tgz"; + url = "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "fuse_box___fuse_box_3.7.1.tgz"; + path = fetchurl { + name = "fuse_box___fuse_box_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/fuse-box/-/fuse-box-3.7.1.tgz"; + sha1 = "d32879ceee4c8bcec9bbd8fcfe5b29e7142371cd"; + }; + } + { + name = "fuse_concat_with_sourcemaps___fuse_concat_with_sourcemaps_1.0.5.tgz"; + path = fetchurl { + name = "fuse_concat_with_sourcemaps___fuse_concat_with_sourcemaps_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/fuse-concat-with-sourcemaps/-/fuse-concat-with-sourcemaps-1.0.5.tgz"; + sha1 = "9c6a521f675cff5cdbb48db1ca9c181ae49a7b97"; + }; + } + { + name = "fuse.js___fuse.js_6.0.4.tgz"; + path = fetchurl { + name = "fuse.js___fuse.js_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.0.4.tgz"; + sha1 = "9f5af976f836247ad5d2c338090d6ce13cf9a4d2"; + }; + } + { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; + }; + } + { + name = "get_value___get_value_2.0.6.tgz"; + path = fetchurl { + name = "get_value___get_value_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + } + { + name = "getopts___getopts_2.2.5.tgz"; + path = fetchurl { + name = "getopts___getopts_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz"; + sha1 = "67a0fe471cacb9c687d817cab6450b96dde8313b"; + }; + } + { + name = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "glob_base___glob_base_0.3.0.tgz"; + path = fetchurl { + name = "glob_base___glob_base_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + }; + } + { + name = "glob_parent___glob_parent_2.0.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "good_listener___good_listener_1.2.2.tgz"; + path = fetchurl { + name = "good_listener___good_listener_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz"; + sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; + }; + } + { + name = "graceful_fs___graceful_fs_3.0.12.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_3.0.12.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz"; + sha1 = "0034947ce9ed695ec8ab0b854bc919e82b1ffaef"; + }; + } + { + name = "har_schema___har_schema_2.0.0.tgz"; + path = fetchurl { + name = "har_schema___har_schema_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + { + name = "har_validator___har_validator_5.1.3.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; + sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_symbols___has_symbols_1.0.1.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; + }; + } + { + name = "has_value___has_value_0.3.1.tgz"; + path = fetchurl { + name = "has_value___has_value_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + } + { + name = "has_value___has_value_1.0.0.tgz"; + path = fetchurl { + name = "has_value___has_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + } + { + name = "has_values___has_values_0.1.4.tgz"; + path = fetchurl { + name = "has_values___has_values_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + } + { + name = "has_values___has_values_1.0.0.tgz"; + path = fetchurl { + name = "has_values___has_values_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "html___html_1.0.0.tgz"; + path = fetchurl { + name = "html___html_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz"; + sha1 = "a544fa9ea5492bfb3a2cca8210a10be7b5af1f61"; + }; + } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } + { + name = "http_errors___http_errors_1.7.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; + sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + }; + } + { + name = "http_signature___http_signature_1.2.0.tgz"; + path = fetchurl { + name = "http_signature___http_signature_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "ie_array_find_polyfill___ie_array_find_polyfill_1.1.0.tgz"; + path = fetchurl { + name = "ie_array_find_polyfill___ie_array_find_polyfill_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/ie-array-find-polyfill/-/ie-array-find-polyfill-1.1.0.tgz"; + sha1 = "5078e533f026831da22bd7476513d9460d65a142"; + }; + } + { + name = "ieee754___ieee754_1.1.13.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; + sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + }; + } + { + name = "import_fresh___import_fresh_3.2.1.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "inquirer___inquirer_3.3.0.tgz"; + path = fetchurl { + name = "inquirer___inquirer_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz"; + sha1 = "9dd2f2ad765dcab1ff0443b491442a20ba227dc9"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_callable___is_callable_1.2.0.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz"; + sha1 = "83336560b54a38e35e3a2df7afd0454d691468bb"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + }; + } + { + name = "is_date_object___is_date_object_1.0.2.tgz"; + path = fetchurl { + name = "is_date_object___is_date_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; + sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + }; + } + { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + }; + } + { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + }; + } + { + name = "is_dotfile___is_dotfile_1.0.3.tgz"; + path = fetchurl { + name = "is_dotfile___is_dotfile_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; + }; + } + { + name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; + path = fetchurl { + name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + }; + } + { + name = "is_extendable___is_extendable_0.1.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + } + { + name = "is_extendable___is_extendable_1.0.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; + sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + }; + } + { + name = "is_extglob___is_extglob_1.0.0.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_glob___is_glob_2.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + }; + } + { + name = "is_number___is_number_2.1.0.tgz"; + path = fetchurl { + name = "is_number___is_number_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + }; + } + { + name = "is_number___is_number_3.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + } + { + name = "is_number___is_number_4.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz"; + sha1 = "0026e37f5454d73e356dfe6564699867c6a7f0ff"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; + path = fetchurl { + name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + } + { + name = "is_primitive___is_primitive_2.0.0.tgz"; + path = fetchurl { + name = "is_primitive___is_primitive_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; + }; + } + { + name = "is_promise___is_promise_2.1.0.tgz"; + path = fetchurl { + name = "is_promise___is_promise_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + } + { + name = "is_regex___is_regex_1.1.0.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; + sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; + }; + } + { + name = "is_symbol___is_symbol_1.0.3.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_windows___is_windows_1.0.2.tgz"; + path = fetchurl { + name = "is_windows___is_windows_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; + sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isobject___isobject_2.1.0.tgz"; + path = fetchurl { + name = "isobject___isobject_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.13.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; + sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + }; + } + { + name = "jsbn___jsbn_0.1.1.tgz"; + path = fetchurl { + name = "jsbn___jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + { + name = "jsesc___jsesc_0.5.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema___json_schema_0.2.3.tgz"; + path = fetchurl { + name = "json_schema___json_schema_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "jsondiffpatch___jsondiffpatch_0.3.11.tgz"; + path = fetchurl { + name = "jsondiffpatch___jsondiffpatch_0.3.11.tgz"; + url = "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.3.11.tgz"; + sha1 = "43f9443a0d081b5f79d413fe20f302079e493201"; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsprim___jsprim_1.4.1.tgz"; + path = fetchurl { + name = "jsprim___jsprim_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + { + name = "kind_of___kind_of_3.2.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + } + { + name = "kind_of___kind_of_4.0.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + } + { + name = "kind_of___kind_of_5.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; + sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "lego_api___lego_api_1.0.8.tgz"; + path = fetchurl { + name = "lego_api___lego_api_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/lego-api/-/lego-api-1.0.8.tgz"; + sha1 = "5e26be726c5e11d540f89e7c6b1abf8c5834bd01"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { + name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; + path = fetchurl { + name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; + sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; + }; + } + { + name = "lodash.curry___lodash.curry_4.1.1.tgz"; + path = fetchurl { + name = "lodash.curry___lodash.curry_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz"; + sha1 = "248e36072ede906501d75966200a86dab8b23170"; + }; + } + { + name = "lodash.debounce___lodash.debounce_3.1.1.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; + sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5"; + }; + } + { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + } + { + name = "lodash.flow___lodash.flow_3.5.0.tgz"; + path = fetchurl { + name = "lodash.flow___lodash.flow_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz"; + sha1 = "87bf40292b8cf83e4e8ce1a3ae4209e20071675a"; + }; + } + { + name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz"; + path = fetchurl { + name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; + sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; + }; + } + { + name = "lodash___lodash_4.17.15.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.15.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; + sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "make_error___make_error_1.3.6.tgz"; + path = fetchurl { + name = "make_error___make_error_1.3.6.tgz"; + url = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz"; + sha1 = "2eb2e37ea9b67c4891f684a1394799af484cf7a2"; + }; + } + { + name = "map_cache___map_cache_0.2.2.tgz"; + path = fetchurl { + name = "map_cache___map_cache_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + } + { + name = "map_visit___map_visit_1.0.0.tgz"; + path = fetchurl { + name = "map_visit___map_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + } + { + name = "match_stream___match_stream_0.0.2.tgz"; + path = fetchurl { + name = "match_stream___match_stream_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz"; + sha1 = "99eb050093b34dffade421b9ac0b410a9cfa17cf"; + }; + } + { + name = "math_random___math_random_1.0.4.tgz"; + path = fetchurl { + name = "math_random___math_random_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz"; + sha1 = "5dd6943c938548267016d4e34f057583080c514c"; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "memoize_one___memoize_one_5.1.1.tgz"; + path = fetchurl { + name = "memoize_one___memoize_one_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz"; + sha1 = "047b6e3199b508eaec03504de71229b8eb1d75c0"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge___merge_1.2.1.tgz"; + path = fetchurl { + name = "merge___merge_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz"; + sha1 = "38bebf80c3220a8a487b6fcfb3941bb11720c145"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + name = "micromatch___micromatch_2.3.11.tgz"; + path = fetchurl { + name = "micromatch___micromatch_2.3.11.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + }; + } + { + name = "micromatch___micromatch_3.1.10.tgz"; + path = fetchurl { + name = "micromatch___micromatch_3.1.10.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; + sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + }; + } + { + name = "mime_db___mime_db_1.43.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.43.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; + sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58"; + }; + } + { + name = "mime_types___mime_types_2.1.26.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.26.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; + sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06"; + }; + } + { + name = "mime___mime_1.6.0.tgz"; + path = fetchurl { + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha1 = "820c86a39334640e99516928bd03fca88057d022"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_0.0.8.tgz"; + path = fetchurl { + name = "minimist___minimist_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + } + { + name = "minimist___minimist_1.2.0.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + path = fetchurl { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_0.5.1.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + } + { + name = "mock_require___mock_require_3.0.3.tgz"; + path = fetchurl { + name = "mock_require___mock_require_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz"; + sha1 = "ccd544d9eae81dd576b3f219f69ec867318a1946"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + name = "mustache___mustache_2.3.2.tgz"; + path = fetchurl { + name = "mustache___mustache_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz"; + sha1 = "a6d4d9c3f91d13359ab889a812954f9230a3d0c5"; + }; + } + { + name = "mute_stream___mute_stream_0.0.7.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + } + { + name = "nan___nan_2.14.0.tgz"; + path = fetchurl { + name = "nan___nan_2.14.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; + sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c"; + }; + } + { + name = "nanomatch___nanomatch_1.2.13.tgz"; + path = fetchurl { + name = "nanomatch___nanomatch_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; + sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + }; + } + { + name = "nanoseconds___nanoseconds_0.1.0.tgz"; + path = fetchurl { + name = "nanoseconds___nanoseconds_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/nanoseconds/-/nanoseconds-0.1.0.tgz"; + sha1 = "69ec39fcd00e77ab3a72de0a43342824cd79233a"; + }; + } + { + name = "natives___natives_1.1.6.tgz"; + path = fetchurl { + name = "natives___natives_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz"; + sha1 = "a603b4a498ab77173612b9ea1acdec4d980f00bb"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + }; + } + { + name = "nopt___nopt_1.0.10.tgz"; + path = fetchurl { + name = "nopt___nopt_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + } + { + name = "normalize_path___normalize_path_2.1.1.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + } + { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + path = fetchurl { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_copy___object_copy_0.1.0.tgz"; + path = fetchurl { + name = "object_copy___object_copy_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + } + { + name = "object_inspect___object_inspect_1.8.0.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; + sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object_visit___object_visit_1.0.1.tgz"; + path = fetchurl { + name = "object_visit___object_visit_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + } + { + name = "object.assign___object.assign_4.1.0.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; + sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + }; + } + { + name = "object.omit___object.omit_2.0.1.tgz"; + path = fetchurl { + name = "object.omit___object.omit_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + }; + } + { + name = "object.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + name = "object.pick___object.pick_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + } + { + name = "object.values___object.values_1.1.1.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + }; + } + { + name = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_2.0.1.tgz"; + path = fetchurl { + name = "onetime___onetime_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "options___options_0.0.6.tgz"; + path = fetchurl { + name = "options___options_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + } + { + name = "orderedmap___orderedmap_1.1.1.tgz"; + path = fetchurl { + name = "orderedmap___orderedmap_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz"; + sha1 = "c618e77611b3b21d0fe3edc92586265e0059c789"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "over___over_0.0.5.tgz"; + path = fetchurl { + name = "over___over_0.0.5.tgz"; + url = "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz"; + sha1 = "f29852e70fd7e25f360e013a8ec44c82aedb5708"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "parse_glob___parse_glob_3.0.4.tgz"; + path = fetchurl { + name = "parse_glob___parse_glob_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + }; + } + { + name = "parse_json___parse_json_5.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; + sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + }; + } + { + name = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + }; + } + { + name = "pascalcase___pascalcase_0.1.1.tgz"; + path = fetchurl { + name = "pascalcase___pascalcase_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_parse___path_parse_1.0.6.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; + sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + }; + } + { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + path = fetchurl { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + } + { + name = "postcss___postcss_6.0.23.tgz"; + path = fetchurl { + name = "postcss___postcss_6.0.23.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz"; + sha1 = "61c82cc328ac60e677645f979054eb98bc0e3324"; + }; + } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "preserve___preserve_0.2.0.tgz"; + path = fetchurl { + name = "preserve___preserve_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + }; + } + { + name = "prettier___prettier_1.19.1.tgz"; + path = fetchurl { + name = "prettier___prettier_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; + sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; + }; + } + { + name = "pretty_time___pretty_time_0.2.0.tgz"; + path = fetchurl { + name = "pretty_time___pretty_time_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-time/-/pretty-time-0.2.0.tgz"; + sha1 = "7a3bdec4049c620cd7c42b7f342b74d56e73d74e"; + }; + } + { + name = "prettysize___prettysize_0.0.3.tgz"; + path = fetchurl { + name = "prettysize___prettysize_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/prettysize/-/prettysize-0.0.3.tgz"; + sha1 = "14afff6a645e591a4ddf1c72919c23b4146181a1"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "prop_types___prop_types_15.7.2.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + }; + } + { + name = "prosemirror_changeset___prosemirror_changeset_2.1.2.tgz"; + path = fetchurl { + name = "prosemirror_changeset___prosemirror_changeset_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.1.2.tgz"; + sha1 = "91dee900eb4618b21ed0c38c8d41dc7539303864"; + }; + } + { + name = "prosemirror_commands___prosemirror_commands_1.1.4.tgz"; + path = fetchurl { + name = "prosemirror_commands___prosemirror_commands_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.4.tgz"; + sha1 = "991563e67623acab4f8c510fad1570f8b4693780"; + }; + } + { + name = "prosemirror_dev_tools___prosemirror_dev_tools_2.1.1.tgz"; + path = fetchurl { + name = "prosemirror_dev_tools___prosemirror_dev_tools_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.1.tgz"; + sha1 = "0c4304b05b437608b3666b72fdb4b21e24fa29fc"; + }; + } + { + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.2.tgz"; + path = fetchurl { + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz"; + sha1 = "28738c4ed7102e814d7a8a26d70018523fc7cd6d"; + }; + } + { + name = "prosemirror_gapcursor___prosemirror_gapcursor_1.1.5.tgz"; + path = fetchurl { + name = "prosemirror_gapcursor___prosemirror_gapcursor_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz"; + sha1 = "0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246"; + }; + } + { + name = "prosemirror_history___prosemirror_history_1.1.3.tgz"; + path = fetchurl { + name = "prosemirror_history___prosemirror_history_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz"; + sha1 = "4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489"; + }; + } + { + name = "prosemirror_inputrules___prosemirror_inputrules_1.1.2.tgz"; + path = fetchurl { + name = "prosemirror_inputrules___prosemirror_inputrules_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz"; + sha1 = "487e46c763e1212a4577397aba7706139084f012"; + }; + } + { + name = "prosemirror_keymap___prosemirror_keymap_1.1.3.tgz"; + path = fetchurl { + name = "prosemirror_keymap___prosemirror_keymap_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.3.tgz"; + sha1 = "be22d6108df2521608e9216a87b1a810f0ed361e"; + }; + } + { + name = "prosemirror_keymap___prosemirror_keymap_1.1.4.tgz"; + path = fetchurl { + name = "prosemirror_keymap___prosemirror_keymap_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz"; + sha1 = "8b481bf8389a5ac40d38dbd67ec3da2c7eac6a6d"; + }; + } + { + name = "prosemirror_model___prosemirror_model_1.9.1.tgz"; + path = fetchurl { + name = "prosemirror_model___prosemirror_model_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz"; + sha1 = "8c08cf556f593c5f015548d2c1a6825661df087f"; + }; + } + { + name = "prosemirror_model___prosemirror_model_1.11.0.tgz"; + path = fetchurl { + name = "prosemirror_model___prosemirror_model_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.0.tgz"; + sha1 = "dc36cdb3ad6442b9f6325c7d89170c624f9dc520"; + }; + } + { + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; + path = fetchurl { + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz"; + sha1 = "471f9caf2d2bed93641d2e490434c0d2d4330df1"; + }; + } + { + name = "prosemirror_state___prosemirror_state_1.3.2.tgz"; + path = fetchurl { + name = "prosemirror_state___prosemirror_state_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.2.tgz"; + sha1 = "1b910b0dc01c1f00926bb9ba1589f7b7ac0d658b"; + }; + } + { + name = "prosemirror_state___prosemirror_state_1.3.3.tgz"; + path = fetchurl { + name = "prosemirror_state___prosemirror_state_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.3.tgz"; + sha1 = "b2862866b14dec2b3ae1ab18229f2bd337651a2c"; + }; + } + { + name = "prosemirror_tables___prosemirror_tables_1.0.0.tgz"; + path = fetchurl { + name = "prosemirror_tables___prosemirror_tables_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.0.0.tgz"; + sha1 = "ec3d0b11e638c6a92dd14ae816d0a2efd1719b70"; + }; + } + { + name = "prosemirror_tables___prosemirror_tables_1.1.1.tgz"; + path = fetchurl { + name = "prosemirror_tables___prosemirror_tables_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz"; + sha1 = "ad66300cc49500455cf1243bb129c9e7d883321e"; + }; + } + { + name = "prosemirror_transform___prosemirror_transform_1.2.3.tgz"; + path = fetchurl { + name = "prosemirror_transform___prosemirror_transform_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.3.tgz"; + sha1 = "239d17591af24d39ef3f1999daa09e1f1c76b06a"; + }; + } + { + name = "prosemirror_transform___prosemirror_transform_1.2.8.tgz"; + path = fetchurl { + name = "prosemirror_transform___prosemirror_transform_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.8.tgz"; + sha1 = "4b86544fa43637fe381549fb7b019f4fb71fe65c"; + }; + } + { + name = "prosemirror_utils___prosemirror_utils_0.9.6.tgz"; + path = fetchurl { + name = "prosemirror_utils___prosemirror_utils_0.9.6.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz"; + sha1 = "3d97bd85897e3b535555867dc95a51399116a973"; + }; + } + { + name = "prosemirror_view___prosemirror_view_1.14.2.tgz"; + path = fetchurl { + name = "prosemirror_view___prosemirror_view_1.14.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.14.2.tgz"; + sha1 = "23eb89f6101e9671b5e0c19d82ee0ad9de5608de"; + }; + } + { + name = "prosemirror_view___prosemirror_view_1.15.6.tgz"; + path = fetchurl { + name = "prosemirror_view___prosemirror_view_1.15.6.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.6.tgz"; + sha1 = "446bf7662235300c5f47362af2db805c6df3ad24"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; + }; + } + { + name = "psl___psl_1.7.0.tgz"; + path = fetchurl { + name = "psl___psl_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; + sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"; + }; + } + { + name = "pullstream___pullstream_0.4.1.tgz"; + path = fetchurl { + name = "pullstream___pullstream_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz"; + sha1 = "d6fb3bf5aed697e831150eb1002c25a3f8ae1314"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "pure_color___pure_color_1.3.0.tgz"; + path = fetchurl { + name = "pure_color___pure_color_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz"; + sha1 = "1fe064fb0ac851f0de61320a8bf796836422f33e"; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + }; + } + { + name = "qs___qs_6.5.2.tgz"; + path = fetchurl { + name = "qs___qs_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + { + name = "randomatic___randomatic_3.1.1.tgz"; + path = fetchurl { + name = "randomatic___randomatic_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz"; + sha1 = "b776efc59375984e36c537b2f51a1f0aff0da1ed"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + }; + } + { + name = "react_base16_styling___react_base16_styling_0.5.3.tgz"; + path = fetchurl { + name = "react_base16_styling___react_base16_styling_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.5.3.tgz"; + sha1 = "3858f24e9c4dd8cbd3f702f3f74d581ca2917269"; + }; + } + { + name = "react_dock___react_dock_0.2.4.tgz"; + path = fetchurl { + name = "react_dock___react_dock_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/react-dock/-/react-dock-0.2.4.tgz"; + sha1 = "e727dc7550b3b73116635dcb9c0e04d0b7afe17c"; + }; + } + { + name = "react_dom___react_dom_16.13.1.tgz"; + path = fetchurl { + name = "react_dom___react_dom_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz"; + sha1 = "c1bd37331a0486c078ee54c4740720993b2e0e7f"; + }; + } + { + name = "react_emotion___react_emotion_9.2.12.tgz"; + path = fetchurl { + name = "react_emotion___react_emotion_9.2.12.tgz"; + url = "https://registry.yarnpkg.com/react-emotion/-/react-emotion-9.2.12.tgz"; + sha1 = "74d1494f89e22d0b9442e92a33ca052461955c83"; + }; + } + { + name = "react_is___react_is_16.13.0.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.0.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz"; + sha1 = "0f37c3613c34fe6b37cd7f763a0d6293ab15c527"; + }; + } + { + name = "react_json_tree___react_json_tree_0.11.2.tgz"; + path = fetchurl { + name = "react_json_tree___react_json_tree_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/react-json-tree/-/react-json-tree-0.11.2.tgz"; + sha1 = "af70199fcbc265699ade2aec492465c51608f95e"; + }; + } + { + name = "react_window___react_window_1.8.5.tgz"; + path = fetchurl { + name = "react_window___react_window_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz"; + sha1 = "a56b39307e79979721021f5d06a67742ecca52d1"; + }; + } + { + name = "react___react_16.13.1.tgz"; + path = fetchurl { + name = "react___react_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; + sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readable_stream___readable_stream_1.0.34.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.0.34.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz"; + sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + }; + } + { + name = "readdirp___readdirp_2.2.1.tgz"; + path = fetchurl { + name = "readdirp___readdirp_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; + sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; + }; + } + { + name = "realm_utils___realm_utils_1.0.9.tgz"; + path = fetchurl { + name = "realm_utils___realm_utils_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/realm-utils/-/realm-utils-1.0.9.tgz"; + sha1 = "5c76a5ff39e4816af2c133a161f4221d6628eff4"; + }; + } + { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + path = fetchurl { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; + sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; + }; + } + { + name = "regenerate___regenerate_1.4.0.tgz"; + path = fetchurl { + name = "regenerate___regenerate_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz"; + sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; + sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } + { + name = "regex_cache___regex_cache_0.4.4.tgz"; + path = fetchurl { + name = "regex_cache___regex_cache_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz"; + sha1 = "75bdc58a2a1496cec48a12835bc54c8d562336dd"; + }; + } + { + name = "regex_not___regex_not_1.0.2.tgz"; + path = fetchurl { + name = "regex_not___regex_not_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; + sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + }; + } + { + name = "regexpu_core___regexpu_core_4.6.0.tgz"; + path = fetchurl { + name = "regexpu_core___regexpu_core_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; + sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6"; + }; + } + { + name = "regjsgen___regjsgen_0.5.1.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; + sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; + }; + } + { + name = "regjsparser___regjsparser_0.6.3.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz"; + sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "repeat_element___repeat_element_1.1.3.tgz"; + path = fetchurl { + name = "repeat_element___repeat_element_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; + sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + }; + } + { + name = "repeat_string___repeat_string_1.6.1.tgz"; + path = fetchurl { + name = "repeat_string___repeat_string_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + } + { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve_url___resolve_url_0.2.1.tgz"; + path = fetchurl { + name = "resolve_url___resolve_url_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + } + { + name = "resolve___resolve_1.15.1.tgz"; + path = fetchurl { + name = "resolve___resolve_1.15.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz"; + sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"; + }; + } + { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rope_sequence___rope_sequence_1.3.2.tgz"; + path = fetchurl { + name = "rope_sequence___rope_sequence_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz"; + sha1 = "a19e02d72991ca71feb6b5f8a91154e48e3c098b"; + }; + } + { + name = "run_async___run_async_2.4.0.tgz"; + path = fetchurl { + name = "run_async___run_async_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz"; + sha1 = "e59054a5b86876cfae07f431d18cbaddc594f1e8"; + }; + } + { + name = "rx_lite_aggregates___rx_lite_aggregates_4.0.8.tgz"; + path = fetchurl { + name = "rx_lite_aggregates___rx_lite_aggregates_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; + sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + }; + } + { + name = "rx_lite___rx_lite_4.0.8.tgz"; + path = fetchurl { + name = "rx_lite___rx_lite_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz"; + sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safe_regex___safe_regex_1.1.0.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "scheduler___scheduler_0.19.1.tgz"; + path = fetchurl { + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; + }; + } + { + name = "select___select_1.1.2.tgz"; + path = fetchurl { + name = "select___select_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz"; + sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "send___send_0.17.1.tgz"; + path = fetchurl { + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + }; + } + { + name = "sentence_splitter___sentence_splitter_3.2.0.tgz"; + path = fetchurl { + name = "sentence_splitter___sentence_splitter_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.0.tgz"; + sha1 = "fb2cd2f61f40006643ba83d9acf4609233c1c68c"; + }; + } + { + name = "serve_static___serve_static_1.14.1.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + }; + } + { + name = "set_value___set_value_2.0.1.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + }; + } + { + name = "setimmediate___setimmediate_1.0.5.tgz"; + path = fetchurl { + name = "setimmediate___setimmediate_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + }; + } + { + name = "shorthash___shorthash_0.0.2.tgz"; + path = fetchurl { + name = "shorthash___shorthash_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/shorthash/-/shorthash-0.0.2.tgz"; + sha1 = "59b268eecbde59038b30da202bcfbddeb2c4a4eb"; + }; + } + { + name = "signal_exit___signal_exit_3.0.2.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + } + { + name = "slice_stream___slice_stream_1.0.0.tgz"; + path = fetchurl { + name = "slice_stream___slice_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz"; + sha1 = "5b33bd66f013b1a7f86460b03d463dec39ad3ea0"; + }; + } + { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + path = fetchurl { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + }; + } + { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + path = fetchurl { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + }; + } + { + name = "snapdragon___snapdragon_0.8.2.tgz"; + path = fetchurl { + name = "snapdragon___snapdragon_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; + sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + name = "source_map_support___source_map_support_0.5.16.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.16.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; + sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042"; + }; + } + { + name = "source_map_url___source_map_url_0.4.0.tgz"; + path = fetchurl { + name = "source_map_url___source_map_url_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; + }; + } + { + name = "sourcemap_blender___sourcemap_blender_1.0.5.tgz"; + path = fetchurl { + name = "sourcemap_blender___sourcemap_blender_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sourcemap-blender/-/sourcemap-blender-1.0.5.tgz"; + sha1 = "d361f3d12381c4e477178113878fdf984a91bdbc"; + }; + } + { + name = "split_string___split_string_3.1.0.tgz"; + path = fetchurl { + name = "split_string___split_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; + sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "sshpk___sshpk_1.16.1.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + { + name = "static_extend___static_extend_0.1.2.tgz"; + path = fetchurl { + name = "static_extend___static_extend_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + } + { + name = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + } + { + name = "stream_browserify___stream_browserify_2.0.2.tgz"; + path = fetchurl { + name = "stream_browserify___stream_browserify_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "structured_source___structured_source_3.0.2.tgz"; + path = fetchurl { + name = "structured_source___structured_source_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz"; + sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; + }; + } + { + name = "stylis_rule_sheet___stylis_rule_sheet_0.0.10.tgz"; + path = fetchurl { + name = "stylis_rule_sheet___stylis_rule_sheet_0.0.10.tgz"; + url = "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz"; + sha1 = "44e64a2b076643f4b52e5ff71efc04d8c3c4a430"; + }; + } + { + name = "stylis___stylis_3.5.4.tgz"; + path = fetchurl { + name = "stylis___stylis_3.5.4.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz"; + sha1 = "f665f25f5e299cf3d64654ab949a57c768b73fbe"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "terser___terser_4.6.4.tgz"; + path = fetchurl { + name = "terser___terser_4.6.4.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz"; + sha1 = "40a0b37afbe5b57e494536815efa68326840fc00"; + }; + } + { + name = "thenby___thenby_1.3.3.tgz"; + path = fetchurl { + name = "thenby___thenby_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/thenby/-/thenby-1.3.3.tgz"; + sha1 = "016c3427772a284bbfef982d978f7574fd15ee9d"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; + path = fetchurl { + name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; + sha1 = "1d1a56edfc51c43e863cbb5382a72330e3555423"; + }; + } + { + name = "tlite___tlite_0.1.9.tgz"; + path = fetchurl { + name = "tlite___tlite_0.1.9.tgz"; + url = "https://registry.yarnpkg.com/tlite/-/tlite-0.1.9.tgz"; + sha1 = "e886e4a305b7522242e2453b7ca4fb84f2d9de0f"; + }; + } + { + name = "tmp___tmp_0.0.33.tgz"; + path = fetchurl { + name = "tmp___tmp_0.0.33.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; + sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { + name = "to_object_path___to_object_path_0.3.0.tgz"; + path = fetchurl { + name = "to_object_path___to_object_path_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + } + { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + } + { + name = "to_regex___to_regex_3.0.2.tgz"; + path = fetchurl { + name = "to_regex___to_regex_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; + sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } + { + name = "touch___touch_2.0.2.tgz"; + path = fetchurl { + name = "touch___touch_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz"; + sha1 = "ca0b2a3ae3211246a61b16ba9e6cbf1596287164"; + }; + } + { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "traverse___traverse_0.3.9.tgz"; + path = fetchurl { + name = "traverse___traverse_0.3.9.tgz"; + url = "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz"; + sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + }; + } + { + name = "ts_node___ts_node_8.10.2.tgz"; + path = fetchurl { + name = "ts_node___ts_node_8.10.2.tgz"; + url = "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz"; + sha1 = "eee03764633b1234ddd37f8db9ec10b75ec7fb8d"; + }; + } + { + name = "tslib___tslib_1.11.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; + sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; + }; + } + { + name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; + path = fetchurl { + name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz"; + sha1 = "75f140bde947d35d8f0d238e0ebf809d64592c37"; + }; + } + { + name = "tslint_react___tslint_react_5.0.0.tgz"; + path = fetchurl { + name = "tslint_react___tslint_react_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/tslint-react/-/tslint-react-5.0.0.tgz"; + sha1 = "d0ae644e8163bdd3e134012e9353094904e8dd44"; + }; + } + { + name = "tslint___tslint_5.20.1.tgz"; + path = fetchurl { + name = "tslint___tslint_5.20.1.tgz"; + url = "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz"; + sha1 = "e401e8aeda0152bc44dd07e614034f3f80c67b7d"; + }; + } + { + name = "tsutils___tsutils_2.29.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_2.29.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; + sha1 = "32b488501467acbedd4b85498673a0812aca0b99"; + }; + } + { + name = "tsutils___tsutils_3.17.1.tgz"; + path = fetchurl { + name = "tsutils___tsutils_3.17.1.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; + sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "typescript_tslint_plugin___typescript_tslint_plugin_0.5.5.tgz"; + path = fetchurl { + name = "typescript_tslint_plugin___typescript_tslint_plugin_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz"; + sha1 = "673875c43640251f1ab3d63745d7d49726ff961c"; + }; + } + { + name = "typescript___typescript_3.8.3.tgz"; + path = fetchurl { + name = "typescript___typescript_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; + sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; + }; + } + { + name = "uglify_js___uglify_js_3.8.0.tgz"; + path = fetchurl { + name = "uglify_js___uglify_js_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz"; + sha1 = "f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805"; + }; + } + { + name = "ultron___ultron_1.0.2.tgz"; + path = fetchurl { + name = "ultron___ultron_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz"; + sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + }; + } + { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + }; + } + { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + }; + } + { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + path = fetchurl { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; + sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + }; + } + { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + path = fetchurl { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; + sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + }; + } + { + name = "union_value___union_value_1.0.1.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { + name = "unset_value___unset_value_1.0.0.tgz"; + path = fetchurl { + name = "unset_value___unset_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + } + { + name = "unstated___unstated_2.1.1.tgz"; + path = fetchurl { + name = "unstated___unstated_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/unstated/-/unstated-2.1.1.tgz"; + sha1 = "36b124dfb2e7a12d39d0bb9c46dfb6e51276e3a2"; + }; + } + { + name = "unzip___unzip_0.1.11.tgz"; + path = fetchurl { + name = "unzip___unzip_0.1.11.tgz"; + url = "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz"; + sha1 = "89749c63b058d7d90d619f86b98aa1535d3b97f0"; + }; + } + { + name = "uri_js___uri_js_4.2.2.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; + sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + }; + } + { + name = "urix___urix_0.1.0.tgz"; + path = fetchurl { + name = "urix___urix_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + } + { + name = "use___use_3.1.1.tgz"; + path = fetchurl { + name = "use___use_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; + sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "utils_extend___utils_extend_1.0.8.tgz"; + path = fetchurl { + name = "utils_extend___utils_extend_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/utils-extend/-/utils-extend-1.0.8.tgz"; + sha1 = "ccfd7b64540f8e90ee21eec57769d0651cab8a5f"; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + name = "verror___verror_1.10.0.tgz"; + path = fetchurl { + name = "verror___verror_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + { + name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz"; + path = fetchurl { + name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz"; + sha1 = "a7bf74ef3254d0a0c272fab15c82128e378b3be9"; + }; + } + { + name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz"; + path = fetchurl { + name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz"; + sha1 = "b8aab6afae2849c84a8983d39a1cf742417afe2f"; + }; + } + { + name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz"; + path = fetchurl { + name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz"; + sha1 = "d3b5952246d30e5241592b6dde8280e03942e743"; + }; + } + { + name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz"; + path = fetchurl { + name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz"; + sha1 = "0d2feddd33f92aadf5da32450df498d52f6f14eb"; + }; + } + { + name = "vscode_uri___vscode_uri_1.0.8.tgz"; + path = fetchurl { + name = "vscode_uri___vscode_uri_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz"; + sha1 = "9769aaececae4026fb6e22359cb38946580ded59"; + }; + } + { + name = "w3c_keyname___w3c_keyname_2.2.2.tgz"; + path = fetchurl { + name = "w3c_keyname___w3c_keyname_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.2.tgz"; + sha1 = "7ea63170454bb19f1a3c6b628fc3dc8889276e91"; + }; + } + { + name = "watch___watch_1.0.2.tgz"; + path = fetchurl { + name = "watch___watch_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz"; + sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "ws___ws_1.1.5.tgz"; + path = fetchurl { + name = "ws___ws_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz"; + sha1 = "cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51"; + }; + } + { + name = "yaml___yaml_1.7.2.tgz"; + path = fetchurl { + name = "yaml___yaml_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz"; + sha1 = "f26aabf738590ab61efaca502358e48dc9f348b2"; + }; + } + { + name = "yn___yn_3.1.1.tgz"; + path = fetchurl { + name = "yn___yn_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz"; + sha1 = "1e87401a09d767c1d5eab26a6e4c185182d2eb50"; + }; + } + { + name = "zenscroll___zenscroll_4.0.2.tgz"; + path = fetchurl { + name = "zenscroll___zenscroll_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/zenscroll/-/zenscroll-4.0.2.tgz"; + sha1 = "e8d5774d1c0738a47bcfa8729f3712e2deddeb25"; + }; + } + ]; +} diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 316c48613324..b5ba0c15ff9c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1mpvikps5l2vynw7afrpkp4ah0q6q2q4q8d074b4vfwhaj1v6v75"; - x86_64-darwin = "0r65wfyzc90lhd0i61xkb8kq9339b3ddyqp5dx7wf0aydgi203br"; - aarch64-linux = "0d4kqjhyq8s7ini25m2igf37bzb2dw01jv62nps3yx3cr52vzyn2"; - aarch64-darwin = "0h5g3h8z1wl7pz6ddlchnwqns956pyi1c3fjivsff0f0yhmdlva7"; - armv7l-linux = "0fyxmq3i4kc1x013xs9flcbkmzzy9sqhjhcj5n38w6mswsb97qrv"; + x86_64-linux = "069jdwqs9z2z95mjs9nx58rp1516dyyqn5bc0vgr7xvlbis97lq0"; + x86_64-darwin = "1bd32dkpyfgknxqn76jcwpa47rac9q14glbf5sb1rh9rfav0m1m8"; + aarch64-linux = "1axxnys3pd2qrvj6mqpa5cih44b4dbpgi8mvn616d8d45jgdnc1r"; + aarch64-darwin = "0bdp0k20lfwpsl1a3dz6c97s0b5bp3rhb66jwgbyyc16zrz79r1z"; + armv7l-linux = "077w5hvc4brb56zs0w37nr4a8vlcij5z3yrv3rz16p58nnkj56hs"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.61.0"; + version = "1.61.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 65eb761cabcd..7f8a0aba0ab8 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "11zj9b8zhgfyh3m78ihg1k78m3v1khwa742mmsxji6ryxqkhvnr4"; - x86_64-darwin = "19jk8rry11dvyfprq8i2j9r9aj17kfxqx5hl069mlkz0ca18kxmc"; - aarch64-linux = "01slccwqhh6njd8q278svbfxph5lajx77ns03yrj9iva8w48gixy"; - armv7l-linux = "1g7zq6y99b5sg8g10hq50qr15m99n0cmydm6rl9dkyca2038ihbi"; + x86_64-linux = "0ic7h5aq1lyplk01bydqwrvz40h59sf0n0q4gxj844k4qidy14md"; + x86_64-darwin = "15s3vj7740ksb82gdjqpxw6cyd45ymdpacamkqk800929cv715qs"; + aarch64-linux = "0n3bxggfzlr1cqarq861yfqka3qfgpwvk8j22l7dv4vki06f8jzy"; + armv7l-linux = "0jksfdals8xf3vh5hqrd40pj5qn8byjrakjnrv926qznxjj152bn"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.60.2"; + version = "1.61.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index d06abfea445a..64fdf50a0d15 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libjxl, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif +, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices , Foundation , testVersion, imagemagick @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - liblqr1 libpng libtiff libxml2 libheif djvulibre + liblqr1 libpng libraw libtiff libxml2 libheif djvulibre ] # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, # let's disable it for now to unbreak the imagemagick build. diff --git a/pkgs/applications/graphics/blockbench-electron/default.nix b/pkgs/applications/graphics/blockbench-electron/default.nix index 174733a4fdc1..a9c258ce925d 100644 --- a/pkgs/applications/graphics/blockbench-electron/default.nix +++ b/pkgs/applications/graphics/blockbench-electron/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A boxy 3D model editor powered by Electron"; homepage = "https://blockbench.net/"; license = licenses.gpl3Only; - maintainers = [ maintainers.ronthecookie ]; + maintainers = [ maintainers.ckie ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index a2b4e949499b..9c25b2784b40 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "drawing"; - version = "0.8.0"; + version = "0.8.3"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "maoschanz"; repo = pname; rev = version; - sha256 = "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0"; + sha256 = "sha256-qDLJ+Mw4z66ro9/zoEIzDJpA+jJLYw0WgsP7mA+56XM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 50e1babda2ac..d412c6fded87 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.11.4"; + version = "3.12.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3ZsPiUXX34Ev/a3OyMO94dyXZyMy4AVt5Cp/ELZLIGw="; + sha256 = "sha256-Pe/8AwOE5ktXNhxDfHm0ga4Uie9EyHroVugbsQ2OOD8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index fc1fb67bd301..36dad897668c 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "457"; + version = "458"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-ZXBVJc+9dFzi75JYl3U3ic0MKolWMsdR3UkLe5EOzsw="; + sha256 = "sha256-oVNgXelFMVT5V41SRlnN+pnYzOWbdDKQQcvRWFZqEro="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/krita/beta.nix b/pkgs/applications/graphics/krita/beta.nix new file mode 100644 index 000000000000..167a96050fd6 --- /dev/null +++ b/pkgs/applications/graphics/krita/beta.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "5.0.0-beta1"; + kde-channel = "unstable"; + sha256 = "1p5l2vpsgcp4wajgn5rgjcyb8l5ickm1nkmfx8zzr4rnwjnyxdbm"; +}) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 3a86d1d4cc73..7e0a8915c408 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,53 +1,7 @@ -{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules -, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons -, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem -, kio, kcrash, breeze-icons -, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase -, qtmultimedia, qtx11extras, quazip -, python3Packages -}: +{ callPackage, ... } @ args: -mkDerivation rec { - pname = "krita"; - version = "4.4.7"; - - src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-I6fFxPRCcRU5dyFXZPvGvTb9MuGikrvTaGCXpp4LRRk="; - }; - - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; - - buildInputs = [ - karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons - ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons - boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio_1 poppler curl ilmbase - qtmultimedia qtx11extras quazip - python3Packages.pyqt5 - ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; - - NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] - ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; - - cmakeFlags = [ - "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" - ]; - - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; - - meta = with lib; { - description = "A free and open source painting application"; - homepage = "https://krita.org/"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; - license = licenses.gpl3Only; - }; -} +callPackage ./generic.nix (args // { + version = "4.4.8"; + kde-channel = "stable"; + sha256 = "1y0d8gnxfdg5nfwk8dgx8fc2bwskvnys049napb1a9fr25bqmimw"; +}) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix new file mode 100644 index 000000000000..efaf341b1f64 --- /dev/null +++ b/pkgs/applications/graphics/krita/generic.nix @@ -0,0 +1,59 @@ +{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules +, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons +, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem +, kio, kcrash, breeze-icons +, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib +, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase +, qtmultimedia, qtx11extras, quazip +, python3Packages + +, version +, kde-channel +, sha256 + +, callPackage +}: + +mkDerivation rec { + pname = "krita"; + inherit version; + + src = fetchurl { + url = "https://download.kde.org/${kde-channel}/${pname}/${version}/${pname}-${version}.tar.gz"; + inherit sha256; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; + + buildInputs = [ + karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons + ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons + boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib + openjpeg opencolorio_1 poppler curl ilmbase + qtmultimedia qtx11extras quazip + python3Packages.pyqt5 + ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; + + NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] + ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; + + cmakeFlags = [ + "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + ]; + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + meta = with lib; { + description = "A free and open source painting application"; + homepage = "https://krita.org/"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 771a32d5a736..0faed5e12ea5 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -15,13 +15,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.15"; + version = "1.16"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "HSWl3FC5YDIADO3h6oHxHdwsrFQKKj2zTtH2e3cc5iI="; + sha256 = "150d1qzjs420clqr48gickiw5ymjx4md6iyjbxmxsdml0pyxpwwn"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 27eb174cdf0c..93a7d75ce45a 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -113,7 +113,6 @@ stdenv.mkDerivation { ''; homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index c0945242096f..d34ab9856fca 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { description = "Scanner Access Now Easy"; homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 1deaab4dfe53..e394acf2b061 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [peti]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 78b30ad44e03..7b74dd745f78 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.3"; + version = "0.30.14"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wkahbnnfxmi1jc5zmm3h761nrnkdks8lk0rj38bfkwg90h6zqwd"; + sha256 = "sha256-McLkgzkI02GcssNnWgXw2lnCuqduKLkFOF/VbADBKJU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 991eee431672..ac3922e17d4b 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "1password"; - version = "8.2.0"; + version = "8.3.0"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "1hnpvvval8a9ny5x5zffn5lf5qrwc4hcs3jvhqmd7m4adh2i6y2i"; + sha256 = "1cakv316ipwyw6s3x4a6qhl0nmg17bxhh08c969gma3svamh1grw"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index dcd0aa498c5b..c7428387d2c8 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.19.0"; + version = "0.20.9"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-sqCq9/QFygFcOUNCCBReD+eEk/8gvhMsuVD3g/ZPAFg="; + sha256 = "sha256-dm3bdKbUHI0FFcyYeYd2XSuZuoPsUhk4KcEwzPHiHM8="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix new file mode 100644 index 000000000000..407dd7040637 --- /dev/null +++ b/pkgs/applications/misc/avizo/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config, vala +, gtk3, glib, gtk-layer-shell +, dbus, dbus-glib, librsvg +, gobject-introspection, gdk-pixbuf, wrapGAppsHook +}: + +stdenv.mkDerivation { + pname = "avizo"; + version = "unstable-2021-07-21"; + + src = fetchFromGitHub { + owner = "misterdanb"; + repo = "avizo"; + rev = "7b3874e5ee25c80800b3c61c8ea30612aaa6e8d1"; + sha256 = "sha256-ixAdiAH22Nh19uK5GoAXtAZJeAfCGSWTcGbrvCczWYc="; + }; + + nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; + + buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; + + postInstall = '' + substituteInPlace "$out"/bin/volumectl \ + --replace 'avizo-client' "$out/bin/avizo-client" + substituteInPlace "$out"/bin/lightctl \ + --replace 'avizo-client' "$out/bin/avizo-client" + ''; + + meta = with lib; { + description = "A neat notification daemon for Wayland"; + homepage = "https://github.com/misterdanb/avizo"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0153d30a52fc..e11efa8f8dd2 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchurl +, fetchpatch , poppler_utils , pkg-config , libpng @@ -26,18 +27,21 @@ mkDerivation rec { pname = "calibre"; - version = "5.24.0"; + version = "5.29.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256:18dr577nv7ijw3ar6mrk2xrc54mlrqkaj5jrc6s5sirl0710fdfg"; + sha256 = "sha256-9ymHEpTHDUM3NAGoeSETzKRLKgJLRY4eEli6N5lbZug="; }; + # https://sources.debian.org/patches/calibre/5.29.0+dfsg-1 patches = [ - # Plugin installation (very insecure) disabled (from Debian) - ./disable_plugins.patch - # Automatic version update disabled by default (from Debian) - ./no_updates_dialog.patch + # allow for plugin update check, but no calibre version check + (fetchpatch { + name = "0001_only_plugin_update.patch"; + url = "https://sources.debian.org/data/main/c/calibre/5.29.0%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; + sha256 = "sha256-aGT8rJ/eQKAkmyHBWdY0ouZuWvDwtLVJU5xY6d3hY3k="; + }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; diff --git a/pkgs/applications/misc/calibre/disable_plugins.patch b/pkgs/applications/misc/calibre/disable_plugins.patch deleted file mode 100644 index 9ef1dd04251d..000000000000 --- a/pkgs/applications/misc/calibre/disable_plugins.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code. -Author: Martin Pitt -Bug-Debian: http://bugs.debian.org/640026 - -Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py -=================================================================== ---- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py 2011-12-16 05:49:14.000000000 +0100 -+++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py 2011-12-20 19:29:04.798468930 +0100 -@@ -28,8 +28,6 @@ - pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config) - cm('welcome wizard', _('Run welcome wizard'), - icon='wizard.png', triggered=self.gui.run_wizard) -- cm('plugin updater', _('Get plugins to enhance calibre'), -- icon='plugins/plugin_updater.png', triggered=self.get_plugins) - if not DEBUG: - pm.addSeparator() - cm('restart', _('Restart in debug mode'), icon='debug.png', diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch deleted file mode 100644 index faaaf2c19949..000000000000 --- a/pkgs/applications/misc/calibre/no_updates_dialog.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py ---- calibre-2.9.0.orig/src/calibre/gui2/main.py 2014-11-09 20:09:54.081231882 +0800 -+++ calibre-2.9.0/src/calibre/gui2/main.py 2014-11-09 20:15:48.193033844 +0800 -@@ -37,8 +37,9 @@ - help=_('Start minimized to system tray.')) - parser.add_option('-v', '--verbose', default=0, action='count', - help=_('Ignored, do not use. Present only for legacy reasons')) -- parser.add_option('--no-update-check', default=False, action='store_true', -- help=_('Do not check for updates')) -+ parser.add_option('--update-check', dest='no_update_check', default=True, -+ action='store_false', -+ help=_('Check for updates')) - parser.add_option('--ignore-plugins', default=False, action='store_true', - help=_('Ignore custom plugins, useful if you installed a plugin' - ' that is preventing calibre from starting')) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 0e501135a98f..1fec32d9f70e 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.2.2"; # When updating also update fetchedMavenDeps.sha256 + version = "21.2.3"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "6FQd7UGX19Ez/updybia/tzl+9GYyPPzPGFsV67Enq0="; + sha256 = "0xu/uMMloCUuhKs392kn6qJzlobDNuvwlHGdS/gGAB8="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "VHOIK6sOAP+O9HicUiE2avLcppRzocPUf1XIcyuGw30="; + outputHash = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 4f8c5f8bb8b5..16f5673bed1b 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "sha256-hiOS0cTaPqllb31p+6nU4GYvw/E1Hdn8yd3sppzGkqg="; + sha256 = "sha256-ALIrNnhpX46xdQdfJdx/9e/QtdyBEgi5xLrbuOBJR7o="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 4baa3a094261..f16e2a87a684 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.21"; + version = "6.4.22"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-akWcHK/XodqlzRNxQNpgwYyEtWmc2OckmnnDM0LJnR0="; + sha256 = "sha256-zGgYvVlDVgIWn6KS1tFj1Wshx/UxEoKUcKOs6r5hLIQ="; }; buildInputs = [ openssl ]; @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { IPSEC. ''; platforms = platforms.unix; - maintainers = [ maintainers.peti ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 4c2e262c9ae1..93886b3a2c21 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-gzU5AqjCIZlhLbnj/xuSGJ69ZhLv9zQxlM0Nn+MIX/U="; + sha256 = "sha256-+x3uN7Uj0fqO0kpHlOVnsshgEJA1z/6ZElKSTyLzfG4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 29399ab2f5b5..bd6ae3d74780 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -26,33 +26,21 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "0a18rbdy9d0fj0vnsc2rm7xlh17vjqn4kdyrq0ldzlzkb6zbdk2k"; + sha256 = "lqXjGSsiWaMJGyr1c2Wt/bs4F8q51mQ1+f6vbZRQzVs="; }; patches = [ - # Fix some Desktop Settings with GNOME 40. - # https://github.com/FontManager/font-manager/issues/215 + # Fix compilation with latest Vala. + # https://github.com/FontManager/font-manager/issues/240 (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/b28f325d7951a66ebf1a2a432ee09fd22048a033.patch"; - sha256 = "dKbrXGb9a4JuG/4x9vprMlh5J17HKJFifRWq9BWp1ow="; - }) - (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/2147204d4c4c6b58161230500186c3a5d4eeb1c1.patch"; - sha256 = "2/PFLwf7h76fIIN4+lyjg/L0KVU1hhRQCfwCAGDpb00="; - }) - (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/3abc541ef8606727c72af7631c021809600336ac.patch"; - sha256 = "rJPnW+7uuFLxTf5tk+Rzo+xkw2+uzU6BkzPXLeR/RGc="; - }) - (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/03a822f0d7b72442cd2ffcc8668da265d3535e0d.patch"; - sha256 = "3Z2UqK5VV2bIwpGd1tA7fivd7ooIuV6CxTJhzgOAkIM="; + url = "https://github.com/FontManager/font-manager/commit/f9c4621389dae5999ca9d2f3c8402c2512a9ea60.patch"; + sha256 = "ZEJZSUYFLKmiHpVusO3ZUXMLUzJbbbCSqMjCtwlzPRY="; }) ]; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index c182db8fdd3a..557cd45c42c9 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "http://nostatic.org/grip"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ marcweber peti ]; + maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 3eb41f5ebe5e..797dfe504cae 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.1-20f4dbb0/Hubstaff-1.6.1-20f4dbb0.sh"; - version = "1.6.1-20f4dbb0"; - sha256 = "097hpr4sjh14pidflvs8n1mkjpmij9l2vaan4m82vjrr0qdqi8qy"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-328c666b/Hubstaff-1.6.2-328c666b.sh"; + version = "1.6.2-328c666b"; + sha256 = "0fmlblw19qk9s9xsl0dl705cnns825wrlc7navii4bvbsn6ycl5v"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 135132bd4316..8b72647574e6 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -74,6 +74,5 @@ stdenv.mkDerivation rec { homepage = "http://ikiwiki.info/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 249569ffbab0..af66e2282b40 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2021.03"; + version = "2021.09"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-XdCyx+SdcV1QitDVkOl9EZCHpU8Qiwu0qhcXkU6b+9o="; + sha256 = "1q2mbmczx2y5ylriq4k3lbjlpw4pwfq2vvcx06ymax31fsrvix84"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 949eb48f392c..7e34ec0a36d9 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_13 }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.3.5"; + version = "0.4.2"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "ruJALAI0YQNwG8An5VzoJX06Qu/pXZ9zsrPZ7EH+5Pk="; + sha256 = "BEDScQtGfkp74Gx3RKK8ItNQ9JD8AJkl1zdS/gZqyXk="; name = "${pname}-${version}.AppImage"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_13}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app ''; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 2d70daa94ecb..fed9d245c190 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -15,6 +15,11 @@ , webkitgtk , wrapGAppsHook + # check inputs +, xvfb-run +, nose +, flake8 + # python dependencies , dbus-python , distro @@ -46,7 +51,7 @@ let # See lutris/util/linux.py - binPath = lib.makeBinPath [ + requiredTools = [ xrandr pciutils psmisc @@ -64,6 +69,8 @@ let xorg.xkbcomp ]; + binPath = lib.makeBinPath requiredTools; + gstDeps = with gst_all_1; [ gst-libav gst-plugins-bad @@ -76,13 +83,13 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.8.4"; + version = "0.5.9.1"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "sha256-5ivXIgDyM9PRvuUhPFPgziXDvggcL+p65kI2yOaiS1M="; + sha256 = "sha256-ykPJneCKbFKv0x/EDo9PkRb1LkMeFeYzTDmvE3ShNe0="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -111,6 +118,20 @@ buildPythonApplication rec { python_magic ]; + checkInputs = [ xvfb-run nose flake8 ] ++ requiredTools; + preCheck = "export HOME=$PWD"; + checkPhase = '' + runHook preCheck + xvfb-run -s '-screen 0 800x600x24' make test + runHook postCheck + ''; + + # unhardcodes xrandr and fixes nosetests + # upstream in progress: https://github.com/lutris/lutris/pull/3754 + patches = [ + ./fixes.patch + ]; + # avoid double wrapping dontWrapGApps = true; makeWrapperArgs = [ @@ -121,8 +142,6 @@ buildPythonApplication rec { # see https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - preCheck = "export HOME=$PWD"; - meta = with lib; { homepage = "https://lutris.net"; description = "Open Source gaming platform for GNU/Linux"; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 38513937d01f..bd35d44b7ccc 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -121,4 +121,16 @@ in buildFHSUserEnv { ln -sf ${lutris-unwrapped}/share/applications $out/share ln -sf ${lutris-unwrapped}/share/icons $out/share ''; + + meta = { + inherit (lutris-unwrapped.meta) + homepage + description + platforms + license + maintainers + broken; + + mainProgram = "lutris"; + }; } diff --git a/pkgs/applications/misc/lutris/fixes.patch b/pkgs/applications/misc/lutris/fixes.patch new file mode 100644 index 000000000000..42482453f6a4 --- /dev/null +++ b/pkgs/applications/misc/lutris/fixes.patch @@ -0,0 +1,67 @@ +diff --git a/Makefile b/Makefile +index 821a9500..75affa77 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,12 +25,12 @@ release: build-source upload upload-ppa + + test: + rm tests/fixtures/pga.db -f +- nosetests3 ++ nosetests + + cover: + rm tests/fixtures/pga.db -f + rm tests/coverage/ -rf +- nosetests3 --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage ++ nosetests --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage + + pgp-renew: + osc signkey --extend home:strycore +diff --git a/lutris/util/graphics/xrandr.py b/lutris/util/graphics/xrandr.py +index f788c94c..5544dbe9 100644 +--- a/lutris/util/graphics/xrandr.py ++++ b/lutris/util/graphics/xrandr.py +@@ -5,6 +5,7 @@ from collections import namedtuple + + from lutris.util.log import logger + from lutris.util.system import read_process_output ++from lutris.util.linux import LINUX_SYSTEM + + Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary", "rate")) + +@@ -12,7 +13,7 @@ Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary" + def _get_vidmodes(): + """Return video modes from XrandR""" + logger.debug("Retrieving video modes from XrandR") +- return read_process_output(["xrandr"]).split("\n") ++ return read_process_output([LINUX_SYSTEM.get("xrandr")]).split("\n") + + + def get_outputs(): # pylint: disable=too-many-locals +@@ -76,7 +77,7 @@ def turn_off_except(display): + for output in get_outputs(): + if output.name != display: + logger.info("Turning off %s", output[0]) +- subprocess.Popen(["xrandr", "--output", output.name, "--off"]) ++ subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "--output", output.name, "--off"]) + + + def get_resolutions(): +@@ -111,7 +112,7 @@ def change_resolution(resolution): + logger.warning("Resolution %s doesn't exist.", resolution) + else: + logger.info("Changing resolution to %s", resolution) +- subprocess.Popen(["xrandr", "-s", resolution]) ++ subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "-s", resolution]) + else: + for display in resolution: + logger.debug("Switching to %s on %s", display.mode, display.name) +@@ -128,7 +129,7 @@ def change_resolution(resolution): + logger.info("Switching resolution of %s to %s", display.name, display.mode) + subprocess.Popen( + [ +- "xrandr", ++ LINUX_SYSTEM.get("xrandr"), + "--output", + display.name, + "--mode", diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/applications/misc/markets/default.nix index bd9dd7ac9509..d1d16a7c8cbd 100644 --- a/pkgs/applications/misc/markets/default.nix +++ b/pkgs/applications/misc/markets/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "markets"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "bitstower"; repo = "markets"; rev = version; - sha256 = "0nk1bs7i6b7r90g5qwd3s2m462vk3kvza0drq7rzb5sdaiz9ccnz"; + sha256 = "0sfdmz7cp8i2bymippp8jyxsidxjn69v9cqm40q77j81kfm84bfv"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index e6282d0acb6d..cc5ff18a2f33 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4807"; + version = "4808"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "3DEcXopoCIcBANYrGclZH6K0JLgeYADXtPjQtobyfps="; + sha256 = "ooiXotpxdy99ViUQ0kFp0NoTowGEZjEoD31x+3XrW28="; }; patches = [ diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 952a7b00d087..435bbda24d03 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -2,47 +2,51 @@ , stdenv , fetchFromGitHub , gtk4 -, gtksourceview +, hicolor-icon-theme , json-glib , libadwaita , libgee , meson , ninja , nix-update-script -, pantheon , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "notejot"; - version = "3.1.5"; + version = "3.2.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-wsHQvN+sqAMs1QldiRoc9JlF4d54JFqNkqC+lyuHC7M="; + hash = "sha256-WyW1tGhO3+OykNa8BRavi93cBMOSBJw0M+0bwQHJOjU="; }; + patches = [ + # build: use gtk4-update-icon-cache + # https://github.com/lainsce/notejot/pull/307 + ./use-gtk4-update-icon-cache.patch + ]; + nativeBuildInputs = [ meson ninja - vala pkg-config python3 - wrapGAppsHook + vala + wrapGAppsHook4 ]; + buildInputs = [ gtk4 - gtksourceview + hicolor-icon-theme json-glib libadwaita libgee - pantheon.elementary-icon-theme - pantheon.granite ]; postPatch = '' @@ -50,6 +54,10 @@ stdenv.mkDerivation rec { patchShebangs build-aux/post_install.py ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/lainsce/notejot"; description = "Stupidly-simple sticky notes applet"; @@ -57,8 +65,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; }; - - passthru.updateScript = nix-update-script { - attrPath = pname; - }; } diff --git a/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch new file mode 100644 index 000000000000..9431c43cef69 --- /dev/null +++ b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch @@ -0,0 +1,20 @@ +diff --git a/build-aux/post_install.py b/build-aux/post_install.py +index 1278304..fface6d 100644 +--- a/build-aux/post_install.py ++++ b/build-aux/post_install.py +@@ -2,11 +2,13 @@ + import os + import subprocess + +-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') ++install_prefix = os.environ['MESON_INSTALL_PREFIX'] ++icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor') ++schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas') + + if not os.environ.get('DESTDIR'): + print('Compiling gsettings schemas…') + subprocess.call(['glib-compile-schemas', schemadir], shell=False) + + print('Rebuilding desktop icons cache...') +- subprocess.call(['gtk-update-icon-cache', '/usr/share/icons/hicolor/'], shell=False) ++ subprocess.call(['gtk4-update-icon-cache', '-qtf', icondir], shell=False) diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 745d03bb189e..fba1c0b0f5f8 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -15,6 +15,7 @@ , hunspellWithDicts , intltool , isocodes +, libappindicator-gtk3 , libcanberra-gtk3 , mousetweaks , udev @@ -70,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 hunspell isocodes + libappindicator-gtk3 libcanberra-gtk3 libxkbcommon mousetweaks @@ -78,7 +80,7 @@ python3.pkgs.buildPythonApplication rec { xorg.libxkbfile ] ++ lib.optional atspiSupport at-spi2-core; - propagatedBuildInputs = with python3.pkgs; [ + pythonPath = with python3.pkgs; [ dbus-python distutils_extra pyatspi diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index f8facbe01fa0..688d5acdd127 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -8,7 +8,6 @@ , gettext , yelp-tools , itstool -, libxmlxx3 , python , pygobject3 , gtk3 @@ -35,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000"; + sha256 = "dpflFEXhn9d05osWCtr2aHuAgXLeBBdgLhaXZra21L0="; }; patches = [ @@ -58,14 +57,13 @@ buildPythonApplication rec { autoreconfHook wrapGAppsHook pkg-config - libxmlxx3 gettext yelp-tools itstool gobject-introspection ]; - propagatedBuildInputs = [ + pythonPath = [ pygobject3 pyatspi dbus-python diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index b360733d5058..93a8d6e088cd 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.13.33"; + version = "0.13.34"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-vKmVScXQLDjhNJEzlhqiyhRZjR26xjrT1LijxzZK8Cg="; + sha256 = "0p0nkqvkir6lriq75ingpfywn2yvyn3l35yxzk4aiq6vr2n7h3mw"; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-0E4nk8WLprumHKQjpdn+U36z7mdgFb7g/i7egLk4Jcs="; + cargoSha256 = "1mzc6rnqcv97dlkl4j4p180f46wlyq45lc6nq7gqw396wc6m04km"; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix new file mode 100644 index 000000000000..7dd52c8ccef4 --- /dev/null +++ b/pkgs/applications/misc/themechanger/default.nix @@ -0,0 +1,65 @@ +{ lib +, gobject-introspection +, meson +, ninja +, pkg-config +, wrapGAppsHook +, desktop-file-utils +, glib +, gtk3 +, python3 +, gsettings-desktop-schemas +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "themechanger"; + version = "0.10.1"; + format = "other"; + + src = fetchFromGitHub { + owner = "ALEX11BR"; + repo = "ThemeChanger"; + rev = "v${version}"; + sha256 = "1bxxn5bmdwaxfvyh6z2rxklwnxgvv6kh5y9m8r1k7d0n4msx1x2h"; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook + desktop-file-utils + gtk3 + ]; + + buildInputs = [ + glib + gtk3 + python3 + gsettings-desktop-schemas + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + ]; + + postPatch = '' + patchShebangs postinstall.py + ''; + + meta = with lib; { + homepage = "https://github.com/ALEX11BR/ThemeChanger"; + description = "A theme changing utility for Linux"; + longDescription = '' + This app is a theme changing utility for Linux, BSDs, and whatnots. + It lets the user change GTK 2/3/4, Kvantum, icon and cursor themes, edit GTK CSS with live preview, and set some related options. + It also lets the user install icon and widget theme archives. + ''; + maintainers = with maintainers; [ ALEX11BR ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 2a322b208819..933464b62631 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.27.0"; - name = "toot-${version}"; + pname = "toot"; + version = "0.28.0"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = version; - sha256 = "197g9lvwg8qnsf18kifcqdj3cpfdnxz9vay766rn9bi4nfz0s6j2"; + sha256 = "076r6l89gxjwxjpiklidcs8yajn5c2bnqjvbj4wc559iqdqj88lz"; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/applications/misc/ttyper/default.nix index 664bf9ba7252..c3001c3337cd 100644 --- a/pkgs/applications/misc/ttyper/default.nix +++ b/pkgs/applications/misc/ttyper/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ttyper"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "max-niederman"; repo = pname; rev = "v${version}"; - sha256 = "1fsb77ky92fyv3ll6zrbxbd69gm85xnc6bivj7sc3sv5cxhgr7a5"; + sha256 = "sha256-9vcoK2mFEivTSZE3KoQRHUr3AfQ/aN5eWP//Jagw3gU="; }; - cargoSha256 = "1sqdql0kfr1vsww6hkrp7yjlzx0mnhfma51z699hkx9c492sf1wk"; + cargoSha256 = "sha256-VzO32b5oAoXR/Ei9up00XRM63I5kuG68TeX4KBCXIdo="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 3b159d4b7f5d..687dc7a49ac9 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,15 +6,13 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.8.0"; + version = "5.6.9.3"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_8_0_836f43f6f6be4149/${pname}_${version}_amd64.deb"; - sha256 = "b3a52f773d633837882dc107b206006325722ca5d5d5a1e8bdf5453f872e1b6f"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_9_3_10c2eb9781db4d7f/${pname}_${version}_amd64.deb"; + sha256 = "0b884aa6992d438cee09f58673780218a00a823e03c114b0c753947020c0a327"; }; - dontWrapGApps = true; - nativeBuildInputs = [ dpkg wrapGAppsHook @@ -31,6 +29,10 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath buildInputs; + dontWrapGApps = true; + dontBuild = true; + dontConfigure = true; + unpackPhase = '' dpkg-deb -x ${src} ./ ''; diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 576d66659a3a..c125c2f75161 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -1,24 +1,31 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "D+WJ1HG1gXIFtIpaqazFqC9Y4GBCUsz88U8q8W9tHFA="; + sha256 = "sha256-Wg1QecSMyifID9uIvVWrmkHax4FbbwEcoXIZ8V8P3FU="; }; - propagatedBuildInputs = [ python3Packages.urwid ]; + propagatedBuildInputs = [ + python3Packages.urwid + ]; doCheck = false; # No tests available + pythonImportsCheck = [ "urlscan" ]; + meta = with lib; { description = "Mutt and terminal url selector (similar to urlview)"; homepage = "https://github.com/firecat53/urlscan"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ dpaetzel jfrankenau ]; }; } diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 531c108cdbf9..2765cd5ad7aa 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -10,11 +10,11 @@ let isFullPackage = mediaSupport; in stdenv.mkDerivation rec { pname = if isFullPackage then "vifm-full" else "vifm"; - version = "0.11"; + version = "0.12"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh"; + sha256 = "1h5j4y704nciyzg3aaav8sl3r5h9mpwq8f28cj65nnxk6a7n3a9k"; }; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 77ff11b98622..f8dbc9c65e4f 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "1.8.9"; + version = "2.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-1cU9HdPXrJ4ibSjOitO8iJfMIaGub/jjlb2lssYFfcU="; + sha256 = "sha256-MIFgNUuuneIIkPRVRarbx6UMoB/3sdJtKvbacUnwHX8="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index e5e56137b844..53c4145cee26 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.30.87"; + version = "1.30.89"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0mx1vnrip1y87g6zj9sdcf5siihwn0b6v1q106d9kz89znpzd64s"; + sha256 = "2fu6Nk/eMLQ9nYy1aZDpjnRg16YosQPqdKtJ2VAYBrw="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4b7fbc38bbcc..a9331041ddde 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -6,7 +6,7 @@ # Native build inputs: , ninja, pkg-config -, python2, python3, perl +, python3, perl , gnutar, which , llvmPackages # postPatch: @@ -34,6 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl +, epoxy # postPatch: , glibc # gconv + locale @@ -53,12 +54,13 @@ buildFun: with lib; let - python2WithPackages = python2.withPackages(ps: with ps; [ - ply jinja2 setuptools - ]); python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools ]); + clangFormatPython3 = fetchurl { + url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; + sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l"; + }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -125,7 +127,7 @@ let nativeBuildInputs = [ ninja pkg-config - python2WithPackages python3WithPackages perl + python3WithPackages perl gnutar which llvmPackages.bintools ]; @@ -150,6 +152,8 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl + ] ++ optionals (chromiumVersionAtLeast "96") [ + epoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] @@ -212,6 +216,9 @@ let # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc + # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: + base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format + patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin @@ -308,7 +315,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - ${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 05f69e48aa59..8cc2725e7972 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": "94.0.4606.71", - "sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya", - "sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4", + "version": "94.0.4606.81", + "sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh", + "sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz", "deps": { "gn": { "version": "2021-08-11", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.32", - "sha256": "1w904axixagn6gqcb90849q3qy0k3c6lgl0c97cb6m78l9xrrnbr", - "sha256bin64": "1z7xx608sh8agdl98r7xk7s43d3qnfpd1jvgbl7l8fqd85ns11i0", + "version": "95.0.4638.49", + "sha256": "11fiq6p2d99hl166pf39g83pk7m7ibi1zz19wj7qmcc7ql7006jz", + "sha256bin64": "04s81fnr01jq74fpl5n6jg8iw5iw6sdwyz40zja68h1crxh5d6d6", "deps": { "gn": { "version": "2021-08-11", @@ -31,22 +31,22 @@ } }, "dev": { - "version": "96.0.4655.0", - "sha256": "00gax7xqi1n4jiqwpff43c43mpqb5jakckwdfbgwhrp6h35xxdv1", - "sha256bin64": "1xyyz6p4qllzyd6wbdbhs6kp062dz40i03wrlsggb919bgp7ivnw", + "version": "96.0.4664.9", + "sha256": "0hlniaglnd19cb3k2wi9mmf56ws8i89lm5y2dbjpr7vqnmj6qc39", + "sha256bin64": "1crl8gbhjyaa0yhkvm4va0g9dyljra8n5zg9bd1znmjlk0c124x3", "deps": { "gn": { - "version": "2021-09-13", + "version": "2021-09-24", "url": "https://gn.googlesource.com/gn", - "rev": "de86ec4176235871a7cb335756987e41246dae4a", - "sha256": "0mlnsqcj06azz5cpwlafi5gg6pvf2s6x9qq02zl1sm2h288y152g" + "rev": "0153d369bbccc908f4da4993b1ba82728055926a", + "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" } } }, "ungoogled-chromium": { - "version": "94.0.4606.71", - "sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya", - "sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4", + "version": "94.0.4606.81", + "sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh", + "sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz", "deps": { "gn": { "version": "2021-08-11", @@ -55,8 +55,8 @@ "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" }, "ungoogled-patches": { - "rev": "94.0.4606.71-1", - "sha256": "12p39ay8lmdni6gnmw3w67pg4w3nrphhgn6bmz3cr6cy7nx4kiv2" + "rev": "94.0.4606.81-1", + "sha256": "113abybh8kkw9a92lj6jww6dl6rc1sv5x7a7a1gjwsihzd2r0cik" } } } diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 6928496ae69f..c0542014b7e5 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-I3U2Jh+PSF+j8Kuv5RejYwiMC1JYBpkYQGsgIFi7LL0="; + sha256 = "sha256-iJ6+tc5nls8E/9/Jp5OS9gfJo8SJ5bN+Im/JzEYEAfI="; fetchSubmodules = true; }; @@ -61,8 +61,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; - # macOS SDK 10.13 or later required - # See https://github.com/NixOS/nixpkgs/issues/101229 - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6477f4fbe06e..4e44e5841805 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "4.1.2369.21-1"; + version = "4.3.2439.44-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "03062mik6paqp219jz420jsg762jjrfxmj1daq129z2zgzq0qr8l"; + sha256 = "1bsx8axs438f4p019mdq66pmpimf575r31rv6cibpgv85366xhh9"; }; unpackPhase = '' @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { buildPhase = '' runHook preBuild echo "Patching Vivaldi binaries" - for f in crashpad_handler vivaldi-bin vivaldi-sandbox ; do + for f in chrome_crashpad_handler vivaldi-bin vivaldi-sandbox ; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index da7c5c815330..c959dd61bad0 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.9.1"; + version = "2021.9.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-VekJq7d80hD8AybkpLq4+9yeeBkeLATr2iG5OFU/TFs="; + sha256 = "sha256-UAx3DY8d3I1g7DuNmBu4w+3NGUQqDdcScXdtq/VkpJ8="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 619b2834e5c6..a4b49adb1e20 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,25 +2,23 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "7.3.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-I+4tFAMmmsmi5WH9WKXIja1vVWsPHNGkWbvjWGUCmkU="; + sha256 = "00cwnfylra0msbb423ad21if98s6smzccsyidqsl4r2mrlkhahwm"; }; - # vendor directory stale - deleteVendor = true; - vendorSha256 = null; + vendorSha256 = "0fcgyyd11xfhn8i11bqnaw3h51bj1y8s37b4d8wzv31dr8zswqsc"; subPackages = [ "." ]; # upstream have helpfully moved the bash completion script to a separate # repo which receives no releases or even tags bashCompletionScript = fetchurl { - url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7"; - sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy"; + url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/5f4f0d5d01e89c6333673f0fa96056749e71b3cd/ci/installers/completion/cf8"; + sha256 = "06w26kpnjd3f2wdjhb4pp0kaq2gb9kf87v7pjd9n2g7s7qhdqyhy"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index c1ce4b38156c..9c211f626aaa 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq -set -eu -o pipefail +set -x -eu -o pipefail cd $(dirname "${BASH_SOURCE[0]}") @@ -14,7 +14,7 @@ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archi SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz) setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix } setKV version ${VERSION} @@ -24,8 +24,15 @@ setKV vendorSha256 "" cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's/ //g') +VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -setKV vendorSha256 ${VENDOR_SHA256} + +if [ -n "${VENDOR_SHA256:-}" ]; then + setKV vendorSha256 ${VENDOR_SHA256} +else + echo "Update failed. VENDOR_SHA256 is empty." + exit 1 +fi + diff --git a/pkgs/applications/networking/cluster/helm/plugins/default.nix b/pkgs/applications/networking/cluster/helm/plugins/default.nix index edd19a25f9ba..342fd9e686a2 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -2,10 +2,12 @@ { - helm-diff = callPackage ./helm-diff.nix {}; + helm-diff = callPackage ./helm-diff.nix { }; - helm-s3 = callPackage ./helm-s3.nix {}; + helm-git = callPackage ./helm-git.nix { }; - helm-secrets = callPackage ./helm-secrets.nix {}; + helm-s3 = callPackage ./helm-s3.nix { }; + + helm-secrets = callPackage ./helm-secrets.nix { }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix new file mode 100644 index 000000000000..05ded10444ba --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, findutils +, git +, gnugrep +, gnused +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "helm-git"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "aslafy-z"; + repo = pname; + rev = "v${version}"; + sha256 = "0hvycqibmlw2zw3nm8rn73v5x1zcgm2jrfdlljbvc1n4n5vnzdrg"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # NOTE: helm-git is comprised of shell scripts. + dontBuild = true; + + installPhase = '' + install -dm755 $out/helm-git + install -m644 -Dt $out/helm-git plugin.yaml + cp helm-git helm-git-plugin.sh $out/helm-git/ + + patchShebangs $out/helm-git/helm-git{,-plugin.sh} + wrapProgram $out/helm-git/helm-git \ + --prefix PATH : ${lib.makeBinPath [ coreutils findutils git gnugrep gnused ]} + + runHook postInstall + ''; + + meta = with lib; { + description = "The Helm downloader plugin that provides GIT protocol support"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 8ce36e8c312e..b552af837bd0 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hlJfgNFHEjIrvHhaAje1XQbNO6e3D/qcCmdVFhklwqs="; + sha256 = "sha256-22jZWRnymIYN1LlGOo8abVx8DTUe9VK1xAHddLknt6A="; }; - vendorSha256 = "sha256-3OTkigryWsyCytyNMyumJJtc/BwtdryvDQRan2dzqfg="; + vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index 1795b48f3382..7956e807e9ec 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq -set -eu -o pipefail +set -x -eu -o pipefail WORKDIR=$(mktemp -d) trap "rm -rf ${WORKDIR}" EXIT @@ -45,7 +45,7 @@ CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix } setKV k3sVersion ${K3S_VERSION} diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix new file mode 100644 index 000000000000..a41c3c0ad35b --- /dev/null +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -0,0 +1,44 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kn"; + version = "0.26.0"; + + src = fetchFromGitHub { + owner = "knative"; + repo = "client"; + rev = "v${version}"; + sha256 = "sha256-hquxv1BluR535WvMtJlVyP7JuARDNGDjPAbdSSj2juo="; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/kn" ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-X knative.dev/client/pkg/kn/commands/version.Version=v${version}" + "-X knative.dev/client/pkg/kn/commands/version.VersionEventing=v${version}" + "-X knative.dev/client/pkg/kn/commands/version.VersionServing=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd kn \ + --bash <($out/bin/kn completion bash) \ + --zsh <($out/bin/kn completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/kn version | grep ${version} > /dev/null + ''; + + meta = with lib; { + description = "The Knative client kn is your door to the Knative world. It allows you to create Knative resources interactively from the command line or from within scripts"; + homepage = "https://github.com/knative/client"; + changelog = "https://github.com/knative/client/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index d882e3cd2de1..7cc11b1af60f 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -111,7 +111,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - x86_64-linux + ruby DEPENDENCIES krane diff --git a/pkgs/applications/networking/cluster/linkerd/update-edge.sh b/pkgs/applications/networking/cluster/linkerd/update-edge.sh index 0ad960edebdd..8bf49452b3e7 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-edge.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-edge.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq -set -eu -o pipefail +set -x -eu -o pipefail cd $(dirname "$0") @@ -14,7 +14,7 @@ VERSION=$(echo ${TAG} | sed 's/^edge-//') SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz) setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./edge.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./edge.nix } setKV version ${VERSION} @@ -25,9 +25,9 @@ cd ../../../../../ set +e VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e +cd - > /dev/null if [ -n "${VENDOR_SHA256:-}" ]; then - cd - > /dev/null setKV vendorSha256 ${VENDOR_SHA256} else echo "Update failed. VENDOR_SHA256 is empty." diff --git a/pkgs/applications/networking/cluster/linkerd/update-stable.sh b/pkgs/applications/networking/cluster/linkerd/update-stable.sh index 96280b507160..37314ac1c460 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-stable.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-stable.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq -set -eu -o pipefail +set -x -eu -o pipefail cd $(dirname "$0") @@ -14,7 +14,7 @@ VERSION=$(echo ${TAG} | sed 's/^stable-//') SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz) setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix } setKV version ${VERSION} @@ -25,11 +25,11 @@ cd ../../../../../ set +e VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e +cd - > /dev/null if [ -n "${VENDOR_SHA256:-}" ]; then - cd - > /dev/null - setKV vendorSha256 ${VENDOR_SHA256} + setKV vendorSha256 ${VENDOR_SHA256} else - echo "Update failed. VENDOR_SHA256 is empty." - exit 1 + echo "Update failed. VENDOR_SHA256 is empty." + exit 1 fi diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 7ed122117e52..2a6d642d0c98 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QkUE4oImP0eg5tofGEUonKzffICG4b3SuPJz9S2ZNfE="; + sha256 = "sha256-FRu1h6DT43rPaa9dcgz83w9K+xtzJgB4l/eTu+Fbb+c="; }; - vendorSha256 = "sha256-mPOyF1S/g1FpUHHNc+cy0nxk6rK9txnZPYHOSvvfu70="; + vendorSha256 = "sha256-QFACe1/5MVbXKTknEyqjWclEQgJSZAJ/QljhLq/tWe4="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 91f5cb82668e..4002f7478b33 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -1,4 +1,5 @@ -{ pkgs +{ nixosTests +, pkgs , poetry2nix , lib , overrides ? (self: super: {}) @@ -59,10 +60,17 @@ let } ).python; -in interpreter.pkgs.nixops.withPlugins(ps: [ - ps.nixops-encrypted-links - ps.nixops-virtd - ps.nixops-aws - ps.nixops-gcp - ps.nixopsvbox -]) + pkg = interpreter.pkgs.nixops.withPlugins(ps: [ + ps.nixops-encrypted-links + ps.nixops-virtd + ps.nixops-aws + ps.nixops-gcp + ps.nixopsvbox + ]) // rec { + # Workaround for https://github.com/NixOS/nixpkgs/issues/119407 + # TODO after #1199407: Use .overrideAttrs(pkg: old: { passthru.tests = .....; }) + tests = nixosTests.nixops.unstable.override { nixopsPkg = pkg; }; + # Not strictly necessary, but probably expected somewhere; part of the workaround: + passthru.tests = tests; + }; +in pkg diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index bef5bbef4090..08e6b714982c 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -38,14 +38,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.18.36" +version = "1.18.60" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.21.36,<1.22.0" +botocore = ">=1.21.60,<1.22.0" jmespath = ">=0.7.1,<1.0.0" s3transfer = ">=0.5.0,<0.6.0" @@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.21.36" +version = "1.21.60" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -70,7 +70,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "certifi" -version = "2021.5.30" +version = "2021.10.8" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -89,7 +89,7 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.0.4" +version = "2.0.7" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -151,7 +151,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "jinja2" -version = "3.0.1" +version = "3.0.2" description = "A very fast and expressive template engine." category = "dev" optional = false @@ -173,7 +173,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "libvirt-python" -version = "7.7.0" +version = "7.8.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -391,7 +391,7 @@ six = ">=1.5" [[package]] name = "pytz" -version = "2021.1" +version = "2021.3" description = "World timezone definitions, modern and historical" category = "dev" optional = false @@ -549,7 +549,7 @@ test = ["pytest"] [[package]] name = "typeguard" -version = "2.12.1" +version = "2.13.0" description = "Run-time type checker for Python" category = "main" optional = false @@ -569,7 +569,7 @@ python-versions = "*" [[package]] name = "urllib3" -version = "1.26.6" +version = "1.26.7" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false @@ -603,16 +603,16 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.18.36-py3-none-any.whl", hash = "sha256:a7fccb61d95230322dd812629455df14167307c569077fa89d297eae73605ffb"}, - {file = "boto3-1.18.36.tar.gz", hash = "sha256:4df1085f5c24504a1b1a6584947f27b67c26eda123f29d3cecce9b2fd683e09b"}, + {file = "boto3-1.18.60-py3-none-any.whl", hash = "sha256:8f3face72d2ac6ad36bd7724410548891ce338b350e6f98574890a7b1d425d78"}, + {file = "boto3-1.18.60.tar.gz", hash = "sha256:45709a04ec5fb67ce5a8eaade3eb0ab24d6eb08d9a9ca6bdb2153047896197fc"}, ] botocore = [ - {file = "botocore-1.21.36-py3-none-any.whl", hash = "sha256:e3e522fbe0bad1197aa7182451dc05f650310e77cf0a77749f6a5e82794c53de"}, - {file = "botocore-1.21.36.tar.gz", hash = "sha256:5b9a7d30e44b8a0a2bbbde62ae01bf6c349017e836985a0248552b00bbce7fae"}, + {file = "botocore-1.21.60-py3-none-any.whl", hash = "sha256:890a5835ac00415ff78f1c7118a774aae83c0c70742284b68abd1176f9d05761"}, + {file = "botocore-1.21.60.tar.gz", hash = "sha256:3e746ca75fb7539ba3f001169264fa54dfaded2477ffc8bd979ce1e1df200620"}, ] certifi = [ - {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, - {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, + {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, + {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, ] cffi = [ {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, @@ -662,8 +662,8 @@ cffi = [ {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, - {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, + {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, + {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -676,6 +676,8 @@ cryptography = [ {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"}, {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, @@ -701,15 +703,15 @@ imagesize = [ {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"}, ] jinja2 = [ - {file = "Jinja2-3.0.1-py3-none-any.whl", hash = "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4"}, - {file = "Jinja2-3.0.1.tar.gz", hash = "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4"}, + {file = "Jinja2-3.0.2-py3-none-any.whl", hash = "sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c"}, + {file = "Jinja2-3.0.2.tar.gz", hash = "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"}, ] jmespath = [ {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, ] libvirt-python = [ - {file = "libvirt-python-7.7.0.tar.gz", hash = "sha256:cc8d6528cef7cf395c5d97566328f16faef6b5653a500b0e88c9c0fc36b72cdb"}, + {file = "libvirt-python-7.8.0.tar.gz", hash = "sha256:9d07416d66805bf1a17f34491b3ced2ac6c42b6a012ddf9177e0e3ae1b103fd5"}, ] markupsafe = [ {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, @@ -804,8 +806,8 @@ python-dateutil = [ {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pytz = [ - {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, - {file = "pytz-2021.1.tar.gz", hash = "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da"}, + {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"}, + {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, ] requests = [ {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, @@ -852,8 +854,8 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] typeguard = [ - {file = "typeguard-2.12.1-py3-none-any.whl", hash = "sha256:cc15ef2704c9909ef9c80e19c62fb8468c01f75aad12f651922acf4dbe822e02"}, - {file = "typeguard-2.12.1.tar.gz", hash = "sha256:c2af8b9bdd7657f4bd27b45336e7930171aead796711bc4cfc99b4731bb9d051"}, + {file = "typeguard-2.13.0-py3-none-any.whl", hash = "sha256:0bc44d1ff865b522eda969627868b0e001c8329296ce50aededbea03febc79ee"}, + {file = "typeguard-2.13.0.tar.gz", hash = "sha256:04e38f92eb59410c9375d3be23df65e0a7643f2e8bcbd421423d808d2f9e99df"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, @@ -861,6 +863,6 @@ typing-extensions = [ {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ - {file = "urllib3-1.26.6-py2.py3-none-any.whl", hash = "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4"}, - {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, + {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"}, + {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"}, ] diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 092a620b98f4..53430cdf94ed 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.11"; - sha256 = "15h7w020p576zl91s5mr4npcmngrqqfj9xzlx6bk9i1cp6h4w0jy"; + version = "1.0.12"; + sha256 = "04fqliz7y4zzs4xraid54mqxwgrzh138nmfcs876vp534slvikpi"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix index 6363852068e5..b8c58e9c347c 100644 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -6,7 +6,7 @@ callPackage ./genericModule.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.1.5"; - sha256 = "03gxh12bd5mj1l4q3xilil806dsqaqmz93ff7ysf441frgkx3iy3"; + version = "1.1.6"; + sha256 = "1q6fqay1s9qwimjwlldc8hr6009cgx3ghz142mdx36jjv9isj9ln"; vendorSha256 = "0rfd22rf76mwj489zhswah4g3dhhz6davm336xgm9dbnyaz9d8r0"; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index deff274e5340..7be9c9cc742b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -563,10 +563,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.4.1", - "sha256": "0mk0f12yy58gjkki7xpf9bjfw9h9zdgby2b4bddqp5csq11payhd", + "rev": "v2.5.0", + "sha256": "1hp3bwhlfiwf1a4l6xfldwdxmyjs4nq3n8g343grjya7ibbhh4sg", "vendorSha256": null, - "version": "2.4.1" + "version": "2.5.0" }, "launchdarkly": { "owner": "terraform-providers", @@ -768,11 +768,13 @@ "version": "0.1.1" }, "openstack": { - "owner": "terraform-providers", + "owner": "terraform-provider-openstack", + "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", - "rev": "v1.28.0", - "sha256": "1g2nxv312ddvkgpph17m9sh4zmy5ddj8gqwnfb3frbfbbamrgar6", - "version": "1.28.0" + "rev": "v1.43.1", + "sha256": "0n6r88p3a6p8p0gjys2r1kcgkwq450jmyd741g45lxmaf3jz2ynb", + "vendorSha256": "0k4srszs8xgf8gz4fa7ysqyww52d7kvqy6zf22f1gkcjyiks9pl7", + "version": "1.43.1" }, "opentelekomcloud": { "owner": "terraform-providers", @@ -1093,12 +1095,13 @@ "version": "0.1.0" }, "vault": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v2.11.0", - "sha256": "1yzakc7jp0rs9axnfdqw409asrbjhq0qa7xn4xzpi7m94g1ii12d", - "version": "2.11.0" + "rev": "v2.24.1", + "sha256": "1xk14q06js774lqyylkbp53dnlsbgh3vi38mqqmndh80xigs6d99", + "version": "2.24.1", + "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48" }, "vcd": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index cab256d92708..ba034056c95d 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,8 +195,8 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.8"; - sha256 = "1755m3h9iz086znjpkhxjbyl3jaxpsqmk73infn9wbhql8pq2wil"; + version = "1.0.9"; + sha256 = "0g97l53xrcafjrzz5inij4q4aaadibn5ilr5j39a6569pkvcvsh3"; vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 1c52f56437cc..e07b9b88ddc4 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.33.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FvgB0jG6PEvhrT9Au/Uv9XSgKx+zNw8zETpg2dJ6QX4="; + sha256 = "sha256-DCum3vCrN530Z0VW0WEoLtjN+kre/mU9O+sJxckZgfc="; }; vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0="; diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/applications/networking/cozy-drive/default.nix index 75a11b0ea12c..57a791d9db4d 100644 --- a/pkgs/applications/networking/cozy-drive/default.nix +++ b/pkgs/applications/networking/cozy-drive/default.nix @@ -29,7 +29,7 @@ appimageTools.wrapType2 { description = "Cozy Drive is a synchronization tool for your files and folders with Cozy Cloud."; homepage = "https://cozy.io"; license = licenses.gpl3Only; - maintainers = with maintainers; [ "Simarra" ]; + maintainers = with maintainers; [ simarra ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8b81d1134353..96ed5a86a169 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.137"; + version = "3.1.140"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "15zl97laijn42rhh524rfb3h1rky461hwfnlny2maa3h61889xrv"; + sha256 = "15ngmpqqx902l7gxg2lb6h8q8vmjk247jbqhc92l1apr1imjqcc5"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index bca1a1affc0d..bb87bd38dc6b 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.23.0.39"; + version = "2.24.0.89"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-LGg14KJ/hEnSaSrdTltY9YXv7Nekkfo66uLkxjMx8AI="; + sha256 = "sha256-rneX8ys/oKfVLavAZk5RJouOZkVsp+9BIAReSeYiKJc="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index f1bce0b8fc06..9cca8b95b821 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.0", + "version": "1.9.2", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -57,7 +57,7 @@ "allchange": "^1.0.2", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "13", + "electron": "13.5", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", @@ -83,7 +83,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "13.4.0", + "electronVersion": "13.5.1", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 3aeaf58dbc26..f17cfd900a54 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -729,6 +729,14 @@ sha1 = "2b9252bd4fdf0393696190cd9550901dd967c777"; }; } + { + name = "_types_node___node_14.17.21.tgz"; + path = fetchurl { + name = "_types_node___node_14.17.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz"; + sha1 = "6359d8cf73481e312a43886fa50afc70ce5592c6"; + }; + } { name = "_types_plist___plist_3.0.2.tgz"; path = fetchurl { @@ -1626,11 +1634,11 @@ }; } { - name = "core_js___core_js_3.17.3.tgz"; + name = "core_js___core_js_3.18.2.tgz"; path = fetchurl { - name = "core_js___core_js_3.17.3.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz"; - sha1 = "8e8bd20e91df9951e903cabe91f9af4a0895bc1e"; + name = "core_js___core_js_3.18.2.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.18.2.tgz"; + sha1 = "63a551e8a29f305cd4123754846e65896619ba5b"; }; } { @@ -2002,11 +2010,11 @@ }; } { - name = "electron___electron_13.4.0.tgz"; + name = "electron___electron_13.5.1.tgz"; path = fetchurl { - name = "electron___electron_13.4.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.4.0.tgz"; - sha1 = "f9f9e518d8c6bf23bfa8b69580447eea3ca0f880"; + name = "electron___electron_13.5.1.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.5.1.tgz"; + sha1 = "76c02c39be228532f886a170b472cbd3d93f0d0f"; }; } { @@ -2154,13 +2162,21 @@ }; } { - name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; - path = fetchurl { - name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; - url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/2306b3d4da4eba908b256014b979f1d3d43d2945"; - sha1 = "e82e07e6163d15ee5243d8df073947540bf0efc9"; - }; - } + name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; + path = + let + repo = fetchgit { + url = "https://github.com/matrix-org/eslint-plugin-matrix-org.git"; + rev = "2306b3d4da4eba908b256014b979f1d3d43d2945"; + sha256 = "0ywgrls2phviz47kzsjrxijkdbs1ky77471fbq9cnpj0fs3si81c"; + }; + in + runCommand "2306b3d4da4eba908b256014b979f1d3d43d2945" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } { name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { @@ -3506,13 +3522,21 @@ }; } { - name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; - path = fetchurl { - name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; - url = "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; - sha1 = "efbc392e3523669d20b812a6dae2f6efb49b888d"; - }; - } + name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; + path = + let + repo = fetchgit { + url = "https://github.com/matrix-org/matrix-web-i18n.git"; + rev = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; + sha256 = "0whjmf23m3204ifgx3spfnlg9pwm956fc16gjxgp9ia0d93xrpn6"; + }; + in + runCommand "e5c7071e0cdf715de87ef39dc8260e11d7add2f8" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } { name = "memoizee___memoizee_0.4.15.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index c14f408441f2..bcd6dac47e05 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -19,12 +19,12 @@ let executableName = "element-desktop"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-vsLu41n3oCSyyPLgASs7jZViu6DPkWmMfSO7414VPO4="; + sha256 = "sha256-F1uyyBbs+U7tQzRtn+p923Z/BY8Nwxr/JTMYwsak8W8="; }; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index d1f128dda159..ca10fb2131f3 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.9.0"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-QMLa1Bgz9feAAR9PKVXAzlRDztJBZnGIG+SsPgwvYRw="; + sha256 = "sha256-Qkn0vyZGvBAeOfTzxydWzjFQJwY39INAhwZNX4xsM7U="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh index 69d0d3d70728..3bbc2f3fb4f0 100755 --- a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh +++ b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix +#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix nix-prefetch-git set -euo pipefail @@ -13,5 +13,5 @@ RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/element-desktop/$1" wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock -yarn2nix --lockfile=element-desktop-yarndeps.lock > element-desktop-yarndeps.nix +yarn2nix --no-patch --lockfile=element-desktop-yarndeps.lock > element-desktop-yarndeps.nix rm element-desktop-yarndeps.lock diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 5b14fba5b420..874fbd6375d0 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -2,7 +2,7 @@ freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, -hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }: +hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk, libappindicator-gtk3 }: let rpath = lib.makeLibraryPath [ @@ -21,6 +21,7 @@ let gnome2.GConf gtk3 pango + libappindicator-gtk3 libuuid libX11 libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index db30ede8a108..a4693dc667b9 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,43 +1,74 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub -, qmake, pkg-config, olm, wrapQtAppsHook -, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qtgraphicaleffects -, python3Packages, pyotherside, libXScrnSaver +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, libXScrnSaver +, olm +, pkg-config +, pyotherside +, python3Packages +, qmake +, qtbase +, qtgraphicaleffects +, qtkeychain +, qtmultimedia +, qtquickcontrols2 +, wrapQtAppsHook }: -let - pypkgs = with python3Packages; [ - aiofiles filetype matrix-nio appdirs cairosvg - pymediainfo setuptools html-sanitizer mistune blist - pyotherside - ]; -in mkDerivation rec { pname = "mirage"; - version = "0.6.4"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mirukana"; repo = pname; rev = "v${version}"; - sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv"; + sha256 = "sha256-dJS4lAXHHNUEAG75gQaS9+aQTTTj8KHqHjISioynFdY="; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook python3Packages.wrapPython ]; - - buildInputs = [ - qtbase qtmultimedia - qtquickcontrols2 - qtkeychain qtgraphicaleffects - olm pyotherside - libXScrnSaver + nativeBuildInputs = [ + pkg-config + python3Packages.wrapPython + qmake + wrapQtAppsHook ]; - propagatedBuildInputs = pypkgs; + buildInputs = [ + libXScrnSaver + olm + pyotherside + qtbase + qtgraphicaleffects + qtkeychain + qtmultimedia + qtquickcontrols2 + ] ++ pythonPath; - pythonPath = pypkgs; + pythonPath = with python3Packages; [ + aiofiles + appdirs + blist + cairosvg + filetype + html-sanitizer + hsluv + matrix-nio + mistune + plyer + pymediainfo + pyotherside + redbaron + simpleaudio + setuptools + watchgod + ]; - qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ]; + qmakeFlags = [ + "PREFIX=${placeholder "out"}" + "CONFIG+=qtquickcompiler" + ]; dontWrapQtApps = true; postInstall = '' @@ -45,14 +76,14 @@ mkDerivation rec { wrapProgram $out/bin/mirage \ --prefix PYTHONPATH : "$PYTHONPATH" \ "''${qtWrapperArgs[@]}" - ''; + ''; meta = with lib; { - description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; - license = licenses.lgpl3; - maintainers = with maintainers; [ colemickens ]; - broken = stdenv.isDarwin; + description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ colemickens AndersonTorres ]; inherit (qtbase.meta) platforms; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 9d8a0d68e756..9b15e12d66fc 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,33 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, openssl -, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive - -, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null -, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null -, traySupport ? true, gtk2 ? null -, pgpSupport ? true, gpgme ? null -, pythonPluginSupport ? true, python ? null -, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null +{ lib +, stdenv +, fetchFromGitHub +, autoconf-archive +, autoreconfHook +, cmocka +, curl +, expat +, expect +, glib +, glibcLocales +, libmesode +, libmicrohttpd +, libotr +, libuuid +, ncurses +, openssl +, pkg-config +, readline +, sqlite +, autoAwaySupport ? true, libXScrnSaver ? null, libX11 +, notifySupport ? true, libnotify, gdk-pixbuf +, omemoSupport ? true, libsignal-protocol-c, libgcrypt +, pgpSupport ? true, gpgme +, pythonPluginSupport ? true, python +, traySupport ? true, gtk }: assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; assert notifySupport -> libnotify != null && gdk-pixbuf != null; -assert traySupport -> gtk2 != null; +assert traySupport -> gtk != null; assert pgpSupport -> gpgme != null; assert pythonPluginSupport -> python != null; assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; -with lib; - stdenv.mkDerivation rec { pname = "profanity"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "0xmzsh0szm8x3hgw65j0cd2bp8cmrnq5pjz49lqajircyzflsngm"; + hash = "sha256-8WGHOy0fSW8o7vMCYZqqpvDsn81JZefM6wGfjQ5iKbU="; }; patches = [ @@ -37,26 +51,42 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - autoreconfHook autoconf-archive glibcLocales pkg-config + autoconf-archive + autoreconfHook + glibcLocales + pkg-config ]; buildInputs = [ - expect readline libuuid glib openssl expat ncurses libotr - curl libmesode cmocka libmicrohttpd sqlite - ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] - ++ optionals notifySupport [ libnotify gdk-pixbuf ] - ++ optionals traySupport [ gtk2 ] - ++ optionals pgpSupport [ gpgme ] - ++ optionals pythonPluginSupport [ python ] - ++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ]; + cmocka + curl + expat + expect + glib + libmesode + libmicrohttpd + libotr + libuuid + ncurses + openssl + readline + sqlite + ] ++ lib.optionals autoAwaySupport [ libXScrnSaver libX11 ] + ++ lib.optionals notifySupport [ libnotify gdk-pixbuf ] + ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ] + ++ lib.optionals pgpSupport [ gpgme ] + ++ lib.optionals pythonPluginSupport [ python ] + ++ lib.optionals traySupport [ gtk ]; # Enable feature flags, so that build fail if libs are missing - configureFlags = [ "--enable-c-plugins" "--enable-otr" ] - ++ optionals notifySupport [ "--enable-notifications" ] - ++ optionals traySupport [ "--enable-icons-and-clipboard" ] - ++ optionals pgpSupport [ "--enable-pgp" ] - ++ optionals pythonPluginSupport [ "--enable-python-plugins" ] - ++ optionals omemoSupport [ "--enable-omemo" ]; + configureFlags = [ + "--enable-c-plugins" + "--enable-otr" + ] ++ lib.optionals notifySupport [ "--enable-notifications" ] + ++ lib.optionals traySupport [ "--enable-icons-and-clipboard" ] + ++ lib.optionals pgpSupport [ "--enable-pgp" ] + ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ] + ++ lib.optionals omemoSupport [ "--enable-omemo" ]; preAutoreconf = '' mkdir m4 @@ -66,18 +96,15 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.utf8"; - meta = { + meta = with lib; { + homepage = "http://www.profanity.im/"; description = "A console based XMPP client"; longDescription = '' Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi. ''; - homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; - platforms = platforms.unix; - changelog = "https://github.com/profanity-im/profanity/releases/tag/${version}"; - downloadPage = "https://github.com/profanity-im/profanity/releases/"; maintainers = [ maintainers.devhell ]; - updateWalker = true; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 22ee49b9261e..fae4eff734e2 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -40,15 +40,43 @@ assert builtins.elem (lib.toLower chatType) [ assert enablePsiMedia -> enablePlugins; -mkDerivation rec { +mkDerivation { pname = "psi-plus"; - version = "1.5.1549"; + + # Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi + # and “-R” ending is optional revision number. + # + # The “psi-plus-snapshots” generally provides snapshots of these separate + # repositories glued together (there are also dependencies/libraries): + # + # 1. Psi + # 2. Plugins pack for Psi + # 3. “psimedia” plugin + # 4. Resources for Psi (icons, skins, sounds) + # + # “X.X.XXXX” is literally a version of Psi. + # So often when for instance plugins are updated separately a new snapshot is + # created. And that snapshot would also be linked to “X.X.XXXX” version. + # So many commits may have the same associated version of the snapshot. + # But mind that only one Git tag is created for “X.X.XXXX” version. + # + # It’s not yet defined in the Psi+ project what value to use as a version for + # any further releases that don’t change Psi version. + # + # Let’s do what Debian does for instance (appends “-R” where “R” is a revision + # number). + # E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/ + # + # This has been communicated with the Psi+ main devs in this XMPP MUC chat: + # psi-dev@conference.jabber.ru + # + version = "1.5.1556-2"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; - rev = version; - sha256 = "0jpv6qzfg6xjwkrnci7fav27nxm174i9l5g4vmsbchqpwfk90z2m"; + rev = "635879010b6697f7041a7bbea1853a1f4673c7f7"; + sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a"; }; cmakeFlags = [ @@ -96,7 +124,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://psi-plus.com"; - description = "XMPP (Jabber) client"; + description = "XMPP (Jabber) client based on Qt5"; maintainers = with maintainers; [ orivej misuzu unclechu ]; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix new file mode 100644 index 000000000000..36e7a651eb3e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -0,0 +1,92 @@ +{ lib, stdenv, pkgs, fetchurl }: +let + libPathNative = { packages }: lib.makeLibraryPath packages; +in +stdenv.mkDerivation rec { + pname = "rocketchat-desktop"; + version = "3.5.7"; + + src = fetchurl { + url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; + sha256 = "1ri8a60fsbqgq83f8wkyfnd59nqk4d0gpz1vanj54769zflpl71s"; + }; + + buildInputs = with pkgs; [ + gtk3 + stdenv.cc.cc + zlib + glib + dbus + atk + pango + freetype + libgnome-keyring3 + fontconfig + gdk-pixbuf + cairo + cups + expat + libgpg-error + alsa-lib + nspr + nss + xorg.libXrender + xorg.libX11 + xorg.libXext + xorg.libXdamage + xorg.libXtst + xorg.libXcomposite + xorg.libXi + xorg.libXfixes + xorg.libXrandr + xorg.libXcursor + xorg.libxkbfile + xorg.libXScrnSaver + systemd + libnotify + xorg.libxcb + at-spi2-atk + at-spi2-core + libdbusmenu + libdrm + mesa + xorg.libxshmfence + libxkbcommon + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + ar p $src data.tar.xz | tar xJ ./opt/ ./usr/ + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv opt $out + mv usr/share $out + ln -s $out/opt/Rocket.Chat/rocketchat-desktop $out/bin/rocketchat-desktop + runHook postInstall + ''; + + postFixup = + let + libpath = libPathNative { packages = buildInputs; }; + in + '' + app=$out/opt/Rocket.Chat + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libpath}:$app" \ + $app/rocketchat-desktop + sed -i -e "s|Exec=.*$|Exec=$out/bin/rocketchat-desktop|" $out/share/applications/rocketchat-desktop.desktop + ''; + + meta = with lib; { + description = "Official Desktop client for Rocket.Chat"; + homepage = "https://github.com/RocketChat/Rocket.Chat.Electron"; + license = licenses.mit; + maintainers = with maintainers; [ gbtb ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index c36159bfabd9..ea5ca8bebfaa 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.7.1"; + version = "1.7.3"; in appimageTools.wrapType2 { name = "session-desktop-appimage-${version}"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "126dx37099pjaqgfv5gbmvn5iiwv2a8lvfbqy5i9h1w1gqnihwq6"; + sha256 = "0s0zvj9ddrngdzsx8hd07pq3150sq8ab1hbpsi9i2ir99sv1p7gn"; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 81967bcbe2b7..7be5d62312de 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let --set LC_MESSAGES "${spellcheckerLanguage}"''); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.19.0"; # Please backport all updates to the stable channel. + version = "5.20.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0avns5axcfs8x9sv7hyjxi1cr7gag00avfj0h99wgn251b313g1a"; + sha256 = "0a57gajxjqkp7zcmjc3iiys06b7v53nd81gkwrsfn2gmshihlzkd"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 7db77fbc31e3..7550e72277f5 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.75.0.140"; + version = "8.77.0.97"; rpath = lib.makeLibraryPath [ alsa-lib @@ -69,7 +69,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-z3xsl53CSJthSd/BMbMD7RdYQ4z9oI/Rb9jUvd82H4E="; + sha256 = "sha256-0u1fpKJrsEgbvTwdkqJZ/SwCRDmJwEi9IXHbMmY8MJI="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 669e7de99fb8..d39ac978d8d3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -46,6 +46,7 @@ , libpsl , brotli , microsoft_gsl +, rlottie }: # Main reference: @@ -60,7 +61,7 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "3.1.1"; + version = "3.1.9"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -69,7 +70,7 @@ mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0h4g8lw9hf9pwmdljavflyn9g9jvjvany7y4vji0qcc1kd99vsnp"; + sha256 = "1nmakl9jxmw3k8gka56cyywbjwv06a5983dy6h9jhkkq950fn33s"; }; postPatch = '' @@ -138,6 +139,7 @@ mkDerivation rec { libpsl brotli microsoft_gsl + rlottie ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 2a91e3ebddcd..504481479ed2 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,25 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3Packages , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils -, meson, ninja +, meson, ninja, makeWrapper }: stdenv.mkDerivation rec { pname = "hexchat"; - version = "2.14.3"; + version = "2.16.0"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "08kvp0dcn3bvmlqcfp9312075bwkqkpa8m7zybr88pfp210gfl85"; + sha256 = "08zhlf9d3xdis62byxzgizhfg8kbppxl7cgxkzhwdc1srpj7vpx6"; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; buildInputs = [ - gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy + gtk2 lua perl python3Packages.python python3Packages.cffi pciutils dbus-glib libcanberra-gtk2 libproxy libnotify openssl desktop-file-utils isocodes ]; @@ -30,9 +30,10 @@ stdenv.mkDerivation rec { sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build chmod +x meson_post_install.py for f in meson_post_install.py \ - src/common/make-te.py \ plugins/perl/generate_header.py \ - po/validate-textevent-translations + plugins/python/generate_plugin.py \ + po/validate-textevent-translations \ + src/common/make-te.py do patchShebangs $f done @@ -40,6 +41,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; + postInstall = '' + wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH" + ''; + meta = with lib; { description = "A popular and easy to use graphical IRC (chat) client"; homepage = "https://hexchat.github.io/"; diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index d169e1fdea65..04f1732f7a5b 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alpine"; - version = "2.24"; + version = "2.25"; src = fetchurl { url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz"; - sha256 = "1vxw19nx10y7nx01d9i6gah2f3y5r2idbq56l13bdqi91bx9y6k5"; + sha256 = "0xppxhcbafq9qa1rns5zl0n238gai08xhvcf2as0nx7nh84ib2k5"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 2a6b0892bfe8..baad7602cf05 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.40.4"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0eAjb8gWhiyjqaOT5ur9gPoQv6W2u37u28qAJVMuUBU="; + sha256 = "1byi1ksimbycd0daxp5j240r3n5qlaa4b3c5l9jzkjr9g3gkclsq"; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 638d60777712..564a4c5499ea 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.40.4"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BYXp36VQQOySNTWgRIdiRl2J4zE1Cawya76Eal1mA3Q="; + sha256 = "0yj2hifis5m2cy59skn07d8n69444vlsw62ildr1fv67zxbblib8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 354ab024c6d0..d0575b60653b 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "alpha-0.7.1"; + version = "alpha-0.7.2"; src = fetchgit { url = "https://git.meli.delivery/meli/meli.git"; rev = version; - sha256 = "00iai2z5zydx9bw0ii0n6d7zwm5rrkj03b4ymic0ybwjahqzvyfq"; + sha256 = "sha256-cbigEJhX6vL+gHa40cxplmPsDhsqujkzQxe0Dr6+SK0="; }; - cargoSha256 = "1r54a51j91iv0ziasjygzw30vqqvqibcnwnkih5xv0ijbaly61n0"; + cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc="; cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index a7b90c284acf..a94555e7959b 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0s9wkygjd7xhvd1zdaidbvszq4abb0iv5830ir65glcfzbdbfak9"; + sha256 = "0z74slnq3y9wr1xr07jigz4n8dgxhk9qb0787sd0j6wj9g4rqxgg"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 50b3b66f15dc..23b636458c9b 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,27 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, fetchpatch +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: stdenv.mkDerivation rec { - version = "20210205"; + version = "20211015"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY="; + sha256 = "sha256-ObYeh9Q/WZ1N60pxR2LoDNCU8rP4tQt/oIxnqALqMhs="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-32055.patch"; - url = "https://github.com/neomutt/neomutt/commit/fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc.patch"; - sha256 = "0bb7gisjynq3w7hhl6vxa469h609bcz6fkdi8vf740pqrwhk68yn"; - }) - ]; - buildInputs = [ cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 26c9c873ea66..bc36c81155a2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.1.2"; + version = "91.2.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "f211ce2469f60862b1d641b5e165292d98db53695ab715090034c1ee2be7b04931f8e5e856b08b0c8c789e4d98df291d59283c257a38b556c0b4b0b63baa539f"; + sha512 = "1f21f77069490be2de131f6125a498c6ed0a7d10b2ff787891d8dea10019719fea8014a8b2d626a2365f10f6307b616e5f1eef2c601e4da5402c9d5fc7d35049"; }; patches = [ ]; diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 01ad09cd25f8..19354df40adf 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -1,28 +1,54 @@ -{ lib, fetchurl, appimageTools }: +{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, makeWrapper, +electron, libsecret }: -let +stdenv.mkDerivation rec { pname = "tutanota-desktop"; version = "3.88.4"; - name = "tutanota-desktop-${version}"; + src = fetchurl { - url = "https://mail.tutanota.com/desktop/tutanota-desktop-linux.AppImage"; - name = "tutanota-desktop-${version}.AppImage"; - sha256 = "sha256-MwvH6SGZwcvxAr5olklqKTF2p2pv8+F5qwpmwN3uZkc="; + url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; + name = "tutanota-desktop-${version}.tar.gz"; + sha256 = "sha256-UOb63+NfW6mHKaj3PDEzvz5hcmJBIISq02rtwgSZMjo="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { - inherit name src; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + dontConfigure = true; + dontBuild = true; - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + desktopItems = makeDesktopItem { + name = pname; + exec = "tutanota-desktop"; + icon = "tutanota-desktop"; + comment = meta.description; + desktopName = "Tutanota Desktop"; + genericName = "Email Reader"; + }; - install -m 444 -D ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications - substituteInPlace $out/share/applications/tutanota-desktop.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/opt/tutanota-desktop $out/share/tutanota-desktop + + cp -r ./ $out/opt/tutanota-desktop + mv $out/opt/tutanota-desktop/{locales,resources} $out/share/tutanota-desktop + + for icon_size in 64 512; do + icon=resources/icons/icon/$icon_size.png + path=$out/share/icons/hicolor/$icon_size'x'$icon_size/apps/tutanota-desktop.png + install -Dm644 $icon $path + done + + makeWrapper ${electron}/bin/electron \ + $out/bin/tutanota-desktop \ + --add-flags $out/share/tutanota-desktop/resources/app.asar \ + --run "mkdir /tmp/tutanota" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]} + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 75f620ead9cf..a14e55e51f29 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -1,26 +1,42 @@ -{ lib, stdenv, fetchurl, pkg-config, gnutls, gsasl, libidn, Security }: - -with lib; +{ lib +, stdenv +, fetchurl +, gnutls +, gsasl +, libidn +, pkg-config +, Security +}: stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.14"; + version = "1.4.15"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "046wbglvry54id9wik6c020fs09piv3gig3z0nh5nmyhsxjw4i18"; + sha256 = "sha256-P1KytdS8WO2TzwsRRs7k903oHCwHol7gMu+mWUZaAnA="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gnutls gsasl libidn ] - ++ optional stdenv.isDarwin Security; + nativeBuildInputs = [ + pkg-config + ]; - configureFlags = optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + buildInputs = [ + gnutls + gsasl + libidn + ] ++ lib.optional stdenv.isDarwin [ + Security + ]; - meta = { - description = "POP3 mail retrieval agent"; - homepage = "https://marlam.de/mpop"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; + configureFlags = lib.optional stdenv.isDarwin [ + "--with-macosx-keyring" + ]; + + meta = with lib;{ + description = "POP3 mail retrieval agent"; + homepage = "https://marlam.de/mpop"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; } diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 299ba0765cde..884e5a644fc0 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.16"; + version = "1.8.17"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1n271yr83grpki9szdirnk6wb5rcc319f0gmfabyw3fzyf4msjy0"; + sha256 = "sha256-D92+dMGp3PZGG0obDbPk00JmGEUAxAPX8QetQttOxNM="; }; patches = [ diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index ddf06a784f1f..3560e8066d88 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/pkgs/applications/networking/opsdroid/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "opsdroid"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "opsdroid"; repo = "opsdroid"; rev = "v${version}"; - sha256 = "1p1x7jbp0jx8anfwvavyn3x8i1vfhmbzyzrm014n26v5y39gabj1"; + sha256 = "15l2jvcpb9l8sgdd9zsvxqglf1r3vap0pp9cklpfa9jj0aik6nx9"; }; disabled = !python3Packages.isPy3k; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 7c9a697243bd..15688d383b38 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.9.0.5150"; + version = "2.9.1.5500"; src = fetchurl { url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "0nf68x840p30yng4fh1nlyiqg40z0rkcv0lskpz8dd4pj1iw5jjs"; + sha256 = "0h4dclxr6kmhmx318wvxz36lhyqw84q0mg4c6di6p230mp8b1l4v"; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index cfb228514cb7..ad791f46d739 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -15,7 +15,7 @@ let url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; }; - version = "build01475"; + version = "build01480"; freenet-jars = stdenv.mkDerivation { pname = "freenet-jars"; @@ -25,7 +25,7 @@ let owner = "freenet"; repo = "fred"; rev = version; - sha256 = "0k02fna9x219j7dhginbnf27i36bibb0rmm4qdwr5xm28hy1nd08"; + sha256 = "0wddkfyhsgs7bcq9svicz6l0a35yv82yqzmji3c345hg4hbch3kb"; }; patchPhase = '' diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index a13f84096863..e46909d2a7c3 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -30,7 +30,8 @@ python3Packages.buildPythonApplication rec { description = "Linux command-line client for ProtonVPN"; homepage = "https://github.com/protonvpn/linux-cli"; maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "protonvpn"; }; } diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 8029264fdaa7..ee92f4727c70 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -83,7 +83,8 @@ in python3Packages.buildPythonApplication rec { description = "Linux GUI for ProtonVPN, written in Python"; homepage = "https://github.com/ProtonVPN/linux-gui"; maintainers = with maintainers; [ offline ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "protonvpn-gui"; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 1b564e8daf4b..158f2aa327e0 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,16 +1,16 @@ { mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus -, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc -, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes +, qtbase, qtwebkit, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc +, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils , wrapQtAppsHook }: mkDerivation rec { pname = "teamviewer"; - version = "15.15.5"; + version = "15.22.3"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-H/CSc2RcjI+Fm8awYcXm3ioAJpbSNEMwGVrTozMux3A="; + sha256 = "15fvzhdq7mnx2l2w4byvij8ww16qwdlkbadal60rm66yzv79mv9w"; }; unpackPhase = '' @@ -19,7 +19,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; - buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; + buildInputs = [ dbus getconf qtbase qtwebkit qtwebengine qtx11extras libX11 ]; propagatedBuildInputs = [ qtquickcontrols ]; installPhase = '' @@ -28,6 +28,7 @@ mkDerivation rec { rm -R \ $out/share/teamviewer/logfiles \ $out/share/teamviewer/config \ + $out/share/teamviewer/tv_bin/RTlib \ $out/share/teamviewer/tv_bin/xdg-utils \ $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} @@ -38,6 +39,27 @@ mkDerivation rec { ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg-utils}/bin $out/share/teamviewer/tv_bin/xdg-utils + declare in_script_dir="./opt/teamviewer/tv_bin/script" + + install -d "$out/share/dbus-1/services" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.service" "$out/share/dbus-1/services" + substituteInPlace "$out/share/dbus-1/services/com.teamviewer.TeamViewer.service" \ + --replace '/opt/teamviewer/tv_bin/TeamViewer' \ + "$out/share/teamviewer/tv_bin/TeamViewer" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.Desktop.service" "$out/share/dbus-1/services" + substituteInPlace "$out/share/dbus-1/services/com.teamviewer.TeamViewer.Desktop.service" \ + --replace '/opt/teamviewer/tv_bin/TeamViewer_Desktop' \ + "$out/share/teamviewer/tv_bin/TeamViewer_Desktop" + + install -d "$out/share/dbus-1/system.d" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.Daemon.conf" "$out/share/dbus-1/system.d" + + install -d "$out/share/polkit-1/actions" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.policy" "$out/share/polkit-1/actions" + substituteInPlace "$out/share/polkit-1/actions/com.teamviewer.TeamViewer.policy" \ + --replace '/opt/teamviewer/tv_bin/script/execscript' \ + "$out/share/teamviewer/tv_bin/script/execscript" + for i in 16 20 24 32 48 256; do size=$i"x"$i @@ -51,17 +73,23 @@ mkDerivation rec { --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ --replace '/var/run/' '/run/' + ''; - wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/TeamViewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes ]}" + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ getconf coreutils ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus ]}" + ]; - wrapQtApp $out/share/teamviewer/tv_bin/script/teamviewer - wrapQtApp $out/bin/teamviewer + postFixup = '' + wrapProgram $out/share/teamviewer/tv_bin/teamviewerd ''${makeWrapperArgs[@]} + # tv_bin/script/teamviewer runs tvw_main which runs tv_bin/TeamViewer + wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer ''${makeWrapperArgs[@]} ''${qtWrapperArgs[@]} + wrapProgram $out/share/teamviewer/tv_bin/teamviewer-config ''${makeWrapperArgs[@]} ''${qtWrapperArgs[@]} + wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop ''${makeWrapperArgs[@]} ''${qtWrapperArgs[@]} ''; dontStrip = true; + dontWrapQtApps = true; preferLocalBuild = true; meta = with lib; { @@ -69,6 +97,6 @@ mkDerivation rec { license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga dasuxullebt ]; + maintainers = with maintainers; [ jagajaga dasuxullebt jraygauthier ]; }; } diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 88304e56a40a..dc3e8b25e70a 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { meta = base.meta // { description = "A fast incremental file transfer utility"; - maintainers = with lib.maintainers; [ peti ehmry kampfschlaefer ]; + maintainers = with lib.maintainers; [ ehmry kampfschlaefer ]; }; } diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 67a37b2d5113..f0aa32355450 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation { description = "Convert MS Word documents to plain text or PostScript"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.peti ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 2ecc334c3d20..03437742612f 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools +{ mkDerivation, lib, fetchpatch, fetchurl, extra-cmake-modules, kdoctools , boost, qtwebkit, qtx11extras, shared-mime-info , breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets , kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n @@ -21,6 +21,17 @@ mkDerivation rec { sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i"; }; + patches = [ + # Fix fontconfig underlinking: https://github.com/NixOS/nixpkgs/issues/137794 + # Can be dropped on next release. + (fetchpatch { + name = "fix-fontconfig-linking.patch"; + url = "https://github.com/KDE/calligra/commit/62f510702ef9c34ac50f8d8601a4290ab558464c.patch"; + sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma"; + excludes = [ "CMakeLists.txt" ]; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d4dad44d7da8..5bd8450a0b99 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { homepage = "http://www.gnucash.org/"; - maintainers = [ lib.maintainers.peti lib.maintainers.domenkozar ]; + maintainers = [ lib.maintainers.domenkozar ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index b3a38905531e..f319b419fbbc 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , meson @@ -6,25 +7,24 @@ , vala , pkg-config , desktop-file-utils -, pantheon , python3 , glib , gtk4 , json-glib , libadwaita , libgee -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "khronos"; - version = "3.5.9"; + version = "3.6.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "sha256-3FatmyANB/tNYSN2hu5IVkyCy0YrC3uA2d/3+5u48w8="; + sha256 = "sha256-AETyVCBUuBzHwDgTkGRIokFYwcmXrb/F85J5GEIu4dE="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -43,12 +43,14 @@ stdenv.mkDerivation rec { json-glib libadwaita libgee - pantheon.granite ]; postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py + # https://github.com/lainsce/khronos/pull/75 + substituteInPlace build-aux/post_install.py \ + --replace 'gtk-update-icon-cache' 'gtk4-update-icon-cache' ''; passthru = { diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix deleted file mode 100644 index 1971a7829447..000000000000 --- a/pkgs/applications/office/minetime/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ appimageTools, fetchurl, lib, runCommand, stdenv, gsettings-desktop-schemas, gtk3, zlib }: - -let - name = "${pname}-${version}"; - pname = "minetime"; - version = "1.8.10"; - appimage = fetchurl { - url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage"; - sha256 = "1a80lgk6v9kv9xb2y3i08gk25jm0pqyl57kfr5p1rbc33prhmcgw"; - }; - extracted = appimageTools.extractType2 { - inherit name; - src = appimage; - }; - patched = runCommand "minetime-patchelf" {} '' - cp -av ${extracted} $out - - x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService - chmod +w $x - - patchelf \ - --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ - $x - ''; -in -appimageTools.wrapAppImage rec { - inherit name; - src = patched; - - profile = '' - export LC_ALL=C.UTF-8 - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; - - multiPkgs = null; # no 32bit needed - extraPkgs = ps: - appimageTools.defaultFhsEnvArgs.multiPkgs ps - ++ (with ps; [ at-spi2-core at-spi2-atk libsecret libnotify ]); - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; - - meta = with lib; { - description = "Modern, intuitive and smart calendar application"; - homepage = "https://minetime.ai"; - license = licenses.unfree; - # Should be cross-platform, but for now we just grab the appimage - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ dtzWill ]; - }; -} diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 8533df467132..f5418f372983 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , autoPatchelfHook , fetchurl , glibc @@ -24,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.54.2"; + version = "0.55.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-fKUKVeR0q8oylpwF4d3jnkON4vbQ80Fc9WYWStb67ek="; + sha256 = "0s7qb7z2wiypiahw1y1lz9pbhxcacj5myzy0qcqjrpnaq7ymvs05"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index c843715fcd21..1bd29b06d9b9 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.9.2"; + version = "21.10.9"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "sha256-R+aXPnQ2Ns2D8PBTvaeh8ht3juZZhZJIb52A8CVRtFI="; + sha256 = "2c86d66ae427bdcd16d706b982cedaa669a27340f7819fc97a8e2b24c709e74f"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index ada2804ccba4..178b2351a6b6 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , mkDerivation , fetchurl -, autoPatchelfHook , dpkg , wrapGAppsHook , wrapQtAppsHook @@ -34,6 +33,8 @@ , unixODBC , xorg , zlib +, steam +, makeWrapper }: stdenv.mkDerivation rec { @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { rm opt/kingsoft/wps-office/office6/{libjsetapi.so,libjswppapi.so,libjswpsapi.so} ''; - nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook wrapQtAppsHook ]; + nativeBuildInputs = [ dpkg wrapGAppsHook wrapQtAppsHook makeWrapper ]; meta = with lib; { description = "Office suite, formerly Kingsoft Office"; @@ -107,6 +108,7 @@ stdenv.mkDerivation rec { sqlite unixODBC zlib + cups.lib ]; dontPatchELF = true; @@ -137,7 +139,12 @@ stdenv.mkDerivation rec { "tcmalloc" # gperftools ]; - installPhase = '' + installPhase = let + steam-run = (steam.override { + extraPkgs = p: buildInputs; + nativeOnly = true; + }).run; + in '' prefix=$out/opt/kingsoft/wps-office mkdir -p $out cp -r opt $out @@ -153,11 +160,14 @@ stdenv.mkDerivation rec { substituteInPlace $i \ --replace /usr/bin $out/bin done - ''; - runtimeLibPath = lib.makeLibraryPath [ - cups.lib - ]; + for i in wps wpp et wpspdf; do + mv $out/bin/$i $out/bin/.$i-orig + makeWrapper ${steam-run}/bin/steam-run $out/bin/$i \ + --add-flags $out/bin/.$i-orig \ + --argv0 $i + done + ''; dontWrapQtApps = true; dontWrapGApps = true; @@ -166,8 +176,7 @@ stdenv.mkDerivation rec { echo "Wrapping $f" wrapProgram "$f" \ "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" \ - --suffix LD_LIBRARY_PATH : "$runtimeLibPath" + "''${qtWrapperArgs[@]}" done ''; } diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 98dce802c5c5..a81227ddd46d 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hackrf"; - version = "2018.01.1"; + version = "2021.03.1"; src = fetchFromGitHub { - owner = "mossmann"; + owner = "greatscottgadgets"; repo = "hackrf"; rev = "v${version}"; - sha256 = "0idh983xh6gndk9kdgx5nzz76x3mxb42b02c5xvdqahadsfx3b9w"; + sha256 = "sha256-2kEfTco95I9YLz/18nfjJSd7U/HE5sBCEioWL2t804k="; }; nativeBuildInputs = [ @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { cd host ''; + postPatch = '' + substituteInPlace host/cmake/modules/FindFFTW.cmake \ + --replace "find_library (FFTW_LIBRARIES NAMES fftw3)" "find_library (FFTW_LIBRARIES NAMES fftw3f)" + ''; + meta = with lib; { description = "An open source SDR platform"; homepage = "https://greatscottgadgets.com/hackrf/"; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 37f04e0ba5a0..6b76c2de4b05 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { description = "Real-time 3D simulation of space"; changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 02ef96e2e123..898885047a05 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -37,6 +37,6 @@ mkDerivation rec { homepage = "http://stellarium.org/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ peti ma27 ]; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix index c4cae59d1c4e..2e44113f40ef 100644 --- a/pkgs/applications/science/biology/fastp/default.nix +++ b/pkgs/applications/science/biology/fastp/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , zlib +, libdeflate +, isa-l }: stdenv.mkDerivation rec { pname = "fastp"; - version = "0.22.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-XR76hNz7iGXQYSBbBandHZ+oU3wyTf1AKlu9Xeq/GyE="; + sha256 = "sha256-vRJlNtg2JabBAUaX91Y04z8MdyxEnreBAlIHn7VB+u4="; }; - buildInputs = [ zlib ]; + buildInputs = [ zlib libdeflate isa-l ]; installPhase = '' install -D fastp $out/bin/fastp diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 20d9565bce44..99210092a154 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "samtools"; - version = "1.11"; + version = "1.13"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1dp5wknak4arnw5ghhif9mmljlfnw5bgm91wib7z0j8wdjywx0z2"; + sha256 = "sha256-YWyi4FHMgAmh6cAc/Yx8r4twkW3f9m87dpFAeUZfjGA="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 437123faafd8..6931c8621c96 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -2,17 +2,29 @@ , openbabel, qttools, wrapQtAppsHook }: -stdenv.mkDerivation rec { +let + avogadroI18N = fetchFromGitHub { + owner = "OpenChemistry"; + repo = "avogadro-i18n"; + rev = "3b8a86cc37e988b043d1503d2f11068389b0aca3"; + sha256 = "9wLY7/EJyIZYnlUAMsViCwD5kGc1vCNbk8vUhb90LMQ="; + }; + +in stdenv.mkDerivation rec { pname = "avogadro2"; - version = "1.94.0"; + version = "1.95.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; rev = version; - sha256 = "6RaiX23YUMfTYAuSighcLGGlJtqeydNgi3PWGF77Jp8="; + sha256 = "9GnsxQsMuik6CPDmJbJPF0/+LXbZHf/JLevpSsMEoP0="; }; + postUnpack = '' + cp -r ${avogadroI18N} avogadro-i18n + ''; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index b539df7592a5..bb6af8a20fd1 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,16 +1,29 @@ -{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkg-config, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: +{ bzip2 +, fetchurl +, glib +, gperf +, gtk3 +, judy +, lib +, pkg-config +, stdenv +, tcl +, tk +, wrapGAppsHook +, xz +}: stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.110"; + version = "3.3.111"; src = fetchurl { - url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-Ku25IVa8ot3SWxODeMrOaxBY5X022TnvD3l2kAa3Wao="; + url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; + sha256 = "0cv222qhgldfniz6zys52zhrynfsp5v0h8ia857lng7v33vw5qdl"; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ]; + buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ]; configureFlags = [ "--with-tcl=${tcl}/lib" @@ -21,9 +34,9 @@ stdenv.mkDerivation rec { meta = { description = "VCD/Waveform viewer for Unix and Win32"; - homepage = "http://gtkwave.sourceforge.net"; - license = lib.licenses.gpl2Plus; + homepage = "http://gtkwave.sourceforge.net"; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ thoughtpolice ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 5a46e8f63840..6a3999585534 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.peti ]; hydraPlatforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 963015b11d50..837f25e320f7 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,13 +2,13 @@ let pname = "alt-ergo"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "OCamlPro"; repo = pname; rev = version; - sha256 = "1jm1yrvsg8iyfp9bb728zdx2i7yb6z7minjrfs27k5ncjqkjm65g"; + sha256 = "0hglj1p0753w2isds01h90knraxa42d2jghr35dpwf9g8a1sm9d3"; }; useDune2 = true; diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index f0cb1efb3050..c6b1f6652451 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { install -Dm0755 build/cadical "$out/bin/cadical" install -Dm0755 build/mobical "$out/bin/mobical" install -Dm0644 src/ccadical.h "$dev/include/ccadical.h" + install -Dm0644 src/cadical.hpp "$dev/include/cadical.hpp" install -Dm0644 build/libcadical.a "$lib/lib/libcadical.a" mkdir -p "$out/share/doc/${pname}/" install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}/" diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index e595bf47c67c..16db7384df17 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -44,6 +44,7 @@ let "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; + "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix @@ -163,7 +164,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = [ "revision" "coq" "coqide" "bin/votour" ]; + buildFlags = [ "revision" "coq" "coqide" ] ++ optional (!versionAtLeast "8.14") "bin/votour"; enableParallelBuilding = true; createFindlibDestdir = true; @@ -177,9 +178,11 @@ self = stdenv.mkDerivation { categories = "Development;Science;Math;IDE;GTK"; }); - postInstall = '' + postInstall = let suffix = if versionAtLeast "8.14" then "-core" else ""; in '' cp bin/votour $out/bin/ - ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq + ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix} + '' + optionalString (versionAtLeast "8.14") '' + ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server '' + optionalString buildIde '' mkdir -p "$out/share/pixmaps" ln -s "$out/share/coq/coq.png" "$out/share/pixmaps/" diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 1fb4693d64a2..987068d9bbb6 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl +, fetchpatch , openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }: let @@ -7,16 +8,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.0.7"; + version = "1.1.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-SFY9RbUHoaOXCaK+uIqhnKbzSkbtWiS6os/JvsggagI="; + sha256 = "0xmml81krr0i18b14dymfdq43szpzws7qj8k404qab51lkqxyxsb"; }; - cargoSha256 = "sha256-6TFionZw76V4htYQrz8eLX7ioW7Fbgd63rtz53s0TLU="; + cargoSha256 = "sha256-xjJ39hoSDn0VUH0YcL+mQBXbzFcIvZ38dPjBxV/yVNc="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -40,12 +41,17 @@ rustPlatform.buildRustPackage rec { --subst-var dynamicLinker \ --subst-var libPath '') + # fix build, will be included in 1.1.1 + (fetchpatch { + url = "https://github.com/leanprover/elan/commit/8d1dec09d67b2ac1768b111d24f1a1cabdd563fa.patch"; + sha256 = "sha256-yMdnXqycu4VF9EKavZ85EuspvAqvzDSIm5894SB+3+A="; + }) ]; postInstall = '' pushd $out/bin mv elan-init elan - for link in lean leanpkg leanchecker leanc leanmake; do + for link in lean leanpkg leanchecker leanc leanmake lake; do ln -s elan $link done popd diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index fc2c1e5cba4c..cbc85c5544cc 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -1,20 +1,31 @@ -{ lib, stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, eprover, ocaml, camlp4, perl, zlib }: stdenv.mkDerivation rec { pname = "leo2"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; - sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv"; + sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ eprover ocaml perl zlib ]; + buildInputs = [ eprover ocaml camlp4 perl zlib ]; - sourceRoot = "leo2/src"; + patches = [ (fetchpatch { + url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch"; + stripLen = 1; + extraPrefix = "lib/"; + sha256 = "sha256:01ln7hi6nvvkqkhn9hciqizizz5qspvqffgksvgmzn9x7kdd9pnh"; + }) + ]; - preConfigure = "patchShebangs configure"; + preConfigure = '' + cd src + patchShebangs configure + substituteInPlace Makefile.pre \ + --replace '+camlp4' "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" + ''; buildFlags = [ "opt" ]; diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index c26504bf7bdc..c5fc3a738373 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,18 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }: +{ lib, stdenv, fetchFromGitHub, cudd, gmp-static, gperf, autoreconfHook, libpoly }: stdenv.mkDerivation rec { pname = "yices"; - version = "2.6.1"; + # We never want X.Y.${odd} versions as they are moving development tags. + version = "2.6.2"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "yices2"; rev = "Yices-${version}"; - sha256 = "04vf468spsh00jh7gj94cjnq8kjyfwy9l6r4z7l2pm0zgwkqgyhm"; + sha256 = "1jx3854zxvfhxrdshbipxfgyq1yxb9ll9agjc2n0cj4vxkjyh9mn"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ gmp-static gperf libpoly ]; + buildInputs = [ cudd gmp-static gperf libpoly ]; configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" "--with-static-gmp-include-dir=${gmp-static.dev}/include" @@ -25,12 +26,16 @@ stdenv.mkDerivation rec { # Usual shenanigans patchPhase = "patchShebangs tests/regress/check.sh"; - # Includes a fix for the embedded soname being libyices.so.2.5, but - # only installing the libyices.so.2.5.x file. + # Includes a fix for the embedded soname being libyices.so.X.Y, but + # only installing the libyices.so.X.Y.Z file. installPhase = let ver_XdotY = lib.versions.majorMinor version; in '' make install LDCONFIG=true + # guard against packaging of unstable versions: they + # have a soname of hext (not current) release. + echo "Checking expected library version to be ${version}" + [ -f $out/lib/libyices.so.${version} ] ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}} ''; diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix index 9b7dabeb7200..2fbaa0a28caf 100644 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/pkgs/applications/science/logic/z3/4.4.0.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # z3's install phase is stupid because it tries to calculate the # python package store location itself, meaning it'll attempt to # write files into the nix store, and fail. - soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; + soext = stdenv.hostPlatform.extensions.sharedLibrary; installPhase = '' mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include cp ../src/api/z3*.h $out/include diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 263130c281b9..c26964bb3144 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = with maintainers; [ peti ] ++ teams.sage.members; + maintainers = with maintainers; teams.sage.members; }; } diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 6b6bfd7d6e5f..0c3ef25909bb 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -63,6 +63,5 @@ lib.fix (eukleides: stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; }) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 2b82a8f81705..3f295b416fb0 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -113,6 +113,5 @@ stdenv.mkDerivation ({ ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; }) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 2205e96383a4..57e4a6f1d336 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "https://wxmaxima-developers.github.io/wxmaxima/"; platforms = platforms.linux; - maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/applications/science/misc/openmodelica/combined/default.nix b/pkgs/applications/science/misc/openmodelica/combined/default.nix index 459a325111e2..0c2220b7ea28 100644 --- a/pkgs/applications/science/misc/openmodelica/combined/default.nix +++ b/pkgs/applications/science/misc/openmodelica/combined/default.nix @@ -24,7 +24,7 @@ symlinkJoin { description = "An open-source Modelica-based modeling and simulation environment intended for industrial and academic usage"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix index 94029fead48e..088fa83b7d92 100644 --- a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix +++ b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (pkg // { inherit omtarget postPatch preAutoreconf configureFlags configurePhase preBuild makeFlags installFlags; src = fetchgit (import ./src-main.nix); - version = "1.17.0"; + version = "1.18.0"; nativeBuildInputs = getAttrDef "nativeBuildInputs" [ ] pkg ++ [ autoconf automake libtool cmake autoreconfHook ]; diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix index c31b23d2f948..1ab8d9390db3 100644 --- a/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix +++ b/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix @@ -1,7 +1,7 @@ { url = "https://github.com/OpenModelica/OpenModelica/"; - rev = "08fd3f9144235f209a4ed7602bfadb32b1823628"; - sha256 = "0clgqk9ilnr43iyl5sdzwfzqpnw9amfy1npdgkpgm1wfnsvz6xrw"; + rev = "49be4faa5a625a18efbbd74cc2f5be86aeea37bb"; + sha256 = "0klqiy4sdizl1djb9hb0arcvfcjz2mmnakrjx81mmxcbr8yq2016"; fetchSubmodules = true; } -# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.17.0' --fetch-submodules +# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.18.0' --fetch-submodules diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix index b49c0f0f60ca..39591eceb40d 100644 --- a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix @@ -55,7 +55,7 @@ mkOpenModelicaDerivation ({ description = "Modelica compiler from OpenModelica suite"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } // lib.optionalAttrs isCross { diff --git a/pkgs/applications/science/misc/openmodelica/omedit/default.nix b/pkgs/applications/science/misc/openmodelica/omedit/default.nix index b0cc530ba37b..b24a43f702bb 100644 --- a/pkgs/applications/science/misc/openmodelica/omedit/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omedit/default.nix @@ -32,7 +32,7 @@ mkOpenModelicaDerivation rec { description = "A Modelica connection editor for OpenModelica"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix index 006daf18812f..a89b73eb8664 100644 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix @@ -31,7 +31,7 @@ mkOpenModelicaDerivation { including Modelica Standard Library"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix index c91addf78040..dff5ee78936a 100644 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix @@ -1,83 +1,81 @@ [ - { url = "https://github.com/modelica-3rdparty/AdvancedNoise.git"; rev = "5ce57acd279dadd0d25b76a6b02d3f9e9d061246"; sha256 = "07jjbj0y6bak269md3xniqb5lgc33m92ar5qixqxj5yxdjaahfs2"; fetchSubmodules = true; } - { url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "b00e01d911e2e54e148f24e36ee387a8b457d89c"; sha256 = "1sljddxkx208nill0975sz9b1xd701n97aia4wxihr140dgs4dgb"; fetchSubmodules = true; } - { url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "v0.4.0"; sha256 = "0dw34mjq29n55xh51g1c9a9d0d8gbpn16gj309dfxn4v2hbnfvzx"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/AlgebraTestSuite.git"; rev = "b937e1a7f447138c59abec9b2092f84f16bf02e8"; sha256 = "0406inasx61dk7vcnziiyhxkna7g61a5hn0znnbxj817hz6q11zn"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ApproxSpline.git"; rev = "28420f5c1a88c9cd069defbd8c05e4a78a090675"; sha256 = "07gpyi2brj5zpvrlsnflqjnhbrgxvpqbdshp8lp4lh9mnj5jv95d"; fetchSubmodules = true; } - { url = "https://github.com/OpenModelica/BioChem.git"; rev = "v1.0.2"; sha256 = "037bvj2lqrslg8k5r0rjgdzccslj9bj25b55k4g440vabm5p05qm"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256 = "0yrkk708v4bvf423xb4zgpmnaj8qhq5primdg758ayddgli23wa9"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "c2f564ae284726a2df6252a8561856691681572b"; sha256 = "01c2i2rlry7b4a6f2skkvzphcrfg5a2waxv4i7zgx5q275fg06i1"; fetchSubmodules = true; } - { url = "https://github.com/EDF-TREE/BuildSysPro.git"; rev = "v3.3.0"; sha256 = "1cvcany3q9p1xndarxa2d8mmqxdnqk22476q8l61nayz5qy25x61"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/BuildingControlLib.git"; rev = "v1.0.0"; sha256 = "0ckdxway0m755mbrl94k4458sijzgknlzsrf7xs5bjymxchm8r2m"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/BuildingSystems.git"; rev = "1e07bb475b921a4eedc6155c5310d1f9f3ef7550"; sha256 = "1xg831vqh6zw88cxxcb3sjgz44l7ygsgxddl05fp6xvz5sjpfcna"; fetchSubmodules = true; } - { url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v6.0.0"; sha256 = "0rnnk1clji0myzr7adggki6knbl6v8381vwnqgiz8mkxbmzdwm4f"; fetchSubmodules = true; } - { url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v7.0.0"; sha256 = "04n04pp4zvyg8n8h7h79c3wyk7lmn940mh7qzs0lv76g1ybypnlz"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "5645573fced862430b7b598b4d7ec1a39c7aa0fa"; sha256 = "1kh7kpmjfz55pb8553srlnrh8l00nw21xf5mjzh7nx9b1rndnmyg"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/DeployStructLib.git"; rev = "v1.0"; sha256 = "1k4zw9lnd0javw4zigxc15l58yf7xdz36b7808g65qxy89w6ksr2"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/DisHeatLib.git"; rev = "b11f53379c122870a52f2da9b1705d2c911cd21d"; sha256 = "1vm96a4z0b40r0nisxrrzyvan4yphjdkx4ad655phva2636xb5rr"; fetchSubmodules = true; } - { url = "https://github.com/AHaumer/DriveControl.git"; rev = "b7233fd97a92867bb4ec2c3647c7f7e888398644"; sha256 = "0nyp1n8wrkjzfypsmjjzac0g9p4wbc1cxxr040fj20bqdg9l3h1b"; fetchSubmodules = true; } - # A broken one. The revision is lost. - # { url = "https://github.com/AHaumer/EMOTH.git"; rev = "fa890c8c2781f0c0b2f8efe955ed8a27875dd9ac"; sha256 = ""; fetchSubmodules = true; } - { url = "https://github.com/christiankral/ElectroMechanicalDrives.git"; rev = "v2.2.0"; sha256 = "0012phmn1y9fgpph45lwbjk0yhm5czidf2z6khm8lddvk93wf31b"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "v2.5.0"; sha256 = "19dsyq1mk5vl54fqaffzqafm5w94l011cy7pg16c7i933dbqnkki"; fetchSubmodules = true; } - { url = "https://github.com/modelica/ExternalMedia.git"; rev = "159518edd538b64e28cd70983a9cc47730323cc4"; sha256 = "0qjd5fk65bln3s1jhs0cqcv54c22m6x2akbmxj09y4x0lkd1kgqn"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ExternalMemoryLib.git"; rev = "6488d5815bda23c665123baa916789e283e16d2c"; sha256 = "06y1i5w690b3b9x23nzls8y67fl7yd7bn4xl5j0dmyi4qx33aqda"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/FMITest.git"; rev = "a67a276083f4010b249802ad8fc70dc30c09adfd"; sha256 = "0mg8jlvlwql2nsjiy7c3rdibv73bkfk149ac0450d5pc0hfn9mln"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/FailureModes.git"; rev = "v1.2.1"; sha256 = "1z8bwrld1rkydgssab5gnrd76frrbky8qxi1lvlaf2jidj6bzn1l"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "v0.6.6"; sha256 = "0a08yyrbg4a49s0bgqgyds6pidx9xr47yspvl9bdak1mq34qibip"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/FeedDriveLibrary.git"; rev = "1.0.1"; sha256 = "15fi9dj6zgl0fr90cwxqjbpphj0dwrrmk74hf25j6zd85w2ycqdz"; fetchSubmodules = true; } - { url = "https://github.com/DLR-SR/FractionalOrder.git"; rev = "99918820e346c362c3ad52d782c8215e5deeac4c"; sha256 = "1pycss6fqh86frfdbdfffjhaz09fz1558f9azgckhf8drx6ry1qs"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Greenhouses-Library.git"; rev = "89ae0e8097eb0751abce2013d304fa5f9c09b885"; sha256 = "1q77xj6aysqsn3d7kjmcq7dihbw18iqm35ifzdi75xgf3cgwla4f"; fetchSubmodules = true; } - { url = "https://github.com/christiankral/HanserModelica.git"; rev = "v1.1.0"; sha256 = "0zwkrhg2y42m18p4z51izrickiv1vikgz0z7fpjia4dbppckav8i"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "3b4a4bca94d388744b2d045344ea2f9b0b4d405b"; sha256 = "17fzpan89075vb5vbhw5ylgxcdsmj2vjnmmka7cgzh06izb69nvh"; fetchSubmodules = true; } - { url = "https://github.com/ibpsa/modelica-ibpsa.git"; rev = "v3.0.0"; sha256 = "0xwgfndlw76zfmiiqadl85l9na9igsqlmfcawx526sdw2lhhgics"; fetchSubmodules = true; } - { url = "https://github.com/open-ideas/IDEAS.git"; rev = "v2.1.0"; sha256 = "0xp0zg6ib5536d5vl361lsn5w5faqdf6djhcmfxns629wjima8rn"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "v1.1.0"; sha256 = "1nvgx94iy1pws0768anrl7ssjlzslb5mbp21j7xvf6wpqfmj0npc"; fetchSubmodules = true; } - { url = "https://github.com/christiankral/KeyWordIO.git"; rev = "v0.9.0"; sha256 = "10kvj6zn2r6m3403ja8nkkxbfcchkz0pfk3g70ibr76zivxb5nim"; fetchSubmodules = true; } - { url = "https://github.com/FishSim/LibRAS.git"; rev = "fca9de50a484a2213f3ca1b39e275c237c471688"; sha256 = "0w1c87sifq8klq0f2l70qxjrlvahyxy1cx9rln80rni4d427yc1k"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "v1.0"; sha256 = "1crj60i5f33l9pgip0xbv6ankcga7px0644cj7c2wnzn1fjmn2k8"; fetchSubmodules = true; } - { url = "https://github.com/looms-polimi/MEV.git"; rev = "v1.0.1"; sha256 = "1a7ih9lc01wzaq8a8aznggpi4aqnczyzq49q5hc4fqvmfwl7l0j3"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ModPowerSystems.git"; rev = "df3afce27d5e935c4111f392275744a655abe216"; sha256 = "1b1fikm92lv6gj82imka3hxbjwv04i4h33y69yhcxdpqa6z6hm4z"; fetchSubmodules = true; } - { url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "614a148f61c1ab5d6788d8c11197803132ec7c2f"; sha256 = "0fg0pbahybx3srv5npk8pw49k23kaw2ns6c00f15iy93mvfrmfsk"; fetchSubmodules = true; } - { url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "34fe8cf3c7127ae09ca5f41e26b48fb6044e1e34"; sha256 = "0yz82k9dsp9d1jxqgxcm27fw1jz718km43qfginmgg0m9kfh2336"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Modelica-Arduino.git"; rev = "v0.1.0"; sha256 = "1n34dksqhrn1synv2mp2ifk4dxyhp15f5v1jb1b3dbw9n19951qb"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Modelica-GNU_ScientificLibrary.git"; rev = "9235ab28bdd7f0fe3e7abba48af53d73332858ec"; sha256 = "168g9gg12lfa863ifs41bnx6yd0yyjnal6986dgpm51dj5arw6id"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Modelica-MVEM.git"; rev = "v1.0.1"; sha256 = "1p68691dnl06lgwm4bl9g036brn4vl7m5x3gq4rxc291339frixk"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ModelicaADS.git"; rev = "v1.0.1"; sha256 = "0fhxrl07d7v3wa79d30psm1gxydc0p7s2akfirdx6dai0633skp9"; fetchSubmodules = true; } - { url = "https://github.com/xogeny/ModelicaBook.git"; rev = "v0.6.0"; sha256 = "0yqbll6p738yvpi1x11cjngpz2glda07mljrkjlm23p7l53x63dc"; fetchSubmodules = true; } - { url = "https://github.com/modelica-compliance/compliance.git"; rev = "8a91e75d8a26acc4de30fc0e5d5e9db83c970bd6"; sha256 = "1cym1wlgsvfrryq8zqzzrgs4wam1l7pc20q07hk3d615nhq21lg6"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ModelicaDFR.git"; rev = "37a441934d05330cf3d13e9ec551954d27eca84c"; sha256 = "13rpcs8cl9x15vi655150zmhmg1iaxpzvxrl3rqif46zpl5dhlj2"; fetchSubmodules = true; } - { url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "v1.8.2"; sha256 = "16c0p9zn0qrraz59ivinibmikdd251plm1vqngznzhksjwvz6bja"; fetchSubmodules = true; } - { url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "v2.3.5"; sha256 = "0rzicynqgayydxqynnairxk7ybg4alv1xnfz8cgkrpicl2g9bacg"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Modelica_Requirements.git"; rev = "a427b5cb7997e9036c577d219e6b8a5d0c28389a"; sha256 = "1ihx46kifnfi9kw1g8nmd9sarl766whbzdk6a44alczsya4gg45k"; fetchSubmodules = true; } - { url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "c8350276bfd945086962cf4150ba941b9c57ed13"; sha256 = "12ad7fpjy50ky3lvl65r9d5xvlzvw5yqdnbp4rsgl3qw7s3wrmja"; fetchSubmodules = true; } - { url = "https://github.com/jwindahlModelon/MultiPhaseMixtureMedia.git"; rev = "0bda0c58af6384f8e0edf7aa7520afb369af3e38"; sha256 = "11bqm69504bh4h05dxlwdmjfxwls06mr49cz47kl8jmrygkfi4i2"; fetchSubmodules = true; } - { url = "https://github.com/OpenIPSL/OpenIPSL.git"; rev = "v1.5.0"; sha256 = "09xrcz0rdxdy220ki5zyl7920y0a4lg24p0aibna4ad15vszhhwj"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Optimisers.git"; rev = "e33c69edaad6dad8029167b0ca00533964a6fe37"; sha256 = "0hcxsrr2n4fzaxdjvgvqayz38kpfk86cclvg5pzcfmjc5bznb8bs"; fetchSubmodules = true; } - { url = "https://github.com/lochel/PNlib.git"; rev = "ab9b6b8527c0c78140365e7b105ae469d4954a64"; sha256 = "0y7bfbnvzv9bnz4v8wvmy42dji3cqpy5b2fmd2jj0rhlzs1infzh"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/PVSystems.git"; rev = "v0.6.2"; sha256 = "0vcgvdaqfbn46lpzk0kvsif3d55wf8yzhkbdpf5zv04kv7zw25w9"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/PhotoVoltaics.git"; rev = "v1.6.0"; sha256 = "0zqx77z217iln3vfxn2v3c2jl0jz5kgcd96ylvimjnwr30mxr09n"; fetchSubmodules = true; } - { url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "v2.3.1"; sha256 = "0nxfw63m278gaff18zz29n2s1vk4kwdbv2qvbjmcq86fl1i5b3bg"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Physiomodel.git"; rev = "v1.0.0"; sha256 = "1sdhv5qgjqv3zdq57pkkrh04ainwv9n5zqd8mb9a3ybjmwdjf6f9"; fetchSubmodules = true; } - { url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "55224a9e76de8aa7f708236bd4d7dee624ecba50"; sha256 = "0hf7vi44adss86x5ahk5if7bdjgw773d8mb3d8ianq12g8azycyd"; fetchSubmodules = true; } - { url = "https://github.com/PowerGrids/PowerGrids.git"; rev = "v1.0.0"; sha256 = "06bx8mqvmizhfwg99djdfgh2mblc4wzmg0zq4ilrp586jwfninmz"; fetchSubmodules = true; } - { url = "https://github.com/modelica/PowerSystems.git"; rev = "v1.0.0"; sha256 = "1xwhwich7gi6vl33zl2r78xdjklchgkjcnvww6390j20l1wjznkn"; fetchSubmodules = true; } - { url = "https://github.com/modelica/PowerSystems.git"; rev = "7369976265a9d7b62097340aba5e463c62cc5061"; sha256 = "1f0h148v2g057l6ixf646d8ymsx1jzqn14xlram8h62la2k6nmvw"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "v1.0.2"; sha256 = "0ch4la04hm059ii5wzph9gsbvqhnfqrvvpqi57qn27bm10c4la0m"; fetchSubmodules = true; } - { url = "https://github.com/casella/ScalableTestSuite.git"; rev = "v1.11.5"; sha256 = "0bhj1q9b8d29nrbr253zszy1w1yvyizvyr3law1pqjj6mhbqmg4i"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "3bf82ba5d3f31b4a0ae05f99ae690037358e153e"; sha256 = "1swka7d58wkg5pqv59lqgfi7gv6rg5vra4j6r76pn9czx9ddal8w"; fetchSubmodules = true; } - { url = "https://github.com/SolarTherm/SolarTherm.git"; rev = "d80fc335d1fa5d1628c45c2e73204bcb8a614b21"; sha256 = "18d8cqlh0ic2yfcxzkz0ar9z19486z9x4sc7c9mpggxib28p39aa"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Soltermica.git"; rev = "9f7224bd89335f95dffe1ccdaa094df5a3279fdf"; sha256 = "1bif3cnwjas6x7b8ahwkm7dbrqrfdqwwa26zmdc6zrpfncl3kqd0"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "2f6bd9382c5aac2aff9148cd9113a418767734b6"; sha256 = "0ii2mj6ngwjir3gzyad8wsj86pvd6wzal91nz2y7gzwj1djchb3x"; fetchSubmodules = true; } - { url = "https://github.com/thom-marx/ThermalSeparation.git"; rev = "ffa0495ba829ecab105be4bfb3b7652625ec9c03"; sha256 = "1czm97bcrpp2jv0a0kd31a929wqlrlzdhdxvyy4w499dn20jzv1l"; fetchSubmodules = true; } - { url = "https://github.com/casella/ThermoPower.git"; rev = "82d21eba0d330005899dd50a6a0ceb7d09c4caeb"; sha256 = "0n83b40hjisy7lpnbz692947d2q3hw5hk4rak7fg0w5dbm4i719p"; fetchSubmodules = true; } - { url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5"; sha256 = "12fsf0xxxc1ja6vmm9ff85f8j5sg1lb7w4g57s2w3fkf4d3a7d0c"; fetchSubmodules = true; } - { url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "5cef9acb4dedf8af6f4638a4448f08a544ebd30b"; sha256 = "0ihnz1s4rs42yis9zym9nw29ia2lqz2yx2wblc50p6f221w7q78s"; fetchSubmodules = true; } - { url = "https://github.com/lenaRB/VVDRlib.git"; rev = "eae4981674642eddffc7f2aa3690320fcaddee0e"; sha256 = "0qxxk2xlas5mqyc1h8ndic208qj1sm5mr5y8664kv3py7i8jdqi4"; fetchSubmodules = true; } - { url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "v1.2.5"; sha256 = "044k17cpc88wprrvw03p6crm6dy6x9a6xj5104d5nln71lqz5sdq"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "v2.1.0"; sha256 = "1dxr4m9j7b5266daj4klbrhvnkqr73sximdw9bk9v5qf0s28li99"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/WindPowerPlants.git"; rev = "v1.2.0"; sha256 = "1lyrqwsb6sm1wc7vlj72zk5cpjhhzh27fviiqayddqy2b903xish"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ipsl.git"; rev = "v1.1.1"; sha256 = "1w2iah8c5d8n01wmxydjk0rrcxh88g8yjy2zmv403azcccq7byzp"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "v2.5.0"; sha256 = "1pd5xf5bgz010lryv8bj6lvlfqn9p184csiffwj8icx7rycnlcqb"; fetchSubmodules = true; } - { url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "58a83b5b36f267613de4676c95163489b1ddc2e7"; sha256 = "0wf6dn64d2psv9b3xg5227vzpk109r3dqzi4m2wwhrilaxs3v004"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/AdvancedNoise.git"; rev = "5ce57acd279dadd0d25b76a6b02d3f9e9d061246"; sha256 = "07jjbj0y6bak269md3xniqb5lgc33m92ar5qixqxj5yxdjaahfs2"; fetchSubmodules = true; } +{ url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "65e49ddf5c935846888a61aa303e52c909619079"; sha256 = "18xn8j3x3j4x9bpjgqnq0b6p3yzzsg5n62fv1ldqbbjcmi0vimd5"; fetchSubmodules = true; } +{ url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "v0.4.0"; sha256 = "0dw34mjq29n55xh51g1c9a9d0d8gbpn16gj309dfxn4v2hbnfvzx"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/AlgebraTestSuite.git"; rev = "b937e1a7f447138c59abec9b2092f84f16bf02e8"; sha256 = "0406inasx61dk7vcnziiyhxkna7g61a5hn0znnbxj817hz6q11zn"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ApproxSpline.git"; rev = "28420f5c1a88c9cd069defbd8c05e4a78a090675"; sha256 = "07gpyi2brj5zpvrlsnflqjnhbrgxvpqbdshp8lp4lh9mnj5jv95d"; fetchSubmodules = true; } +{ url = "https://github.com/OpenModelica/BioChem.git"; rev = "v1.0.2"; sha256 = "037bvj2lqrslg8k5r0rjgdzccslj9bj25b55k4g440vabm5p05qm"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256 = "0yrkk708v4bvf423xb4zgpmnaj8qhq5primdg758ayddgli23wa9"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "834fb3519ca8f89efe268582d39d00a7c3991150"; sha256 = "1iwqh4kr36wgxc0gci63gdgbqln2sap1w4bkydk1vkss2s302lg4"; fetchSubmodules = true; } +{ url = "https://github.com/EDF-TREE/BuildSysPro.git"; rev = "v3.3.0"; sha256 = "1cvcany3q9p1xndarxa2d8mmqxdnqk22476q8l61nayz5qy25x61"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/BuildingControlLib.git"; rev = "v1.0.0"; sha256 = "0ckdxway0m755mbrl94k4458sijzgknlzsrf7xs5bjymxchm8r2m"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/BuildingSystems.git"; rev = "c3070d48015ee75c1577f349cb388a498bef7270"; sha256 = "0r876wm6f1xx4cli1lqlylpl3zgaddmy06hcafbnzry9j38vbz4y"; fetchSubmodules = true; } +{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v6.0.0"; sha256 = "0rnnk1clji0myzr7adggki6knbl6v8381vwnqgiz8mkxbmzdwm4f"; fetchSubmodules = true; } +{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v7.0.0"; sha256 = "04n04pp4zvyg8n8h7h79c3wyk7lmn940mh7qzs0lv76g1ybypnlz"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "5645573fced862430b7b598b4d7ec1a39c7aa0fa"; sha256 = "1kh7kpmjfz55pb8553srlnrh8l00nw21xf5mjzh7nx9b1rndnmyg"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/DeployStructLib.git"; rev = "v1.0"; sha256 = "1k4zw9lnd0javw4zigxc15l58yf7xdz36b7808g65qxy89w6ksr2"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/DisHeatLib.git"; rev = "b11f53379c122870a52f2da9b1705d2c911cd21d"; sha256 = "1vm96a4z0b40r0nisxrrzyvan4yphjdkx4ad655phva2636xb5rr"; fetchSubmodules = true; } +{ url = "https://github.com/AHaumer/DriveControl.git"; rev = "b7233fd97a92867bb4ec2c3647c7f7e888398644"; sha256 = "0nyp1n8wrkjzfypsmjjzac0g9p4wbc1cxxr040fj20bqdg9l3h1b"; fetchSubmodules = true; } +{ url = "https://github.com/christiankral/ElectroMechanicalDrives.git"; rev = "v2.2.0"; sha256 = "0012phmn1y9fgpph45lwbjk0yhm5czidf2z6khm8lddvk93wf31b"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "v2.5.0"; sha256 = "19dsyq1mk5vl54fqaffzqafm5w94l011cy7pg16c7i933dbqnkki"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/ExternalMedia.git"; rev = "6138312c96142ff3c01190147e6277991bfa2fca"; sha256 = "1d9g2hbdvgz13j7kdi1kglkkllj9f00x3dwdp5piyypvs464jsn5"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ExternalMemoryLib.git"; rev = "6488d5815bda23c665123baa916789e283e16d2c"; sha256 = "06y1i5w690b3b9x23nzls8y67fl7yd7bn4xl5j0dmyi4qx33aqda"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/FMITest.git"; rev = "a67a276083f4010b249802ad8fc70dc30c09adfd"; sha256 = "0mg8jlvlwql2nsjiy7c3rdibv73bkfk149ac0450d5pc0hfn9mln"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/FailureModes.git"; rev = "v1.2.1"; sha256 = "1z8bwrld1rkydgssab5gnrd76frrbky8qxi1lvlaf2jidj6bzn1l"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "v0.6.6"; sha256 = "0a08yyrbg4a49s0bgqgyds6pidx9xr47yspvl9bdak1mq34qibip"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/FeedDriveLibrary.git"; rev = "1.0.1"; sha256 = "15fi9dj6zgl0fr90cwxqjbpphj0dwrrmk74hf25j6zd85w2ycqdz"; fetchSubmodules = true; } +{ url = "https://github.com/DLR-SR/FractionalOrder.git"; rev = "99918820e346c362c3ad52d782c8215e5deeac4c"; sha256 = "1pycss6fqh86frfdbdfffjhaz09fz1558f9azgckhf8drx6ry1qs"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Greenhouses-Library.git"; rev = "89ae0e8097eb0751abce2013d304fa5f9c09b885"; sha256 = "1q77xj6aysqsn3d7kjmcq7dihbw18iqm35ifzdi75xgf3cgwla4f"; fetchSubmodules = true; } +{ url = "https://github.com/christiankral/HanserModelica.git"; rev = "v1.1.0"; sha256 = "0zwkrhg2y42m18p4z51izrickiv1vikgz0z7fpjia4dbppckav8i"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "3b4a4bca94d388744b2d045344ea2f9b0b4d405b"; sha256 = "17fzpan89075vb5vbhw5ylgxcdsmj2vjnmmka7cgzh06izb69nvh"; fetchSubmodules = true; } +{ url = "https://github.com/ibpsa/modelica-ibpsa.git"; rev = "v3.0.0"; sha256 = "0xwgfndlw76zfmiiqadl85l9na9igsqlmfcawx526sdw2lhhgics"; fetchSubmodules = true; } +{ url = "https://github.com/open-ideas/IDEAS.git"; rev = "v2.1.0"; sha256 = "0xp0zg6ib5536d5vl361lsn5w5faqdf6djhcmfxns629wjima8rn"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "v1.1.0"; sha256 = "1nvgx94iy1pws0768anrl7ssjlzslb5mbp21j7xvf6wpqfmj0npc"; fetchSubmodules = true; } +{ url = "https://github.com/christiankral/KeyWordIO.git"; rev = "v0.9.0"; sha256 = "10kvj6zn2r6m3403ja8nkkxbfcchkz0pfk3g70ibr76zivxb5nim"; fetchSubmodules = true; } +{ url = "https://github.com/FishSim/LibRAS.git"; rev = "fca9de50a484a2213f3ca1b39e275c237c471688"; sha256 = "0w1c87sifq8klq0f2l70qxjrlvahyxy1cx9rln80rni4d427yc1k"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "v1.0"; sha256 = "1crj60i5f33l9pgip0xbv6ankcga7px0644cj7c2wnzn1fjmn2k8"; fetchSubmodules = true; } +{ url = "https://github.com/looms-polimi/MEV.git"; rev = "v1.0.1"; sha256 = "1a7ih9lc01wzaq8a8aznggpi4aqnczyzq49q5hc4fqvmfwl7l0j3"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ModPowerSystems.git"; rev = "df3afce27d5e935c4111f392275744a655abe216"; sha256 = "1b1fikm92lv6gj82imka3hxbjwv04i4h33y69yhcxdpqa6z6hm4z"; fetchSubmodules = true; } +{ url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "4a91d52248b0f17415bba1d58881fc730bd94215"; sha256 = "19caxz6hvlrsls3b2387a24zwwnykbb138jpb42gwpy8jlh93yzi"; fetchSubmodules = true; } +{ url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "cab27240a4a3ed4ea137226f056bbc0d79543f7a"; sha256 = "06y911i2hs7hg4ykhb8wngvxhwnaww8rsakwa7ssd047a7glzsb0"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Modelica-Arduino.git"; rev = "v0.1.0"; sha256 = "1n34dksqhrn1synv2mp2ifk4dxyhp15f5v1jb1b3dbw9n19951qb"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Modelica-GNU_ScientificLibrary.git"; rev = "9235ab28bdd7f0fe3e7abba48af53d73332858ec"; sha256 = "168g9gg12lfa863ifs41bnx6yd0yyjnal6986dgpm51dj5arw6id"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Modelica-MVEM.git"; rev = "v1.0.1"; sha256 = "1p68691dnl06lgwm4bl9g036brn4vl7m5x3gq4rxc291339frixk"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ModelicaADS.git"; rev = "v1.0.1"; sha256 = "0fhxrl07d7v3wa79d30psm1gxydc0p7s2akfirdx6dai0633skp9"; fetchSubmodules = true; } +{ url = "https://github.com/xogeny/ModelicaBook.git"; rev = "v0.6.0"; sha256 = "0yqbll6p738yvpi1x11cjngpz2glda07mljrkjlm23p7l53x63dc"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-compliance/compliance.git"; rev = "8a91e75d8a26acc4de30fc0e5d5e9db83c970bd6"; sha256 = "1cym1wlgsvfrryq8zqzzrgs4wam1l7pc20q07hk3d615nhq21lg6"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ModelicaDFR.git"; rev = "37a441934d05330cf3d13e9ec551954d27eca84c"; sha256 = "13rpcs8cl9x15vi655150zmhmg1iaxpzvxrl3rqif46zpl5dhlj2"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "v1.8.2"; sha256 = "16c0p9zn0qrraz59ivinibmikdd251plm1vqngznzhksjwvz6bja"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "v2.3.5"; sha256 = "0rzicynqgayydxqynnairxk7ybg4alv1xnfz8cgkrpicl2g9bacg"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Modelica_Requirements.git"; rev = "a427b5cb7997e9036c577d219e6b8a5d0c28389a"; sha256 = "1ihx46kifnfi9kw1g8nmd9sarl766whbzdk6a44alczsya4gg45k"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "c8350276bfd945086962cf4150ba941b9c57ed13"; sha256 = "12ad7fpjy50ky3lvl65r9d5xvlzvw5yqdnbp4rsgl3qw7s3wrmja"; fetchSubmodules = true; } +{ url = "https://github.com/jwindahlModelon/MultiPhaseMixtureMedia.git"; rev = "0bda0c58af6384f8e0edf7aa7520afb369af3e38"; sha256 = "11bqm69504bh4h05dxlwdmjfxwls06mr49cz47kl8jmrygkfi4i2"; fetchSubmodules = true; } +{ url = "https://github.com/OpenIPSL/OpenIPSL.git"; rev = "v1.5.0"; sha256 = "09xrcz0rdxdy220ki5zyl7920y0a4lg24p0aibna4ad15vszhhwj"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Optimisers.git"; rev = "e33c69edaad6dad8029167b0ca00533964a6fe37"; sha256 = "0hcxsrr2n4fzaxdjvgvqayz38kpfk86cclvg5pzcfmjc5bznb8bs"; fetchSubmodules = true; } +{ url = "https://github.com/lochel/PNlib.git"; rev = "059545d48dd9ceeccfa3b4e47689ec8dd334dcd8"; sha256 = "1a0hxkgsi4klw9c8zav1dy2p1c85ald29gx82hfacwv55xl9f127"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/PVSystems.git"; rev = "v0.6.2"; sha256 = "0vcgvdaqfbn46lpzk0kvsif3d55wf8yzhkbdpf5zv04kv7zw25w9"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/PhotoVoltaics.git"; rev = "v1.6.0"; sha256 = "0zqx77z217iln3vfxn2v3c2jl0jz5kgcd96ylvimjnwr30mxr09n"; fetchSubmodules = true; } +{ url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "v2.3.1"; sha256 = "0nxfw63m278gaff18zz29n2s1vk4kwdbv2qvbjmcq86fl1i5b3bg"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Physiomodel.git"; rev = "v1.0.0"; sha256 = "1sdhv5qgjqv3zdq57pkkrh04ainwv9n5zqd8mb9a3ybjmwdjf6f9"; fetchSubmodules = true; } +{ url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "55224a9e76de8aa7f708236bd4d7dee624ecba50"; sha256 = "0hf7vi44adss86x5ahk5if7bdjgw773d8mb3d8ianq12g8azycyd"; fetchSubmodules = true; } +{ url = "https://github.com/PowerGrids/PowerGrids.git"; rev = "v1.0.0"; sha256 = "06bx8mqvmizhfwg99djdfgh2mblc4wzmg0zq4ilrp586jwfninmz"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/PowerSystems.git"; rev = "v1.0.0"; sha256 = "1xwhwich7gi6vl33zl2r78xdjklchgkjcnvww6390j20l1wjznkn"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/PowerSystems.git"; rev = "f0721333f4875143565147a7d043bee1c300873b"; sha256 = "0gbvx0gzf3akb0w7yvdxfq2y4ps91cy5b93iwnvnw7652x716813"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "v1.0.2"; sha256 = "0ch4la04hm059ii5wzph9gsbvqhnfqrvvpqi57qn27bm10c4la0m"; fetchSubmodules = true; } +{ url = "https://github.com/casella/ScalableTestSuite.git"; rev = "v1.11.5"; sha256 = "0bhj1q9b8d29nrbr253zszy1w1yvyizvyr3law1pqjj6mhbqmg4i"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "3bf82ba5d3f31b4a0ae05f99ae690037358e153e"; sha256 = "1swka7d58wkg5pqv59lqgfi7gv6rg5vra4j6r76pn9czx9ddal8w"; fetchSubmodules = true; } +{ url = "https://github.com/SolarTherm/SolarTherm.git"; rev = "203fb5af3b95c731c7fcbe2833d51fd420e80796"; sha256 = "1bh4y4igzd0k59xm8j14p52gnlbwkiwwy6bhhyarpr361yrchn33"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Soltermica.git"; rev = "9f7224bd89335f95dffe1ccdaa094df5a3279fdf"; sha256 = "1bif3cnwjas6x7b8ahwkm7dbrqrfdqwwa26zmdc6zrpfncl3kqd0"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "2f6bd9382c5aac2aff9148cd9113a418767734b6"; sha256 = "0ii2mj6ngwjir3gzyad8wsj86pvd6wzal91nz2y7gzwj1djchb3x"; fetchSubmodules = true; } +{ url = "https://github.com/thom-marx/ThermalSeparation.git"; rev = "ffa0495ba829ecab105be4bfb3b7652625ec9c03"; sha256 = "1czm97bcrpp2jv0a0kd31a929wqlrlzdhdxvyy4w499dn20jzv1l"; fetchSubmodules = true; } +{ url = "https://github.com/casella/ThermoPower.git"; rev = "650be2c8cbd5abc3535e92b865e509073afc8aeb"; sha256 = "08ijrx8xw43dadz5s3kiwa17ax9faq2wyq9gm0vlz9ddbkj0hcaq"; fetchSubmodules = true; } +{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5"; sha256 = "12fsf0xxxc1ja6vmm9ff85f8j5sg1lb7w4g57s2w3fkf4d3a7d0c"; fetchSubmodules = true; } +{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "5cef9acb4dedf8af6f4638a4448f08a544ebd30b"; sha256 = "0ihnz1s4rs42yis9zym9nw29ia2lqz2yx2wblc50p6f221w7q78s"; fetchSubmodules = true; } +{ url = "https://github.com/lenaRB/VVDRlib.git"; rev = "eae4981674642eddffc7f2aa3690320fcaddee0e"; sha256 = "0qxxk2xlas5mqyc1h8ndic208qj1sm5mr5y8664kv3py7i8jdqi4"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "v1.2.5"; sha256 = "044k17cpc88wprrvw03p6crm6dy6x9a6xj5104d5nln71lqz5sdq"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "v2.1.0"; sha256 = "1dxr4m9j7b5266daj4klbrhvnkqr73sximdw9bk9v5qf0s28li99"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/WindPowerPlants.git"; rev = "v1.2.0"; sha256 = "1lyrqwsb6sm1wc7vlj72zk5cpjhhzh27fviiqayddqy2b903xish"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ipsl.git"; rev = "v1.1.1"; sha256 = "1w2iah8c5d8n01wmxydjk0rrcxh88g8yjy2zmv403azcccq7byzp"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "v2.5.0"; sha256 = "1pd5xf5bgz010lryv8bj6lvlfqn9p184csiffwj8icx7rycnlcqb"; fetchSubmodules = true; } +{ url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "58a83b5b36f267613de4676c95163489b1ddc2e7"; sha256 = "0wf6dn64d2psv9b3xg5227vzpk109r3dqzi4m2wwhrilaxs3v004"; fetchSubmodules = true; } ] diff --git a/pkgs/applications/science/misc/openmodelica/omparser/default.nix b/pkgs/applications/science/misc/openmodelica/omparser/default.nix index fcf5acd29ee9..cbf8f2255e76 100644 --- a/pkgs/applications/science/misc/openmodelica/omparser/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omparser/default.nix @@ -22,7 +22,7 @@ mkOpenModelicaDerivation rec { suite"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omplot/default.nix b/pkgs/applications/science/misc/openmodelica/omplot/default.nix index 7edc4b6efb22..51ab89407f4c 100644 --- a/pkgs/applications/science/misc/openmodelica/omplot/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omplot/default.nix @@ -28,7 +28,7 @@ mkOpenModelicaDerivation rec { description = "Plotting tool for OpenModelica-generated results files"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omshell/default.nix b/pkgs/applications/science/misc/openmodelica/omshell/default.nix index 2f8c5203c07a..3c39d62f92d6 100644 --- a/pkgs/applications/science/misc/openmodelica/omshell/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omshell/default.nix @@ -34,7 +34,7 @@ mkOpenModelicaDerivation rec { description = "Interactive OpenModelica session shell"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix index 448cdee6c263..d91d427a0770 100644 --- a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix @@ -20,7 +20,7 @@ mkOpenModelicaDerivation rec { description = "The OpenModelica FMI & SSP-based co-simulation environment"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index ab94df9ef18f..ca486006fecb 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "emuflight-configurator"; - version = "0.3.6"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip"; - sha256 = "sha256-egSUd/+RNo0vr2EJibgk9nNnql5sHC11gctUMK+DzW0="; + sha256 = "sha256-s5AE+r9Fw6S7IG2cDW2T7vctcYIAY8al7eCFIDjD5oI="; }; nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ]; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index f988dee102a2..12d8ef7c0bb2 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.43"; + version = "1.8.45"; src = fetchPypi { inherit pname version; - sha256 = "685e595dc8ccf354a62b354b5ef4b1f9558c4b76b1216a093dd1cc1fae37dd27"; + sha256 = "f1010cefb5b97a5d392d32aa1425bdb7df995161125f8686f2c7383c2a86e9e5"; }; postPatch = '' diff --git a/pkgs/applications/terminal-emulators/ctx/default.nix b/pkgs/applications/terminal-emulators/ctx/default.nix new file mode 100644 index 000000000000..78c673d035a0 --- /dev/null +++ b/pkgs/applications/terminal-emulators/ctx/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchgit +, SDL2 +, alsa-lib +, babl +, curl +, libdrm # Not documented +, pkg-config +, enableFb ? false +}: + +stdenv.mkDerivation rec { + pname = "ctx"; + version = "0.pre+date=2021-10-09"; + + src = fetchgit { + name = "ctx-source"; # because of a dash starting the directory + url = "https://ctx.graphics/.git/"; + rev = "d11d0d1a719a3c77712528e2feed8c0878e0ea64"; + sha256 = "sha256-Az3POgdvDOVaaRtzLlISDODhAKbefpGx5KgwO3dttqs="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + SDL2 + alsa-lib + babl + curl + libdrm + ]; + + configureScript = "./configure.sh"; + configureFlags = lib.optional enableFb "--enable-fb"; + dontAddPrefix = true; + + hardeningDisable = [ "format" ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + homepage = "https://ctx.graphics/"; + description = "Vector graphics terminal"; + longDescription= '' + ctx is an interactive 2D vector graphics, audio, text- canvas and + terminal, with escape sequences that enable a 2D vector drawing API using + a vector graphics protocol. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 565fe180ba13..b3613c8ff481 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fast-export"; - version = "200213"; + version = "210917"; src = fetchFromGitHub { owner = "frej"; repo = pname; rev = "v${version}"; - sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287"; + sha256 = "0xg8r9rbqv7mriraqxdks2mgj7j4c9gap3kc05y1kxi3nniywyd3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index ceb2c36d9615..9fa8e6e6253a 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-TjBUVP9/hMB8yFnupSxwHDr5bmtiMFwsDi1axsD5ykA="; + sha256 = "sha256-70FmFN76azRqnAZ9SLgr/V8moqkWoBbDB6IdSXM7Vmg="; }; - vendorSha256 = "sha256-ZsMzLJ+eHAKNxhVFpQxRyTv/rcWvxA/luKPjXT+Zt4Y="; + vendorSha256 = "sha256-004TspNwjCWnrD86HEf5wGpt8OCP5qIrTwlGWSRNUmg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 0afcd8400c7b..25eb31936dce 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -1,9 +1,11 @@ -{ lib, fetchFromGitHub - -, coreutils +{ lib +, fetchFromGitHub +, fetchpatch , git , libiconv , ncurses +, openssl +, pkg-config , rustPlatform , sqlite , stdenv @@ -13,45 +15,38 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.3.2"; + version = "0.3.6-nixos.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "0pfiyb23ah1h6risrhjr8ky7b1k1f3yfc3z70s92q3czdlrk6k07"; + sha256 = "sha256-Sq+43w7xgrCe2w+9A/gfe/34+K2IgZVholtD+WF59Qo="; }; - cargoSha256 = "0gplx80xhpz8kwry7l4nv4rlj9z02jg0sgb6zy1y3vd9s2j5wals"; + cargoSha256 = "sha256-tCpvIqGMklOUJ/+d8poq4uz2EyZTkBmtlkA/BUIVPxs="; - # Remove path hardcodes patching if they get fixed upstream, see: - # https://github.com/arxanas/git-branchless/issues/26 - postPatch = '' - # Inline test hardcodes `echo` location. - substituteInPlace ./src/commands/wrap.rs --replace '/bin/echo' '${coreutils}/bin/echo' - - # Tests in general hardcode `git` location. - substituteInPlace ./src/testing.rs --replace '/usr/bin/git' '${git}/bin/git' - ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses + openssl sqlite - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; preCheck = '' - # Tests require path to git. export PATH_TO_GIT=${git}/bin/git + export GIT_EXEC_PATH=$(${git}/bin/git --exec-path) ''; meta = with lib; { description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history"; homepage = "https://github.com/arxanas/git-branchless"; - license = licenses.asl20; - maintainers = with maintainers; [ msfjarvis nh2 ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ msfjarvis nh2 hmenke ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index fb5113dad089..97b96f7461f6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "0sx45y1d1v6y66msjc1lw9jhjppgbxqj145kivmd7lr6ccw68kav"; + sha256 = "sha256-drfMD9tQe1dc61MH3Cxu9oin137f4FsZJY3X2kDHdh4="; }; nativeBuildInputs = [ installShellFiles ]; @@ -33,16 +33,15 @@ buildPythonApplication rec { installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh ''; + postInstallCheck = '' + git init + test "$($out/bin/git-machete version)" = "git-machete version ${version}" + ''; + passthru = { updateScript = nix-update-script { attrPath = pname; }; - - tests = { - version = testVersion { - package = git-machete; - }; - }; }; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 9c9fa6032c6c..6bdefb8cb38d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -333,6 +333,11 @@ stdenv.mkDerivation { # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. disable_test t7816-grep-binary-pattern + # fail (as of 2.33.0) + #===( 18623;1208 8/? 224/? 2/? )= =fatal: Not a valid object name refs/tags/signed-empty + disable_test t6300-for-each-ref + #===( 22665;1651 9/? 1/? 0/? 0/? )= =/private/tmp/nix-build-git-2.33.0.drv-2/git-2.33.0/t/../contrib/completion/git-completion.bash: line 405: compgen: command not found + disable_test t9902-completion '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit @@ -362,6 +367,6 @@ stdenv.mkDerivation { ''; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ primeos peti wmertens globin ]; + maintainers = with lib.maintainers; [ primeos wmertens globin ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 20219be776a5..b46cfb8ee8df 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dRHlbxNV4nS50WbJP5lD1zB7NkZmv7nlPUm3RlQIBtc="; + sha256 = "sha256-NzE2eT3QxnbDW63Cnv6M7IlYgb2XuymphwaL1PTfcyQ="; }; - cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE="; + cargoSha256 = "sha256-9SWovdjYfeneqOVl+I+tuJTIC/htC7h1tXi2KUbdYb8="; nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index 484491bcf788..d256e212ecae 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.4.4"; + version = "1.4.10"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "1hj1md4h4m1g7cx41sjihlr8xq0zhkikci4cp2gbldqcq5x8iws4"; + sha256 = "sha256-5yv0RZfGLS/cxOxettHQHSPldcq+xa+TNj6dDIAmzOM="; }; - cargoSha256 = "sha256-2QgL8iH0FNlUR/863YML3PLad8lRkYjfSmbl49LTfWw="; + cargoSha256 = "sha256-xG7aic7NCcltz9YmQ4V40/h3OR8Vt5IgApp4yoDbPuc="; # tests require it to be in a git repository preCheck = '' diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 0fd180c441a6..6aa639be86c9 100644 --- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -1,12 +1,9 @@ { lib , fetchFromGitHub -, crystal_1_0 +, crystal }: -let - crystal = crystal_1_0; - -in crystal.buildCrystalPackage rec { +crystal.buildCrystalPackage rec { pname = "thicket"; version = "0.1.5"; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 65411c77ec6b..849965e15f5a 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.17"; + version = "2.17.2"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-/6BAGZo8GwsmXXGLJ2oTxIbgOCwP5p6Vh4wABSvAGZM="; + sha256 = "sha256-JfT0jW6aUZAYESQI0tFfnITFv20Jk7DWbvz8Ipt4t1Y="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 30ffc2b3295e..3088a68ca699 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.3"; + version = "1.15.4"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-r8FP9jEIChg4XDb0AF9riQBpNCVmffrVI0yzI83qwA0="; + sha256 = "sha256-UsaTA6bI5pr3vbvO3jFn8A8qVRi385fbiJQD09Ut/X0="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 1fbb099e0139..748e34c33aea 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.7.2"; + version = "8.0.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-jL0XLw0V0ED+lDBn3sGaJmm96zQwXue333UuYGHjB64="; + sha256 = "1n88m41424qwsfp2hy58piqpv2dk6i74hcj184aq6njllvnsznnq"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 6578d5e2a0fc..ff1689f28f8f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.3.2", - "repo_hash": "1vsppz5akx5l54riacqbzkgdy47j9r71550mg2ay5ihy6iqxa2xr", + "version": "14.3.3", + "repo_hash": "1sh8lf6arqljzc0hmajl2r2j38ahk9hl6kikg9inw72xycrll7dk", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.3.2-ee", + "rev": "v14.3.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.3.2", + "GITALY_SERVER_VERSION": "14.3.3", "GITLAB_PAGES_VERSION": "1.44.0", "GITLAB_SHELL_VERSION": "13.21.1", - "GITLAB_WORKHORSE_VERSION": "14.3.2" + "GITLAB_WORKHORSE_VERSION": "14.3.3" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 26d8cb1732fd..88c92df71e34 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -80,11 +80,6 @@ let # Fixup "resolved"-entries in yarn.lock to match our offline cache ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock - # fixup_yarn_lock currently doesn't correctly fix the dagre-d3 - # url, so we have to do it manually - ${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \ - '"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index b8d8c4dfb890..26deabcc230d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -20,7 +20,7 @@ let }; }; }; - version = "14.3.2"; + version = "14.3.3"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -32,7 +32,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-00Sgv1b3dwbN7ic//7NtrdiliunOnXRJ0GTQHYFjuqo="; + sha256 = "sha256-WC361E+p3i02n2YCOwUzRxCWFt5UMEfJi6tHZPj1dgo="; }; vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 84b0b2580e62..3e3bc25162b2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.3.2"; + version = "14.3.3"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index dd2970c3ed28..51ccc8a03cc2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1650,4 +1650,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.2.24 + 2.2.20 diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 9859163031c3..f3400f7e8e02 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # should be odd-unstable but we are tracking unstable versions for now }; }; diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix deleted file mode 100644 index 0a76f7df9704..000000000000 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchurl, python2Packages, makeWrapper -, guiSupport ? false, tk ? null -, ApplicationServices -}: - -let - inherit (python2Packages) docutils hg-git dulwich python; - -in python2Packages.buildPythonApplication rec { - pname = "mercurial"; - version = "4.9.1"; - - src = fetchurl { - url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; - }; - - format = "other"; - - inherit python; # pass it so that the same version can be used in hg2git - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ docutils ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; - - propagatedBuildInputs = [ hg-git dulwich ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - postInstall = (lib.optionalString guiSupport - '' - mkdir -p $out/etc/mercurial - cp contrib/hgk $out/bin - cat >> $out/etc/mercurial/hgrc << EOF - [extensions] - hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py - EOF - # setting HG so that hgk can be run itself as well (not only hg view) - WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} - --set HG $out/bin/hg - --prefix PATH : ${tk}/bin " - '') + - '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - $WRAP_TK - done - - # copy hgweb.cgi to allow use in apache - mkdir -p $out/share/cgi-bin - cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin - chmod u+x $out/share/cgi-bin/hgweb.cgi - - # install bash/zsh completions - install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg - install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg - ''; - - meta = { - description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = "https://www.mercurial-scm.org"; - downloadPage = "https://www.mercurial-scm.org/release/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.eraserhd ]; - updateWalker = true; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index e5a12dd9006c..14b318abab45 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.53"; + version = "1.0.0-alpha.54"; src = fetchCrate { inherit version pname; - sha256 = "1y5wnqscyfhd806qs6gfmssm7hvfdi7mxc9p1125jnmzca4wcsm2"; + sha256 = "0b9494kwchfds8hk566k3fkwdvcskpgw0ajlrdry9lmmvx3vj7dc"; }; - cargoSha256 = "0m9zjagq59rxf5pysklal030f4n0dqgmjsgwcnljajxc2r26665h"; + cargoSha256 = "0rgd6mfxbxgzpj2nj2y315kgvxiayr9xbma4j014bc61ms7cnys7"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index e90405c9a8ba..00ac026e8696 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -77,7 +77,7 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.0.3) @@ -90,12 +90,12 @@ GEM nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) - parallel (1.20.1) + parallel (1.21.0) parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) public_suffix (4.0.6) - puma (5.4.0) + puma (5.5.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -120,7 +120,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) railties (5.2.6) actionpack (= 5.2.6) @@ -146,11 +146,11 @@ GEM railties (>= 5.1, < 6.2) roadie (>= 3.1, < 5.0) rotp (6.2.0) - rouge (3.26.0) - rqrcode (2.0.0) + rouge (3.26.1) + rqrcode (2.1.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) - rqrcode_core (1.1.0) + rqrcode_core (1.2.0) rubocop (1.12.1) parallel (~> 1.10) parser (>= 3.0.0.0) @@ -160,7 +160,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.10.0) + rubocop-ast (1.12.0) parser (>= 3.0.1.1) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) @@ -190,8 +190,8 @@ GEM thread_safe (0.3.6) tzinfo (1.2.9) thread_safe (~> 0.1) - unicode-display_width (2.0.0) - webdrivers (4.6.0) + unicode-display_width (2.1.0) + webdrivers (4.6.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) @@ -245,7 +245,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 2.7.3p183 + ruby 2.7.4p191 BUNDLED WITH 2.1.4 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index eb6218826bfe..5a964f51e362 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let - version = "4.2.2"; + version = "4.2.3"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1xlqf7g5imjmc3as2aajvbrs217jh3qpdvvpsd9mka9rk4kykyz6"; + sha256 = "033slhr5kmz5b29v7n52336i0r7y4m9si748b22r85s2jpf37xkj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 376084e80dce..dbbef0f218aa 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -301,10 +301,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3"; + sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; method_source = { groups = ["default"]; @@ -420,10 +420,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; type = "gem"; }; - version = "1.20.1"; + version = "1.21.0"; }; parser = { dependencies = ["ast"]; @@ -470,10 +470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; + sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; type = "gem"; }; - version = "5.4.0"; + version = "5.5.2"; }; racc = { groups = ["default" "test"]; @@ -545,10 +545,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; + sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.2"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -680,10 +680,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; + sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; type = "gem"; }; - version = "3.26.0"; + version = "3.26.1"; }; rqrcode = { dependencies = ["chunky_png" "rqrcode_core"]; @@ -691,20 +691,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "073w0qgjydkqpsqsb9yr8qg0mhvwlzx6z53hqr2b5zifvb9wzh02"; + sha256 = "0444sgvx3ahvgr3c9swpy32kcdpciwgcqahp3pb4m7d23xp1qjdc"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; rqrcode_core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d632w2pd34bw9l3bsfnyqaa8vgbz9pxpj29gpf8parqr7wq922k"; + sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; rubocop = { dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -723,10 +723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x6za0j9wwxr14rkkkmpbnwj04lak4yjmkyrdl8c31m9acba80zw"; + sha256 = "0x0xfq2mpg194rcanbjrgvjbh94s9kq72jynxx61789s628kxy59"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -870,10 +870,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m"; + sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; @@ -881,10 +881,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hi6pgkfwgz1bzfclyrr449xy9y2f2bcrnnnlb5ghvvrqkgn0dry"; + sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp"; type = "gem"; }; - version = "4.6.0"; + version = "4.6.1"; }; websocket-driver = { dependencies = ["websocket-extensions"]; diff --git a/pkgs/applications/version-management/verco/default.nix b/pkgs/applications/version-management/verco/default.nix index 538544c5b224..715ae0978cc1 100644 --- a/pkgs/applications/version-management/verco/default.nix +++ b/pkgs/applications/version-management/verco/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "verco"; - version = "6.5.5"; + version = "6.7.0"; src = fetchFromGitHub { owner = "vamolessa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n+GGiu/xGGGC6FQPoASok87bCG0MFVIf6l6nt1lvw8A="; + sha256 = "sha256-H8rDaRVU3G3iuBv0Tz/YOuYbL2k8wEoEIIEG7hjU6eM="; }; - cargoSha256 = "sha256-lNtR4N+bFFCr3Ct99DJCbtDeKxTzT7ZjvAWixbQm3jg="; + cargoSha256 = "sha256-4Ou/stedL3WCY4Awsl++lc5fZ9gxd4uorf4G2/0DiPc="; meta = with lib; { description = "A simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 96358383047a..176efb799541 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -18,6 +18,8 @@ , gtk4 , gst_all_1 , libadwaita +, appstream-glib +, libsoup }: stdenv.mkDerivation rec { @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + appstream-glib desktop-file-utils # for update-desktop-database glib gobject-introspection @@ -53,6 +56,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-ugly gtk4 libadwaita + libsoup wayland wayland-protocols ]; diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index db1399ef6032..41c035350d83 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.3"; + version = "1.22.4"; src = fetchPypi { inherit pname version; - sha256 = "317a9636587182280debc85d483f6d21987ceb6cd96ab36a2399836780eca822"; + sha256 = "a20978538ae9a51bdbe5ef5aa0f87ede0f8efd2817ab240980de56eac36982e3"; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 211112b4ee06..aa32e8828e06 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256:0qaghj70ffc90wck1i4217ky5d6cryrmgna2ipsc4v8dcvbyc1lh"; + sha256 = "sha256-52cVY3SBT048tErydk3l27yBvM/FMVpEMf5miAeInDM="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 3cb73f94cf46..1ad0dee49c7e 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -38,25 +38,25 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20210508"; - kodiVersion = "19.1"; + kodiReleaseDate = "20211006"; + kodiVersion = "19.2"; rel = "Matrix"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "0jh67vw3983lnfgqzqfislawwbpq0vxxk1ljsg7mar06mlwfxb7h"; + sha256 = "sha256-w5m7xlnjQDJ4l75b3ctF0wMZ4kqi+H0X6WFLs0gV6lM="; }; ffmpeg = stdenv.mkDerivation rec { pname = "kodi-ffmpeg"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "xbmc"; repo = "FFmpeg"; - rev = "${version}-${rel}-Beta1"; - sha256 = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w"; + rev = "${version}-${rel}-${kodiVersion}"; + sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f"; }; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index ebf5de4e00b1..4eac16d349bf 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "61.0.0"; + version = "62.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "04f18jr0a5m1sah8163m28b82w1ikjzmahqy67pbbpzg0mc6rqr4"; + sha256 = "0pjf1lkpjirqanazm7a28b8bsyin4i1kd1s4y169zsilzb28kpiz"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix index 1e2abb45a5b3..76d4ec85a014 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; - maintainers = with maintainers; [ peti jshcmpbll ]; + maintainers = with maintainers; [ jshcmpbll ]; license = licenses.gpl2; platforms = with platforms; linux; }; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3a613f26ae68..ce9a72aebf9a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate fluidsynth wayland wayland-protocols ncurses srt - ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 + ] ++ optional (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) live555 ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ]) ++ optional jackSupport libjack2 @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64) then live555 else null; + LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) then live555 else null; # vlc depends on a c11-gcc wrapper script which we don't have so we need to # set the path to the compiler diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index d8b6dfc2efaa..54378dbe13d3 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -2,6 +2,7 @@ , csmSupport ? false, seabios ? null , secureBoot ? false , httpSupport ? false +, tpmSupport ? false }: assert csmSupport -> seabios != null; @@ -30,9 +31,10 @@ edk2.mkDerivation projectDscPath { hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; buildFlags = - lib.optional secureBoot "-DSECURE_BOOT_ENABLE=TRUE" + lib.optional secureBoot "-D SECURE_BOOT_ENABLE=TRUE" ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] - ++ lib.optionals httpSupport [ "-DNETWORK_HTTP_ENABLE=TRUE" "-DNETWORK_HTTP_BOOT_ENABLE=TRUE" ]; + ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] + ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; postPatch = lib.optionalString csmSupport '' cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 05e468a73228..1afab167308f 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "18.0"; + version = "19.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "0k9gclkba2bhmyqhyigjgfgcnqpg16v3yczhh08ljxmbrsbs02ig"; + sha256 = "0h3varacv9696mih8zrz3fp6xa8hxxvwzkrslhpf9ilcjs1bjihd"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "086ldzb1rbbrzjbklay4nvhc18ipyxi9gnp56f06393zvfbhc5dl"; + cargoSha256 = "015r9m9fr634ppn4qy0b8w1khjlxsv3wbpf3s7crmklzy57wakxl"; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix new file mode 100644 index 000000000000..3ce3d9a880f8 --- /dev/null +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "docker-compose"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "compose"; + rev = "v${version}"; + sha256 = "sha256-6OjA3f6c9s/86UPxy9EqLIc/0ZuW6UhKyQdkM7YoTsU="; + }; + + vendorSha256 = "sha256-6h36TZmo0RvB3YzZRmsrs2Fbl+8zPTuL9LxWkuNgRqw="; + + doCheck = false; + installPhase = '' + install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose + ''; + + meta = with lib; { + description = "Docker CLI plugin to define and run multi-container applications with Docker"; + license = licenses.asl20; + maintainers = [ maintainers.babariviere ]; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 24bd7a1339aa..8345b2b42d76 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -8,16 +8,16 @@ rec { , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? true + , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool - , sqlite, iproute2, lvm2, systemd, docker-buildx + , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp , nixosTests - , clientOnly ? !stdenv.isLinux + , clientOnly ? !stdenv.isLinux, symlinkJoin }: let docker-runc = runc.overrideAttrs (oldAttrs: { @@ -117,6 +117,10 @@ rec { ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; }); + + plugins = optionals buildxSupport [ docker-buildx ] + ++ optionals composeSupport [ docker-compose_2 ]; + pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in buildGoPackage ((optionalAttrs (!clientOnly) { @@ -141,14 +145,14 @@ rec { ]; buildInputs = optionals (!clientOnly) [ sqlite lvm2 btrfs-progs systemd libseccomp - ] ++ optionals (buildxSupport) [ docker-buildx ]; + ] ++ plugins; postPatch = '' patchShebangs man scripts/build/ substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - '' + optionalString buildxSupport '' + '' + optionalString (plugins != []) '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ - ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} + "${pluginsRef}/libexec/docker/cli-plugins" ''; # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index ba056920e849..78f47d5292cd 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.6.4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u4XLWDJ35jEKKr98eEoUUsT3gawM/qNqXPXrhlQlugg="; + sha256 = "sha256-CBRBcRvMFE9Pdxac3O15z0brF/5D279/Hat0CSYGRyE="; }; - vendorSha256 = "sha256-ivKudP0SlArfD+wXHmqNRmW8UGu0o2SJqURrjPhK2hs="; + vendorSha256 = "sha256-xlFIO33OOyLnIvbsbyHVNdyxh0vlwQOATbbZA7rsz9E="; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -34,7 +34,9 @@ buildGoModule rec { wrapProgram $out/bin/limactl \ --prefix PATH : ${lib.makeBinPath [ qemu ]} installShellCompletion --cmd limactl \ - --bash <($out/bin/limactl completion bash) + --bash <($out/bin/limactl completion bash) \ + --fish <($out/bin/limactl completion fish) \ + --zsh <($out/bin/limactl completion zsh) runHook postInstall ''; @@ -50,4 +52,3 @@ buildGoModule rec { maintainers = with maintainers; [ anhduy ]; }; } - diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 400232d2246d..c9ec18593dff 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -2,7 +2,6 @@ , runCommand , makeWrapper , lib -, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -14,15 +13,12 @@ , cni-plugins # not added to path , iptables , iproute2 -, gvproxy -, qemu -, xz }: let podman = podman-unwrapped; - binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ + binPath = lib.makeBinPath ([ runc crun conmon @@ -31,10 +27,6 @@ let util-linux iptables iproute2 - ] ++ lib.optionals stdenv.isDarwin [ - gvproxy - qemu - xz ] ++ extraPackages); in runCommand podman.name { diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index d3da358b6396..fe4b2be47929 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -1,9 +1,10 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cairo , fontconfig +, libevdev +, libinput , libxkbcommon , makeWrapper , mesa @@ -23,24 +24,15 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-1IztedN5/I/4TDKHLJ26fSrDsvJ5QAr+cbzS2PQITDE="; + hash = "sha256-tWfHJajAOYZJ73GckZWWTdVz75YmHA7t/qDhM7+tJgk="; }; - patches = [ - # To fix the build with wlroots 0.14.0: - (fetchpatch { - # Add fixes for wlroots 0.14.0 - url = "https://github.com/project-repo/cagebreak/commit/d57869d43add58331386fc8e89c14bb2b74afe17.patch"; - sha256 = "0g6sl8y4kk0bm5x6pxqbxw2j0gyg3ybr2v9m70q2pxp70kms4lqg"; - }) - ]; - nativeBuildInputs = [ makeWrapper meson @@ -53,6 +45,8 @@ stdenv.mkDerivation rec { buildInputs = [ cairo fontconfig + libevdev + libinput libxkbcommon mesa # for libEGL headers pango diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index a51c80bf0833..7aa62e69df94 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,9 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb-run }: +, xorgserver, xvfb-run +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs +}: stdenv.mkDerivation rec { pname = "i3"; @@ -12,7 +14,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-im7hd2idzyKWTSC2CTAU7k+gQZNF0/1RXVUS2ZgLsnk="; }; - nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ]; + nativeBuildInputs = [ + pkg-config makeWrapper meson ninja installShellFiles + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs + ]; + + mesonFlags = [ + "-Ddocs=true" + "-Dmans=true" + ]; buildInputs = [ libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 5df02fbd5c17..9fe9aa457987 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -79,7 +79,12 @@ let find -not \( -path ${everythingFile} -or -path ${lib.interfaceFile everythingFile} \) -and \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} + runHook postInstall ''; + meta = if meta.broken or false then meta // { hydraPlatforms = lib.platforms.none; } else meta; + + # Retrieve all packages from the finished package set that have the current package as a dependency and build them + passthru.tests = with builtins; + lib.filterAttrs (name: pkg: self.lib.isUnbrokenAgdaPackage pkg && elem pname (map (pkg: pkg.pname) pkg.buildInputs)) self; }; in { diff --git a/pkgs/build-support/agda/lib.nix b/pkgs/build-support/agda/lib.nix index 976151a8283c..80a0974192bb 100644 --- a/pkgs/build-support/agda/lib.nix +++ b/pkgs/build-support/agda/lib.nix @@ -7,4 +7,9 @@ * interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai" */ interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai"; + + /* Takes an arbitrary derivation and says whether it is an agda library package + * that is not marked as broken. + */ + isUnbrokenAgdaPackage = pkg: pkg.isAgdaDerivation or false && !pkg.meta.broken; } diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/build-dotnet-module/default.nix new file mode 100644 index 000000000000..0161c101e5bf --- /dev/null +++ b/pkgs/build-support/build-dotnet-module/default.nix @@ -0,0 +1,144 @@ +{ lib, stdenv, makeWrapper, dotnetCorePackages, dotnetPackages, cacert, linkFarmFromDrvs, fetchurl }: + +{ name ? "${args.pname}-${args.version}" +, enableParallelBuilding ? true +# Flags to pass to `makeWrapper`. This is done to avoid double wrapping. +, makeWrapperArgs ? [] + +# Flags to pass to `dotnet restore`. +, dotnetRestoreFlags ? [] +# Flags to pass to `dotnet build`. +, dotnetBuildFlags ? [] +# Flags to pass to `dotnet install`. +, dotnetInstallFlags ? [] +# Flags to pass to dotnet in all phases. +, dotnetFlags ? [] + +# The binaries that should get installed to `$out/bin`, relative to `$out/lib/$pname/`. These get wrapped accordingly. +# Unfortunately, dotnet has no method for doing this automatically. +# If unset, all executables in the projects root will get installed. This may cause bloat! +, executables ? null +# The packages project file, which contains instructions on how to compile it. +, projectFile ? null +# The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched. +# This can be generated using the `nuget-to-nix` tool. +, nugetDeps ? null +# Libraries that need to be available at runtime should be passed through this. +# These get wrapped into `LD_LIBRARY_PATH`. +, runtimeDeps ? [] + +# The type of build to perform. This is passed to `dotnet` with the `--configuration` flag. Possible values are `Release`, `Debug`, etc. +, buildType ? "Release" +# The dotnet SDK to use. +, dotnet-sdk ? dotnetCorePackages.sdk_5_0 +# The dotnet runtime to use. +, dotnet-runtime ? dotnetCorePackages.runtime_5_0 +, ... } @ args: + +assert projectFile == null -> throw "Defining the `projectFile` attribute is required. This is usually an `.csproj`, or `.sln` file."; + +# TODO: Automatically generate a dependency file when a lockfile is present. +# This file is unfortunately almost never present, as Microsoft recommands not to push this in upstream repositories. +assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated using the `nuget-to-nix` tool."; + +let + _nugetDeps = linkFarmFromDrvs "${name}-nuget-deps" (import nugetDeps { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }); + + package = stdenv.mkDerivation (args // { + nativeBuildInputs = args.nativeBuildInputs or [] ++ [ dotnet-sdk dotnetPackages.Nuget cacert makeWrapper ]; + + # Stripping breaks the executable + dontStrip = true; + + DOTNET_NOLOGO = true; # This disables the welcome message. + DOTNET_CLI_TELEMETRY_OPTOUT = true; + + configurePhase = args.configurePhase or '' + runHook preConfigure + + export HOME=$(mktemp -d) + + nuget sources Add -Name nixos -Source "$PWD/nixos" + nuget init "${_nugetDeps}" "$PWD/nixos" + + # This is required due to https://github.com/NuGet/Home/issues/4413. + mkdir -p $HOME/.nuget/NuGet + cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet + + dotnet restore ${lib.escapeShellArg projectFile} \ + ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source "$PWD/nixos" \ + "''${dotnetRestoreFlags[@]}" \ + "''${dotnetFlags[@]}" + + runHook postConfigure + ''; + + buildPhase = args.buildPhase or '' + runHook preBuild + + dotnet build ${lib.escapeShellArg projectFile} \ + -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ + -p:BuildInParallel=${if enableParallelBuilding then "true" else "false"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:Version=${args.version} \ + --configuration ${buildType} \ + --no-restore \ + "''${dotnetBuildFlags[@]}" \ + "''${dotnetFlags[@]}" + + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + dotnet publish ${lib.escapeShellArg projectFile} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --output $out/lib/${args.pname} \ + --configuration ${buildType} \ + --no-build \ + --no-self-contained \ + "''${dotnetInstallFlags[@]}" \ + "''${dotnetFlags[@]}" + '' + (if executables != null then '' + for executable in ''${executables}; do + execPath="$out/lib/${args.pname}/$executable" + + if [[ -f "$execPath" && -x "$execPath" ]]; then + makeWrapper "$execPath" "$out/bin/$(basename "$executable")" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ + "''${gappsWrapperArgs[@]}" \ + ''${makeWrapperArgs} + else + echo "Specified binary \"$executable\" is either not an executable, or does not exist!" + exit 1 + fi + done + '' else '' + for executable in $out/lib/${args.pname}/*; do + if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then + makeWrapper "$executable" "$out/bin/$(basename "$executable")" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ + "''${gappsWrapperArgs[@]}" \ + ''${makeWrapperArgs} + fi + done + '') + '' + runHook postInstall + ''; + }); +in + package diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 47fd99c12f8e..a42b025bc7f2 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -37,6 +37,11 @@ let + inherit (lib) + escapeShellArgs + toList + ; + mkDbExtraCommand = contents: let contentsList = if builtins.isList contents then contents else [ contents ]; @@ -402,7 +407,7 @@ rec { preMount = lib.optionalString (contents != null && contents != [ ]) '' echo "Adding contents..." - for item in ${toString contents}; do + for item in ${escapeShellArgs (map (c: "${c}") (toList contents))}; do echo "Adding $item..." rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ done diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 9f6823a58789..141c2ba0ea45 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -553,4 +553,16 @@ rec { # Example export of the bash image exportBash = pkgs.dockerTools.exportImage { fromImage = bash; }; + + build-image-with-path = buildImage { + name = "build-image-with-path"; + tag = "latest"; + contents = [ pkgs.bashInteractive ./test-dummy ]; + }; + + layered-image-with-path = pkgs.dockerTools.streamLayeredImage { + name = "layered-image-with-path"; + tag = "latest"; + contents = [ pkgs.bashInteractive ./test-dummy ]; + }; } diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix new file mode 100644 index 000000000000..7fe5b35e2596 --- /dev/null +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -0,0 +1,37 @@ +{ stdenv, gnutar, findutils, fetchurl, ... }: +{ name +, url +, version +, sha256 +, patches ? [ ] +}: +stdenv.mkDerivation { + name = "nc-app-${name}"; + inherit version patches; + + src = fetchurl { + inherit url sha256; + }; + + nativeBuildInputs = [ + gnutar + findutils + ]; + + unpackPhase = '' + tar -xzpf $src + ''; + + installPhase = '' + approot="$(dirname $(dirname $(find -path '*/appinfo/info.xml' | head -n 1)))" + + if [ -d "$approot" ]; + then + mv "$approot/" $out + chmod -R a-w $out + else + echo "Could not find appinfo/info.xml" + exit 1; + fi + ''; +} diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index 5b0ef4856708..c7058ce123c5 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -279,3 +279,17 @@ int system(const char *command) rewriteSystemCall(command, newCommand); return _system(newCommand); } + +int mkdir(const char *path, mode_t mode) +{ + int (*mkdir_real) (const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdir"); + char buf[PATH_MAX]; + return mkdir_real(rewrite(path, buf), mode); +} + +int mkdirat(int dirfd, const char *path, mode_t mode) +{ + int (*mkdirat_real) (int dirfd, const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdirat"); + char buf[PATH_MAX]; + return mkdirat_real(dirfd, rewrite(path, buf), mode); +} diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index bd54401e2356..9104bf2dce5c 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -3,7 +3,7 @@ { name ? "debian-build" , diskImage -, src, stdenv, vmTools, checkinstall +, src, lib, stdenv, vmTools, checkinstall , fsTranslation ? false , # Features provided by this package. debProvides ? [] diff --git a/pkgs/common-updater/scripts/list-archive-two-level-versions b/pkgs/common-updater/scripts/list-archive-two-level-versions index e46652820ad2..36a051e97c91 100755 --- a/pkgs/common-updater/scripts/list-archive-two-level-versions +++ b/pkgs/common-updater/scripts/list-archive-two-level-versions @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash # lists all available versions listed for a package in a site (http) diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags index ff09671c7cb0..d137552cdd66 100755 --- a/pkgs/common-updater/scripts/list-git-tags +++ b/pkgs/common-updater/scripts/list-git-tags @@ -1,4 +1,4 @@ -#! /bin/sh -x +#!/usr/bin/env bash # lists all available tags from a git repository diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index d5c23466ee03..0ac6b3cf8c28 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -188,7 +188,9 @@ tempHash=$(printf '%0*d' "$hashLength" 0) if [[ -n "$sri" ]]; then # SRI hashes only support base64 # SRI hashes need to declare the hash type as part of the hash - tempHash="$(nix to-sri --type "$oldHashAlgo" "$tempHash")" + tempHash="$(nix hash to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null \ + || nix to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null)" \ + || die "Failed to convert hash to SRI representation!" fi # Escape regex metacharacter that are allowed in hashes (+) @@ -232,7 +234,9 @@ if [[ -z "$newHash" ]]; then if [[ -n "$sri" ]]; then # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type - newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")" + newHash="$(nix hash to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null \ + || nix to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null)" \ + || die "Failed to convert hash to SRI representation!" fi fi diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index ded70a91c955..cdc104f3a535 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "40.3"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PeBXr6KsDebKcH9KdsKTLcvFVsHQ0cwCBWXcGHYpLM0="; + sha256 = "0lfxj8irwm88n3ba351ak85r97pqlds6y2hqbsic714yj4k8df1a"; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix index d737c9383f15..914583d97eec 100644 --- a/pkgs/data/fonts/3270font/default.nix +++ b/pkgs/data/fonts/3270font/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.3.0"; + version = "2.3.1"; in fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_fd00815.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_3b8f2fb.zip"; - sha256 = "0ny2jcsfa1kfzkm979dfzqv756ijm5xirm02ln7a4kwhxxsm5xr1"; + sha256 = "06n87ydn2ayfhpg8318chmnwmdk3d4mmy65fcgf8frbiv2kpqncs"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/bront/default.nix b/pkgs/data/fonts/bront/default.nix new file mode 100644 index 000000000000..d21c820f127b --- /dev/null +++ b/pkgs/data/fonts/bront/default.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation { + pname = "bront_fonts"; + version = "unstable-2015-06-28"; + + src = fetchFromGitHub { + owner = "chrismwendt"; + repo = "bront"; + rev = "aef23d9a11416655a8351230edb3c2377061c077"; + sha256 = "1sx2gv19pgdyccb38sx3qnwszksmva7pqa1c8m35s6cipgjhhgb4"; + }; + + installPhase = '' + install -m444 -Dt $out/share/fonts/truetype *Bront.ttf + ''; + + meta = with lib; { + description = "Bront Fonts"; + longDescription = "Ubuntu Mono Bront and DejaVu Sans Mono Bront fonts."; + homepage = "https://github.com/chrismwendt/bront"; + license = licenses.free; + platforms = platforms.all; + maintainers = [ maintainers.grburst ]; + }; +} diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index eb6635ec3a38..a707d6f25a49 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -2,36 +2,36 @@ let fonts = { - aegan = { version = "10.00"; file = "Aegean.zip"; sha256 = "0k47nhzw4vx771ch3xx8mf6xx5vx0hg0cif5jdlmdaz4h2c3rawz"; description = "Aegean"; }; - aegyptus = { version = "8.00"; file = "Aegyptus.zip"; sha256 = "13h2pi641k9vxgqi9l11mjya10ym9ln54wrkwxx6gxq63zy7y5mj"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; - akkadian = { version = "7.18"; file = "Akkadian.zip"; sha256 = "1bplcvszbdrk85kqipn9lzhr62647wjibz1p8crzjvsw6f9ymxy3"; description = "Sumero-Akkadian Cuneiform"; }; - assyrian = { version = "2.00"; file = "AssyrianFont.zip"; sha256 = "0vdvb24vsnmwzd6bw14akqg0hbvsk8avgnbwk9fkybn1f801475k"; description = "Neo-Assyrian in Unicode with OpenType"; }; - eemusic = { version = "2.00"; file = "EEMusic.zip"; sha256 = "1y9jf105a2b689m7hdjmhhr7z5j0qd2w6dmb3iic9bwaczlrjy7j"; description = "Byzantine Musical Notation in Unicode with OpenType"; }; - maya = { version = "4.18"; file = "Maya.zip"; sha256 = "08z2ch0z2c43fjfg5m4yp3l1dp0cbk7lv5i7wzsr3cr9kr59wpi9"; description = "Maya Hieroglyphs"; }; - symbola = { version = "12.00"; file = "Symbola.zip"; sha256 = "1i3xra33xkj32vxs55xs2afrqyc822nk25669x78px5g5qd8gypm"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; - textfonts = { version = "9.00"; file = "Textfonts.zip"; sha256 = "0wzxz4j4fgk81b88d58715n1wvq2mqmpjpk4g5hi3vk77y2zxc4d"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; - unidings = { version = "9.19"; file = "Unidings.zip"; sha256 = "1bybzgdqhmq75hb12n3pjrsdcpw1a6sgryx464s68jlq4zi44g78"; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; + aegan = { version = "13.00"; file = "Aegean.zip"; sha256 = "1w4ks341jw12p6zi1fy1hb3kqiqv61yn8i2hr9ybng9n8xdw03li"; description = "Aegean"; }; + aegyptus = { version = "13.00"; file = "Aegyptus.zip"; sha256 = "16j8rj3mr2cddag7laxvzpm5w3yk467fwzsk60nq8pnh6ab1v05y"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; + akkadian = { version = "13.00"; file = "Akkadian.zip"; sha256 = "1f2v9cjk307c5lw0si9hwjcll5wb9nwwy5im0y16kvpgwh2ccshc"; description = "Sumero-Akkadian Cuneiform"; }; + assyrian = { version = "13.00"; file = "Assyrian.zip"; sha256 = "18nx6ayfk3ba6wg1rp37r9fll5ajrwq2mp5w2l3y1q1kk92frkid"; description = "Neo-Assyrian in Unicode with OpenType"; }; + eemusic = { version = "13.00"; file = "EEMusic.zip"; sha256 = "1kk5rd3wd7y13z9bqcg1k9idbwad4l3hfmi3lbfk4y1w895vgxk2"; description = "Byzantine Musical Notation in Unicode with OpenType"; }; + maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; sha256 = "0fzzrlkd4m2dj2phg97nz782w0afmw0f0ykdvlwyp29j1ak7yyp1"; description = "Maya Hieroglyphs"; }; + symbola = { version = "13.00"; file = "Symbola.zip"; sha256 = "04pxh5agvlkyg8mvv2szwshnmzi3n0m7va4xsyq401zbsa147rmi"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; + textfonts = { version = "13.00"; file = "Textfonts.zip"; sha256 = "1xp8qlfpvcf5n96zgm07zij3ndlzvqjlii8gx9sbj5aa56rxkdgb"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; + unidings = { version = "13.00"; file = "Unidings.zip"; sha256 = "0cvnxblk9wsr8mxm5lrdpdm456vi7lln7qh53b67npg4baf0as63"; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; }; mkpkg = name_: {version, file, sha256, description}: fetchzip rec { name = "${name_}-${version}"; - url = "http://users.teilar.gr/~g1951d/${file}"; + url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; postFetch = '' mkdir -p $out/share/{fonts,doc} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.docx \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.odt \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any rmdir "$out/share/doc/${name}" $out/share/doc || true # remove dirs if empty ''; inherit sha256; meta = { inherit description; - # see http://users.teilar.gr/~g1951d/License.pdf + # see https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf # quite draconian: non-commercial, no modifications, # no redistribution, "a single instantiation and no # network installation" license = lib.licenses.unfree; - homepage = "http://users.teilar.gr/~g1951d/"; + homepage = "https://dn-works.com/ufas/"; }; }; in diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/data/fonts/i-dot-ming/default.nix new file mode 100644 index 000000000000..766440032f3a --- /dev/null +++ b/pkgs/data/fonts/i-dot-ming/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchzip }: + +let + version = "7.01"; +in +fetchzip { + name = "i.ming-${version}"; + url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; + sha256 = "1b2dj7spkznpkad8a0blqigj9f6ism057r0wn9wdqg5g88yp32vd"; + + postFetch = '' + install -DT -m444 $downloadedFile $out/share/fonts/truetype/I.Ming/I.Ming.ttf + ''; + + meta = with lib; { + description = "An open source Pan-CJK serif typeface"; + homepage = "https://github.com/ichitenfont/I.Ming"; + license = licenses.ipa; + platforms = platforms.all; + maintainers = [ maintainers.linsui ]; + }; +} diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 327b7fa2ca52..57069fadbc5e 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, google-fonts }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "inconsolata"; + version = "unstable-2021-01-19"; - inherit (google-fonts) src version; + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a"; + sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; + }; installPhase = '' - install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf + install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf ''; meta = with lib; { diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index efdea602c354..3a40ef978e3a 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.4"; + version = "1.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-qYFyZT1mLNHBRrX/NX2pmt9P5n8urEK/msQMctSckzE="; + sha256 = "1iw9wqfs8s3l5k5ngyjmvvxbsxcsya3a6h1xwl6d603swv7h1s02"; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 00de4f6760cd..c0f65ab7eadc 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2021-07-14"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2"; + sha256 = "0qbbg0hcdda7apk892b8nhbrsvji12nv97ss7lv412xwcmxsj9fp"; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index a936679d347e..aaab65085fa2 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "c3251a7b66241fd25a603ea957ec88b9fa6fffa9", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c3251a7b66241fd25a603ea957ec88b9fa6fffa9.tar.gz", - "sha256": "0rpwykkvd6m5v0ay3ra9fyjgax1y67pr857s32z7l5bjgv1aap5p", - "msg": "Update from Hackage at 2021-10-05T05:41:58Z" + "commit": "73463ac080cd55650580d58fe80e5b2dcdfe5a7e", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/73463ac080cd55650580d58fe80e5b2dcdfe5a7e.tar.gz", + "sha256": "1vwlpkrpfj6wdzlv4lwargyakyci81gri70z2jhkpvv3l6adc0gk", + "msg": "Update from Hackage at 2021-10-15T10:42:20Z" } diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 3e72d8a74b8a..f1424b15ad1a 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -14,6 +14,8 @@ mkDerivation rec { pname = "adwaita-qt"; version = "1.4.0"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index ea2362c0529f..ea18da119c7e 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20210412"; + version = "20211018"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "sha256-BNJirtBtdWsIzQfsJsZzg1zFbJEzZPq1j2qZ+1QjRH8="; + sha256 = "1rrxm5b7l8kq1h0lm08ck54xljzm8w573mxx904n3rhdg3ri9d63"; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index f33fa2db5462..42979c8c81b3 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "04a9c56w4hm8lwa8hzy5lwj4yli19gzy5wp5iinsm61qas9xgy69"; + sha256 = "01p1g0gy6d1c8aa9y7inhn6zhm0qy0fzmwlniiv07h15g32appvd"; }; sourceRoot = "."; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index bdb14be0bdd8..1eb6a5f39e6d 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "10.3"; + version = "11.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0v9sxjy4x03y3hcgbkn9lj010kd5csiyc019dwxzvx5kg8xh8qca"; + sha256 = "1krfjk76yjyzsxkhymc1dpy3y7ykawdxzwb282wgbb480dpg8s05"; }; buildInputs = [ diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index c158cc8a00ce..83764e3c8bca 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-07-27"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "17x4lqlv6whx8vg0c1nm89j7671l033apn4alqyhjb9qx5w2fa43"; + sha256 = "12dwmgq0kadjfky5bjm62vwgdlw3nmrrhqqs5iw15w0pn3mbmd5c"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index 36c449ee9de7..611263dbbbcf 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "terminology"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0v74858yvrrfy0l2pq7yn6izvqhpkb9gw2jpd3a3khjwv8kw6frz"; + sha256 = "0imk7cjkcjss3zf4hjwmy54pbizm6l6pq553jcx7bpsnhs56bbsz"; }; nativeBuildInputs = [ @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { patchShebangs data/colorschemes/*.py ''; - meta = { + meta = with lib; { description = "Powerful terminal emulator based on EFL"; homepage = "https://www.enlightenment.org/about-terminology"; - license = lib.licenses.bsd2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; }; } diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index 71a582993abf..38754a556938 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -2,7 +2,6 @@ , stdenv , gettext , fetchurl -, fetchpatch , wrapGAppsHook , gnome-video-effects , libcanberra-gtk3 @@ -35,23 +34,15 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "3.38.0"; + version = "41.0"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; + url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "EG8d9n4c9Bwqp5yZveZ2rskA2wNstSX6EIObBhh9Ivk="; }; - patches = [ - # Fix build with latest Vala or GLib - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch"; - sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4="; - }) - ]; - nativeBuildInputs = [ appstream-glib docbook_xml_dtd_43 diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 500e60feb75c..6275bcd3fc65 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "3.18.4"; + version = "3.41.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2"; + sha256 = "KcdG8ihzteQVvDly29PdYNalH3CA5qPpVsNNZHrjRKI="; }; nativeBuildInputs = [ @@ -50,18 +50,6 @@ stdenv.mkDerivation rec { desktop-file-utils ]; - patches = [ - # Fixes for darwin. Drop in next release. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/ghex/commit/b0af26666cd990d99076c242b2abb3efc6e98671.patch"; - sha256 = "1zwdkgr2nqrn9q3ydyvrrpn5x55cdi747fhbq6mh6blp9cbrk9b5"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/ghex/commit/cc8ef9e67b23604c402460010dc0b5dccb85391b.patch"; - sha256 = "0j2165rfhlbrlzhmcnirqd5m89ljpz0n3nz20sxbwlc8h42zv36s"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 510da6c83d94..fa0f590b5f5b 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "40.3"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "//COj0Wkvm0zsKGpY6yzc5ujld6yFZDUOLsepvv3QFg="; + sha256 = "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h"; }; doCheck = true; diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index da2e37e51fc4..c8c2853203ce 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "njcB/UoOWJgA0iUgN3BkTzHVI0ZV9UqDqF/wVW3X6jM="; + sha256 = "0gqrxcn7fcvlh5c9691lx5zgdgs71ah15h5psrbhkg8qcqy95b3k"; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 5cbd58d602a9..960a3320472d 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"; + sha256 = "0yw6mimfwn0fij8zncjb4rg8bnazd1z47rmzq85lk6807nlyqag1"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index a00b239641f8..1f2cb9dc52e1 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -13,6 +13,7 @@ , wrapGAppsHook , glib , gtk3 +, libhandy , libxml2 , gtk-vnc , gtk-frdp @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "40.0.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-vpvLoHzz+vWs4M5UzSL4YJtNx3ZuJe5f2cGAw5WbTRE="; + hash = "sha256-M5/1VaEI0gt6sPO/GCmWMWAYYOeO+peLpqudGO3DtGA="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { glib gtk-vnc gtk3 + libhandy libxml2 gtk-frdp ]; diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 5784fb8d481f..7ddf227a8fb3 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -9,13 +9,13 @@ , gtk3 , gobject-introspection , gdk-pixbuf +, librest , librsvg , libgweather , geoclue2 , wrapGAppsHook , folks , libchamplain -, gfbgraph , libsoup , gsettings-desktop-schemas , webkitgtk @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-LFt+HmX39OVP6G7d2hE46qbAaRoUlAPZXL4i7cgiUJw="; + sha256 = "sha256-G0CC22wHDp3LCFJZ6+PIpCG44eiyezKEq2BXULudjJI="; }; doCheck = true; @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { gdk-pixbuf geoclue2 geocode-glib - gfbgraph gjs gnome-online-accounts gnome.adwaita-icon-theme @@ -64,6 +63,7 @@ stdenv.mkDerivation rec { libgee libgweather libhandy + librest librsvg libsoup webkitgtk diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 803235e95843..96ec321fa4a9 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -25,18 +25,19 @@ , gst_all_1 , libdazzle , libsoup +, libhandy , gsettings-desktop-schemas }: python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "40.1.1"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "IMtnPhHC8xQ9NYjPyrmhInkQgOun3GASypTBhglVjVE="; + sha256 = "1llz2aqa3n3ivwl7i09pgylsbgrfzb872vcj1k7pvivxm1kkbcb9"; }; nativeBuildInputs = [ @@ -67,6 +68,7 @@ python3.pkgs.buildPythonApplication rec { libnotify libdazzle libsoup + libhandy gsettings-desktop-schemas tracker ] ++ (with gst_all_1; [ @@ -77,13 +79,12 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly ]); - propagatedBuildInputs = with python3.pkgs; [ + pythonPath = with python3.pkgs; [ pycairo dbus-python pygobject3 ]; - postPatch = '' for f in meson_post_conf.py meson_post_install.py; do chmod +x $f @@ -91,6 +92,13 @@ python3.pkgs.buildPythonApplication rec { done ''; + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + doCheck = false; # handle setup hooks better diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index ae1334cd562b..cfa77fadb79d 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -21,15 +21,16 @@ , libical , librest , json-glib +, itstool }: stdenv.mkDerivation rec { pname = "gnome-todo"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "aAl8lvBnXHFCZn0QQ0ToNHLdf8xTj+wKzb9gJrucobE="; + sha256 = "1r94880d4khbjhhfnhaba3y3d4hv2bri82rzfzxn27s5iybpqras"; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { gettext python3 wrapGAppsHook + itstool ]; buildInputs = [ @@ -62,10 +64,6 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/meson/meson_post_install.py patchShebangs build-aux/meson/meson_post_install.py - - # https://gitlab.gnome.org/GNOME/gnome-todo/merge_requests/103 - substituteInPlace src/meson.build \ - --replace 'Gtk-3.0' 'Gtk-4.0' ''; passthru = { diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 17e98bb2a569..aa192a6a3b65 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PREUTEeXxG0gaMPd9c4rwDD8oPJyzwPyGMT0baO3PE0="; + sha256 = "1vidwq768xnrnr24jcfbpwjczz7vm5zmaiv41nb75q4p8avlwqg5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix index 0675ccb2f82d..f207307588a1 100644 --- a/pkgs/desktops/gnome/apps/polari/default.nix +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -1,17 +1,15 @@ { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils -, pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib -, gnome, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: +, pkg-config, gtk4, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib +, gnome, wrapGAppsHook4, telepathy-logger, gspell, gsettings-desktop-schemas }: -let +stdenv.mkDerivation rec { pname = "polari"; - version = "3.38.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "41.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "o7BfgWYDcMZ8lCtvRLKYx7eIFv6zjJJuwiEr3iLqQOs="; }; patches = [ @@ -24,12 +22,12 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ - meson ninja pkg-config itstool gettext wrapGAppsHook libxml2 + meson ninja pkg-config itstool gettext wrapGAppsHook4 libxml2 desktop-file-utils gobject-introspection appstream-glib ]; buildInputs = [ - gtk3 glib adwaita-icon-theme gsettings-desktop-schemas + gtk4 gtk3 glib adwaita-icon-theme gsettings-desktop-schemas telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk ]; diff --git a/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch index 0fb09eb154af..269b455f9787 100644 --- a/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch +++ b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch @@ -1,24 +1,24 @@ diff --git a/src/thumbnailer.js b/src/thumbnailer.js old mode 100644 new mode 100755 -index e2ad0a5..7ebf08a +index ed6350ea..83d832cb --- a/src/thumbnailer.js +++ b/src/thumbnailer.js @@ -1,3 +1,4 @@ -+#!/usr/bin/env gjs - imports.gi.versions.Gdk = '3.0'; - imports.gi.versions.Gtk = '3.0'; - ++#!/usr/bin/env gjs --module + import Cairo from 'cairo'; + import Gdk from 'gi://Gdk?version=3.0'; + import Gio from 'gi://Gio'; diff --git a/src/urlPreview.js b/src/urlPreview.js -index f17e0be..ccffc32 100644 +index 5f7931e4..d2282900 100644 --- a/src/urlPreview.js +++ b/src/urlPreview.js -@@ -44,7 +44,7 @@ class Thumbnailer { - _generateThumbnail(data) { +@@ -69,7 +69,7 @@ class Thumbnailer { + async _generateThumbnail(data) { let { filename, uri } = data; this._subProc = Gio.Subprocess.new( -- ['gjs', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], +- ['gjs', '--module', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], + [`${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], Gio.SubprocessFlags.NONE); - this._subProc.wait_async(null, (o, res) => { - try { + try { + await this._subProc.wait_async(null); diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index d09a4c9ff3e6..67036df2d51b 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -27,15 +27,13 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw="; + hash = "sha256-5u7AnoEESClfVH8YwdV3K2XD7cHZ5aJZXxC13eaJKfU="; }; - doCheck = true; - nativeBuildInputs = [ meson ninja @@ -65,10 +63,21 @@ stdenv.mkDerivation rec { libhandy ]; + doCheck = true; + postPatch = '' patchShebangs build-aux/ ''; + preCheck = '' + # Add “org.gnome.crypto.pgp” GSettings schema to path + # to make it available for “gpgme-backend” test. + # It is used by Seahorse’s internal “common” library. + addToSearchPath XDG_DATA_DIRS "${glib.getSchemaPath gcr}/../.." + # The same test also requires home directory so that it can store settings. + export HOME=$TMPDIR + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 04f8a7a3c37b..c7c85779d3fb 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "40.1.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY="; + sha256 = "71M52MNfytXRBIG3BICAPw+iCz08vDOSOPys7q7gHro="; }; # For convenience, we can specify adwaita-icon-theme only in packages diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 40ff8e201543..40ea18b1af1e 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6"; + sha256 = "ytYnjS3MgMhLVxBapbtY2KMM6Y1vq9dnUZ3bhshX6FU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index bffcb8b74c23..67ecf9f5c13c 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "40.3"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KKo7BwgdlWV1RvcIlJR/qIZjGix/lV5Wz4DbcxrjsjU="; + sha256 = "sha256-kX3ghv2X/T7JMPoHyIut0r4fXQrmueVpyYYATgNZqaw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 6f673d632267..617ef1cc38f5 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -39,17 +39,19 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "40.3"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "2tE4ufLVXeJxEo/KOLYfU/2YDFh9KeG6a1CP/zsZ9WQ="; + sha256 = "s50YJUkllbC3TF1qZoaoV/lBnfpMAvgBPCl7yHDibdA="; }; patches = lib.optionals withPantheon [ + # Make this respect dark mode settings from Pantheon # https://github.com/elementary/browser - ./dark-style.patch - ./navigation-buttons.patch + # The patch currently differs from upstream (updated for epiphany 40 and 41). + ./pantheon-dark-style.patch + ./pantheon-navigation-buttons.patch ]; nativeBuildInputs = [ @@ -95,7 +97,9 @@ stdenv.mkDerivation rec { p11-kit sqlite webkitgtk - ] ++ lib.optional withPantheon pantheon.granite; + ] ++ lib.optionals withPantheon [ + pantheon.granite + ]; # Tests need an X display mesonFlags = [ diff --git a/pkgs/desktops/gnome/core/epiphany/dark-style.patch b/pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch similarity index 100% rename from pkgs/desktops/gnome/core/epiphany/dark-style.patch rename to pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch diff --git a/pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch b/pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch similarity index 100% rename from pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch rename to pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 11cd3735e1d5..45812dbc901a 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -30,6 +30,7 @@ , gsettings-desktop-schemas , gnome-desktop , dbus +, pantheon , python3 , texlive , t1lib @@ -40,19 +41,27 @@ , supportMultimedia ? true # PDF multimedia , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps +, withPantheon ? false }: stdenv.mkDerivation rec { pname = "evince"; - version = "40.4"; + version = "41.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M0IFAODgYPF4pDUGMZfULa57Z+OcxDepZRCjPd9+lfs="; + sha256 = "lautDW/urJVg2zq4C6fF6rsf3xyg47PJMzmvBUU6JNg="; }; + patches = lib.optionals withPantheon [ + # Make this respect dark mode settings from Pantheon + # https://github.com/elementary/evince + # The patch currently differs from upstream (updated for evince 41). + ./pantheon-dark-style.patch + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py @@ -96,9 +105,18 @@ stdenv.mkDerivation rec { poppler t1lib texlive.bin.core # kpathsea for DVI support - ] ++ lib.optional supportXPS libgxps - ++ lib.optionals supportMultimedia (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); + ] ++ lib.optionals supportXPS [ + libgxps + ] ++ lib.optionals supportMultimedia (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]) ++ lib.optionals withPantheon [ + pantheon.granite + ]; mesonFlags = [ "-Dnautilus=false" @@ -128,8 +146,8 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.gnome.members; + maintainers = teams.gnome.members ++ teams.pantheon.members; }; } diff --git a/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch b/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch new file mode 100644 index 000000000000..5e1ef67b08cd --- /dev/null +++ b/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch @@ -0,0 +1,86 @@ +diff --git a/meson.build b/meson.build +index bcb69cf7..4a18c08c 100644 +--- a/meson.build ++++ b/meson.build +@@ -162,6 +162,7 @@ gmodule_dep = dependency('gmodule-2.0') + gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req_version) + gtk_dep = dependency('gtk+-3.0', version: gtk_req_version) + gthread_dep = dependency('gthread-2.0', version: glib_req_version) ++granite_dep = dependency('granite') + # Keep the version here synchronised with subprojects/libhandy.wrap + hdy_dep = dependency('libhandy-1', version: hdy_req_version, fallback: ['libhandy', 'libhandy_dep']) + +diff --git a/shell/ev-application.c b/shell/ev-application.c +index e704bda2..d705328c 100644 +--- a/shell/ev-application.c ++++ b/shell/ev-application.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #ifdef GDK_WINDOWING_X11 + #include +@@ -176,7 +177,7 @@ ev_spawn (const char *uri, + + g_string_append_printf (cmd, " %s", path); + g_free (path); +- ++ + /* Page label */ + if (dest) { + switch (ev_link_dest_get_dest_type (dest)) { +@@ -940,6 +941,20 @@ ev_application_migrate_config_dir (EvApplication *application) + g_free (old_accels); + } + ++static void ++ev_application_set_prefers_color_scheme () ++{ ++ GtkSettings* gtk_settings = gtk_settings_get_default (); ++ GraniteSettings* granite_settings = granite_settings_get_default (); ++ ++ g_object_set ( ++ gtk_settings, ++ "gtk-application-prefer-dark-theme", ++ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK, ++ NULL ++ ); ++} ++ + static void + ev_application_startup (GApplication *gapplication) + { +@@ -992,6 +1007,7 @@ ev_application_startup (GApplication *gapplication) + + EvApplication *application = EV_APPLICATION (gapplication); + const gchar **it; ++ GraniteSettings* granite_settings = granite_settings_get_default (); + + g_application_set_resource_base_path (gapplication, "/org/gnome/evince"); + +@@ -999,6 +1015,11 @@ ev_application_startup (GApplication *gapplication) + + hdy_init (); + ++ ev_application_set_prefers_color_scheme (); ++ ++ g_signal_connect (granite_settings, "notify::prefers-color-scheme", ++ G_CALLBACK(ev_application_set_prefers_color_scheme), NULL); ++ + for (it = action_accels; it[0]; it += g_strv_length ((gchar **)it) + 1) + gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]); + } +diff --git a/shell/meson.build b/shell/meson.build +index 7cbc48f2..a3089b13 100644 +--- a/shell/meson.build ++++ b/shell/meson.build +@@ -52,6 +52,7 @@ sources += gnome.compile_resources( + deps = [ + gdk_pixbuf_dep, + gnome_desktop_dep, ++ granite_dep, + hdy_dep, + libevmisc_dep, + libevproperties_dep, diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 156ffbb1c78f..aabe9af14827 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.40.4"; + version = "3.42.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "h8GF8Yw3Jw42EZgfGb2SIayXTIB0Ysjc6QvqCHEsWAA="; + sha256 = "6P3TvEegfW+KMFK7yuiA8g9tvE9pc6jpDQAWm7mbFjU="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index e3c693836374..392ea61688a6 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -26,6 +26,7 @@ , plymouth , librsvg , coreutils +, xorgserver , xwayland , dbus , nixos-icons @@ -42,13 +43,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "40.1"; + version = "41.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "q7ih6mZISPLJD4SsqkLpTSVgVwNYgamPvUH7xdfRc/0="; + sha256 = "VzjEKTqfWoDUpungb00N8+nzE8p7Yb+02K+rqYPiANw="; }; mesonFlags = [ @@ -102,7 +103,7 @@ stdenv.mkDerivation rec { # Change hardcoded paths to nix store paths. (substituteAll { src = ./fix-paths.patch; - inherit coreutils plymouth xwayland dbus; + inherit coreutils plymouth xorgserver xwayland dbus; }) # The following patches implement certain environment variables in GDM which are set by diff --git a/pkgs/desktops/gnome/core/gdm/fix-paths.patch b/pkgs/desktops/gnome/core/gdm/fix-paths.patch index d649556fe9e6..980627c78d46 100644 --- a/pkgs/desktops/gnome/core/gdm/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gdm/fix-paths.patch @@ -1,66 +1,64 @@ +diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c +index 5fbbad68..739718ec 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -201,7 +201,7 @@ +@@ -233,9 +233,9 @@ struct GdmDisplayServerConfiguration { + const char *session_type; + } display_server_configuration[] = { #ifdef ENABLE_WAYLAND_SUPPORT - gboolean wayland_enabled = FALSE; - if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) { -- if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) -+ if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) - return TRUE; - } +- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" }, ++ { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" }, #endif +- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" }, ++ { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" }, + { NULL, NULL, NULL }, + }; + +diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c +index cc61efc9..4c9d15af 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c -@@ -145,7 +145,7 @@ +@@ -148,7 +148,7 @@ plymouth_is_running (void) GError *error; - + error = NULL; - res = g_spawn_command_line_sync ("plymouth --ping", + res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping", NULL, NULL, &status, &error); if (! res) { g_debug ("Could not ping plymouth: %s", error->message); -@@ -163,7 +163,7 @@ +@@ -166,7 +166,7 @@ plymouth_prepare_for_transition (void) GError *error; - + error = NULL; - res = g_spawn_command_line_sync ("plymouth deactivate", + res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate", NULL, NULL, NULL, &error); if (! res) { g_warning ("Could not deactivate plymouth: %s", error->message); -@@ -178,7 +178,7 @@ +@@ -181,7 +181,7 @@ plymouth_quit_with_transition (void) GError *error; - + error = NULL; - res = g_spawn_command_line_async ("plymouth quit --retain-splash", &error); + res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error); if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); -@@ -194,7 +194,7 @@ +@@ -197,7 +197,7 @@ plymouth_quit_without_transition (void) GError *error; - + error = NULL; - res = g_spawn_command_line_async ("plymouth quit", &error); + res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error); if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); ---- a/data/gdm.service.in -+++ b/data/gdm.service.in -@@ -26,7 +26,7 @@ Restart=always - IgnoreSIGPIPE=no - BusName=org.gnome.DisplayManager - EnvironmentFile=-${LANG_CONFIG_FILE} --ExecReload=/bin/kill -SIGHUP $MAINPID -+ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID - KeyringMode=shared - - [Install] +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 4b709731..245ac0cf 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -2916,16 +2916,16 @@ gdm_session_start_session (GdmSession *self, +@@ -2972,16 +2972,16 @@ gdm_session_start_session (GdmSession *self, */ if (run_launcher) { if (is_x11) { @@ -80,3 +78,16 @@ self->selected_program); } } +diff --git a/data/gdm.service.in b/data/gdm.service.in +index 17e8a8de..afc70977 100644 +--- a/data/gdm.service.in ++++ b/data/gdm.service.in +@@ -26,7 +26,7 @@ Restart=always + IgnoreSIGPIPE=no + BusName=org.gnome.DisplayManager + EnvironmentFile=-${LANG_CONFIG_FILE} +-ExecReload=/bin/kill -SIGHUP $MAINPID ++ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID + KeyringMode=shared + + [Install] diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 370cd14e4677..814878d57140 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4="; + sha256 = "HaGsDSYb7fD80shbSAvGVQXiPPUfEUMSbA03cX5pMUU="; }; passthru = { diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 7e19e9523ce8..58c079078d64 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz"; + sha256 = "pm3AS9hYfnbWc3Wmrvp5VTtWnJvfeOvcKBfxwK3j3Jk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 62a43d20d580..919bb5206cff 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9"; + sha256 = "Y+MUm10UdbeiaYAFu191DzyApzVxcWDjnfjP3+v8zfA="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 6170f53c716b..d7a898c1c45c 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -1,5 +1,4 @@ { fetchurl -, fetchpatch , lib , stdenv , substituteAll @@ -17,6 +16,7 @@ , gettext , glib , glib-networking +, gcr , glibc , gnome-bluetooth , gnome-color-manager @@ -24,8 +24,6 @@ , gnome-online-accounts , gnome-settings-daemon , gnome -, grilo -, grilo-plugins , gsettings-desktop-schemas , gsound , gtk3 @@ -70,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE="; + sha256 = "sha256-pWliIq01P8+aB8QG4ofsyROOJQZFyypZQaiP8GhWWME="; }; patches = [ @@ -85,13 +83,6 @@ stdenv.mkDerivation rec { inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) - - # Fix startup assertion in power panel. - # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/974 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/9acaa10567c94048657c69538e5d7813f82c4224.patch"; - sha256 = "59GeTPcG2UiVTL4VTS/TP0p0QkAQpm3VgvuAiw64wUU="; - }) ]; nativeBuildInputs = [ @@ -119,14 +110,13 @@ stdenv.mkDerivation rec { gdk-pixbuf glib glib-networking + gcr gnome-bluetooth gnome-desktop gnome-online-accounts gnome-remote-desktop # optional, sharing panel gnome-settings-daemon gnome-user-share # optional, sharing panel - grilo - grilo-plugins # for setting wallpaper from Flickr gsettings-desktop-schemas gsound gtk3 diff --git a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch index 57eb4b3d44a9..c31e093f4b7e 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch @@ -1,15 +1,17 @@ +diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c +index ddcc1511..546c2a36 100644 --- a/libgnome-desktop/gnome-desktop-thumbnail-script.c +++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, +@@ -555,9 +555,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", +- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", + "@bubblewrap_bin@", + "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind", "/run/current-system", "/run/current-system", ++ "--ro-bind-try", "/run/current-system", "/run/current-system", NULL); /* These directories might be symlinks into /usr/... */ diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix index df8096b90eec..6ab45283c852 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "40.4"; + version = "41.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iK6W9YXg0IcJQbuj113fPsQDSOHFrnQTIcpIL6ydRe8="; + sha256 = "sha256-acsdPZoQcA62Y0jvHA5mqFX8WpeuYpAt+XpJnaEVYtI="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index ead50f1c9d1a..195a0c4f016d 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ztES6qh9j/ohOv1NC62TnPp662cbeySIWaHchNb1Iec="; + sha256 = "sha256-h0PJj9ZWBi74YpM+/jDFvkxrMi7ALu4VTscNCO0Ild8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 622a7de1bffa..4ba915df2dbd 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"; + sha256 = "XdQQMxvgcOTgNDl/J1SYDgc4UdUKIRny+/lq3G/i6HY="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index b6aedeeb6464..ff1d95861e37 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "QSplhO5upN+WN8QimT9Or4FYTSkZD16JOvmnhxy5Axs="; + sha256 = "R/ZHW2bIQ+fVPZC6Dns5SHYt8VFjSkNvaMK5u6BQVgo="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index fda0f6e2ffd6..fac50cd2b34d 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -7,6 +7,7 @@ , python3 , wrapGAppsHook , glib +, nv-codec-headers-11 , pipewire , systemd , libvncserver @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-mvpuUlVwo3IJP5cwM4JwkDiU87H5+KnfX1eDbqHSnek="; + hash = "sha256-apvIscaHRvSjqsH+dMRKcuJqi7S+HxynMCdwWstlK14="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { fuse3 gdk-pixbuf # For libnotify glib + nv-codec-headers-11 libnotify libsecret libvncserver diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 4a1b7f4c20c7..307de72cc4f0 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "40.0.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp"; + sha256 = "5spjYfvR3qst4aHjkNTxQWfPR7HFR9u4tlpdielmOIQ="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 94b29e8b4dee..25f7fb93ab30 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9R1MQsIru9AxLKcY9Hz0Vp/FikbvQAdDrk0cx9kKzXk="; + sha256 = "2E+qwUSLOPl12cGUkMWSivxcWixJ3X5/ga9pD5Rm/Gg="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 6a7cb1742ba6..04a4b0984ecb 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "40.4"; + version = "41.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "160z8bz2kqmrs6a4cs2gakv0rl9ba69p3ij2xjakqav50n9r3i9b"; + sha256 = "Uvlx6FFA5d50uTae9mVuSc6Vrx8jL8Hg3x8EYSmrT2U="; }; patches = [ @@ -103,6 +103,13 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; }) + + # Make color picker in GTK work again + # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1990 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/a3dcdaae30bdcbadec7ba3fa31c9eb0bb2a4c8c2.patch"; + sha256 = "1UTWGZ5CiVJVCYcepaf+A6/8X/s6jUMsYB4BJ7VTjxk="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch index e17a608a2d85..8b35736ecfcd 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch @@ -1,30 +1,36 @@ ---- a/js/ui/extensionDownloader.js -+++ b/js/ui/extensionDownloader.js -@@ -86,7 +86,7 @@ - stream.output_stream.write_bytes(contents, null); - stream.close(null); - let [success, pid] = GLib.spawn_async(null, -- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], -+ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], - null, - GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, - null); ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button { - if (xkbVariant.length > 0) - description = `${description}\t${xkbVariant}`; - -- Util.spawn(['gkbd-keyboard-display', '-l', description]); -+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); - } - }); +diff --git a/data/org.gnome.Shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service +index de91167c5..1c9965678 100644 --- a/data/org.gnome.Shell-disable-extensions.service +++ b/data/org.gnome.Shell-disable-extensions.service -@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer +@@ -11,5 +11,5 @@ ConditionPathExists=%t/gnome-shell-disable-extensions [Service] Type=simple # Disable extensions -ExecStart=gsettings set org.gnome.shell disable-user-extensions true +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true Restart=no +diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js +index 8bf4646a6..59e88bb4c 100644 +--- a/js/ui/extensionDownloader.js ++++ b/js/ui/extensionDownloader.js +@@ -114,7 +114,7 @@ async function extractExtensionArchive(bytes, dir) { + stream.close_async(GLib.PRIORITY_DEFAULT, null); + + const unzip = Gio.Subprocess.new( +- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], ++ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], + Gio.SubprocessFlags.NONE); + await unzip.wait_check_async(null); + } +diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js +index bc50f3d37..868eb5abf 100644 +--- a/js/ui/status/keyboard.js ++++ b/js/ui/status/keyboard.js +@@ -1080,6 +1080,6 @@ class InputSourceIndicator extends PanelMenu.Button { + if (xkbVariant.length > 0) + description = '%s\t%s'.format(description, xkbVariant); + +- Util.spawn(['gkbd-keyboard-display', '-l', description]); ++ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); + } + }); diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 6d71c579d7ed..4d9a5c407653 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -25,7 +25,6 @@ , gsettings-desktop-schemas , gnome-desktop , libxmlb -, gnome-online-accounts , json-glib , libsecret , valgrind-light @@ -43,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "voxhGoAvcXGNzLvUVE7ZaIcxGYRv03t7dqeq1yx5mL8="; + sha256 = "AkC3bsnfYi2b7A6zjkrFY8rt5oCLrZO4gmPYCXD/OcE="; }; patches = [ @@ -89,7 +88,6 @@ stdenv.mkDerivation rec { polkit flatpak libxmlb - gnome-online-accounts libsysprof-capture ] ++ lib.optionals withFwupd [ fwupd diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index 77579be6272d..d373d6f358c6 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx"; + sha256 = "x/xExhlJt5SwKJlo67vMDBX4z8PZ5Fv6qB7UXBITnl8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index ab3e3aecc035..48e65009ade7 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,36 +1,79 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus -, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, pcre2 -, libxslt, docbook-xsl-nons }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, python3 +, libxml2 +, gnome +, dconf +, nautilus +, glib +, gtk3 +, gsettings-desktop-schemas +, vte +, gettext +, which +, libuuid +, vala +, desktop-file-utils +, itstool +, wrapGAppsHook +, pcre2 +, libxslt +, docbook-xsl-nons +}: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.40.1"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07"; + sha256 = "tQ6eVmQjDmyikLzziBKltl4LqsZqSG7iEIlM9nX3Lgs="; }; - buildInputs = [ - gtk3 gsettings-desktop-schemas vte libuuid dconf - # For extension - nautilus - ]; - nativeBuildInputs = [ - pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons - vala desktop-file-utils wrapGAppsHook pcre2 + meson + ninja + pkg-config + gettext + itstool + which + libxml2 + libxslt + glib # for glib-compile-schemas + docbook-xsl-nons + vala + desktop-file-utils + wrapGAppsHook + pcre2 + python3 ]; - # Silly ./configure, it looks for dbus file from gnome-shell in the + buildInputs = [ + glib + gtk3 + gsettings-desktop-schemas + vte + libuuid + dconf + nautilus # For extension + ]; + + # Silly build system, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - ''; + substituteInPlace src/meson.build \ + --replace "gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml'" \ + "'${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml'" - configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 + patchShebangs \ + data/icons/meson_updateiconcache.py \ + data/meson_desktopfile.py \ + src/meson_compileschemas.py + ''; passthru = { updateScript = gnome.updateScript { @@ -39,8 +82,6 @@ stdenv.mkDerivation rec { }; }; - enableParallelBuilding = true; - meta = with lib; { description = "The GNOME Terminal Emulator"; homepage = "https://wiki.gnome.org/Apps/Terminal"; diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix index 211326cfcdbd..bab13a6ccd19 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dhttpd=${apacheHttpd.out}/bin/httpd" - "-Dmodules_path=${apacheHttpd.dev}/modules" + "-Dmodules_path=${apacheHttpd}/modules" "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user" # In 3.34.0 it defaults to false but it is silently ignored and always installed. # Let’s add it anyway in case they decide to make build respect the option in the future. diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index 336a4d260c4e..7d15e6b41ef6 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , intltool , fetchFromGitLab , meson @@ -11,7 +12,6 @@ , desktop-file-utils , gtk-doc , wrapGAppsHook -, gnome , itstool , libxml2 , yelp-tools @@ -25,6 +25,7 @@ , runCommand , symlinkJoin , gobject-introspection +, nix-update-script }: let @@ -44,7 +45,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "13.0.2"; + version = "14.0.0"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -53,7 +54,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "099za9mc6qdq9pwcbjp3d7hxjbaa43vk2w9qw4yiyswl1xq3jw62"; + sha256 = "sha256-d283zVRH42NZNq+vGmItN3ZBrRrl9gpYDco7osm3RoY="; }; nativeBuildInputs = [ @@ -93,8 +94,8 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; + updateScript = nix-update-script { + attrPath = "gnome.gucharmap"; }; }; diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 3336cfab730e..78b90a379c38 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -14,6 +14,7 @@ , zenity , libcanberra , ninja +, xvfb-run , xkeyboard_config , libxkbfile , libXdamage @@ -45,13 +46,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "40.4"; + version = "41.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pxwVnNKshKZ32l+nrMSUg7Jifa13L4gPiJ645FMKHiM="; + sha256 = "sha256-+oChp0QETYjr/Wd/8DID1ncF7SzWJOoGy7i1iUjN+J4="; }; patches = [ @@ -90,6 +91,7 @@ let self = stdenv.mkDerivation rec { mesa # needed for gbm meson ninja + xvfb-run pkg-config python3 wrapGAppsHook diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 1f92e49c4f66..2a964964a09e 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -34,11 +34,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "40.2"; + version = "41.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "tx7y/gfl7qiaK7HlvTCUe9GIc7+zD3nL8X7fvU0g9g0="; + sha256 = "+blBrcEEcAxn6kB2YiMV8fa3fc7BVMN/PUwLKDlQoeU="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch index 6fe651b9cbb4..d2319ec13ed3 100644 --- a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch +++ b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 4aa683d6..a930d533 100644 +index 8af2fcf9..0e318307 100644 --- a/meson.build +++ b/meson.build -@@ -20,7 +20,11 @@ if not get_option('uninstalled') +@@ -22,7 +22,11 @@ if not get_option('uninstalled') rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'rygel') rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'rygel') @@ -15,7 +15,7 @@ index 4aa683d6..a930d533 100644 rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') rygel_presetdir = join_paths(rygel_datadir, 'presets') -@@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) +@@ -57,7 +61,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) conf.set_quoted('PLUGIN_DIR', rygel_plugindir) conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir) conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir) @@ -25,14 +25,11 @@ index 4aa683d6..a930d533 100644 conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract')) conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications')) diff --git a/meson_options.txt b/meson_options.txt -index cb604c4e..1b049b77 100644 +index fd04776a..3dee43ba 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -1,6 +1,7 @@ +@@ -1,3 +1,4 @@ ++option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') - option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') -+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') - option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) - option('engines', type : 'array', choices : ['simple', 'gstreamer']) - option('examples', type : 'boolean', value : 'true') + option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages') diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index f43df23f44a1..c3cfeec8ff80 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,16 +28,20 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.40.1"; + version = "0.40.2"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0="; + sha256 = "yejHNiltIsTe/pWXJ6KdMUN7vSt6oMZHDWviQBEFBpc="; }; + patches = [ + ./add-option-for-installation-sysconfdir.patch + ]; + nativeBuildInputs = [ meson ninja @@ -78,16 +82,10 @@ stdenv.mkDerivation rec { "-Dapi-docs=false" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" - # Build all plug-ins except for tracker 2 - "-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3" ]; doCheck = true; - patches = [ - ./add-option-for-installation-sysconfdir.patch - ]; - postPatch = '' patchShebangs data/xml/process-xml.py ''; diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix index be501c0aef31..9514caa1e9b1 100644 --- a/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "40.1"; + version = "40.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6+45qx/kygU8TtK9OjynZ0L/EJQ23QZF00FWIhMroLQ="; + sha256 = "sha256-61N55MtspgUJLJQiEMGEJdA2dz2nZUHkO4nYIj+CuaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index cd93094120db..f08f51512c47 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -8,8 +8,7 @@ , gnome , gtksourceview4 , gjs -, webkitgtk -, libmusicbrainz5 +, webkitgtk_4_1 , icu , wrapGAppsHook , gst_all_1 @@ -23,11 +22,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "3.38.1"; + version = "41.0"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "8+bRDIFVKNA6Zl+v0VwHGeAXqBOXWzrzIHYZnjeIiOk="; + url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "m3UlaQzkNmJO+gpgV3NJNDLNDva49GSYLouETtqYmO4="; }; nativeBuildInputs = [ @@ -49,8 +48,7 @@ stdenv.mkDerivation rec { gtksourceview4 gdk-pixbuf librsvg - libmusicbrainz5 - webkitgtk + webkitgtk_4_1 epoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 7d1d4e90abf0..0178c04b53ca 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "j/rPfA6inO3qBndzCGHUh2qPesTaTGI0u3X3/TcFoQg="; + sha256 = "/OVi4rJsvPwMZ4U43MgfncFc5g1aie5DWJB79jQwTEA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 32f3fbd61538..8b091e000bad 100644 --- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kZxVL4RqrsdB/lHVr0FrRpvNslx37/w7WhWktLf/gU4="; + sha256 = "sha256-yM1kwJO72MXV5H/TiGTpCDG1+c90A1MIcCBvqWY2pKU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 746866fc9c20..b1e094292bf1 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -1,23 +1,47 @@ -{ lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib -, gnome, sqlite -, itstool, libxml2, libxslt, gst_all_1 -, wrapGAppsHook }: +{ lib +, stdenv +, gettext +, fetchurl +, webkitgtk_4_1 +, pkg-config +, gtk3 +, glib +, gnome +, sqlite +, itstool +, libxml2 +, libxslt +, gst_all_1 +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "yelp"; - version = "40.3"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oXOEeFHyYYm+eOy7EAFdU52Mzv/Hwj6GNUkrw62l7iM="; + sha256 = "sha256-RWpkFWR7zusBWbkLNVP/MocozymmCPzggCQjJQTMuHQ="; }; - nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; + nativeBuildInputs = [ + pkg-config + gettext + itstool + wrapGAppsHook + ]; + buildInputs = [ - gtk3 glib webkitgtk sqlite - libxml2 libxslt gnome.yelp-xsl + gtk3 + glib + webkitgtk_4_1 + sqlite + libxml2 + libxslt + gnome.yelp-xsl gnome.adwaita-icon-theme - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ]; passthru = { diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index 51ad81a77a46..ef8259e9e82e 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -1,10 +1,12 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, meson +, ninja , pkg-config , libxml2 , gnome , gtk3 -, yelp-tools , gettext , libX11 , itstool @@ -13,17 +15,18 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.32.0"; + version = "3.41.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; + sha256 = "GbZ2w1EOIrrfzDIEBi1DK6U3QC9eCuJhKMDZDJVAN+E="; }; nativeBuildInputs = [ + meson + ninja pkg-config gettext - yelp-tools itstool libxml2 wrapGAppsHook diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index 6be6c77f7c27..2ad3c3ff39ad 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -7,10 +7,10 @@ , gtk3 , wrapGAppsHook , glib -, amtk , appstream-glib , gobject-introspection , python3 +, gi-docgen , webkitgtk , gettext , itstool @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "40.1"; + version = "41.2"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PorZPoSEtEgjyuR0ov2dziLtbs0lZVWSzq17G2gya7s="; + sha256 = "7KqQsPTaqPsgMPbcaQv1M/+Zp3NDf+Dhis/oLZl/YNI="; }; nativeBuildInputs = [ @@ -37,22 +39,27 @@ stdenv.mkDerivation rec { appstream-glib gobject-introspection python3 + gi-docgen ]; buildInputs = [ glib gtk3 webkitgtk - amtk gnome.adwaita-icon-theme gsettings-desktop-schemas ]; + mesonFlags = [ + "-Dgtk_doc=true" + ]; + doCheck = true; postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py + # patchShebangs requires executable file + chmod +x build-aux/meson/meson_post_install.py + patchShebangs build-aux/meson/meson_post_install.py ''; preFixup = '' @@ -63,6 +70,11 @@ stdenv.mkDerivation rec { ) ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/devhelp-3 "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "devhelp"; diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 6efefd1fb032..5b1d110d46a5 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "unstable-2021-07-07"; + version = "unstable-2021-10-03"; - # temporarily switched to https://github.com/micheleg/dash-to-dock/pull/1402 because upstream doesn't work with GNOME 40 yet. + # temporarily switched to commit hash because GNOME 40 version is not released yet. src = fetchFromGitHub { - owner = "ewlsh"; + owner = "micheleg"; repo = "dash-to-dock"; - rev = "e4beec847181e4163b0a99ceaef4c4582cc8ae4c"; - hash = "sha256-7UVnLXH7COnIbqxbt3CCscuu1YyPH6ax5DlKdaHCT/0="; + rev = "9605dd69fe86d4f92416299c3f62605e75827dd3"; + sha256 = "0vrkiq5z2f11gqlfyis2rsnp6j25hwsp24s21vr55qkzkfszsigg"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix index 6f249bcb635d..9b24c1241e13 100644 --- a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix +++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-emoji-selector"; - version = "19"; + version = "20"; src = fetchFromGitHub { owner = "maoschanz"; repo = "emoji-selector-for-gnome"; rev = version; - sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb"; + sha256 = "sha256-I5aEHDC5GaGkAoH+1l4eyhBmJ+lmyZZoDw2Fq2SSlmo="; }; passthru = { diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 37824495a188..2d3d2415db24 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-gsconnect"; - version = "47"; + version = "48"; outputs = [ "out" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "sha256-cpyB7ufjKTj7YVbPlQFJ4qaL6Rb/aBReKxCYzErT4+Q="; + sha256 = "sha256-cKEFTF8DnQIQAXVW9NvE34mUqueQP/OtxTzMUy1dT5U="; }; patches = [ diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index c632bce407bc..a2dbd9257a2d 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk"; + sha256 = "8MKVFSLw5YX6aDdipBk9q2ujLtjOiSB/gIJ7VgRVaO8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix index 9c08aa5cada4..15759c681984 100644 --- a/pkgs/desktops/gnome/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "hitori"; - version = "3.38.2"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wmQ1cwN/ansW6SCK7e6GkQJvCBq6qhYJQu21LwkCnKw="; + sha256 = "99cQPLBjP7ATcwExqYw646IWK5+5SZ/H8ZUS1YG/ZWk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/games/swell-foop/default.nix b/pkgs/desktops/gnome/games/swell-foop/default.nix index 50fab598153a..b36f273f6d2f 100644 --- a/pkgs/desktops/gnome/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "swell-foop"; - version = "40.1"; + version = "41.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1"; + sha256 = "YEL/MTxsh9VkgnxwNpazsgkTbD/Dn+Jkpu+k4wWTg9g="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 2afb401bef45..e8bfaffb45e8 100644 --- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch +, meson +, ninja , pkg-config , gnome , gtk3 @@ -11,21 +15,32 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.3.3"; + version = "0.4.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "JyQA9zo3Wn6I/fHhJZG/uPPwPt8BeAytzXT3C2E+XAQ="; + sha256 = "6oxtUkurxxKsWeHQ46yL8BN0gtrfM8lP6RE3lKG8RHQ="; }; - passthru = { - updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; }; - }; + patches = [ + # Make compatible with older Meson. + # https://gitlab.gnome.org/GNOME/gnome-autoar/-/merge_requests/26 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/2d90da6174c03aad546802234a3d77fa0b714e6b.patch"; + sha256 = "CysDpBJmVPm4gOSV2h041MY2yApfAy8+4QC7Jlka1xE="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/ac21bd0c50584a1905a0da65d4bf9a6926ecd483.patch"; + sha256 = "aTu6eKFSKjljk0TYkhFjPcD8eJCIk8TR0YhZYO9JE1k="; + }) + ]; nativeBuildInputs = [ gobject-introspection + meson + ninja pkg-config vala ]; @@ -39,6 +54,17 @@ stdenv.mkDerivation rec { glib ]; + mesonFlags = [ + "-Dvapi=true" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-autoar"; + attrPath = "gnome.gnome-autoar"; + }; + }; + meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index c220e7eeccd1..6a9f4f19385d 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { libsoup ]; - propagatedBuildInputs = with python3Packages; [ + pythonPath = with python3Packages; [ pygobject3 ]; diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index 15fcfbfe390a..12abe49b918a 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.40.2"; + version = "3.42.0"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-DUikcnkDBRkCwPLrl8lkNr+SeNpc3bPwPTWRn91nOo4="; + sha256 = "sha256-YsAA487Q2BwDh4V2TPN/YwAFCw+F11OKMjatcNR98/c="; }; patches = [ diff --git a/pkgs/desktops/gnome/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix index 2881cc7e50fb..245a52293432 100644 --- a/pkgs/desktops/gnome/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -1,9 +1,13 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, autoconf-archive -, appstream-glib +, substituteAll +, fetchpatch +, meson +, ninja , pkg-config , wrapGAppsHook +, desktop-file-utils , libcanberra , gst_all_1 , vala @@ -11,43 +15,54 @@ , gom , sqlite , libxml2 -, autoreconfHook , glib , gobject-introspection , libpeas -, gnome-shell , gsettings-desktop-schemas -, adwaita-icon-theme , gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-pomodoro"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { - owner = "codito"; + owner = "gnome-pomodoro"; repo = "gnome-pomodoro"; rev = version; - sha256 = "sha256-im66QUzz6PcX0vkf4cN57ttRLB4KKPFky1pwUa4V7kQ="; + sha256 = "sha256-USzLHoBM0QbBPtbTzJJY02cOSDtmlxPGYhMj7M1FJic="; }; + patches = [ + # Our glib setup hooks moves GSettings schemas to a subdirectory to prevent conflicts. + # We need to patch the build script so that the extension can find them. + (substituteAll { + src = ./fix-schema-path.patch; + inherit pname version; + }) + + # Fix error reporting code. + # https://github.com/gnome-pomodoro/gnome-pomodoro/pull/591 + (fetchpatch { + url = "https://github.com/gnome-pomodoro/gnome-pomodoro/commit/133bd62f15653856d9705b66188b42c20d81719e.patch"; + sha256 = "A20K+57A6/lYH2Buri2+wrCQgz6EGBdYg2xQbHPSkYc="; + }) + ]; + nativeBuildInputs = [ - appstream-glib - autoconf-archive - autoreconfHook + meson + ninja gettext gobject-introspection libxml2 pkg-config vala wrapGAppsHook + desktop-file-utils ]; buildInputs = [ - adwaita-icon-theme glib - gnome-shell gom gsettings-desktop-schemas gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch b/pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch new file mode 100644 index 000000000000..0750d01f8675 --- /dev/null +++ b/pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch @@ -0,0 +1,40 @@ +diff --git a/data/meson.build b/data/meson.build +index 5e4ce69..982b3c9 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -31,7 +31,7 @@ i18n.merge_file( + + install_data( + 'org.gnome.pomodoro.gschema.xml', +- install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', ++ install_dir: gschema_dir, + ) + + subdir('icons') +diff --git a/meson-post-install.sh b/meson-post-install.sh +index bf4013a..c87fba4 100644 +--- a/meson-post-install.sh ++++ b/meson-post-install.sh +@@ -7,7 +7,7 @@ datadir="${prefix}/$1" + # want/need us to do the below + if [ -z "${DESTDIR}" ]; then + echo "Compiling GSchema..." +- glib-compile-schemas "${datadir}/glib-2.0/schemas" ++ glib-compile-schemas "${datadir}/gsettings-schemas/@pname@-@version@/glib-2.0/schemas" + + echo "Updating icon cache..." + gtk-update-icon-cache -f -t "${datadir}/icons/hicolor" +diff --git a/meson.build b/meson.build +index 09857a1..a07d27c 100644 +--- a/meson.build ++++ b/meson.build +@@ -40,7 +40,8 @@ add_project_arguments( + ) + + # We are going to use these variables later on for the plugins +-gschema_dir = get_option('prefix') / get_option('datadir') / 'glib-2.0' / 'schemas' ++nix_package_name = '@pname@' + '-' + '@version@' ++gschema_dir = get_option('prefix') / get_option('datadir') / 'gsettings-schemas' / nix_package_name / 'glib-2.0' / 'schemas' + plugin_libdir = get_option('prefix') / get_option('libdir') / meson.project_name() / 'plugins' + extension_dir = get_option('prefix') / get_option('datadir') / 'gnome-shell' / 'extensions' / 'pomodoro@arun.codito.in' + diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 3e0062c7a793..264389a68836 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-modules-path=${apacheHttpd}/modules" "--with-cajadir=$(out)/lib/caja/extensions-2.0" ]; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index b3b5409f6a01..668638c1bfec 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -71,6 +71,8 @@ lib.makeScope pkgs.newScope (self: with self; { epiphany = pkgs.epiphany.override { withPantheon = true; }; + evince = pkgs.evince.override { withPantheon = true; }; + sideload = callPackage ./apps/sideload { }; #### DESKTOP diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index b65bc7df8ed8..fac10cf31d41 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -24,6 +24,7 @@ let inherit (lib) getBin getLib; in mkDerivation { name = "plasma-workspace"; + passthru.providedSessions = [ "plasma" "plasmawayland" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index df072f862080..5a4a5dc2a18a 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "catfish"; - version = "4.16.2"; + version = "4.16.3"; src = fetchurl { url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-shouFRlD8LGU04sX/qrzghh5R+0SoCw9ZJKvt0gBKms="; + sha256 = "sha256-6amaYtEJgTkVCN1D88v6LVCmm9a30e7vfTC6TGc9z9o="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index c3e7805b112d..1fdbe267c039 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.6"; + version = "0.5.7"; odd-unstable = false; - sha256 = "sha256-cdM2NHUnN2FITITb4077Je5Z8xwZAJfjmwXfV+WE6jk="; + sha256 = "sha256-VLPzzM9dl+HAPI+Qn2QTjrKfRgngsExlPFRsdmsNcSM="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 99cb0e7cc626..0a937f68fd06 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.16.0"; + version = "4.16.1"; - sha256 = "sha256-YmawNgkCM2xwoMKZrY9SxRhm2t0tsmk2j2+grW9zPCk="; + sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw="; nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index b9d6f5b23eb5..62e454a62852 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.5.3"; + version = "2.6.0"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-Hw4vdFChKOqllsxMS2Bi7UL48a3Z6oB8oCPKWwa8bJY="; + sha256 = "sha256-VTv4nOL1ltHrewf3q4Uz4e2QjV+Jf7YZTNqILjuAEpM="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 11bf1cc96365..29e826c88d66 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -219,28 +219,34 @@ let in rec { - binaryCrystal_0_36 = genericBinary { - version = "0.36.1"; + binaryCrystal_1_0 = genericBinary { + version = "1.0.0"; sha256s = { - x86_64-linux = "065vzq34g7hgzl2mrzy9gwwsfikc78nj7xxsbrk67r6rz0a7bk1q"; - i686-linux = "18m4b1lnd682i5ygbg6cljqjny60nn2mlrzrk765h2ip6fljqbm1"; - x86_64-darwin = "0xggayk92zh64pb5sz77n12hkcd1hg8kw90z7gb18594q551sf1v"; + x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; + i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; + x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; }; }; - crystal_0_36 = generic { - version = "0.36.1"; - sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk="; - binary = binaryCrystal_0_36; - }; - crystal_1_0 = generic { version = "1.0.0"; sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; - binary = crystal_0_36; + binary = binaryCrystal_1_0; }; - crystal = crystal_1_0; + crystal_1_1 = generic { + version = "1.1.1"; + sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ="; + binary = crystal_1_0; + }; + + crystal_1_2 = generic { + version = "1.2.0"; + sha256 = "sha256-38mmsolzmCnv+MFUMc+AEiklDLBHIr/jqXMLzc0nVq4="; + binary = crystal_1_1; + }; + + crystal = crystal_1_2; crystal2nix = callPackage ./crystal2nix.nix { }; } diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 56880826a19c..38c2fae60347 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -3,7 +3,7 @@ , sha512 }: -assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; +assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; { lib, stdenv , fetchurl , libunwind @@ -17,7 +17,7 @@ assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; let pname = if type == "aspnetcore" then "aspnetcore-runtime" - else if type == "netcore" then + else if type == "runtime" then "dotnet-runtime" else "dotnet-sdk"; @@ -30,12 +30,12 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); urls = { aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; - netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; + runtime = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; }; descriptions = { - aspnetcore = "ASP .NET Core runtime ${version}"; - netcore = ".NET Core runtime ${version}"; + aspnetcore = "ASP.NET Core Runtime ${version}"; + runtime = ".NET Runtime ${version}"; sdk = ".NET SDK ${version}"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index a38d44e37efa..c99af4e62ae5 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -5,7 +5,7 @@ in assert lib.assertMsg ((builtins.length packages) != 0) ''You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ - sdk_3_0 aspnetcore_2_1 + sdk_3_1 aspnetcore_5_0 ];`'' ; buildEnv { name = "dotnet-core-combined"; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 89d7f4c7d922..5b4740c22e51 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,6 +1,6 @@ /* How to combine packages for use in development: -dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_3_0 sdk aspnetcore_2_1 ]; +dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspnetcore_5_0 ]; Hashes below are retrived from: https://dotnet.microsoft.com/download/dotnet @@ -9,75 +9,19 @@ https://dotnet.microsoft.com/download/dotnet let buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); - buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; }); - buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); + buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); in rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; - # v2.1.22 (LTS) + # EOL - aspnetcore_2_1 = buildAspNetCore { - version = "2.1.22"; - sha512 = { - x86_64-linux = "27v3a69dgnnb4lz5p2dn2qwadb8vpnqwdy6mnnqfp1dl4kgg3izvriz2268if272sy6flcz5lckjlmn0i0i1jci5zypc7x9kykj991l"; - aarch64-linux = null; # no aarch64 version of this package is available - x86_64-darwin = "0xh06jmzx2cfq51hv9l4h72hbfyh3r0wlla217821gi0hlw6xcc0gb3b4xmqcs240fllqnwrnrwz0axi3xi21wacgn3xbcmzpbi6jml"; - }; - }; + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; - netcore_2_1 = buildNetCore { - version = "2.1.22"; - sha512 = { - x86_64-linux = "0c2b31l59izcxbhz5wzjpjkdl550s5p3aid4vyghq468vyf67pm0npjny50c172b63vw0ikfbps2b2hj16hpifp116gj4b5llmqjhyc"; - aarch64-linux = "3llai3d2xpgbr7a4ndg9wqfpnb5zb8k07dicc57a6cmniiqyqigyxinhpx2k0l45mbnihjsr5k1rih3r6bwlj241v67iwd2i0dpqd8a"; - x86_64-darwin = "106mx6a4rwcvq41v54c1yx89156s43n889im9g0q2pvm7054q8b6xm6qrnymzmj5i2i6awyk0z02j5pfiyh35sw9afxb3695ymsb3v8"; - }; - }; - - sdk_2_1 = buildNetCoreSdk { - version = "2.1.810"; - sha512 = { - x86_64-linux = "388nrba5f7z9syq23xh3k45rzy3iys58s32ya7a0q9mwdf1y3haw7yvbq79cn08741hhqdi73mip8jf50f4s64mbr62ay1p76zsrkj5"; - aarch64-linux = "2vs8bhk63cjrqkm5n164ahc6bdz58aq9vmhaiyy27krp7wlkz4gpiva9153h7mywhk709l1qc7cddj99qsh2ygv6axjfigbhgrzslqi"; - x86_64-darwin = "3qxlgbd0np0w8wmp98mhp4cqgva4zglqf7k9kzqbwxfwr5s795kap7rs5w0cy7h0bsvj0ygx3d5nzyn9hp3fsswx4jl4mkvillnvjzy"; - }; - }; - - # v2.2 - - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1"; - - # v3.0.2 (Maintenance) - - aspnetcore_3_0 = buildAspNetCore { - version = "3.0.3"; - sha512 = { - x86_64-linux = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq"; - aarch64-linux = "2xkg4q88q5jw6jdz6cxj8vsjr475nd0fcvifkv1shdm2j9dsjy233hwpxbr140m5n5ggyh6z99238z9j4kp2az977y8y8irz8m8ppvf"; - x86_64-darwin = "2p04j6p4j93pan71ih13hv57zxalcirh0n3vfjq0cfb80pbhf1f5cgxl24pw6kifh6hhh38rj62c4mr69lxzlqc8sfcfaws8dyz2avm"; - }; - }; - - netcore_3_0 = buildNetCore { - version = "3.0.3"; - sha512 = { - x86_64-linux = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx"; - aarch64-linux = "1lp8din7d5jv5fkyq1a7m01i1xg9jwpiljvam1kcyzsnwzvi0cb4ji336cfx4lqrn95gvc75gkzi6q8b4fz0h21gvk6z6kmlcr63nyg"; - x86_64-darwin = "0s20k7xawwd09xhy4xdcxp1rw6jd418ibrvhb509dnj480g48xryda2203g4mpswd24v2kx0n9qzxgbrbq9lvasfglkxi84bbqayp83"; - }; - }; - - sdk_3_0 = buildNetCoreSdk { - version = "3.0.103"; - sha512 = { - x86_64-linux = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12"; - aarch64-linux = "32843q2lj7dgciq62g9v1q31vwfjyv5vaxrz712d942mcg5lyzjygwri106bv4naq3a22131ldzwnsifbdn2vq1iz60raqdb7ss9vnf"; - x86_64-darwin = "3apswk2bhalgi0hm7h2j9p152jvp39h4xilxxzix5j1n36b442l1pwk7lj7019lxafjqkz5y850xkfcp14ks5wcvs33xs2c0aqwxvcn"; - }; - }; - - # v3.1.1 (LTS) + # v3.1 (LTS) aspnetcore_3_1 = buildAspNetCore { version = "3.1.19"; @@ -88,7 +32,7 @@ rec { }; }; - netcore_3_1 = buildNetCore { + runtime_3_1 = buildNetRuntime { version = "3.1.19"; sha512 = { x86_64-linux = "2cf268cc13bb4739203a18a9160aac58f2088e8ec275b1f7ef2fe2b74bc16edfdfbeb886a74fc9421edbf2899fa9e3ee7ea2734a83b1800b4a9848fb7e10bbbe"; @@ -97,7 +41,7 @@ rec { }; }; - sdk_3_1 = buildNetCoreSdk { + sdk_3_1 = buildNetSdk { version = "3.1.413"; sha512 = { x86_64-linux = "2a0824f11aba0b79d3f9a36af0395649bc9b4137e61b240a48dccb671df0a5b8c2086054f8e495430b7ed6c344bb3f27ac3dfda5967d863718a6dadeca951a83"; @@ -106,7 +50,7 @@ rec { }; }; - # v5.0.0 + # v5.0 (Current) aspnetcore_5_0 = buildAspNetCore { version = "5.0.10"; @@ -117,7 +61,7 @@ rec { }; }; - net_5_0 = buildNetCore { + runtime_5_0 = buildNetRuntime { version = "5.0.10"; sha512 = { x86_64-linux = "421b00d5751381e6bf829dcba8fa0d781f0efd065be492739d60a4bef2b7b362dbec77fa3289e2ee45cab40616f95318fc214699ffe2f33aa15e77c2d163841c"; @@ -126,7 +70,7 @@ rec { }; }; - sdk_5_0 = buildNetCoreSdk { + sdk_5_0 = buildNetSdk { version = "5.0.401"; sha512 = { x86_64-linux = "a444d44007709ceb68d8f72dec0531e17f85f800efc0007ace4fa66ba27f095066930e6c6defcd2f85cdedea2fec25e163f5da461c1c2b8563e5cd7cb47091e0"; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 1a6685e91411..aaf59ca1ef57 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -36,13 +36,13 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202102"; + version = "202108"; # submodules src = fetchgit { url = "https://github.com/tianocore/edk2"; rev = "edk2-stable${edk2.version}"; - sha256 = "1292hfbqz4wyikdf6glqdy80n9zpy54gnfngqnyv05908hww6h82"; + sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2"; }; buildInputs = [ libuuid pythonEnv ]; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index e1c441e7afe0..c192c603c883 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -314,7 +314,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ peti veprbl ]; + maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 3b92ecddc08a..70278c237d4c 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -330,7 +330,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ peti veprbl ]; + maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index e0ef8e317899..1809d7ae42ef 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -344,8 +344,6 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ peti ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index f8cdf7198eef..acd04c24a3be 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.8"; + version = "1.16.9"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-jyqMJLeTN1syQ9+C/bDIOHSG3MioksocmRqpms4Ia5g="; + sha256 = "sha256-ChzH/XvSBEj3Hr7WTYRhOIUNUJmxjPXMEKT8RRYNjD0="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 84bb70a4cf35..2f62c450c2e0 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-SdwIM5dwrNVhMxLbjBQer2F3mZVXe4nZO1Qe+DBn5bE="; + sha256 = "sha256-IlXrPk6CTdfV/Nwuf4RTQ3HBhjEuVG+xCGo0wXdS9DE="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 16a7552dd4e3..6868ca9f8d8f 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { declarativity of logic programming. ''; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/graalvm/001_mx.py.patch b/pkgs/development/compilers/graalvm/001_mx.py.patch deleted file mode 100644 index 0477c6c556f1..000000000000 --- a/pkgs/development/compilers/graalvm/001_mx.py.patch +++ /dev/null @@ -1,291 +0,0 @@ -diff --git a/mx.py b/mx.py -index a0b9315..b7d67a0 100755 ---- a/mx.py -+++ b/mx.py -@@ -238,21 +238,7 @@ def _check_file_with_sha1(path, sha1, sha1path, mustExist=True, newFile=False, l - f.write(value or sha1OfFile(path)) - - if exists(path): -- if sha1Check and sha1: -- if not _sha1CachedValid() or (newFile and sha1 != _sha1Cached()): -- logv('Create/update SHA1 cache file ' + sha1path) -- _writeSha1Cached() -- -- if sha1 != _sha1Cached(): -- computedSha1 = sha1OfFile(path) -- if sha1 == computedSha1: -- warn('Fixing corrupt SHA1 cache file ' + sha1path) -- _writeSha1Cached(computedSha1) -- return True -- if logErrors: -- size = os.path.getsize(path) -- log_error('SHA1 of {} [size: {}] ({}) does not match expected value ({})'.format(TimeStampFile(path), size, computedSha1, sha1)) -- return False -+ return True - elif mustExist: - if logErrors: - log_error("'{}' does not exist".format(path)) -@@ -1057,46 +1043,8 @@ class SuiteImport: - version = import_dict.get("version") - suite_dir = None - version_from = import_dict.get("versionFrom") -- if version_from and version: -- abort("In import for '{}': 'version' and 'versionFrom' can not be both set".format(name), context=context) -- if version is None and version_from is None: -- if not (in_subdir and (importer.vc_dir != importer.dir or isinstance(importer, BinarySuite))): -- abort("In import for '{}': No version given and not a 'subdir' suite of the same repository".format(name), context=context) -- if importer.isSourceSuite(): -- suite_dir = join(importer.vc_dir, name) -- version = importer.version() -- if urls is None: -- if not in_subdir: -- if import_dict.get("subdir") is None and importer.vc_dir != importer.dir: -- warn("In import for '{}': No urls given but 'subdir' is not set, assuming 'subdir=True'".format(name), context) -- in_subdir = True -- else: -- abort("In import for '{}': No urls given and not a 'subdir' suite".format(name), context=context) -- return SuiteImport(name, version, None, None, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir) -- # urls a list of alternatives defined as dicts -- if not isinstance(urls, list): -- abort('suite import urls must be a list', context=context) -- urlinfos = [] -- mainKind = None -- for urlinfo in urls: -- if isinstance(urlinfo, dict) and urlinfo.get('url') and urlinfo.get('kind'): -- kind = urlinfo.get('kind') -- if not VC.is_valid_kind(kind): -- abort('suite import kind ' + kind + ' illegal', context=context) -- else: -- abort('suite import url must be a dict with {"url", kind", attributes', context=context) -- vc = vc_system(kind) -- if kind != 'binary': -- assert not mainKind or mainKind == kind, "Only expecting one non-binary kind" -- mainKind = kind -- url = mx_urlrewrites.rewriteurl(urlinfo.get('url')) -- urlinfos.append(SuiteImportURLInfo(url, kind, vc)) -- vc_kind = None -- if mainKind: -- vc_kind = mainKind -- elif urlinfos: -- vc_kind = 'binary' -- return SuiteImport(name, version, urlinfos, vc_kind, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir) -+ suite_dir = join(get_env('MX_GIT_CACHE_DIR'), name) -+ return SuiteImport(name, version, [], None, True, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir) - - @staticmethod - def get_source_urls(source, kind=None): -@@ -1467,8 +1415,6 @@ class Suite(object): - :type dists: list[Distribution] - """ - def __init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=False): -- if primary is True and vc_dir is None: -- abort("The primary suite must be in a vcs repository") - self.imported_by = [] if primary else [importing_suite] - self.mxDir = mxDir - self.dir = dirname(mxDir) -@@ -1496,7 +1442,7 @@ class Suite(object): - self._outputRoot = None - self._preloaded_suite_dict = None - self.vc = vc -- self.vc_dir = vc_dir -+ self.vc_dir = get_env('MX_GIT_CACHE_DIR') - self._preload_suite_dict() - self._init_imports() - if load: -@@ -2405,7 +2351,9 @@ class Repository(SuiteConstituent): - class SourceSuite(Suite): - """A source suite""" - def __init__(self, mxDir, primary=False, load=True, internal=False, importing_suite=None, dynamicallyImported=False): -- vc, vc_dir = VC.get_vc_root(dirname(mxDir), abortOnError=False) -+ vc, vc_dir_test = VC.get_vc_root(dirname(mxDir), abortOnError=False) -+ vc_dir = get_env('MX_GIT_CACHE_DIR') -+ warn("LOOKING FOR: " + mxDir) - Suite.__init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=dynamicallyImported) - logvv("SourceSuite.__init__({}), got vc={}, vc_dir={}".format(mxDir, self.vc, self.vc_dir)) - self.projects = [] -@@ -2454,17 +2402,7 @@ class SourceSuite(Suite): - """ - Gets the release tag from VC or create a time based once if VC is unavailable - """ -- if snapshotSuffix not in self._releaseVersion: -- _version = self._get_early_suite_dict_property('version') -- if _version and self.getMxCompatibility().addVersionSuffixToExplicitVersion(): -- if not self.is_release(): -- _version = _version + '-' + snapshotSuffix -- if not _version: -- _version = self.vc.release_version_from_tags(self.vc_dir, self.name, snapshotSuffix=snapshotSuffix) -- if not _version: -- _version = 'unknown-{0}-{1}'.format(platform.node(), time.strftime('%Y-%m-%d_%H-%M-%S_%Z')) -- self._releaseVersion[snapshotSuffix] = _version -- return self._releaseVersion[snapshotSuffix] -+ return get_env('version') - - def scm_metadata(self, abortOnError=False): - scm = self.scm -@@ -2993,12 +2931,35 @@ def _find_suite_import(importing_suite, suite_import, fatalIfMissing=True, load= - Attempts to locate an existing suite in the local context - Returns the path to the mx.name dir if found else None - """ -- if mode == 'binary': -- # binary suites are always stored relative to the importing suite in mx-private directory -- return importing_suite._find_binary_suite_dir(suite_import.name) -+ warn("FAKE CLONE: " + str(suite_import)) -+ if (suite_import.name == "truffle"): -+ return join(get_env('TMP'), "source", "truffle", "mx.truffle") -+ if (suite_import.name == "graal-nodejs"): -+ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-nodejs", "mx.graal-nodejs") -+ if (suite_import.name == "truffleruby"): -+ return join(get_env('MX_GIT_CACHE_DIR'), "truffleruby", "mx.truffleruby") -+ if (suite_import.name == "graalpython"): -+ return join(get_env('MX_GIT_CACHE_DIR'), "graalpython", "mx.graalpython") -+ if (suite_import.name == "vm"): -+ return join(get_env('TMP'), "source", "vm", "mx.vm") -+ if (suite_import.name == "fastr"): -+ return join(get_env('MX_GIT_CACHE_DIR'), "fastr", "mx.fastr") -+ if (suite_import.name == "sdk"): -+ return join(get_env('TMP'), "source", "sdk", "mx.sdk") -+ if (suite_import.name == "graal-js"): -+ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-js", "mx.graal-js") -+ if (suite_import.name == "regex"): -+ return join(get_env('TMP'), "source", "regex", "mx.regex") -+ if (suite_import.name == "substratevm"): -+ return join(get_env('TMP'), "source", "substratevm", "mx.substratevm") -+ if (suite_import.name == "tools"): -+ return join(get_env('TMP'), "source", "tools", "mx.tools") -+ if (suite_import.name == "sulong"): -+ return join(get_env('TMP'), "source", "sulong", "mx.sulong") -+ if (suite_import.name == "compiler"): -+ return join(get_env('TMP'), "source", "compiler", "mx.compiler") - else: -- # use the SuiteModel to locate a local source copy of the suite -- return _suitemodel.find_suite_dir(suite_import) -+ return join(get_env('MX_GIT_CACHE_DIR'), suite_import.name) - - def _get_import_dir(url, mode): - """Return directory where the suite will be cloned to""" -@@ -3816,7 +3777,7 @@ def getmtime(name): - """ - Wrapper for builtin open function that handles long path names on Windows. - """ -- return os.path.getmtime(_safe_path(name)) -+ return 315532800 - - - def stat(name): -@@ -4062,57 +4023,8 @@ def _attempt_download(url, path, jarEntryName=None): - return False - - def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False): -- """ -- Attempts to downloads content for each URL in a list, stopping after the first successful download. -- If the content cannot be retrieved from any URL, the program is aborted, unless abortOnError=False. -- The downloaded content is written to the file indicated by `path`. -- """ -- if not verifyOnly: -- ensure_dirname_exists(path) -- assert not path.endswith(os.sep) -- -- # https://docs.oracle.com/javase/7/docs/api/java/net/JarURLConnection.html -- jarURLPattern = re.compile('jar:(.*)!/(.*)') -- verify_errors = {} -- for url in urls: -- if not verifyOnly or verbose: -- log('Downloading ' + url + ' to ' + path) -- m = jarURLPattern.match(url) -- jarEntryName = None -- if m: -- url = m.group(1) -- jarEntryName = m.group(2) -- -- if not _opts.trust_http and (url.lower().startswith('http://') or url.lower().startswith('ftp://')): -- warn('Downloading from non-https URL {}. Use --trust-http mx option to suppress this warning.'.format(url)) -- -- if verifyOnly: -- try: -- conn = _urlopen(url, timeout=10) -- conn.close() -- except (IOError, socket.timeout) as e: -- _suggest_tlsv1_error(e) -- verify_errors[url] = e -- else: -- for i in range(4): -- if i != 0: -- time.sleep(1) -- warn('Retry {} to download from {}'.format(i, url)) -- if _attempt_download(url, path, jarEntryName): -- return True # Download was successful -- -- if verifyOnly and len(verify_errors) < len(urls): # verify-mode at least one success -> success -- return True -- else: # Either verification error or no download was successful -- msg = 'Could not download to ' + path + ' from any of the following URLs: ' + ', '.join(urls) -- if verifyOnly: # verify-mode -> print error details -- for url, e in verify_errors.items(): -- msg += '\n ' + url + ': ' + str(e) -- if abortOnError: -- abort(msg) -- else: -- warn(msg) -- return False -+ print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly)) -+ return True - - def update_file(path, content, showDiff=False): - """ -@@ -7887,30 +7799,6 @@ class PackedResourceLibrary(ResourceLibrary): - - def get_path(self, resolve): - extract_path = _make_absolute(self.extract_path, self.suite.dir) -- download_path = super(PackedResourceLibrary, self).get_path(resolve) -- if resolve and self._check_extract_needed(extract_path, download_path): -- extract_path_tmp = tempfile.mkdtemp(suffix=basename(extract_path), dir=dirname(extract_path)) -- try: -- # extract archive -- Extractor.create(download_path).extract(extract_path_tmp) -- # ensure modification time is up to date -- os.utime(extract_path_tmp, None) -- logv("Moving temporary directory {} to {}".format(extract_path_tmp, extract_path)) -- try: -- # attempt atomic overwrite -- os.rename(extract_path_tmp, extract_path) -- except OSError: -- # clean destination & re-try for cases where atomic overwrite doesn't work -- rmtree(extract_path, ignore_errors=True) -- os.rename(extract_path_tmp, extract_path) -- except OSError as ose: -- # Rename failed. Race with other process? -- if self._check_extract_needed(extract_path, download_path): -- # ok something really went wrong -- abort("Extracting {} failed!".format(download_path), context=ose) -- finally: -- rmtree(extract_path_tmp, ignore_errors=True) -- - return extract_path - - def _check_download_needed(self): -@@ -8430,7 +8318,7 @@ class VC(_with_metaclass(ABCMeta, object)): - :param str branch: a branch name - :param bool abortOnError: if True abort on error - """ -- abort(self.kind + " update_to_branch is not implemented") -+ self.run(['hg', vcdir] + cmd) - - def is_release_from_tags(self, vcdir, prefix): - """ -@@ -8831,7 +8719,7 @@ class HgConfig(VC): - return None - - def parent_info(self, vcdir, abortOnError=True): -- out = self.hg_command(vcdir, ["log", "-r", ".", "--template", "{author}|||{date|hgdate}"], abortOnError=abortOnError) -+ out = _check_output_str(["hg", '-R', vcdir, "log", "-r", ".", "--template", "{author}|||{date|hgdate}"]) - author, date = out.split("|||") - ts, _ = date.split(" ") - return self._sanitize_parent_info({ -@@ -14069,6 +13957,7 @@ class Archiver(SafeFileCreation): - - def _add_zip(self, filename, archive_name, provenance): - self._add_provenance(archive_name, provenance) -+ os.utime(filename, (315532800, 315532800)) - self.zf.write(filename, archive_name) - - def _add_str_zip(self, data, archive_name, provenance): diff --git a/pkgs/development/compilers/graalvm/002_setjmp.c.patch b/pkgs/development/compilers/graalvm/002_setjmp.c.patch deleted file mode 100644 index 38a29fd8fbfd..000000000000 --- a/pkgs/development/compilers/graalvm/002_setjmp.c.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c -index 16b869354d8..3691739d13b 100644 ---- a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c -+++ b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c -@@ -41,11 +41,3 @@ int sigsetjmp(sigjmp_buf env, int savesigs) { - WARN_UNSUPPORTED(sigsetjmp); - return 0; - } -- --void longjmp(jmp_buf env, int val) { -- ERR_UNSUPPORTED(longjmp); --} -- --void siglongjmp(sigjmp_buf env, int val) { -- ERR_UNSUPPORTED(siglongjmp); --} diff --git a/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch b/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch deleted file mode 100644 index bb9a00687124..000000000000 --- a/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/truffle/mx.truffle/mx_truffle.py b/truffle/mx.truffle/mx_truffle.py -index 8889c5ad810..add211a45c5 100644 ---- a/truffle/mx.truffle/mx_truffle.py -+++ b/truffle/mx.truffle/mx_truffle.py -@@ -695,6 +695,7 @@ class LibffiBuildTask(mx.AbstractNativeBuildTask): - os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)] - for patch in self.subject.patches: - mx.run(git_apply + [patch], cwd=self.subject.suite.vc_dir) -+ mx.run(['cp', os.path.join(os.getenv('TMP'), 'truffle.make'), os.path.join(self.subject.delegate.dir, 'Makefile')]) - - self.delegate.logBuild() - self.delegate.build() diff --git a/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch b/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch deleted file mode 100644 index 0aa1bc9b88dd..000000000000 --- a/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/mx.jvmci/mx_jvmci.py b/mx.jvmci/mx_jvmci.py -index 491fc19ab9..b4ddc03abb 100644 ---- a/mx.jvmci/mx_jvmci.py -+++ b/mx.jvmci/mx_jvmci.py -@@ -192,6 +192,7 @@ class HotSpotVMJDKDeployedDist(JDKDeployedDist): - if m.name in _hs_deploy_map: - targetDir = join(jdkDir, _hs_deploy_map[m.name]) - mx.logv('Deploying {} from {} to {}'.format(m.name, dist.name, targetDir)) -+ subprocess.call(["chmod", "-R", "+rw", targetDir]) - tar.extract(m, targetDir) - - """ diff --git a/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch b/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch deleted file mode 100644 index 06f693db9f63..000000000000 --- a/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/tool/jt.rb b/tool/jt.rb -index 870d88edcb..0a6e4c367b 100755 ---- a/tool/jt.rb -+++ b/tool/jt.rb -@@ -152,13 +152,16 @@ module Utilities - end - - def find_mx -- if which('mx') -- 'mx' -+ if ENV.key?("MX_GIT_CACHE_DIR") -+ "mx-internal" - else -- mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git") -- "#{mx_repo}/mx" -+ if which('mx') -+ 'mx' -+ else -+ mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git") -+ "#{mx_repo}/mx" -+ end - end -- end - - def find_launcher(use_native) - if use_native -@@ -444,8 +447,8 @@ module Commands - --no-sforceimports do not run sforceimports before building - parser build the parser - options build the options -- graalvm build a minimal JVM-only GraalVM containing only TruffleRuby, -- available by default in mxbuild/truffleruby-jvm, -+ graalvm build a minimal JVM-only GraalVM containing only TruffleRuby, -+ available by default in mxbuild/truffleruby-jvm, - the Ruby is symlinked into rbenv or chruby if available - --graal include the GraalVM Compiler in the build - --native build native ruby image as well, available in mxbuild/truffleruby-native -@@ -491,7 +494,7 @@ module Commands - jt test compiler run compiler tests - jt test integration [TESTS] run integration tests - jt test bundle [--jdebug] tests using bundler -- jt test gems [TESTS] tests using gems -+ jt test gems [TESTS] tests using gems - jt test ecosystem [TESTS] tests using the wider ecosystem such as bundler, Rails, etc - jt test cexts [--no-openssl] [--no-gems] [test_names...] - run C extension tests (set GEM_HOME) diff --git a/pkgs/development/compilers/graalvm/006_mx_copylib.py.patch b/pkgs/development/compilers/graalvm/006_mx_copylib.py.patch deleted file mode 100644 index 43ca3e168327..000000000000 --- a/pkgs/development/compilers/graalvm/006_mx_copylib.py.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/mx.fastr/mx_copylib.py b/mx.fastr/mx_copylib.py -index 4f57e1954..db45220d9 100644 ---- a/mx.fastr/mx_copylib.py -+++ b/mx.fastr/mx_copylib.py -@@ -54,6 +54,9 @@ def _copylib(lib, libpath, plain_libpath_base, target): - else: - try: - if platform.system() == 'Linux': -+ # https://github.com/oracle/fastr/issues/110 -+ if libpath.endswith("libgcc_s.so"): -+ libpath = libpath + ".1" - output = subprocess.check_output(['objdump', '-p', libpath]) - elif platform.system() == 'SunOS': - output = subprocess.check_output(['elfdump', '-d', libpath]) diff --git a/pkgs/development/compilers/graalvm/007_unimplemented.c.patch b/pkgs/development/compilers/graalvm/007_unimplemented.c.patch deleted file mode 100644 index 96cca7ed239b..000000000000 --- a/pkgs/development/compilers/graalvm/007_unimplemented.c.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c b/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c -index dcf081316..c2cb4879b 100644 ---- a/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c -+++ b/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c -@@ -20,8 +20,10 @@ - - #include - #include -+#include - - #include -+#include - #include - - Rboolean known_to_be_latin1 = FALSE; -@@ -166,3 +168,69 @@ int Scollate(SEXP a, SEXP b) { - void z_prec_r(Rcomplex *r, Rcomplex *x, double digits) { - unimplemented("z_prec_r"); - } -+ -+int Rf_AdobeSymbol2ucs2(int n) { -+ unimplemented("Rf_AdobeSymbol2ucs2"); -+ return 0; -+} -+ -+size_t Mbrtowc(wchar_t *wc, const char *s, size_t n, mbstate_t *ps) { -+ unimplemented("Mbrtowc"); -+ return 0; -+} -+ -+double R_GE_VStrHeight(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) { -+ unimplemented("R_GE_VStrHeight"); -+ return 0; -+} -+ -+void R_GE_VText(double x, double y, const char * const s, cetype_t enc, -+ double x_justify, double y_justify, double rotation, -+ const pGEcontext gc, pGEDevDesc dd) { -+ unimplemented("R_GE_VText"); -+} -+ -+double R_GE_VStrWidth(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) { -+ unimplemented("R_GE_VStrWidth"); -+} -+ -+void setulb(int n, int m, double *x, double *l, double *u, int *nbd, -+ double *f, double *g, double factr, double *pgtol, -+ double *wa, int * iwa, char *task, int iprint, int *isave) { -+ unimplemented("setulb"); -+} -+ -+void genptry(int n, double *p, double *ptry, double scale, void *ex) { -+ unimplemented("genptry"); -+} -+ -+double EXP(double x) { -+ unimplemented("EXP"); -+ return 0; -+} -+ -+double LOG(double x) { -+ unimplemented("LOG"); -+ return 0; -+} -+ -+Rwchar_t Rf_utf8toucs32(wchar_t high, const char *s) { -+ unimplemented("Rf_utf8toucs32"); -+ return 0; -+} -+ -+size_t mbtoucs(unsigned int *wc, const char *s, size_t n) { -+ unimplemented("mbtoucs"); -+ return (size_t) 0; -+} -+ -+ -+int DispatchOrEval(SEXP call, SEXP op, const char *generic, SEXP args, -+ SEXP rho, SEXP *ans, int dropmissing, int argsevald) { -+ unimplemented("DispatchOrEval"); -+ return 0; -+} -+ -+void ENSURE_NAMEDMAX (SEXP x) { -+ unimplemented("ENSURE_NAMEDMAX"); -+} diff --git a/pkgs/development/compilers/graalvm/008_remove_jfr.patch b/pkgs/development/compilers/graalvm/008_remove_jfr.patch deleted file mode 100644 index 1aea044c8023..000000000000 --- a/pkgs/development/compilers/graalvm/008_remove_jfr.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/mx.jvmci/suite.py b/mx.jvmci/suite.py -index 9690c0a38f..fa1d36b7e1 100644 ---- a/mx.jvmci/suite.py -+++ b/mx.jvmci/suite.py -@@ -241,18 +241,7 @@ suite = { - "workingSets" : "JVMCI,HotSpot,SPARC", - }, - -- "jdk.vm.ci.hotspot.jfr" : { -- "subDir" : "jvmci", -- "sourceDirs" : ["src"], -- "dependencies" : [ -- "jdk.vm.ci.hotspot", -- "JFR", -- ], -- "checkstyle" : "jdk.vm.ci.hotspot", -- "javaCompliance" : "1.8", -- "profile" : "", -- "workingSets" : "JVMCI,HotSpot", -- }, -+ - - "hotspot" : { - "native" : True, -@@ -354,7 +343,7 @@ suite = { - "jdk.vm.ci.hotspot.aarch64", - "jdk.vm.ci.hotspot.amd64", - "jdk.vm.ci.hotspot.sparc", -- "jdk.vm.ci.hotspot.jfr", -+ - ], - "distDependencies" : [ - "JVMCI_SERVICES", diff --git a/pkgs/development/compilers/graalvm/009_remove_signedness_verifier.patch b/pkgs/development/compilers/graalvm/009_remove_signedness_verifier.patch deleted file mode 100644 index cf8bd4050662..000000000000 --- a/pkgs/development/compilers/graalvm/009_remove_signedness_verifier.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java -index 23a76357fd2..f13694b6ed7 100644 ---- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java -+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java -@@ -249,15 +249,6 @@ public final class SizeAndSignednessVerifier extends NativeInfoTreeVisitor { - } - - private void checkSignedness(boolean isUnsigned, ResolvedJavaType type, ResolvedJavaMethod method) { -- if (isSigned(type)) { -- if (isUnsigned) { -- addError("Type " + type.toJavaName(false) + " is signed, but accessed C value is unsigned", method); -- } -- } else if (nativeLibs.isWordBase(type)) { -- /* every Word type other than Signed is assumed to be unsigned. */ -- if (!isUnsigned) { -- addError("Type " + type.toJavaName(false) + " is unsigned, but accessed C value is signed", method); -- } -- } -+ - } - } diff --git a/pkgs/development/compilers/graalvm/010_mx_substratevm.py b/pkgs/development/compilers/graalvm/010_mx_substratevm.py deleted file mode 100644 index afb6b5681679..000000000000 --- a/pkgs/development/compilers/graalvm/010_mx_substratevm.py +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py -index b89163ef983..0fd0138b336 100644 ---- a/substratevm/mx.substratevm/mx_substratevm.py -+++ b/substratevm/mx.substratevm/mx_substratevm.py -@@ -189,7 +189,7 @@ if str(svm_java_compliance().value) not in GRAAL_COMPILER_FLAGS_MAP: - mx.abort("Substrate VM does not support this Java version: " + str(svm_java_compliance())) - GRAAL_COMPILER_FLAGS = GRAAL_COMPILER_FLAGS_BASE + GRAAL_COMPILER_FLAGS_MAP[str(svm_java_compliance().value)] - --IMAGE_ASSERTION_FLAGS = ['-H:+VerifyGraalGraphs', '-H:+VerifyPhases'] -+IMAGE_ASSERTION_FLAGS = ['-H:+VerifyGraalGraphs', '-H:+VerifyPhases', '-H:+ReportExceptionStackTraces'] - suite = mx.suite('substratevm') - svmSuites = [suite] - clibraryDists = ['SVM_HOSTED_NATIVE'] diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 54cc917a5be0..1aa1fbc11775 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -16,6 +16,6 @@ in { graalvm11-ce = mkGraal rec { version = "21.2.0"; javaVersion = "11"; - platforms = ["x86_64-linux" "x86_64-darwin"]; + platforms = ["x86_64-linux" "aarch64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/repository.nix b/pkgs/development/compilers/graalvm/community-edition/repository.nix index b532fe8cb5d3..5b3cdf75bc5b 100644 --- a/pkgs/development/compilers/graalvm/community-edition/repository.nix +++ b/pkgs/development/compilers/graalvm/community-edition/repository.nix @@ -10,17 +10,26 @@ , gtkSupport ? true, cairo, glib, gtk3 }: let - platform = if stdenv.isDarwin then "darwin-amd64" else "linux-amd64"; + platform = { + aarch64-linux = "linux-aarch64"; + x86_64-linux = "linux-amd64"; + x86_64-darwin = "darwin-amd64"; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + runtimeDependencies = [ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]; + runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; + javaVersionPlatform = "${javaVersion}-${platform}"; + graalvmXXX-ce = stdenv.mkDerivation rec { name = "graalvm${javaVersion}-ce"; srcs = [ (fetchurl { sha256 = { "8-linux-amd64" = "01gyxjmfp7wpcyn7x8b184fn0lp3xryfw619bqch120pzvr6z88f"; + "11-linux-aarch64" = "sha256-u9841eaHH347JHCrm5u3YGZ9RSTuKiDq368TY2otAYw="; "11-linux-amd64" = "0w7lhvxm4nggqdcl4xrhdd3y6dqw9jhyca9adjkp508n4lqf1lxv"; "11-darwin-amd64" = "0dnahicdl0vhrbiml9z9nbb7k75hbsjj8rs246i1lwril12dqb7n"; }.${javaVersionPlatform}; @@ -29,6 +38,7 @@ let (fetchurl { sha256 = { "8-linux-amd64" = "1jlvrxdlbsmlk3ia43h9m29kmmdn83h6zdlnf8qb7bm38c84nhsc"; + "11-linux-aarch64" = "sha256-7W5gkhj2kON2ocrGpyH/OL/phOyHkjNDId2CtyUAEWY="; "11-linux-amd64" = "1ybd7a6ii6582skr0nkxx7bccsa7gkg0yriql2h1lcz0rfzcdi3g"; "11-darwin-amd64" = "1jdy845vanmz05zx5b9227gb1msh9wdrz2kf3fx9z54ssd9qgdhm"; }.${javaVersionPlatform}; @@ -37,11 +47,23 @@ let (fetchurl { sha256 = { "8-linux-amd64" = "18ip0ay06q1pryqs8ja988mvk9vw475c0nfjcznnsd1zp296p6jc"; + "11-linux-aarch64" = "sha256-i9ysgqbI52PiXofZQ5AnPSzs2TeR8An5CIYzcwhx28o="; "11-linux-amd64" = "1jszz97mkqavxzyhx5jxhi43kqjxk9c36j5l5hy3kn8sdfmbplm4"; "11-darwin-amd64" = "1767ryhv2cn5anlys63ysax1p8ag79bykac1xfrjfan8yv6d8ybl"; }.${javaVersionPlatform}; url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) + (fetchurl { + sha256 = { + "8-linux-amd64" = "08s36rjy5irg25b7lqx0m4v2wpywin3cqyhdrywhvq14f7zshsd5"; + "11-linux-aarch64" = "sha256-Lkc/mq1w18+PQ5McvLGyQBSOz/TMSUgwioRZ0Dtyhm4="; + "11-linux-amd64" = "1ybjaknmbsdg8qzb986x39fq0h7fyiymdcigc7y86swk8dd916hv"; + "11-darwin-amd64" = "02dwlb62kqr4rjjmvkhn2xk9l1p47ahg9xyyfkw7im1jwlqmqnzf"; + }.${javaVersionPlatform}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar"; + }) + ] ++ lib.optionals (platform == "amd64") [ + # graalpython is not available on aarch64 platforms yet (fetchurl { sha256 = { "8-linux-amd64" = "0il15438qnikqsxdsl7fcdg0c8zs3cbm4ry7pys7fxxr1ckd8szq"; @@ -50,14 +72,6 @@ let }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) - (fetchurl { - sha256 = { - "8-linux-amd64" = "08s36rjy5irg25b7lqx0m4v2wpywin3cqyhdrywhvq14f7zshsd5"; - "11-linux-amd64" = "1ybjaknmbsdg8qzb986x39fq0h7fyiymdcigc7y86swk8dd916hv"; - "11-darwin-amd64" = "02dwlb62kqr4rjjmvkhn2xk9l1p47ahg9xyyfkw7im1jwlqmqnzf"; - }.${javaVersionPlatform}; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar"; - }) ]; buildInputs = lib.optionals stdenv.isLinux [ @@ -124,10 +138,9 @@ let exit 1 fi - unpack_jar ''${arr[1]} - unpack_jar ''${arr[2]} - unpack_jar ''${arr[3]} - unpack_jar ''${arr[4]} + for jar in "''${arr[@]:1}"; do + unpack_jar "$jar" + done ''; outputs = [ "out" "lib" ]; @@ -145,7 +158,6 @@ let ln -s $f ${basepath}/${platform}/$(basename $f) done ''; - copyClibrariesToLib = '' # add those libraries to $lib output too, so we can use them with # `native-image -H:CLibraryPath=''${graalvm11-ce.lib}/lib ...` and reduce @@ -173,6 +185,13 @@ let ${copyClibrariesToLib} ''; + "11-linux-aarch64" = '' + ${nativePRNGWorkaround "$out/conf/security/java.security"} + + ${copyClibrariesToOut "$out/lib/svm/clibraries"} + + ${copyClibrariesToLib} + ''; "11-darwin-amd64" = '' # create empty $lib/lib to avoid breaking builds mkdir -p $lib/lib @@ -219,53 +238,60 @@ let doInstallCheck = true; installCheckPhase = '' - echo ${ - lib.escapeShellArg '' - public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World"); - } + echo ${ + lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); } - '' - } > HelloWorld.java - $out/bin/javac HelloWorld.java + } + '' + } > HelloWorld.java + $out/bin/javac HelloWorld.java - # run on JVM with Graal Compiler - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + # run on JVM with Graal Compiler + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - # Ahead-Of-Time compilation - $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld - ./helloworld | fgrep 'Hello World' + # Ahead-Of-Time compilation + $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld + ./helloworld | fgrep 'Hello World' - ${ - lib.optionalString stdenv.isLinux '' - # Ahead-Of-Time compilation with --static - # --static flag doesn't work for darwin - $out/bin/native-image --no-server --static HelloWorld - ./helloworld | fgrep 'Hello World' - '' - } + ${ + lib.optionalString stdenv.isLinux '' + # Ahead-Of-Time compilation with --static + # --static flag doesn't work for darwin + $out/bin/native-image --no-server --static HelloWorld + ./helloworld | fgrep 'Hello World' + '' + } - echo "Testing interpreted languages" - $out/bin/graalpython -c 'print(1 + 1)' - $out/bin/ruby -e 'puts(1 + 1)' + ${ + lib.optionalString (platform == "amd64") '' + echo "Testing interpreted languages" + $out/bin/graalpython -c 'print(1 + 1)' + $out/bin/ruby -e 'puts(1 + 1)' - echo '1 + 1' | $out/bin/graalpython + echo '1 + 1' | $out/bin/graalpython + '' + } - ${ - lib.optionalString stdenv.isLinux '' - # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL - # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even - # though `openssl` is in `propagatedBuildInputs`. For more details see: - # https://github.com/NixOS/nixpkgs/pull/105815 - echo '1 + 1' | $out/bin/irb - '' - } + ${# TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL + # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even + # though `openssl` is in `propagatedBuildInputs`. For more details see: + # https://github.com/NixOS/nixpkgs/pull/105815 + # TODO: "truffleruby: an internal exception escaped out of the interpreter" + # error on linux-aarch64 + lib.optionalString (platform == "linux-amd64") '' + echo '1 + 1' | $out/bin/irb + '' + } - ${lib.optionalString (javaVersion == "11" && stdenv.isLinux) '' - # Doesn't work on MacOS, we have this error: "Launching JShell execution engine threw: Operation not permitted (Bind failed)" - echo '1 + 1' | $out/bin/jshell - ''}''; + ${# TODO: Doesn't work on MacOS, we have this error: + # "Launching JShell execution engine threw: Operation not permitted (Bind failed)" + lib.optionalString (javaVersion == "11" && stdenv.isLinux) '' + echo '1 + 1' | $out/bin/jshell + '' + }''; passthru.home = graalvmXXX-ce; @@ -280,6 +306,7 @@ let glittershark babariviere ericdallo + thiagokokada ]; platforms = platforms; }; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix deleted file mode 100644 index 9430ded8b6a8..000000000000 --- a/pkgs/development/compilers/graalvm/default.nix +++ /dev/null @@ -1,540 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial_4, python27, setJavaClassPath, - which, zlib, makeWrapper, openjdk, unzip, git, clang, llvm, icu, ruby, glibc, bash, gcc, libobjc, - xcodebuild, gfortran, readline, bzip2, xz, pcre, curl, ed, libresolv, libiconv, writeScriptBin, - openssl, perl, CoreFoundation, Foundation, JavaNativeFoundation, JavaRuntimeSupport, JavaVM, Cocoa -}: - -let - version = "19.2.1"; - mercurial = mercurial_4; - truffleMake = ./truffle.make; - makeMxGitCache = list: out: '' - mkdir ${out} - ${lib.concatMapStrings ({ url, name, rev, sha256 }: '' - mkdir -p ${out}/${name} - cp -rf ${fetchgit { inherit url rev sha256; }}/* ${out}/${name} - '' - ) list} - - # # GRAAL-NODEJS # # - chmod -R +rw ${out} - sed -i "s|#include \"../../../../mxbuild/trufflenode/coremodules/node_snapshots.h\"| \ - #include \"$NIX_BUILD_TOP/mxbuild/graal-nodejs/trufflenode/coremodules/node_snapshots.h\"|g" \ - ${out}/graaljs/graal-nodejs/deps/v8/src/graal/callbacks.cc - - # patch the shebang in python script runner - chmod -R +rw ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2 - patchShebangs ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2/python - - # # TUFFLE-RUBY # # - (cd ${out}/truffleruby && git apply ${./005_tool_jt.rb.patch}) - patchShebangs ${out}/truffleruby/tool/query-versions-json.rb - - substituteInPlace ${out}/truffleruby/src/main/c/Makefile \ - --replace '(MX_HOME)/mx' '(MX_HOME)/mx-internal' - - substituteInPlace ${out}/truffleruby/src/processor/java/org/truffleruby/processor/BuildInformationProcessor.java \ - --replace 'trufflerubyHome = findHome();' \ - 'trufflerubyHome = new File(System.getenv("MX_GIT_CACHE_DIR"), "truffleruby");' \ - --replace tool/query-versions-json.rb 'ruby tool/query-versions-json.rb' \ - --replace 'revision = runCommand("git rev-parse --short=8 HEAD");' \ - 'revision = "${version}";' \ - --replace 'compileDate = runCommand("git log -1 --date=short --pretty=format:%cd");' \ - 'compileDate = "1970-01-01";' - - substituteInPlace ${out}/truffleruby/mx.truffleruby/mx_truffleruby.py \ - --replace "mx_binary = join(mx._mx_home, 'mx')" "mx_binary = join(mx._mx_home, 'mx-internal')" - - # # FASTR # # - (cd ${out}/fastr && git apply ${ ./006_mx_copylib.py.patch }) - (cd ${out}/fastr && git apply ${ ./007_unimplemented.c.patch }) - substituteInPlace ${out}/fastr/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.java \ - --replace 'File suiteRoot = srcGenDir.getCanonicalFile().getParentFile().getParentFile().getParentFile();' \ - 'File suiteRoot = new File(System.getenv("MX_GIT_CACHE_DIR"), "fastr");' - - substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/gnur/Makefile.libs \ - --replace 'mx -p' 'mx-internal -p' - - substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/include/Makefile \ - --replace 'mx -p' 'mx-internal -p' - - substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/fficall/Makefile \ - --replace 'mx -p' 'mx-internal -p' - - substituteInPlace ${out}/fastr/com.oracle.truffle.r.native.recommended/Makefile \ - --replace 'mx -p' 'mx-internal -p' - - # Make sure that the logs aren't hidden when compiling gnur - substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/gnur/Makefile.gnur \ - --replace '> gnur_configure.log 2>&1' "" \ - --replace '> gnur_make.log 2>&1' "" - - substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/run/Linux/Renviron \ - --replace /bin/ "" \ - --replace /usr/bin/ "" - - sed -i "s|exec \$mx|exec mx-internal|g" ${out}/fastr/com.oracle.truffle.r.native/run/*.sh - chmod +x ${out}/fastr/com.oracle.truffle.r.native/run/*.sh - patchShebangs ${out}/fastr/com.oracle.truffle.r.native/run/*.sh - - cd ${out} - hg init - hg add - hg commit -m 'dummy commit' - hg tag ${lib.escapeShellArg "vm${version}"} - hg checkout ${lib.escapeShellArg "vm${version}"} - ''; - - # pre-download some cache entries ('mx' will not be able to download under nixbld) - makeMxCache = list: - stdenv.mkDerivation { - name = "mx-cache"; - nativeBuildInputs = [ unzip ]; - buildCommand = with lib; '' - mkdir $out - ${lib.concatMapStrings - ({url, name, sha1, isNinja ? false}: '' - install -D ${fetchurl { inherit url sha1; }} $out/${name} - echo -n ${sha1} > $out/${name}.sha1 - ${if isNinja then '' - export BASENAME=${removeSuffix ".zip" name} - mkdir "$out/$BASENAME.extracted" && - unzip "$out/${name}" -d "$out/$BASENAME.extracted" - - # Ninja is called later in the build process - ${lib.optionalString stdenv.isLinux '' - if [ -f $out/$BASENAME.extracted/ninja ]; then - patchelf --set-interpreter \ - "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.cc.cc.lib}/lib64" \ - $out/$BASENAME.extracted/ninja - fi''} - '' - else ""} - '') list} - ''; - }; - - jvmci8-mxcache = [ - rec { sha1 = "53addc878614171ff0fcbc8f78aed12175c22cdb"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4.jar"; } - rec { sha1 = "9bd1fa334d941005bc9ab3ac92478a590f5b7d73"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.sources.jar"; url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4-sources.jar"; } - rec { sha1 = "e5ca9511493b7e3bc2cabdb8ded92e855f3aac32"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4.jar"; } - rec { sha1 = "eb61e479b35b467954f28a565c094c563b790e19"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.sources.jar"; url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4-sources.jar"; } - rec { sha1 = "869021a6d90cfb008b12e83fccbe42eca29e5355"; name = "JACOCOAGENT_0.8.4_${sha1}/jacocoagent-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-runtime.jar"; } - rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"; } - rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar"; } - rec { sha1 = "fa29aa438674ff19d5e1386d2c3527a0267f291e"; name = "ASM_7.1_${sha1}/asm-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1.jar"; } - rec { sha1 = "9d170062d595240da35301362b079e5579c86f49"; name = "ASM_7.1_${sha1}/asm-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1-sources.jar"; } - rec { sha1 = "a3662cf1c1d592893ffe08727f78db35392fa302"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar"; } - rec { sha1 = "157238292b551de8680505fa2d19590d136e25b9"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1-sources.jar"; } - rec { sha1 = "379e0250f7a4a42c66c5e94e14d4c4491b3c2ed3"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar"; } - rec { sha1 = "36789198124eb075f1a5efa18a0a7812fb16f47f"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1-sources.jar"; } - rec { sha1 = "431dc677cf5c56660c1c9004870de1ed1ea7ce6c"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar"; } - rec { sha1 = "a62ff3ae6e37affda7c6fb7d63b89194c6d006ee"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1-sources.jar"; } - rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar"; } - rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar"; } - rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar"; } - rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar"; } - rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar"; } - rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar"; } - rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar"; url = "mirror://maven/junit/junit/4.12/junit-4.12.jar"; } - rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = "mirror://maven/junit/junit/4.12/junit-4.12-sources.jar"; } - rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; } - rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"; } - rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } -] ++ lib.optionals stdenv.isLinux [ - rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } - ] -++ lib.optionals stdenv.isDarwin [ - rec { sha1 = "67f6d23cbebd8998450a88b5bef362171f66f11a"; name = "hsdis_${sha1}/hsdis.dylib"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-darwin-${sha1}.dylib"; } - ]; - - graal-mxcache = jvmci8-mxcache ++ [ - # rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } - rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_COMPILER_RT_LINUX_${sha1}/llvm-org-compiler-rt-linux.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } - rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar"; } - rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar"; } - rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar"; url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar"; } - rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar"; } - rec { sha1 = "702ca2d0ae93841c5ab75e4d119b29780ec0b7d9"; name = "NINJA_SYNTAX_${sha1}/ninja-syntax.tar.gz"; url = "https://pypi.org/packages/source/n/ninja_syntax/ninja_syntax-1.7.2.tar.gz"; } - rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = "mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar"; } - rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = "mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar"; } - rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar"; url = "mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar"; } - rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar"; url = "mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar"; } - rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = "mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar"; } - rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = "mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar"; } - rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar"; } - rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_SOURCES_${sha1}/libffi-sources.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz"; } - rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar"; } - rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar"; } - rec { sha1 = "8dc5a90bed5f51d7538d05b8c31c31b7dfddbd66"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20.tar.gz"; } - rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = "mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar"; } - rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar"; url = "mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar"; } - # This duplication of asm with underscore and minus is totally weird - rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar"; } - rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar"; } - rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar"; } - rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar"; } - rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar"; } - rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar"; } - rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar"; } - rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar"; } - # From here on the deps are new - rec { sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1.jar"; } - rec { sha1 = "c9f7246bf93bb0dc7fe9e7c9eca531a8fb98d252"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1-sources.jar"; } - rec { sha1 = "4b52bd03014f6d080ef0528865c1ee50621e35c6"; name = "NETBEANS_PROFILER_${sha1}/netbeans-profiler.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/org-netbeans-lib-profiler-8.2-201609300101.jar"; } - rec { sha1 = "b5840706cc8ce639fcafeab1bc61da2d8aa37afd"; name = "NASHORN_INTERNAL_TESTS_${sha1}/nashorn-internal-tests.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/nashorn-internal-tests-700f5e3f5ff2.jar"; } - rec { sha1 = "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5"; name = "JACKSON_ANNOTATIONS_${sha1}/jackson-annotations.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-annotations/2.8.6/jackson-annotations-2.8.6.jar"; } - rec { sha1 = "2ef7b1cc34de149600f5e75bc2d5bf40de894e60"; name = "JACKSON_CORE_${sha1}/jackson-core.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar"; } - rec { sha1 = "c43de61f74ecc61322ef8f402837ba65b0aa2bf4"; name = "JACKSON_DATABIND_${sha1}/jackson-databind.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar"; } - rec { sha1 = "2838952e91baa37ac73ed817451268a193ba440a"; name = "JCODINGS_${sha1}/jcodings.jar"; url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40.jar"; } - rec { sha1 = "0ed89e096c83d540acac00d6ee3ea935b4c905ff"; name = "JCODINGS_${sha1}/jcodings.sources.jar"; url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40-sources.jar"; } - rec { sha1 = "5dbb09787a9b8780737b71fbf942235ef59051b9"; name = "JONI_${sha1}/joni.jar"; url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25.jar"; } - rec { sha1 = "505a09064f6e2209616f38724f6d97d8d889aa92"; name = "JONI_${sha1}/joni.sources.jar"; url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25-sources.jar"; } - rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar"; url = "mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar"; } - rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz"; url = "http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz"; } - rec { sha1 = "90aa8308da72ae610207d8f6ca27736921be692a"; name = "ANTLR4_COMPLETE_${sha1}/antlr4-complete.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7.1-complete.jar"; }] ++ - lib.optionals stdenv.isLinux [ - rec { sha1 = "df4c1f784294d02a82d78664064248283bfcc297"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } - rec { sha1 = "344483aefa15147c121a8fb6fb35a2406768cc5c"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-linux-x86_64.jar"; } - rec { sha1 = "fd1a723d62cbbc591041d303e8b151d89f131643"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-linux-amd64.tar.gz"; } - rec { sha1 = "987234c4ce45505c21302e097c24efef4873325c"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip"; - isNinja = true; }] ++ - lib.optionals stdenv.isDarwin [ - rec { sha1 = "0fa1af180755fa4cc018ee9be33f2d7d827593c4"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-darwin-amd64.tar.gz"; } - rec { sha1 = "57bc74574104a9e0a2dc4d7a71ffcc5731909e57"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-macosx-x86_64.jar"; } - rec { sha1 = "ae23bb365930f720acc88c62640bae6852a37d67"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-macosx-x86_64.tar.gz"; } - rec { sha1 = "8142c497f7dfbdb052a1e31960fdfe2c6f9a5ca2"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip"; - isNinja = true; }]; - - graal-mxcachegit = [ - { sha256 = "01w39ms39gl3cw7c2fgcacr2yjg94im9x2x7p5g94l6xlcgqvcnr"; name = "graaljs"; url = "https://github.com/graalvm/graaljs.git"; rev = "vm-${version}"; } - { sha256 = "1dps9n5b9c80pbg1fmlwpffy6ina0f0h27di24kafc8isxrdggia"; name = "truffleruby"; url = "https://github.com/oracle/truffleruby.git"; rev = "vm-${version}"; } - { sha256 = "0jdpdqm3ld1wsasmi8ka26qf19cibjac8lrqm040h5vh0iqzxizy"; name = "fastr"; url = "https://github.com/oracle/fastr.git"; rev = "vm-${version}"; } - { sha256 = "1gv8vafwrafjzvgv4gwk4kcsb3bnvsx07qa5inc0bdyxy5shl381"; name = "graalpython"; url = "https://github.com/graalvm/graalpython.git"; rev = "vm-${version}"; }]; - - ninja-syntax = python27.pkgs.buildPythonPackage rec { - version = "1.7.2"; - pname = "ninja_syntax"; - doCheck = false; - src = python27.pkgs.fetchPypi { - inherit pname version; - sha256 = "07zg30m0khx55fv2gxxn7pqd549z0vk3x592mrdlk9l8krxwjb9l"; - }; - }; - - findbugs = fetchzip { - name = "findbugs-3.0.0"; - url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip"; - sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m"; - }; - - python27withPackages = python27.withPackages (ps: [ ninja-syntax ]); - -in rec { - - mx = stdenv.mkDerivation rec { - version = "5.247.1"; - pname = "mx"; - src = fetchFromGitHub { - owner = "graalvm"; - repo = "mx"; - rev = version; - sha256 = "038qr49rqzkhj76nqd27h8fysssnlpdhmy23ks2y81xlxhlzkc59"; - }; - nativeBuildInputs = [ makeWrapper ]; - prePatch = '' - cp mx.py bak_mx.py - ''; - patches = [ ./001_mx.py.patch ]; - postPatch = '' - mv mx.py internal_mx.py - mv bak_mx.py mx.py - ''; - buildPhase = '' - substituteInPlace mx --replace /bin/pwd pwd - - # avoid crash with 'ValueError: ZIP does not support timestamps before 1980' - substituteInPlace internal_mx.py --replace \ - 'zipfile.ZipInfo(arcname, time.localtime(getmtime(join(root, f)))[:6])' \ - 'zipfile.ZipInfo(arcname, time.strptime ("1 Jan 1980", "%d %b %Y" )[:6])' - ''; - installPhase = '' - mkdir -p $out/bin - cp -dpR * $out/bin - wrapProgram $out/bin/mx \ - --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \ - --set FINDBUGS_HOME ${findbugs} - makeWrapper ${python27}/bin/python $out/bin/mx-internal \ - --add-flags "$out/bin/internal_mx.py" \ - --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \ - --set FINDBUGS_HOME ${findbugs} - ''; - meta = with lib; { - homepage = "https://github.com/graalvm/mx"; - description = "Command-line tool used for the development of Graal projects"; - license = licenses.gpl2; - platforms = python27.meta.platforms; - }; - }; - - jvmci8 = stdenv.mkDerivation rec { - version = "19.3-b05"; - pname = "jvmci"; - src = fetchFromGitHub { - owner = "graalvm"; - repo = "graal-jvmci-8"; - rev = "jvmci-${version}"; - sha256 = "0j7my76vldbrvki9x1gn9ics3x2z96j05jdy4nflbpik8i396114"; - }; - buildInputs = [ mx mercurial openjdk ] ++ lib.optionals stdenv.isDarwin [ - libobjc CoreFoundation Foundation JavaNativeFoundation JavaRuntimeSupport JavaVM xcodebuild Cocoa - ]; - postUnpack = '' - # a fake mercurial dir to prevent mx crash and supply the version to mx - ( cd $sourceRoot - hg init - hg add - hg commit -m 'dummy commit' - hg tag ${lib.escapeShellArg src.rev} - hg checkout ${lib.escapeShellArg src.rev} - ) - ''; - patches = [ ./004_mx_jvmci.py.patch ] ++ - lib.optional stdenv.isDarwin [ - ./008_remove_jfr.patch ]; - postPatch ='' - # The hotspot version name regex fix - substituteInPlace mx.jvmci/mx_jvmci.py \ - --replace "\\d+.\\d+-b\\d+" "\\d+.\\d+-b[g\\d][a\\d]" - # darwin: https://github.com/oracle/graal/issues/1816 - substituteInPlace src/share/vm/code/compiledIC.cpp \ - --replace 'entry == false' '*entry == false' - ''; - hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.isDarwin [ - "-Wno-reserved-user-defined-literal" - "-Wno-c++11-narrowing" - ] ++ - lib.optional stdenv.isLinux [ - "-Wno-error=format-overflow" # newly detected by gcc7 - "-Wno-error=nonnull" - ]); - - buildPhase = '' - export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild - export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache} - - mx-internal --primary-suite . --vm=server -v build -DFULL_DEBUG_SYMBOLS=0 - mx-internal --primary-suite . --vm=server -v vm -version - mx-internal --primary-suite . --vm=server -v unittest - ''; - installPhase = '' - mkdir -p $out - ${if stdenv.isDarwin - then "mv openjdk1.8.0_*/darwin-amd64/product/* $out" - else "mv openjdk1.8.0_*/linux-amd64/product/* $out"} - install -v -m0555 -D $MX_CACHE_DIR/hsdis*/hsdis.so $out/jre/lib/amd64/hsdis-amd64.so - ''; - # copy-paste openjdk's preFixup - preFixup = '' - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - postFixup = openjdk.postFixup or null; - dontStrip = true; # stripped javac crashes with "segmentaion fault" - inherit (openjdk) meta; - }; - - graalvm8 = stdenv.mkDerivation rec { - inherit version; - pname = "graal"; - src = fetchFromGitHub { - owner = "oracle"; - repo = "graal"; - rev = "vm-${version}"; - sha256 = "0v8zkmzkyhmmmvra5pp876d4i4ijrrw15j98ipayc7is02kwiwmq"; - }; - - patches = [ ./002_setjmp.c.patch ./003_mx_truffle.py.patch ] ++ - lib.optional stdenv.isDarwin [ - ./009_remove_signedness_verifier.patch ./010_mx_substratevm.py - ]; - - nativeBuildInputs = [ gfortran ]; - - buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang - python27withPackages icu ruby bzip2 which - readline bzip2 xz pcre curl ed - ] ++ lib.optional stdenv.isDarwin [ - CoreFoundation gcc.cc.lib libiconv perl openssl - ]; - - postUnpack = '' - ${lib.optionalString stdenv.isLinux '' - cp ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/stdlib.h \ - $sourceRoot/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include - ''} - cp ${truffleMake} $TMPDIR/truffle.make - rm $sourceRoot/truffle/src/libffi/patches/others/0001-Add-mx-bootstrap-Makefile.patch - - # a fake mercurial dir to prevent mx crash and supply the version to mx - ( cd $sourceRoot - hg init - hg add - hg commit -m 'dummy commit' - hg tag ${lib.escapeShellArg src.rev} - hg checkout ${lib.escapeShellArg src.rev} - ) - - # make a copy of jvmci8 - mkdir $NIX_BUILD_TOP/jvmci8 - cp -dpR ${jvmci8}/* $NIX_BUILD_TOP/jvmci8 - chmod +w -R $NIX_BUILD_TOP/jvmci8 - export MX_CACHE_DIR=${makeMxCache graal-mxcache} - export MX_GIT_CACHE_DIR=$NIX_BUILD_TOP/mxgitcache - ${makeMxGitCache graal-mxcachegit "$MX_GIT_CACHE_DIR"} - cd $TMPDIR - ''; - - postPatch = '' - substituteInPlace substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/PosixDirectives.java \ - --replace '' '<${zlib.dev}/include/zlib.h>' - substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \ - --replace 'cmd.add("-v");' 'cmd.add("-v"); cmd.add("-L${zlib}/lib");' - - # For debugging native-image build, add this replace statement on CCompilerInvoker.java - # --replace '(String line : lines) {' '(String line : lines) {System.out.println("DEBUG: " + line);' - ${if stdenv.isLinux then '' - substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \ - --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \ - 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");' '' - else '' - substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \ - --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \ - 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${gcc.cc}/bin/gcc"); - command.add("-F"); command.add("${CoreFoundation}/Library/Frameworks"); - command.add("-framework"); command.add("CoreFoundation");' - ''} - - # prevent cyclical imports caused by identical names - substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \ - --replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";' - # dragonegg can't seem to compile on nix, so let's not require it - substituteInPlace sulong/mx.sulong/suite.py \ - --replace '"requireDragonegg" : True,' '"requireDragonegg" : False,' - substituteInPlace truffle/mx.truffle/mx_truffle.py \ - --replace 'os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)' \ - 'self.subject.delegate.dir' - substituteInPlace sulong/projects/bootstrap-toolchain-launchers/Makefile \ - --replace /bin/bash ${bash}/bin/bash - # Patch the native-image template, as it will be run during build - chmod +x vm/mx.vm/launcher_template.sh && patchShebangs vm/mx.vm - # Prevent random errors from too low maxRuntimecompilemethods - substituteInPlace truffle/mx.truffle/macro-truffle.properties \ - --replace '-H:MaxRuntimeCompileMethods=1400' \ - '-H:MaxRuntimeCompileMethods=28000' - ${lib.optionalString stdenv.isDarwin '' - substituteInPlace truffle/src/com.oracle.truffle.nfi.test.native/src/object.cc \ - --replace '#include ' "" - ''} - ${lib.optionalString stdenv.isLinux '' - substituteInPlace sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/stdlib.h \ - --replace '# include ' '# include "${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/cstdlib"' - ''} - ''; - - buildPhase = '' - export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild - export MX_GIT_CACHE='refcache' - export JVMCI_VERSION_CHECK='ignore' - export JAVA_HOME=$NIX_BUILD_TOP/jvmci8 - export FASTR_RELEASE=true - export PKG_LDFLAGS_OVERRIDE="-L${pcre.out}/lib -L${zlib}/lib -L${gfortran.cc.lib}/lib64" - ${lib.optionalString stdenv.isDarwin '' - export CC="gcc" - export CPP="gcc -E" - export NIX_CXXSTDLIB_LINK="" - export NIX_CXXSTDLIB_LINK_FOR_TARGET="" - export OPENSSL_PREFIX=$(realpath openssl) - # this fixes error: impure path 'LibFFIHeaderDirectives' used in link - export NIX_ENFORCE_PURITY=0 - ''} - ( cd vm - mx-internal -v --suite sdk --suite compiler --suite vm --suite tools --suite regex --suite truffle \ - --dynamicimports /substratevm,/sulong,graal-js,graalpython,fastr,truffleruby build - ) - ''; - - installPhase = - (if stdenv.isDarwin then '' - mkdir -p $out - rm -rf $MX_ALT_OUTPUT_ROOT/vm/darwin-amd64/GRAALVM_*STAGE1* - cp -rf $MX_ALT_OUTPUT_ROOT/vm/darwin-amd64/GRAALVM*/graalvm-unknown-${version}/* $out - '' - else '' - mkdir -p $out - rm -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM_*STAGE1* - cp -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM*/graalvm-unknown-${version}/* $out - - # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html - substituteInPlace $out/jre/lib/security/java.security \ - --replace file:/dev/random file:/dev/./urandom \ - --replace NativePRNGBlocking SHA1PRNG - # copy static and dynamic libraries needed for static compilation - cp -rf ${glibc}/lib/* $out/jre/lib/svm/clibraries/linux-amd64/ - cp ${glibc.static}/lib/* $out/jre/lib/svm/clibraries/linux-amd64/ - cp ${zlib.static}/lib/libz.a $out/jre/lib/svm/clibraries/linux-amd64/libz.a - ''); - - inherit (jvmci8) preFixup; - dontStrip = true; # stripped javac crashes with "segmentaion fault" - doInstallCheck = true; - installCheckPhase = '' - echo ${lib.escapeShellArg '' - public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World"); - } - } - ''} > HelloWorld.java - $out/bin/javac HelloWorld.java - - # run on JVM with Graal Compiler - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - - # Ahead-Of-Time compilation - $out/bin/native-image --no-server HelloWorld - ./helloworld - ./helloworld | fgrep 'Hello World' - - ${lib.optionalString stdenv.isLinux - '' - # Ahead-Of-Time compilation with --static (supported on linux only) - $out/bin/native-image --no-server --static HelloWorld - ./helloworld - ./helloworld | fgrep 'Hello World' - ''} - ''; - enableParallelBuilding = true; - passthru.home = graalvm8; - - meta = with lib; { - homepage = "https://github.com/oracle/graal"; - description = "High-Performance Polyglot VM"; - license = licenses.gpl2; - maintainers = with maintainers; [ volth hlolli ]; - platforms = [ "x86_64-linux" "x86_64-darwin" /*"aarch64-linux"*/ ]; - }; - }; -} diff --git a/pkgs/development/compilers/graalvm/truffle.make b/pkgs/development/compilers/graalvm/truffle.make deleted file mode 100644 index ec357446a5df..000000000000 --- a/pkgs/development/compilers/graalvm/truffle.make +++ /dev/null @@ -1,16 +0,0 @@ -# This Makefile is used by mx to bootstrap libffi build. - -# `make MX_VERBOSE=y` will report all lines executed. The actual value doesn't -# matter as long as it's not empty. - -QUIETLY$(MX_VERBOSE) = @ - -.PHONY: default - -default: - sed -i "s|-print-multi-os-directory||g" ../$(SOURCES)/configure - $(QUIETLY) echo CONFIGURE libffi - $(QUIETLY) mkdir ../$(OUTPUT) - $(QUIETLY) cd ../$(OUTPUT) && ../$(SOURCES)/configure $(CONFIGURE_ARGS) - $(QUIETLY) echo MAKE libffi - $(QUIETLY) $(MAKE) -C ../$(OUTPUT) diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix new file mode 100644 index 000000000000..f9b8020c924c --- /dev/null +++ b/pkgs/development/compilers/ligo/default.nix @@ -0,0 +1,62 @@ +{ lib +, fetchFromGitLab +, coq +, cacert +}: + +coq.ocamlPackages.buildDunePackage rec { + pname = "ligo"; + version = "0.26.0"; + src = fetchFromGitLab { + owner = "ligolang"; + repo = "ligo"; + rev = "d48098c6724bc0a62170c2f9ff73c792c71c8452"; + sha256 = "sha256-uu5985llYsi/9ExKZetk48FqU0sJQB1EirdT/pUw0DA="; + }; + + # The build picks this up for ligo --version + LIGO_VERSION=version; + + useDune2 = true; + + buildInputs = with coq.ocamlPackages; [ + coq + menhir + menhirLib + qcheck + ocamlgraph + ppx_deriving + ppx_deriving_yojson + ppx_expect + tezos-base + tezos-shell-services + tezos-010-PtGRANAD-test-helpers + tezos-protocol-010-PtGRANAD-parameters + tezos-protocol-010-PtGRANAD + tezos-protocol-environment + yojson + getopt + terminal_size + pprint + linenoise + data-encoding + bisect_ppx + cmdliner + ]; + + checkInputs = [ + cacert + coq.ocamlPackages.ca-certs + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://ligolang.org/"; + downloadPage = "https://ligolang.org/docs/intro/installation"; + description = "A friendly Smart Contract Language for Tezos"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ulrikstrid ]; + }; +} diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 7fadc6d6dcac..6267678c46d5 100644 --- a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${./wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 7fadc6d6dcac..6267678c46d5 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${./wasm.patch} ''; diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index adb7490785e4..a226c7edba45 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,9 +1,5 @@ -{ lib, fetchFromGitHub, crystal_1_0, openssl }: +{ lib, fetchFromGitHub, crystal, openssl }: -let - crystal = crystal_1_0; - -in crystal.buildCrystalPackage rec { version = "0.14.0"; pname = "mint"; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index bb233e34c195..07d301187a8e 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake -, boost, python3, eigen +, boost, python3, eigen, python3Packages , icestorm, trellis , llvmPackages @@ -39,17 +39,18 @@ stdenv.mkDerivation rec { = [ cmake ] ++ (lib.optional enableGui wrapQtAppsHook); buildInputs - = [ boostPython python3 eigen ] + = [ boostPython python3 eigen python3Packages.apycula ] ++ (lib.optional enableGui qtbase) ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); cmakeFlags = [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}" - "-DARCH=generic;ice40;ecp5" + "-DARCH=generic;ice40;ecp5;gowin" "-DBUILD_TESTS=ON" "-DICESTORM_INSTALL_PREFIX=${icestorm}" "-DTRELLIS_INSTALL_PREFIX=${trellis}" "-DTRELLIS_LIBDIR=${trellis}/lib/trellis" + "-DGOWIN_BBA_EXECUTABLE=${python3Packages.apycula}/bin/gowin_bba" "-DUSE_OPENMP=ON" # warning: high RAM usage "-DSERIALIZE_CHIPDBS=OFF" @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { wrapQtApp $out/bin/nextpnr-generic wrapQtApp $out/bin/nextpnr-ice40 wrapQtApp $out/bin/nextpnr-ecp5 + wrapQtApp $out/bin/nextpnr-gowin ''; meta = with lib; { diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 7434347f2a28..c4be7c27d85c 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -72,15 +72,17 @@ let nimHost = parsePlatform stdenv.hostPlatform; nimTarget = parsePlatform stdenv.targetPlatform; - bootstrapCompiler = stdenv.mkDerivation rec { + bootstrapCompiler = let + revision = "561b417c65791cd8356b5f73620914ceff845d10"; + in stdenv.mkDerivation { pname = "nim-bootstrap"; - version = "0.20.0"; + version = "g${lib.substring 0 7 revision}"; src = fetchgit { # A Git checkout is much smaller than a GitHub tarball. - url = "https://github.com/nim-lang/csources.git"; - rev = "v${version}"; - sha256 = "0i6vsfy1sgapx43n226q8m0pvn159sw2mhp50zm3hhb9zfijanis"; + url = "https://github.com/nim-lang/csources_v1.git"; + rev = revision; + sha256 = "1c2k681knrha1zmf4abhb32i2wwd3nwflzylnqryxk753swla043"; }; enableParallelBuilding = true; @@ -96,12 +98,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.4.8"; + version = "1.6.0"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-t5jFd0EdfZW4YxJh27Nnbp0a/Z42dA0ESWagVVtBRBo="; + hash = "sha256-UgZdSNcqcnAuwa/l96mDHhFnNTHiec3/nK7AGgfuxj0="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; @@ -112,7 +114,7 @@ in { ./nixbuild.patch # Load libraries at runtime by absolute path - ]; + ] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch; configurePhase = '' runHook preConfigure diff --git a/pkgs/development/compilers/nim/nim.cfg.patch b/pkgs/development/compilers/nim/nim.cfg.patch index a95b672d1c1d..7195132e52f6 100644 --- a/pkgs/development/compilers/nim/nim.cfg.patch +++ b/pkgs/development/compilers/nim/nim.cfg.patch @@ -1,5 +1,5 @@ diff --git a/config/nim.cfg b/config/nim.cfg -index a33a2f0a9..e069193ff 100644 +index 3b964d124..850ed0ed9 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -8,26 +8,12 @@ @@ -29,42 +29,3 @@ index a33a2f0a9..e069193ff 100644 path="$lib/deprecated/core" path="$lib/deprecated/pure" path="$lib/pure/collections" -@@ -111,7 +97,7 @@ path="$lib/pure" - @end - - @if unix: -- @if not bsd or haiku: -+ @if not bsd or genode or haiku: - # -fopenmp - gcc.options.linker = "-ldl" - gcc.cpp.options.linker = "-ldl" -@@ -295,29 +281,6 @@ vcc.cpp.options.size = "/O1" - # Configuration for the Tiny C Compiler: - tcc.options.always = "-w" - --# Configuration for the Genode toolchain --@if genode: -- noCppExceptions # avoid std C++ -- tlsEmulation:on # no TLS segment register magic -- @if i386 or amd64: -- gcc.exe = "genode-x86-gcc" -- gcc.cpp.exe = "genode-x86-g++" -- gcc.cpp.linkerexe = "genode-x86-ld" -- @elif arm: -- gcc.exe = "genode-arm-gcc" -- gcc.cpp.exe = "genode-arm-g++" -- gcc.cpp.linkerexe = "genode-arm-ld" -- @elif arm64: -- gcc.exe = "genode-aarch64-gcc" -- gcc.cpp.exe = "genode-aarch64-g++" -- gcc.cpp.linkerexe = "genode-aarch64-ld" -- @elif riscv64: -- gcc.exe = "genode-riscv-gcc" -- gcc.cpp.exe = "genode-riscv-g++" -- gcc.cpp.linkerexe = "genode-riscv-ld" -- @end --@end -- - @if arm or arm64: - --define:nimEmulateOverflowChecks - @end diff --git a/pkgs/development/compilers/nim/toLocation.patch b/pkgs/development/compilers/nim/toLocation.patch new file mode 100644 index 000000000000..a3db46044049 --- /dev/null +++ b/pkgs/development/compilers/nim/toLocation.patch @@ -0,0 +1,16 @@ +diff --git a/lib/std/private/miscdollars.nim b/lib/std/private/miscdollars.nim +index 840fedf54..6c3436308 100644 +--- a/lib/std/private/miscdollars.nim ++++ b/lib/std/private/miscdollars.nim +@@ -6,9 +6,8 @@ template toLocation*(result: var string, file: string | cstring, line: int, col: + # it can be done in a single place. + result.add file + if line > 0: +- result.add "(" ++ result.add ":" + addInt(result, line) + if col > 0: +- result.add ", " ++ result.add ":" + addInt(result, col) +- result.add ")" diff --git a/pkgs/development/compilers/ocaml/4.13.nix b/pkgs/development/compilers/ocaml/4.13.nix index 256242e9cbb5..4bfa949fa885 100644 --- a/pkgs/development/compilers/ocaml/4.13.nix +++ b/pkgs/development/compilers/ocaml/4.13.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "13"; - patch_version = "0"; - sha256 = "sha256:1f7gnndzs6qcyy2gnzalnhm808pifxhvxg2qp5dnsziz6li7x303"; + patch_version = "1"; + sha256 = "sha256:1s7xwqidpjwfhnpfma4nb93gxfr7g9jfn03s1j03iyavmpgph7ck"; } diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 03e8be7053a2..b46dee899a33 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,36 +1,38 @@ -{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo }: -with lib; +{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo, which }: stdenv.mkDerivation rec { pname = "tcc"; - version = "0.9.27"; - upstreamVersion = "release_${concatStringsSep "_" (builtins.splitVersion version)}"; + version = "unstable-2021-10-09"; src = fetchFromRepoOrCz { repo = "tinycc"; - rev = upstreamVersion; - sha256 = "12mm1lqywz0akr2yb2axjfbw8lwv57nh395vzsk534riz03ml977"; + rev = "ca11849ebb88ef4ff87beda46bf5687e22949bd6"; + sha256 = "sha256-xnUDyTYZxbxUCblACyX73boBhU073VRqSy1SWlWsvIw="; }; - nativeBuildInputs = [ perl texinfo ]; + nativeBuildInputs = [ perl texinfo which ]; hardeningDisable = [ "fortify" ]; - enableParallelBuilding = true; - postPatch = '' - substituteInPlace "texi2pod.pl" \ - --replace "/usr/bin/perl" "${perl}/bin/perl" + patchShebangs texi2pod.pl ''; + configureFlags = [ + "--cc=$CC" + "--ar=$AR" + "--crtprefix=${lib.getLib stdenv.cc.libc}/lib" + "--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include" + "--libpaths=${lib.getLib stdenv.cc.libc}/lib" + # build cross compilers + "--enable-cross" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "--config-musl" + ]; + preConfigure = '' echo ${version} > VERSION - - configureFlagsArray+=("--cc=cc") configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") - configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib") - configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include") - configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib") ''; postFixup = '' @@ -47,9 +49,8 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = { + meta = with lib; { description = "Small, fast, and embeddable C compiler and interpreter"; - longDescription = '' TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike other C compilers, it is meant to be self-sufficient: you do not @@ -73,11 +74,9 @@ stdenv.mkDerivation rec { With libtcc, you can use TCC as a backend for dynamic code generation. ''; - - homepage = "http://www.tinycc.org/"; - license = licenses.mit; - - platforms = [ "x86_64-linux" ]; + homepage = "https://repo.or.cz/tinycc.git"; + license = licenses.lgpl21Only; + platforms = platforms.linux; maintainers = [ maintainers.joachifm ]; }; } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 013b024f3bce..ba64e53876cb 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -42,6 +42,8 @@ let "0.52" = ./disable-graphviz-0.46.1.patch; + "0.54" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -89,10 +91,11 @@ let doCheck = false; # fails, requires dbus daemon passthru = { - updateScript = gnome.updateScript { - attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; - packageName = pname; - }; + updateScript = gnome.updateScript { + attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; + packageName = pname; + freeze = true; + }; }; meta = with lib; { @@ -130,5 +133,10 @@ in rec { sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; }; - vala = vala_0_52; + vala_0_54 = generic { + version = "0.54.1"; + sha256 = "0jlhd6hr9mai7hhc2c78w6zmnzf7xncp7fhyiavkqqzhhsn7gpjx"; + }; + + vala = vala_0_54; } diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index da10125c2433..4428d4dbba65 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "A ISO-compatible high-performance Prolog compiler"; license = lib.licenses.artistic2; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.linux; broken = !stdenv.is64bit; # the linux 32 bit build fails. }; diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index a0bf9a9ad8ff..156a4c17bc2c 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -1,20 +1,27 @@ -{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3 }: +{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3, pkgsHostTarget }: + +let + runtimeDeps = [ + z3 + pkgsHostTarget.targetPackages.stdenv.cc + ]; +in rustPlatform.buildRustPackage rec { pname = "zz"; - version = "unstable-2021-03-07"; + version = "unstable-2021-05-04"; # when updating, choose commit of the latest build on http://bin.zetz.it/ src = fetchFromGitHub { owner = "zetzit"; repo = "zz"; - rev = "d3fc968ba2ae6668f930e39077f9a90aecb9fdc4"; - sha256 = "18p17lgwq6rq1n76sj0dwb32bpxflfd7knky1v0sgmaxfpaq04y3"; + rev = "18020b10b933cfe2fc7f2256b71e646889f9b1d2"; + sha256 = "01nlyyk1qxk76dq2hw3wpbjwkh27zzp6mpczjnxdpv6rxs7mc825"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "03xdmm4993hqdb3cihjjv4n4mdk8lnlccva08fh6m1d56p807rni"; + cargoSha256 = "080rd8x4jsssnx4il80xcb81iw8pjcm70zckpa1hcijkw9104dgs"; postPatch = '' # remove search path entry which would reference /build @@ -26,7 +33,7 @@ rustPlatform.buildRustPackage rec { cp -r modules "$out/share/zz/" wrapProgram $out/bin/zz \ - --prefix PATH ":" "${lib.getBin z3}/bin" \ + --prefix PATH ":" "${lib.makeBinPath runtimeDeps}" \ --suffix ZZ_MODULE_PATHS ":" "$out/share/zz/modules" ''; diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix index 445a0422446a..c67b47f18776 100644 --- a/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/pkgs/development/coq-modules/aac-tactics/default.nix @@ -6,6 +6,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."8.14.0".sha256 = "04x47ngb95m1h4jw2gl0v79s5im7qimcw7pafc34gkkf51pyhakp"; release."8.13.0".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTY="; release."8.12.0".sha256 = "sha256-dPNA19kZo/2t3rbyX/R5yfGcaEfMhbm9bo71Uo4ZwoM="; release."8.11.0".sha256 = "sha256-CKKMiJLltIb38u+ZKwfQh/NlxYawkafp+okY34cGCYU="; @@ -17,6 +18,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = "8.14"; out = "8.14.0"; } { case = "8.13"; out = "8.13.0"; } { case = "8.12"; out = "8.12.0"; } { case = "8.11"; out = "8.11.0"; } diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 84dc92a3cd5f..cb83a9fdc339 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -8,6 +8,7 @@ with lib; mkCoqDerivation { defaultVersion = if versions.isGe "8.5" coq.coq-version then "${coq.coq-version}.0" else null; + release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06"; release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y"; release."8.12.0".sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8"; release."8.11.0".sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp"; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index d19d3826c742..e6d5e11fcc5f 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -6,6 +6,7 @@ with lib; mkCoqDerivation { repo = "Coq-Equations"; inherit version; defaultVersion = switch coq.coq-version [ + { case = "8.14"; out = "1.3-8.14"; } { case = "8.13"; out = "1.2.4+coq8.13"; } { case = "8.12"; out = "1.2.4+coq8.12"; } { case = "8.11"; out = "1.2.4+coq8.11"; } @@ -43,6 +44,8 @@ with lib; mkCoqDerivation { release."1.2.4+coq8.12".sha256 = "1n0w8is464qcq8mk2mv7amaf0khbjz5mpc9phf0rhpjm0lb22cb3"; release."1.2.4+coq8.13".rev = "v1.2.4-8.13"; release."1.2.4+coq8.13".sha256 = "0i014lshsdflzw6h0qxra9d2f0q82vffxv2f29awbb9ad0p4rq4q"; + release."1.3-8.14".rev = "v1.3-8.14"; + release."1.3-8.14".sha256 = "19bj9nncd1r9g4273h5qx35gs3i4bw5z9bhjni24b413hyj55hkv"; mlPlugin = true; preBuild = "coq_makefile -f _CoqProject -o Makefile"; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 4de6e2da8b51..84cd739ed6ab 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -9,8 +9,8 @@ mkCoqDerivation { release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4="; inherit version; - defaultVersion = with versions; switch mathcomp.version [ - { case = pred.inter (isGe "1.11.0") (isLt "1.13"); out = "1.2.3"; } + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; propagatedBuildInputs = [ mathcomp.algebra ]; diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index 57a1beead497..4c571f483e16 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.12"; } + { cases = [ (range "8.10" "8.14") "1.12.0" ]; out = "1.12"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; diff --git a/pkgs/development/coq-modules/goedel/default.nix b/pkgs/development/coq-modules/goedel/default.nix index f6ed9491e98c..c50f8672e01c 100644 --- a/pkgs/development/coq-modules/goedel/default.nix +++ b/pkgs/development/coq-modules/goedel/default.nix @@ -5,12 +5,14 @@ mkCoqDerivation { pname = "goedel"; owner = "coq-community"; - release."8.12.0".rev = "v8.12.0"; + releaseRev = (v: "v${v}"); + release."8.12.0".sha256 = "sha256-4lAwWFHGUzPcfHI9u5b+N+7mQ0sLJ8bH8beqQubfFEQ="; + release."8.13.0".sha256 = "0sqqkmj6wsk4xmhrnqkhcsbsrqjzn2gnk67nqzgrmjpw5danz8y5"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "8.12.0"; } + { case = range "8.11" "8.14"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 5607d342a2eb..1ecda185cdd8 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "0.9"; } + { case = isEq "8.13"; out = "0.9"; } ] null; propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap hierarchy-builder ]; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 491ff959eced..aff3bc30b5b0 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,8 +5,8 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.12"; out = "1.1.0"; } - { case = range "8.11" "8.12"; out = "0.10.0"; } + { case = range "8.12" "8.13"; out = "1.1.0"; } + { case = isEq "8.11"; out = "0.10.0"; } ] null; release."1.1.0".sha256 = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q="; release."1.0.0".sha256 = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp"; diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index d2d9870f3209..c0a9e948440e 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,8 +6,8 @@ with lib; mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "3.4.0"; } - { case = range "8.9" "8.11"; out = "3.3.0"; } + { case = range "8.11" "8.13"; out = "3.4.0"; } + { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb"; release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index 66791b130614..843a99de4be6 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation rec { release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "8.13+no"; } + { case = isEq "8.13"; out = "8.13+no"; } ] null; mlPlugin = true; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index 65af999d08f2..6ed8e114d803 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -8,10 +8,11 @@ with lib; mkCoqDerivation rec { defaultVersion = with versions; switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (isEq "8.13") (isEq "1.12") ]; out = "1.0.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.14") (isEq "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; + release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; propagatedBuildInputs = [ mathcomp-algebra ]; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index c7fed9ced513..306e68ac0f05 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.5.4"; } + { cases = [ (range "8.10" "8.14") "1.12.0" ]; out = "1.5.4"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } { cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; } diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 900e52f1682b..0a8bb78eeb70 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -5,8 +5,8 @@ with lib; mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.6"; out = "4.0.2"; } - { case = range "8.5" "8.8"; out = "1.2.8"; } + { case = range "8.6" "8.13"; out = "4.0.2"; } + { case = isEq "8.5"; out = "1.2.8"; } ] null; release."4.0.2".sha256 = "1q96bsxclqx84xn5vkid501jkwlc1p6fhb8szrlrp82zglj58b0b"; release."1.2.8".sha256 = "05fskx5x1qgaf9qv626m38y5izichzzqc7g2rglzrkygbskrrwsb"; diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index ad48809a9fed..fa1aa3c8399a 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = if versions.isGe "8.12" coq.version then "0.1.0" else null; + defaultVersion = if versions.range "8.12" "8.13" coq.version then "0.1.0" else null; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; meta = { diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index bc18108264a1..1908c755cd3a 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.13"; out = "1.1.2"; } + { case = range "8.10" "8.14"; out = "1.1.2"; } ] null; diff --git a/pkgs/development/coq-modules/relation-algebra/default.nix b/pkgs/development/coq-modules/relation-algebra/default.nix index da74215d537f..01cb7f63b71a 100644 --- a/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/pkgs/development/coq-modules/relation-algebra/default.nix @@ -15,11 +15,11 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "1.7.5"; } - { case = isGe "8.12"; out = "1.7.4"; } - { case = isGe "8.11"; out = "1.7.3"; } - { case = isGe "8.10"; out = "1.7.2"; } - { case = isGe "8.9"; out = "1.7.1"; } + { case = isEq "8.13"; out = "1.7.5"; } + { case = isEq "8.12"; out = "1.7.4"; } + { case = isEq "8.11"; out = "1.7.3"; } + { case = isEq "8.10"; out = "1.7.2"; } + { case = isEq "8.9"; out = "1.7.1"; } ] null; mlPlugin = true; diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index 1fb01312e666..796c9dee0a40 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -15,8 +15,7 @@ mkCoqDerivation rec { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "8.13.0"; } - { case = "8.11"; out = "8.11.1"; } + { case = range "8.10" "8.13"; out = "8.13.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 5505713eb479..1f6e995703cb 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -15,10 +15,11 @@ let }); release = { - "8.13.0+0.13.0".sha256 = "sha256:0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; - "8.12.0+0.12.1".sha256 = "sha256:048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn"; - "8.11.0+0.11.1".sha256 = "sha256:1phmh99yqv71vlwklqgfxiq2vj99zrzxmryj2j4qvg5vav3y3y6c"; - "8.10.0+0.7.2".sha256 = "sha256:1ljzm63hpd0ksvkyxcbh8rdf7p90vg91gb4h0zz0941v1zh40k8c"; + "8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja"; + "8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; + "8.12.0+0.12.1".sha256 = "048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn"; + "8.11.0+0.11.1".sha256 = "1phmh99yqv71vlwklqgfxiq2vj99zrzxmryj2j4qvg5vav3y3y6c"; + "8.10.0+0.7.2".sha256 = "1ljzm63hpd0ksvkyxcbh8rdf7p90vg91gb4h0zz0941v1zh40k8c"; }; in @@ -27,6 +28,7 @@ in inherit version release; defaultVersion = with versions; switch coq.version [ + { case = isEq "8.14"; out = "8.14+rc1+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } { case = isEq "8.12"; out = "8.12.0+0.12.1"; } { case = isEq "8.11"; out = "8.11.0+0.11.1"; } @@ -63,10 +65,14 @@ in }).overrideAttrs(o: let inherit (o) version; in { src = fetchzip { - url = "https://github.com/ejgallego/coq-serapi/releases/download/${version}/coq-serapi-${ - if version == "8.11.0+0.11.1" then version - else builtins.replaceStrings [ "+" ] [ "." ] version - }.tbz"; + url = + if version == "8.14+rc1+0.14.0" + then "https://github.com/ejgallego/coq-serapi/archive/refs/tags/8.14+rc1+0.14.0.tar.gz" + else + "https://github.com/ejgallego/coq-serapi/releases/download/${version}/coq-serapi-${ + if version == "8.11.0+0.11.1" then version + else builtins.replaceStrings [ "+" ] [ "." ] version + }.tbz"; sha256 = release."${version}".sha256; }; }) diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 604a3f48f87b..d49892e3396e 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,8 +6,8 @@ with lib; mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "1.5.0"; } - { case = range "8.8" "8.11"; out = "1.4.0"; } + { case = range "8.11" "8.13"; out = "1.5.0"; } + { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf"; release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix index 4d3859a77df8..8c44e34e3ed1 100644 --- a/pkgs/development/embedded/fpga/trellis/default.nix +++ b/pkgs/development/embedded/fpga/trellis/default.nix @@ -31,6 +31,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" + # TODO: should this be in stdenv instead? + "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; preConfigure = '' @@ -39,6 +41,12 @@ in stdenv.mkDerivation rec { cd libtrellis ''; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/ecppack $out/share/trellis/misc/basecfgs/empty_lfe5u-85f.config /tmp/test.bin + ''; + meta = with lib; { description = "Documentation and bitstream tools for Lattice ECP5 FPGAs"; longDescription = '' @@ -49,7 +57,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/YosysHQ/prjtrellis"; license = licenses.isc; - maintainers = with maintainers; [ q3k thoughtpolice emily ]; + maintainers = with maintainers; [ q3k thoughtpolice emily rowanG077 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 209391aaf5df..1afa282a1785 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1022ff2x9jvi2a0820lbgmmh54cxh1vbn0qfdwr50w7ggvjp88i6"; + sha256 = "1yn84q0iy81b2sczbf4gx8b56f9ghb9kgwjc0n7l5xn5lb2wqlqa"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -1272,10 +1272,21 @@ self: super: { gi-cairo-render = doJailbreak super.gi-cairo-render; gi-cairo-connector = doJailbreak super.gi-cairo-connector; - # Remove when https://github.com/gtk2hs/svgcairo/pull/10 gets merged. - svgcairo = appendPatch super.svgcairo (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/svgcairo/commit/df6c6172b52ecbd32007529d86ba9913ba001306.patch"; - sha256 = "128qrns56y139vfzg1rbyqfi2xn8gxsmpnxv3zqf4v5spsnprxwh"; + svgcairo = overrideCabal super.svgcairo (drv: { + patches = [ + # Remove when https://github.com/gtk2hs/svgcairo/pull/10 gets merged. + (pkgs.fetchpatch { + url = "https://github.com/gtk2hs/svgcairo/commit/df6c6172b52ecbd32007529d86ba9913ba001306.patch"; + sha256 = "128qrns56y139vfzg1rbyqfi2xn8gxsmpnxv3zqf4v5spsnprxwh"; + }) + # The update here breaks svgcairo: + # https://github.com/NixOS/nixpkgs/commit/08fcd73d9dc9a28aa901210b259d9bfb3c228018 + # and updating the call to the header with the correct name fixes it. + (pkgs.fetchpatch { + url = "https://github.com/dalpd/svgcairo/commit/4dc6d8d3a6c24be0b8c1fd73b282ff247e7b1e6f.patch"; + sha256 = "1pq9ld9z67zsxj8vqjf82qwckcp69lvvnrjb7wsyb5jc6jaj3q0a"; + }) + ]; }); # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) @@ -1990,15 +2001,22 @@ EOT # Needs Cabal >= 3.4 chs-cabal = super.chs-cabal.override { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }; # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; + # https://github.com/hadolint/language-docker/issues/72 + language-docker_10_2_0 = overrideCabal super.language-docker_10_2_0 (drv: { + testFlags = (drv.testFlags or []) ++ [ + "--skip=/Language.Docker.Integration/parse" + ]; + }); + # 2021-09-06: hadolint depends on language-docker >= 10.1 hadolint = super.hadolint.override { - language-docker = self.language-docker_10_1_2; + language-docker = self.language-docker_10_2_0; }; # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) @@ -2025,11 +2043,15 @@ EOT # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_5; }); http3 = super.http3.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_5; }); + # Fixes https://github.com/NixOS/nixpkgs/issues/140613 + # https://github.com/recursion-schemes/recursion-schemes/issues/128 + recursion-schemes = appendPatch super.recursion-schemes ./patches/recursion-schemes-128.patch; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 714b889f2c05..4d0c33208944 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -44,15 +44,15 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # cabal-install-parsers is written for Cabal 3.6 - cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_1_0; }; + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_0; }; # older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4 cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override { - Cabal = self.Cabal_3_4_0_0; + Cabal = self.Cabal_3_4_1_0; }; # Jailbreak to fix the build. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 0d1efbf71198..25d8e44b4545 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -51,7 +51,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and random, but an older # version of base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # Ignore overly restrictive upper version bounds. @@ -98,7 +98,7 @@ self: super: { darcs = dontDistribute super.darcs; # The package needs the latest Cabal version. - cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_1_0; }); + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_2_0; }); # cabal-fmt requires Cabal3 cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index df96afc0e0ca..87cf1c868338 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -45,7 +45,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # Jailbreaks & Version Updates @@ -72,6 +72,17 @@ self: super: { vector-binary-instances = doJailbreak super.vector-binary-instances; vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; + weeder = self.weeder_2_3_0; + generic-lens-core = self.generic-lens-core_2_2_0_0; + generic-lens = self.generic-lens_2_2_0_0; + + # Doesn't allow Dhall 1.39.* + weeder_2_3_0 = super.weeder_2_3_0.override { + dhall = self.dhall_1_40_1; + }; + + # Upstream also disables test for GHC 9: https://github.com/kcsongor/generic-lens/pull/130 + generic-lens_2_2_0_0 = dontCheck super.generic-lens_2_2_0_0; # Apply patches from head.hackage. alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { @@ -155,7 +166,7 @@ self: super: { # 2021-09-18: Need path >= 0.9.0 for ghc 9 compat path = self.path_0_9_0; # 2021-09-18: Need ormolu >= 0.3.0.0 for ghc 9 compat - ormolu = doDistribute self.ormolu_0_3_0_1; + ormolu = doDistribute self.ormolu_0_3_1_0; # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2206 # Restrictive upper bound on ormolu hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 6826e6174a55..ece3daf3b371 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -43,73 +43,209 @@ self: super: { unix = null; xhtml = null; - # 0.12.0 introduces support for 9.2 - base-compat = self.base-compat_0_12_0; - - # cabal-install needs more recent versions of Cabal and base16-bytestring. - cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { - Cabal = null; + aeson = appendPatch (doJailbreak super.aeson) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/aeson-1.5.6.0.patch"; + sha256 = "07rk7f0lhgilxvbg2grpl1p5x25wjf9m7a0wqmi2jr0q61p9a0nl"; + # The revision information is newer than that included in the patch + excludes = ["*.cabal"]; }); + attoparsec = appendPatch (doJailbreak super.attoparsec_0_14_1) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/attoparsec-0.14.1.patch"; + sha256 = "0nprywmi3i9ih8mcc8afyimrfjr8pbcjxr2ywz9gwdlwdplk21da"; + }); + + # 0.12.0 introduces support for 9.2 + base-compat = self.base-compat_0_12_0; + base-compat-batteries = self.base-compat-batteries_0_12_0; + + basement = overrideCabal (appendPatch super.basement (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/basement-0.0.12.patch"; + sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z"; + })) (drv: { + # This is inside a conditional block so `doJailbreak` doesn't work + postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal"; + }); + + base16-bytestring = appendPatch super.base16-bytestring (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/base16-bytestring-1.0.1.0.patch"; + sha256 = "19ajai9y04981zfpcdj1nlz44b12gjj4m1ncciijv43mnz82plji"; + }); + + # Duplicate Show instances in tests and library cause compiling tests to fail + blaze-builder = appendPatch (dontCheck super.blaze-builder) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/blaze-builder-0.4.2.1.patch"; + sha256 = "1h5ny3mlng69vwaabl3af8hlv4qi24wfw8s14lw2ksw1yjbgi0j8"; + }); + + cereal = appendPatch (doJailbreak super.cereal) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch"; + sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128"; + }); + + # Tests fail because of typechecking changes + conduit = dontCheck super.conduit; + + constraints = appendPatch super.constraints (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/constraints-0.13.patch"; + sha256 = "0cr4qzw0fbwy97f3wx0v3mv8yc642ahpfa80kaqrq191232fzzf3"; + }); + + cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch"; + sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09"; + }); + + # cabal-install needs more recent versions of Cabal + cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { + Cabal = self.Cabal_3_6_2_0; + }); + + doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18_1)) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch"; + sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1"; + }); + + entropy = appendPatch super.entropy (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/entropy-0.4.1.6.patch"; + sha256 = "0pbbl6m8b3snf9cz6rs0ljmacpsavayfn0s3p67hdcmndy3ndawi"; + }); + + # Tests fail in GHC 9.2 + extra = dontCheck super.extra; + # Jailbreaks & Version Updates + assoc = doJailbreak super.assoc; async = doJailbreak super.async; base64-bytestring = doJailbreak super.base64-bytestring; ChasingBottoms = doJailbreak super.ChasingBottoms; + cpphs = overrideCabal super.cpphs (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}); + cryptohash-md5 = doJailbreak super.cryptohash-md5; + cryptohash-sha1 = doJailbreak super.cryptohash-sha1; data-fix = doJailbreak super.data-fix; dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; + ghc-byteorder = doJailbreak super.ghc-byteorder; hackage-security = doJailbreak super.hackage-security; hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); - integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); + integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }); + indexed-traversable = doJailbreak super.indexed-traversable; + lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; - network = super.network_3_1_2_2; + network = super.network_3_1_2_5; parallel = doJailbreak super.parallel; + polyparse = overrideCabal (doJailbreak super.polyparse) (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }); primitive = doJailbreak super.primitive; regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; + scientific = doJailbreak super.scientific; + shelly = doJailbreak super.shelly; split = doJailbreak super.split; splitmix = doJailbreak super.splitmix; tar = doJailbreak super.tar; + these = doJailbreak super.these; time-compat = doJailbreak super.time-compat; + type-equality = doJailbreak super.type-equality; vector = doJailbreak (dontCheck super.vector); vector-binary-instances = doJailbreak super.vector-binary-instances; - vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; + indexed-traversable-instances = doJailbreak super.indexed-traversable-instances; + + hpack = overrideCabal (doJailbreak super.hpack) (drv: { + # Cabal 3.6 seems to preserve comments when reading, which makes this test fail + # 2021-10-10: 9.2.1 is not yet supported (also no issue) + testFlags = [ + "--skip=/Hpack/renderCabalFile/is inverse to readCabalFile/" + ] ++ drv.testFlags or []; + }); + + # Patch for TH code from head.hackage + vector-th-unbox = appendPatch (doJailbreak super.vector-th-unbox) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/vector-th-unbox-0.2.1.9.patch"; + sha256 = "02bvvy3hx3cf4y4dr64zl5pjvq8giwk4286j5g1n6k8ikyn2403p"; + }); + + # Patch for TH code from head.hackage + invariant = appendPatch (doJailbreak super.invariant) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/invariant-0.5.4.patch"; + sha256 = "17gg8ck4r6qmlbcbpbnqzksgf5q7i891zs6axfzhas6ajncylxvc"; + }); + + # base 4.15 support from head.hackage + lens = appendPatch (doJailbreak super.lens_5_0_1) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/lens-5.0.1.patch"; + sha256 = "1s8qqg7ymvv94dnfnr1ragx91chh9y7ydc4jx25zn361wbn00pv7"; + }); + + semigroupoids = overrideCabal super.semigroupoids (drv: { + # Patch from head.hackage for base 4.15 compat + patches = drv.patches or [] ++ [ + (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/semigroupoids-5.3.5.patch"; + sha256 = "0xrn1gv6b2n76522pk2nfp4z69kvp14l2zpif2f8zzz6cwcrx9w8"; + }) + ]; + # acrobatics to make the patch apply + prePatch = '' + find . -type f | xargs -L 1 ${pkgs.buildPackages.dos2unix}/bin/dos2unix + ''; + editedCabalFile = null; + revision = null; + }); + + # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760 + alex = dontCheck super.alex; # Apply patches from head.hackage. - alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch"; - sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; - }); - doctest = dontCheck (doJailbreak super.doctest_0_18_1); language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; - sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; + sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }); - # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x - hashable = super.hashable_1_3_3_0; + hashable = super.hashable_1_3_4_1; + + haskell-src-meta = appendPatch (doJailbreak super.haskell-src-meta) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch"; + sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp"; + }); + + # Tests depend on `parseTime` which is no longer available + hourglass = dontCheck super.hourglass; # 1.2.1 introduced support for GHC 9.2.1, stackage has 1.2.0 # The test suite indirectly depends on random, which leads to infinite recursion random = dontCheck super.random_1_2_1; - # 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet - lens = super.lens_5_0_1; - # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 - memory = super.memory_0_16_0; + memory = appendPatch super.memory_0_16_0 (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch"; + sha256 = "1kjganx729a6xfgfnrb3z7q6mvnidl042zrsd9n5n5a3i76nl5nl"; + }); # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs # https://github.com/snoyberg/mono-traversable/issues/192 mono-traversable = dontCheck super.mono-traversable; + quickcheck-instances = appendPatch (doJailbreak super.quickcheck-instances) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/quickcheck-instances-0.3.25.2.patch"; + sha256 = "0ndnb6wbnhxxwy69jjdpmd7gmmv6asmx1jczwz1hsn921mn1ilnp"; + # `.cabal` revision information has been included in the patch + excludes = ["*.cabal"]; + }); + # Disable tests pending resolution of # https://github.com/Soostone/retry/issues/71 retry = dontCheck super.retry; + # Disable tests pending resolution of + # https://github.com/haskell/text/issues/380 or https://github.com/fpco/streaming-commons/issues/60 + streaming-commons = dontCheck (appendPatch super.streaming-commons (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch"; + sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy"; + })); + # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage hlint = super.hlint_3_3_4.overrideScope (self: super: { ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7471021f0a91..743657a1e3ec 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -742,7 +742,6 @@ broken-packages: - commodities - commonmark-cli - commsec - - compactable - Compactable - compact-list - compact-map @@ -1284,6 +1283,7 @@ broken-packages: - escape-artist - escoger - espial + - esqueleto-pgcrypto - ess - estimators - EstProgress @@ -1434,6 +1434,7 @@ broken-packages: - flamethrower - flamingra - flat-maybe + - flatparse - flay - flexible-time - flickr @@ -1534,7 +1535,6 @@ broken-packages: - funcons-values - function-instances-algebra - functor - - functor-combinators - functor-friends - functor-infix - functorm @@ -1676,6 +1676,7 @@ broken-packages: - git-cuk - git-date - gitdo + - github - github-backup - github-data - github-tools @@ -2403,6 +2404,7 @@ broken-packages: - htssets - http2-client - http2-grpc-proto-lens + - http3 - http-attoparsec - http-client-lens - http-client-request-modifiers @@ -2845,6 +2847,7 @@ broken-packages: - linear-algebra-cblas - linear-base - linear-code + - linear-generics - linear-maps - linear-opengl - linearscan @@ -3847,7 +3850,6 @@ broken-packages: - process-leksah - process-listlike - processmemory - - procex - procrastinating-variable - procstat - prof2pretty @@ -4384,6 +4386,7 @@ broken-packages: - shopify - shortcut-links - shorten-strings + - short-vec - show-prettyprint - Shpadoinkle-backend-snabbdom - Shpadoinkle-isreal @@ -5288,6 +5291,7 @@ broken-packages: - warc - warp-dynamic - warp-grpc + - warp-quic - warp-static - warp-systemd - wasm diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 073fc552f1a2..e6a1c1e1be21 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -98,6 +98,8 @@ default-package-overrides: - ghc-api-compat == 8.10.7 # 2021-09-14: Pin hiedb to version needed by ghcide - hiedb == 0.4.0.* + # 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes + - weeder < 2.3.0 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. @@ -147,6 +149,8 @@ package-maintainers: - pretty-simple - spago - termonad + dalpd: + - svgcairo domenkozar: - cachix - cachix-api diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 54521699a0c4..5e40f12bcc59 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.12 +# Stackage LTS 18.13 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -163,22 +163,22 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - - ascii ==1.0.1.4 - - ascii-case ==1.0.0.4 - - ascii-char ==1.0.0.8 + - ascii ==1.0.1.6 + - ascii-case ==1.0.0.6 + - ascii-char ==1.0.0.10 - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.4 - - ascii-predicates ==1.0.0.4 + - ascii-group ==1.0.0.6 + - ascii-predicates ==1.0.0.6 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.4 - - ascii-th ==1.0.0.4 + - ascii-superset ==1.0.1.6 + - ascii-th ==1.0.0.6 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 - assert-failure ==0.1.2.5 - assoc ==1.0.2 - astro ==0.4.3.0 - - async ==2.2.3 + - async ==2.2.4 - async-extra ==0.2.0.0 - async-pool ==0.9.1 - async-refresh ==0.3.0.0 @@ -277,7 +277,7 @@ default-package-overrides: - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.2.1 - bmp ==1.2.6.3 - - BNFC ==2.9.2 + - BNFC ==2.9.3 - BNFC-meta ==0.6.1 - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 @@ -614,7 +614,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.9.1 + - dl-fedora ==0.9.2 - dlist ==1.0 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -683,7 +683,7 @@ default-package-overrides: - elynx-tree ==0.5.1.1 - email-validate ==2.3.2.15 - emd ==0.2.0.0 - - emojis ==0.1 + - emojis ==0.1.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 @@ -704,7 +704,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.5.2.2 + - esqueleto ==3.5.3.0 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -838,7 +838,7 @@ default-package-overrides: - generic-aeson ==0.2.0.12 - generic-arbitrary ==0.1.0 - generic-constraints ==1.1.1.1 - - generic-data ==0.9.2.0 + - generic-data ==0.9.2.1 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.1 - generic-functor ==0.2.0.0 @@ -1011,7 +1011,7 @@ default-package-overrides: - hasql-transaction ==1.0.1 - hasty-hamiltonian ==1.3.4 - HaTeX ==3.22.3.0 - - HaXml ==1.25.5 + - HaXml ==1.25.6 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 - hdaemonize ==0.5.6 @@ -1107,7 +1107,7 @@ default-package-overrides: - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.7.1 + - HsOpenSSL ==0.11.7.2 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.7.10 @@ -1259,7 +1259,7 @@ default-package-overrides: - intset-imperative ==0.1.0.0 - invariant ==0.5.4 - invertible ==0.2.0.7 - - invertible-grammar ==0.1.3 + - invertible-grammar ==0.1.3.1 - io-machine ==0.2.0.0 - io-manager ==0.1.0.3 - io-memoize ==1.1.1.0 @@ -1395,6 +1395,7 @@ default-package-overrides: - linear ==1.21.6 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 + - linux-capabilities ==0.1.0.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 @@ -1446,7 +1447,7 @@ default-package-overrides: - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 - - markdown ==0.1.17.4 + - markdown ==0.1.17.5 - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - massiv ==0.6.1.0 @@ -1578,7 +1579,7 @@ default-package-overrides: - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur3 ==1.0.4 + - murmur3 ==1.0.5 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.1 @@ -1634,7 +1635,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.3 - - nonempty-containers ==0.3.4.3 + - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 @@ -1686,7 +1687,7 @@ default-package-overrides: - opentelemetry-extra ==0.7.0 - opentelemetry-lightstep ==0.7.0 - opentelemetry-wai ==0.7.0 - - operational ==0.2.3.5 + - operational ==0.2.4.0 - operational-class ==0.3.0.0 - optics ==0.3 - optics-core ==0.3.0.1 @@ -2011,7 +2012,7 @@ default-package-overrides: - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.3 - rocksdb-query ==0.4.2 - - roles ==0.2.0.0 + - roles ==0.2.1.0 - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 @@ -2120,7 +2121,7 @@ default-package-overrides: - set-cover ==0.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.10 - - sexp-grammar ==2.3.2 + - sexp-grammar ==2.3.3 - SHA ==1.6.4.4 - shake ==0.19.6 - shake-language-c ==0.12.0 @@ -2464,7 +2465,7 @@ default-package-overrides: - turtle ==1.5.22 - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - - typed-process ==0.2.6.1 + - typed-process ==0.2.6.3 - typed-uuid ==0.1.0.0 - type-equality ==1 - type-errors ==0.2.0.0 @@ -2608,7 +2609,7 @@ default-package-overrides: - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - warp ==3.3.17 - - warp-tls ==3.3.1 + - warp-tls ==3.3.2 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 @@ -2660,7 +2661,7 @@ default-package-overrides: - Xauth ==0.1 - xdg-basedir ==0.2.2 - xdg-userdirs ==0.1.0.2 - - xeno ==0.4.2 + - xeno ==0.4.3 - xlsx ==0.8.4 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 @@ -2693,7 +2694,7 @@ default-package-overrides: - yesod-fb ==0.6.1 - yesod-form ==1.7.0 - yesod-gitrev ==0.2.2 - - yesod-markdown ==0.12.6.11 + - yesod-markdown ==0.12.6.12 - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.0.9 - yesod-paginator ==1.1.1.0 @@ -2724,6 +2725,6 @@ default-package-overrides: - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 - - zstd ==0.1.2.0 + - zstd ==0.1.3.0 - ztail ==1.2.0.2 - zydiskell ==0.2.0.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9c3f7a77e80a..0b96cad46871 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -331,15 +331,9 @@ dont-distribute-packages: - Shellac-haskeline - Shellac-readline - ShortestPathProblems - - Shpadoinkle-backend-pardiff - - Shpadoinkle-backend-static - - Shpadoinkle-developer-tools - Shpadoinkle-disembodied - Shpadoinkle-examples - - Shpadoinkle-html - Shpadoinkle-router - - Shpadoinkle-template - - Shpadoinkle-widgets - SimpleGL - SimpleLog - SimpleServer @@ -534,6 +528,7 @@ dont-distribute-packages: - base64-bytes - baserock-schema - batchd + - batching - battlenet-yesod - battleships - bayes-stack @@ -732,7 +727,9 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc + - clash-ghc_1_4_5 - clash-lib + - clash-lib_1_4_5 - clash-multisignal - clash-prelude-quickcheck - clash-shake @@ -935,6 +932,7 @@ dont-distribute-packages: - delta - delta-h - dep-t-advice + - dependent-literals-plugin - dependent-state - dephd - deptrack-devops @@ -1071,6 +1069,7 @@ dont-distribute-packages: - every-bit-counts - exception-monads-fd - exference + - exon - expand - expat-enumerator - expiring-containers @@ -1117,6 +1116,7 @@ dont-distribute-packages: - filesystem-enumerator - find-clumpiness - findhttp + - finite-table - firstify - fix-parser-simple - fixed-point-vector @@ -2308,6 +2308,7 @@ dont-distribute-packages: - mkbndl - mlist - mmark-cli + - mmark-cli_0_0_5_1 - mmark-ext - mmtl-base - moan @@ -2426,6 +2427,7 @@ dont-distribute-packages: - nomyx-language - nomyx-library - nomyx-server + - notifications-tray-icon - notmuch-haskell - notmuch-web - numeric-ode @@ -2453,6 +2455,7 @@ dont-distribute-packages: - one-liner_2_0 - online - online-csv + - opc-xml-da-client - open-adt-tutorial - open-union - openpgp-Crypto @@ -2559,6 +2562,7 @@ dont-distribute-packages: - polh-lexicon - polydata - polysemy-RandomFu + - polysemy-check - polysemy-http - polysemy-log-co - polysemy-methodology-co-log @@ -2623,7 +2627,6 @@ dont-distribute-packages: - proto3-suite - protobuf-native - protocol-buffers-descriptor-fork - - proton - psc-ide - puffytools - pugs-compat @@ -2907,13 +2910,13 @@ dont-distribute-packages: - servant-auth-token-persistent - servant-auth-token-rocksdb - servant-auth-wordpress - - servant-cli - servant-client-namedargs - servant-csharp - servant-db-postgresql - servant-ede - servant-event-stream - servant-examples + - servant-github-webhook - servant-http2-client - servant-matrix-param - servant-polysemy @@ -2941,6 +2944,7 @@ dont-distribute-packages: - shelduck - shellmate-extras - shine-varying + - short-vec-lens - showdown - shpider - shuffle @@ -3434,6 +3438,7 @@ dont-distribute-packages: - xml-push - xml-query-xml-conduit - xml-query-xml-types + - xml-syntax - xml-tydom-conduit - xml2x - xmltv diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bdb1a8dda491..5fc968ccddeb 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -978,4 +978,21 @@ self: super: builtins.intersectAttrs super { doCheck = with pkgs.stdenv; hostPlatform == buildPlatform && buildPlatform.isx86; }; + + # procex relies on close_range which has been introduced in Linux 5.9, + # the test suite seems to force the use of this feature (or the fallback + # mechanism is broken), so we can't run the test suite on machines with a + # Kernel < 5.9. To check for this, we use uname -r to obtain the Kernel + # version and sort -V to compare against our minimum version. If the + # Kernel turns out to be older, we disable the test suite. + procex = overrideCabal super.procex (drv: { + postConfigure = '' + minimumKernel=5.9 + higherVersion=`printf "%s\n%s\n" "$minimumKernel" "$(uname -r)" | sort -rV | head -n1` + if [[ "$higherVersion" = "$minimumKernel" ]]; then + echo "Used Kernel doesn't support close_range, disabling tests" + unset doCheck + fi + '' + (drv.postConfigure or ""); + }); } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 313c95eca8ff..0ab3b8de2105 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1277,34 +1277,6 @@ self: { }) {}; "BNFC" = callPackage - ({ mkDerivation, alex, array, base, Cabal, cabal-doctest - , containers, deepseq, directory, doctest, filepath, happy, hspec - , hspec-discover, HUnit, mtl, pretty, process, QuickCheck - , string-qq, temporary, time - }: - mkDerivation { - pname = "BNFC"; - version = "2.9.2"; - sha256 = "1wn46a6rw6fwxmqp3b8nz81ag2nphyalm6l2frzg63xbdxnlwgmi"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base containers deepseq directory filepath mtl pretty process - string-qq time - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck string-qq temporary time - ]; - testToolDepends = [ alex happy hspec-discover ]; - description = "A compiler front-end generator"; - license = lib.licenses.bsd3; - }) {}; - - "BNFC_2_9_3" = callPackage ({ mkDerivation, alex, array, base, Cabal, cabal-doctest , containers, deepseq, directory, doctest, filepath, happy, hspec , hspec-discover, HUnit, mtl, pretty, process, QuickCheck @@ -1330,7 +1302,6 @@ self: { testToolDepends = [ alex happy hspec-discover ]; description = "A compiler front-end generator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "BNFC-meta" = callPackage @@ -2774,7 +2745,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_4_0_0" = callPackage + "Cabal_3_4_1_0" = callPackage ({ mkDerivation, array, async, base, base-compat, base-orphans , binary, bytestring, clock, containers, deepseq, Diff, directory , filepath, integer-logarithms, mtl, optparse-applicative, parsec @@ -2784,8 +2755,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "3.4.0.0"; - sha256 = "1za1cl14fkw8y89hhw6sqirzmkixjaa4wpqsibyk0fvnjs59jydq"; + version = "3.4.1.0"; + sha256 = "1rqpq6l4b9990rmlgcyz44awps6r37ccyi6bgk7dhcsflad6prj4"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -2804,15 +2775,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_6_1_0" = callPackage + "Cabal_3_6_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.6.1.0"; - sha256 = "0yjdp78775752k10q4j5dbvqj37xaa2b3anmfld53mgr17k182a7"; + version = "3.6.2.0"; + sha256 = "0hmw2wkypd42qyyfi6rhbsxmymbxg9rrw683yg39627vlw33v44y"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -3398,6 +3369,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "Color_0_3_3" = callPackage + ({ mkDerivation, base, colour, criterion, data-default-class + , deepseq, hspec, hspec-discover, HUnit, JuicyPixels, massiv + , massiv-test, QuickCheck, random, vector + }: + mkDerivation { + pname = "Color"; + version = "0.3.3"; + sha256 = "14sf71lhqc1w6s3p1k8a99xgzcwfnr3v5irvfkr09rvv7fd66nva"; + libraryHaskellDepends = [ base data-default-class deepseq vector ]; + testHaskellDepends = [ + base colour hspec HUnit JuicyPixels massiv massiv-test QuickCheck + random vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base colour criterion deepseq random ]; + description = "Color spaces and conversions between them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Combinatorrent" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, cereal , containers, deepseq, directory, filepath, hopenssl, hslogger @@ -9468,6 +9460,8 @@ self: { pname = "HTTP"; version = "4000.3.16"; sha256 = "0bgyj3ahqlyg0jw6qsm2sncp8mklc4h0dj91s043vb3ig01iq2fn"; + revision = "1"; + editedCabalFile = "0wagwgzfy2mqkha88fjl37ah0l7h4biz34v65993xd502ly68hk0"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -9785,26 +9779,6 @@ self: { }) {}; "HaXml" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , polyparse, pretty, random - }: - mkDerivation { - pname = "HaXml"; - version = "1.25.5"; - sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb"; - revision = "4"; - editedCabalFile = "029jnlmab1llr55dmlamrn2hxkbqw7ryz1dfg19h1aip6byf4ljh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers filepath polyparse pretty random - ]; - executableHaskellDepends = [ base directory polyparse pretty ]; - description = "Utilities for manipulating XML documents"; - license = "LGPL"; - }) {}; - - "HaXml_1_25_6" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , polyparse, pretty, random }: @@ -9820,7 +9794,6 @@ self: { executableHaskellDepends = [ base directory polyparse pretty ]; description = "Utilities for manipulating XML documents"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; }) {}; "Hach" = callPackage @@ -10834,20 +10807,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.7.1"; - sha256 = "1vkcs0crifjpgr1rxkbzkwyhl4zg84m5bfxkp095mgry557gqzm8"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_7_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10859,7 +10818,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -11772,6 +11730,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "JuicyPixels_3_3_6" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl + , primitive, transformers, vector, zlib + }: + mkDerivation { + pname = "JuicyPixels"; + version = "3.3.6"; + sha256 = "1f8giivsqxma19ax78dr7j4gir12iyfqn2mlsd27zzl8dn7dy6w1"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq mtl primitive + transformers vector zlib + ]; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "JuicyPixels-blp" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, directory , filepath, hashable, JuicyPixels, optparse-simple, text-show @@ -18147,8 +18122,8 @@ self: { pname = "SecureHash-SHA3"; version = "0.1.1.0"; sha256 = "0dva3bzfzyzh8kxljyipd041a2w1zhxjvxmhnw2mlv2jcywnk2hz"; - revision = "2"; - editedCabalFile = "0rvalvvjadb0i0rh9z5lgw2hca4a9yw3cg2f6gcx7h30f5dp8x1j"; + revision = "3"; + editedCabalFile = "0jsx09bjk98nvfy0fvr5n2dyx8s22xnq66dvniyl572g5kfyknwm"; libraryHaskellDepends = [ base bytestring ]; description = "simple static linked SHA3 using private symbols and the ref impl"; license = lib.licenses.bsd2; @@ -18461,7 +18436,6 @@ self: { ]; description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-backend-snabbdom" = callPackage @@ -18492,7 +18466,6 @@ self: { libraryHaskellDepends = [ base compactable Shpadoinkle text ]; description = "A backend for rendering Shpadoinkle as Text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-console" = callPackage @@ -18538,7 +18511,6 @@ self: { ]; description = "Chrome extension to aide in development"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-disembodied" = callPackage @@ -18609,7 +18581,6 @@ self: { ]; description = "A typed, template generated Html DSL, and helpers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-isreal" = callPackage @@ -18704,7 +18675,6 @@ self: { ]; description = "Read standard file formats into Shpadoinkle with Template Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-widgets" = callPackage @@ -18729,7 +18699,6 @@ self: { ]; description = "A collection of common reusable types and components"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Shrub" = callPackage @@ -19078,16 +19047,18 @@ self: { }) {}; "SpaceInvaders" = callPackage - ({ mkDerivation, array, base, HGL, random, Yampa }: + ({ mkDerivation, array, base, deepseq, HGL, random + , simple-affine-space, Yampa + }: mkDerivation { pname = "SpaceInvaders"; - version = "0.4.5"; - sha256 = "1nf50gdjdm7bwxzg5ligly9v1hkkdmqd8b1f8637a9bg8sz1rzbd"; - revision = "1"; - editedCabalFile = "0s21i9snp7734amqd6q7ckbj77vsnl0mi2k939ha0phfvdisb5gy"; + version = "0.13.3"; + sha256 = "0gl1cs2msc7c8vs4zknl77wqmlmp2k4brv0asni6mlc6nigriq4f"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ array base HGL random Yampa ]; + executableHaskellDepends = [ + array base deepseq HGL random simple-affine-space Yampa + ]; description = "Video game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -20725,6 +20696,8 @@ self: { pname = "ValveValueKeyvalue"; version = "1.0.1.0"; sha256 = "05m75nhsz1a2zb59lkdmkv7wznljhr76k7qm2pia37dj8h5zywcy"; + revision = "1"; + editedCabalFile = "1d4n0kqypzrcbxaq43aiw5zaq12ncws5c50ckyzvky4cs208g0is"; libraryHaskellDepends = [ base parsec ]; description = "A Valve Value-keyvalue parser for Haskell made with Parsec"; license = lib.licenses.mit; @@ -20913,8 +20886,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.7.1"; - sha256 = "1h9kz02s7ams9fw9x8k947nzji2b82s9xn2yvqzys14ypzc34qpn"; + version = "0.7.2"; + sha256 = "1hdiwm79qmf24rx1wcmc48ykbiy3pfnn0kbg77wfp0rnq7qlcknc"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21951,8 +21924,8 @@ self: { ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.13.2"; - sha256 = "0y0jmk9cbcnhwdrjcacx5j8gb64aj61a04nxizwbds0zvibcdzgb"; + version = "0.13.3"; + sha256 = "06w2glnn5w97bjmwl88j46xkr2mkvgy5a2wwwzqq168awn436kk3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24513,6 +24486,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson_2_0_1_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat + , base-compat-batteries, base-orphans, base16-bytestring + , bytestring, containers, data-fix, deepseq, Diff, directory, dlist + , filepath, generic-deriving, ghc-prim, hashable + , indexed-traversable, integer-logarithms, primitive, QuickCheck + , quickcheck-instances, scientific, semialign, strict, tagged + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, text, th-abstraction, these, time, time-compat + , unordered-containers, uuid-types, vector, witherable + }: + mkDerivation { + pname = "aeson"; + version = "2.0.1.0"; + sha256 = "0zlplkgsv1czp4rvi9k6pyyrfgd6vcdkj9vq84dr9zf7pzi8fl1s"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries bytestring containers + data-fix deepseq dlist ghc-prim hashable indexed-traversable + primitive scientific semialign strict tagged template-haskell text + th-abstraction these time time-compat unordered-containers + uuid-types vector witherable + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers data-fix Diff directory dlist filepath + generic-deriving ghc-prim hashable integer-logarithms QuickCheck + quickcheck-instances scientific strict tagged tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text these time + time-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -24639,6 +24647,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-commit_1_4" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, hspec, mtl, text }: + mkDerivation { + pname = "aeson-commit"; + version = "1.4"; + sha256 = "1xbck5hcbfqm2kc3yzrl1dzdmjl9zf84vc33ird3c50ny884amwa"; + libraryHaskellDepends = [ aeson base mtl text ]; + testHaskellDepends = [ aeson aeson-qq base hspec text ]; + description = "Parse Aeson data with commitment"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-compat" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , base-compat, base-orphans, bytestring, containers, exceptions @@ -24667,6 +24688,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-compat_0_3_10" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , base-compat, base-orphans, bytestring, containers, exceptions + , hashable, QuickCheck, quickcheck-instances, scientific, tagged + , tasty, tasty-hunit, tasty-quickcheck, text, time + , time-locale-compat, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.10"; + sha256 = "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-iso8601 base base-compat bytestring + containers exceptions hashable scientific tagged text time + time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat base-orphans bytestring + containers exceptions hashable QuickCheck quickcheck-instances + scientific tagged tasty tasty-hunit tasty-quickcheck text time + time-locale-compat unordered-containers vector + ]; + description = "Compatibility layer for aeson"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-decode" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, data-default , hedgehog, text, time, unordered-containers, vector @@ -24775,10 +24823,8 @@ self: { }: mkDerivation { pname = "aeson-extra"; - version = "0.5"; - sha256 = "0nlp6bwb8zynfncfzr05fi9acfs8n2fkz4anm2c0g97dk2ziq213"; - revision = "2"; - editedCabalFile = "02c6rjwm8dyijfcj2wvhx1s9pd3d37g9yqgih4x80na533naps31"; + version = "0.5.1"; + sha256 = "13d01hppx71cm7f901n1bd0hxj69ikbp57i6ckfygc6da0mg49jc"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions hashable parsec @@ -24988,8 +25034,8 @@ self: { }: mkDerivation { pname = "aeson-match-qq"; - version = "1.2.0"; - sha256 = "000dna5xs5ybhr4vyla6ndj7ykk7lphg4dbcp7nn13746fnnggs2"; + version = "1.3.0"; + sha256 = "1jxw5rg8sj0913h9ldknhikpq7avlwj0lmqx613zsr9kv4yhz1qh"; libraryHaskellDepends = [ aeson attoparsec base bytestring either haskell-src-meta scientific template-haskell text unordered-containers vector @@ -25057,6 +25103,24 @@ self: { license = lib.licenses.mit; }) {}; + "aeson-optics_1_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , optics-core, optics-extra, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "aeson-optics"; + version = "1.1.1"; + sha256 = "1na5nsbp4sds8q289knzj4rgiwabbinxm0ihh66jfz0sjiia4wp7"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring optics-core + optics-extra scientific text unordered-containers vector + ]; + description = "Law-abiding optics for aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-options" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -25125,6 +25189,8 @@ self: { pname = "aeson-pretty"; version = "0.8.8"; sha256 = "09n7gs91y1fbw6gjszrd2na3isnvk3y5rsi90lzjrwywnqfadkl1"; + revision = "1"; + editedCabalFile = "0xr8f76vmcdvlg8wvw0jdrzpzqy73d4rvf633wfwhmslfr7f5jvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25159,6 +25225,29 @@ self: { license = lib.licenses.mit; }) {}; + "aeson-qq_0_8_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim + , haskell-src-meta, hspec, hspec-discover, parsec, scientific + , template-haskell, text, vector + }: + mkDerivation { + pname = "aeson-qq"; + version = "0.8.4"; + sha256 = "0dpklq2xdhrkg1rdc7zfdjnzm6c3qxx2i1xskrqdxpqi84ffnlyh"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat haskell-src-meta parsec + scientific template-haskell text vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec + parsec scientific template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "JSON quasiquoter for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-quick" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, microlens, tasty, tasty-hunit, text @@ -25252,6 +25341,37 @@ self: { broken = true; }) {}; + "aeson-schemas_1_3_5" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq + , first-class-families, hashable, hint, interpolate, megaparsec + , QuickCheck, raw-strings-qq, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-orphans + , th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.3.5"; + sha256 = "1fdq109yjmvixri7hamj8z0iryxxdja8kkm6pk54mi0az0vx9743"; + libraryHaskellDepends = [ + aeson base first-class-families hashable megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base deepseq first-class-families hashable hint + interpolate megaparsec QuickCheck raw-strings-qq tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text th-orphans + th-test-utils unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq first-class-families hashable + megaparsec template-haskell text th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -27987,8 +28107,8 @@ self: { pname = "amazonka-core"; version = "1.6.1"; sha256 = "0hx250dja1l4n4y5115w0qngzlqj8f6p861sdaykh0yjm4nzb621"; - revision = "1"; - editedCabalFile = "1656dyw6fk3gvph6v3xzvdp3p8xny3ji0gxg7qxvmvn60gj9ricv"; + revision = "2"; + editedCabalFile = "15mwn2cv4f99rb53wzk7hplb6ncpcl7crsvj8dx71ymm60cf2kxr"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -30516,8 +30636,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.1.1.0"; - sha256 = "07b4sxx36r604j2q3xyk1y962c6fgy091ly4gc27v49zhmfrmypr"; + version = "1.2.1.0"; + sha256 = "1gzqf0dby0w25nbz6lzlb4b7jgxydv09wqfcvbcfjwn0wg76wfvc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32791,6 +32911,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "argo" = callPackage + ({ mkDerivation, array, base, bytestring, deepseq, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "argo"; + version = "0.2021.10.13"; + sha256 = "1jlw1v0kzcapc0ziax15hxgvb86q7cby7dpsqlrygw0y72w05w9q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base bytestring deepseq text ]; + executableHaskellDepends = [ array base bytestring deepseq text ]; + testHaskellDepends = [ + array base bytestring deepseq tasty tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + array base bytestring deepseq tasty-bench text + ]; + description = "Parse and render JSON"; + license = lib.licenses.mit; + }) {}; + "argon" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , containers, directory, docopt, filepath, ghc, ghc-paths @@ -33557,12 +33700,13 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.0.1.4"; - sha256 = "0j0cx91q4kmljv2fnfa1cllmyyk2wr6vg373bdfq0cx79d6542hw"; + version = "1.0.1.6"; + sha256 = "1bxii5r24p7i68h37m6q7bjqy9fgp6s33ia9s62hwh70xkkcm8yw"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-predicates ascii-superset ascii-th base bytestring data-ascii text ]; + testHaskellDepends = [ base text ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; }) {}; @@ -33602,17 +33746,6 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-case"; - version = "1.0.0.4"; - sha256 = "1485y33as83f1iprdq7hl6ar7gha85678ajq80jld06wsmi9k0xa"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-case"; @@ -33622,21 +33755,9 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-char" = callPackage - ({ mkDerivation, base, hashable }: - mkDerivation { - pname = "ascii-char"; - version = "1.0.0.8"; - sha256 = "1ajpkzq1d04ww5yif7dl4np5zhhm5ks8wxhmfdl8ygy8r7akg50d"; - libraryHaskellDepends = [ base hashable ]; - description = "A Char type representing an ASCII character"; - license = lib.licenses.asl20; - }) {}; - - "ascii-char_1_0_0_10" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { pname = "ascii-char"; @@ -33646,7 +33767,6 @@ self: { testHaskellDepends = [ base ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-cows" = callPackage @@ -33677,17 +33797,6 @@ self: { }) {}; "ascii-group" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-group"; - version = "1.0.0.4"; - sha256 = "0h1y0dmly3yammmqwa197nf3g83x03r5jlnsv9z9zxm9bin38ac5"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-group"; @@ -33697,7 +33806,6 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -33716,17 +33824,6 @@ self: { }) {}; "ascii-predicates" = callPackage - ({ mkDerivation, ascii-char, base }: - mkDerivation { - pname = "ascii-predicates"; - version = "1.0.0.4"; - sha256 = "0c2331y1izxw7n33pfxfb7krz4lgdf87244xlnf03x8npckb7kgq"; - libraryHaskellDepends = [ ascii-char base ]; - description = "Various categorizations of ASCII characters"; - license = lib.licenses.asl20; - }) {}; - - "ascii-predicates_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base }: mkDerivation { pname = "ascii-predicates"; @@ -33736,7 +33833,6 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "Various categorizations of ASCII characters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -33784,19 +33880,6 @@ self: { }) {}; "ascii-superset" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: - mkDerivation { - pname = "ascii-superset"; - version = "1.0.1.4"; - sha256 = "1bjkinz2p8lq4grnj5d9q1z9jsn4b8cgkqsnxjhzb3plz94i5mxk"; - libraryHaskellDepends = [ - ascii-char base bytestring hashable text - ]; - description = "Representing ASCII with refined supersets"; - license = lib.licenses.asl20; - }) {}; - - "ascii-superset_1_0_1_6" = callPackage ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; @@ -33808,7 +33891,6 @@ self: { testHaskellDepends = [ ascii-char base text ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -33829,20 +33911,6 @@ self: { }) {}; "ascii-th" = callPackage - ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell - }: - mkDerivation { - pname = "ascii-th"; - version = "1.0.0.4"; - sha256 = "08vfy2gp0ppa3l95gjqrbqca3gn2aln7zvw7qpp6x7jnzjkl8dn1"; - libraryHaskellDepends = [ - ascii-char ascii-superset base template-haskell - ]; - description = "Template Haskell support for ASCII"; - license = lib.licenses.asl20; - }) {}; - - "ascii-th_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, ascii-superset, base, bytestring , template-haskell, text }: @@ -33858,7 +33926,6 @@ self: { ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-vector-avc" = callPackage @@ -34528,24 +34595,6 @@ self: { }) {}; "async" = callPackage - ({ mkDerivation, base, hashable, HUnit, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; - version = "2.2.3"; - sha256 = "0p4k6872pj0aykbnc19ilam1h8fgskxlwpyg5qisaivr0fhg6yj6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base hashable stm ]; - testHaskellDepends = [ - base HUnit stm test-framework test-framework-hunit - ]; - description = "Run IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "async_2_2_4" = callPackage ({ mkDerivation, base, hashable, HUnit, stm, test-framework , test-framework-hunit }: @@ -34561,7 +34610,6 @@ self: { ]; description = "Run IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "async-ajax" = callPackage @@ -35278,15 +35326,28 @@ self: { }) {}; "attenuation" = callPackage - ({ mkDerivation, base, profunctors }: + ({ mkDerivation, base, constraints }: mkDerivation { pname = "attenuation"; - version = "0.1.0.0"; - sha256 = "0swiqnh34654rljydbd91nbkpgi1x816b7y3f57i4qnync29nsd0"; + version = "0.2.0"; + sha256 = "0qp203qchmllxsrcfz04lxnssrij203i5q8byy159vc8cspd03nq"; revision = "1"; - editedCabalFile = "1bh0ydj5fywx8zcgvfb40092jb09njj2kk09kg7gfvq2fvpz5whr"; - libraryHaskellDepends = [ base profunctors ]; - description = "Representational subtyping relations and variance roles"; + editedCabalFile = "11h8m92hb0spgzvbijkgfbhbhrnf76a8w2z6yw8zahk0bgdqxrzi"; + libraryHaskellDepends = [ base constraints ]; + description = "Subtyping relations and variance roles"; + license = lib.licenses.asl20; + }) {}; + + "attenuation-profunctors" = callPackage + ({ mkDerivation, attenuation, base, constraints, profunctors }: + mkDerivation { + pname = "attenuation-profunctors"; + version = "0.1.0"; + sha256 = "11zhh9iwb7r2jfp9bn8bqx1wzl4mln9v80gb2jijp0rryag25ili"; + libraryHaskellDepends = [ + attenuation base constraints profunctors + ]; + description = "Attenuation support for Profunctors"; license = lib.licenses.asl20; }) {}; @@ -35887,6 +35948,8 @@ self: { pname = "authenticate"; version = "1.3.5"; sha256 = "10df40ycd4r45p58xzdh0vcsa401909fa99nkgd18fx5alqh84sz"; + revision = "1"; + editedCabalFile = "0lmb1m5d1l2scnm2fqxfk348m8xqbc7f7kvk7zvpsvcdcpxinafz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring case-insensitive conduit containers html-conduit http-conduit http-types network-uri @@ -36655,6 +36718,8 @@ self: { pname = "aws"; version = "0.22"; sha256 = "1l3f94mpih7slz37ikyjkyrwvlf110w87997d8sbnbd8glwlcb8r"; + revision = "1"; + editedCabalFile = "1xj2chcn73v45wxb3lr0b3px6p3gbbzvwgx1mqrds4lp2yy7a1cr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38948,8 +39013,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "9"; - editedCabalFile = "003vi0psr8s5whjy1qw43swiw1g1l1mxa962xqz9fdpxbmvlanfy"; + revision = "10"; + editedCabalFile = "0d9nd34ga5xhgkvbysqzyn03w3zi42hgfjk6cza2ymiqxrl2yk9m"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -39294,6 +39359,7 @@ self: { ]; description = "An Applicative Functor deferring actions to run in a batch later"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "battlenet" = callPackage @@ -41140,6 +41206,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-instances_1_0_2" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring + , case-insensitive, hashable, QuickCheck, quickcheck-instances + , scientific, tagged, tasty, tasty-quickcheck, text, text-binary + , time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1.0.2"; + sha256 = "10z29k35clq74ma2f0yrkbyf14wdax1zzgb6mn26ja4vp9f5wc14"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + scientific tagged text text-binary time-compat unordered-containers + vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary bytestring case-insensitive hashable QuickCheck + quickcheck-instances scientific tagged tasty tasty-quickcheck text + time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-io" = callPackage ({ mkDerivation, async, base, binary, bytestring, concurrency , deque, exceptions, hspec, process, stm, transformers @@ -41414,6 +41506,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-tagged_0_3_1" = callPackage + ({ mkDerivation, array, base, base16-bytestring, binary + , binary-instances, bytestring, containers, criterion, deepseq + , QuickCheck, quickcheck-instances, singleton-bool, structured + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "binary-tagged"; + version = "0.3.1"; + sha256 = "01d1wb8h5mz76l09r2azphvhm1y3nar8pqrh2waxn797bd2dh6fp"; + libraryHaskellDepends = [ + array base base16-bytestring binary bytestring containers + structured tagged + ]; + testHaskellDepends = [ + base binary binary-instances bytestring QuickCheck + quickcheck-instances singleton-bool tagged tasty tasty-hunit + tasty-quickcheck transformers + ]; + benchmarkHaskellDepends = [ + base binary binary-instances bytestring criterion deepseq text + unordered-containers + ]; + description = "Tagged binary serialisation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-tree" = callPackage ({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq , doctest, ghc-prim, HUnit, QuickCheck, random, test-framework @@ -43731,6 +43852,8 @@ self: { pname = "bitwise-enum"; version = "1.0.1.0"; sha256 = "0vmdr8csmxwab7s4nmqdfpqdssivh90fddk94i8wkwj1la867y1z"; + revision = "1"; + editedCabalFile = "0g4w46bv0pj52v3kfcc41g9m750il67fg78n54s91p6jam6l0r6h"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -43973,8 +44096,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "3"; - editedCabalFile = "0bdl3xbxj2dpg5gv1h0561hhjjs6pp3bkgrg18gpl3pbksmr9q8j"; + revision = "4"; + editedCabalFile = "0lxslpm4s98ddh12py9810k2q872vizphfrszp8gxkkvfzflbb5b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -44712,6 +44835,8 @@ self: { pname = "bloodhound"; version = "0.16.0.0"; sha256 = "0g4x2g0qmwgfrz39iwwagrr7p19fmmz1fpfk29bkmvqvbfvsjgqz"; + revision = "1"; + editedCabalFile = "129sx2n094p2y7k8hf1cpr84hw2z9lk37l1w515r85n09ckkyb2l"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers exceptions hashable http-client http-types mtl network-uri scientific semigroups semver @@ -45038,6 +45163,8 @@ self: { pname = "bnb-staking-csvs"; version = "0.2.0.0"; sha256 = "1m2bd6cwlgavq3nri3xwbqim2zikzv1dxqf5a5gxkqra1qgbvm4v"; + revision = "1"; + editedCabalFile = "066nk1wjxlwh1dqhgr4yalch45w09p032whbvs5rin18airixyk3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47285,6 +47412,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "bugsnag-hs_0_2_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client + , text, time, unordered-containers + }: + mkDerivation { + pname = "bugsnag-hs"; + version = "0.2.0.5"; + sha256 = "1gm38w8vjgxmn2a9a7xr364pcv7vsvd3brf90hwbwh7y88q6jdn2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring http-client text time unordered-containers + ]; + testHaskellDepends = [ aeson base bytestring hedgehog ]; + description = "A Bugsnag client for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bugzilla" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, data-default, http-conduit, http-types, iso8601-time @@ -47328,6 +47473,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "bugzilla-redhat_0_3_3" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection + , containers, hspec, http-conduit, http-types, iso8601-time + , resourcet, text, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "bugzilla-redhat"; + version = "0.3.3"; + sha256 = "1nslky0rc868hyx11s0bvlz6r4mvagknhwmnlqvgcnlfbg6xni4d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring connection containers + http-conduit http-types iso8601-time resourcet text time + transformers unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec time ]; + description = "A Haskell interface to the Bugzilla native REST API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "build" = callPackage ({ mkDerivation, algebraic-graphs, base, containers, extra , filepath, mtl, random, transformers @@ -48149,10 +48316,8 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.7.0"; - sha256 = "13dc4cwiga63wmnw9hl332d8gvqjl4yl0p09z2pkmwl81br7ybrc"; - revision = "1"; - editedCabalFile = "0jwax6jdzfcy007dqwdza1r4q8s12ly2gpzpaqy8gi52ap6xc05x"; + version = "0.3.8.0"; + sha256 = "0rfqpnc1awnpn50yfjxgwb65byhdcg5rivg3mbsd5clmq337cz12"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -49011,6 +49176,8 @@ self: { pname = "ca-province-codes"; version = "1.0.0.0"; sha256 = "1lhmmqn83v9bflm4x2nqbxx6pjh393id29syglinaqal4dvl5qq3"; + revision = "1"; + editedCabalFile = "0502zw8bbx6761s8dfnmbnw475y9x2ikk8s281j1fd1db3wdv17l"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base hspec QuickCheck text ]; description = "ISO 3166-2:CA Province Codes and Names"; @@ -49586,8 +49753,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "3.6.0.0"; - sha256 = "0ishq4n1jn0kll8257akrzm95lg9ryhyp9pzypcikgvqhl0sz741"; + version = "3.6.2.0"; + sha256 = "0dihpm4h3xh13vnpvwflnb7v614qdvljycc6ffg5cvhwbwfrxyfw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -49710,6 +49877,8 @@ self: { pname = "cabal-install-parsers"; version = "0.4.3"; sha256 = "0gpnfv80rhrws12b1klyi5fkqvn8pgnl2hxh5fbnfp8fbrwklfjq"; + revision = "1"; + editedCabalFile = "18ngagasjind29r0840rnsjzzki92q01yi1p0fw4i5p129mczc8n"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko @@ -49859,6 +50028,34 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "cabal-plan_0_7_2_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat + , base16-bytestring, bytestring, containers, directory, filepath + , mtl, optics-core, optparse-applicative, parsec, process + , semialign, singleton-bool, text, these, topograph, transformers + , vector + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.7.2.1"; + sha256 = "0n45bakzf1r1nyvs76fmrj0cf74knqnpyb2i82baxia0falbp48r"; + configureFlags = [ "-fexe" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal async base base-compat bytestring containers + directory mtl optics-core optparse-applicative parsec process + semialign singleton-bool text these topograph transformers vector + ]; + description = "Library and utility for processing cabal's plan.json file"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-progdeps" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -51148,8 +51345,8 @@ self: { }: mkDerivation { pname = "camfort"; - version = "1.1.1"; - sha256 = "173k5mf2w4ba553j8qh5biljw3xhrk0qipix72cx8xd0vadkh62f"; + version = "1.1.2"; + sha256 = "13a6x4j4f95izwz7g5sykpb2pq4lzwcswi31986gkyl6nicn5cfj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53358,6 +53555,8 @@ self: { pname = "cereal"; version = "0.5.8.1"; sha256 = "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id"; + revision = "1"; + editedCabalFile = "02v1nivac478nzzykjbq3rawnqskxjc4sb54m6s5jcgbigfnb2x0"; libraryHaskellDepends = [ array base bytestring containers ghc-prim ]; @@ -55507,10 +55706,8 @@ self: { }: mkDerivation { pname = "cipher-aes128"; - version = "0.7.0.5"; - sha256 = "1bafr5aa9mjfzdgc6gwapvb9g04pyh4lwhv2x2m1v3ljjglg9d1w"; - revision = "1"; - editedCabalFile = "0miqp8jvgsqkgj5rxb2vjwa24ac5kdyy3b2cwxb9z0wk1ixk5ilm"; + version = "0.7.0.6"; + sha256 = "1pcxmgj9i8g3yl502lpywc75dilmaszlzixpd7wqjqr7lvasa117"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -56240,6 +56437,37 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-ghc_1_4_5" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim + , ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp + , lens, mtl, primitive, process, reflection, split + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.4.5"; + sha256 = "1qss6wic91fwbdjmi8bk5hwv282xs7rfxx4zhp0px5dqp2s8kc6v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory exceptions extra + filepath ghc ghc-boot ghc-prim ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable + haskeline integer-gmp lens mtl primitive process reflection split + template-haskell text time transformers uniplate unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "Clash: a functional hardware description language - GHC frontend"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring @@ -56283,6 +56511,49 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-lib_1_4_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array + , attoparsec, base, base16-bytestring, binary, bytestring + , clash-prelude, concurrent-supply, containers, cryptohash-sha256 + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, pretty-show, prettyprinter + , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.4.5"; + sha256 = "1xbh513l3xg2xh7s9zkqxp2qwf9p2qhmp0xbj91r706av1cilyxi"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array attoparsec base + base16-bytestring binary bytestring clash-prelude concurrent-supply + containers cryptohash-sha256 data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers pretty-show prettyprinter + primitive process reducers template-haskell temporary terminal-size + text text-show time transformers trifecta unordered-containers + utf8-string vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson aeson-pretty base base16-bytestring bytestring clash-prelude + concurrent-supply containers data-default deepseq ghc + ghc-typelits-knownnat haskell-src-exts lens pretty-show + quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell + text transformers unordered-containers + ]; + description = "Clash: a functional hardware description language - As a library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -56340,6 +56611,48 @@ self: { broken = true; }) {}; + "clash-prelude_1_4_5" = callPackage + ({ mkDerivation, array, arrows, base, bifunctors, binary + , bytestring, Cabal, cabal-doctest, constraints, containers + , criterion, data-binary-ieee754, data-default-class, deepseq + , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hedgehog, hint + , integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, text-show, th-abstraction + , th-lift, th-orphans, time, transformers, type-errors, uniplate + , vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.4.5"; + sha256 = "0hikw8n0agjq5x4rfnklb9wixdbcn8snfh3rzb4r8j5b187j1brk"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array arrows base bifunctors binary bytestring constraints + containers data-binary-ieee754 data-default-class deepseq ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + text-show th-abstraction th-lift th-orphans time transformers + type-errors uniplate vector + ]; + testHaskellDepends = [ + base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base + tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Clash: a functional hardware description language - Prelude library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -58504,23 +58817,24 @@ self: { "cobot" = callPackage ({ mkDerivation, array, base, bytestring, clock, containers , criterion, deepseq, hspec, lens, linear, megaparsec, mtl - , parallel, random, split, template-haskell, text + , parallel, random, split, template-haskell, text, vector }: mkDerivation { pname = "cobot"; - version = "0.1.1.4"; - sha256 = "0sskb87cjq6b6splwyl4dc11vwyx4jqp4xwdsgk78awfl1zcqhxd"; + version = "0.1.1.7"; + sha256 = "12g2vfb224lax59pv6jd4061v0bdzk91w0dc034p6mzm02dpxhqr"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl - split template-haskell text + split template-haskell text vector ]; testHaskellDepends = [ array base bytestring containers deepseq hspec lens linear - megaparsec mtl split template-haskell text + megaparsec mtl split template-haskell text vector ]; benchmarkHaskellDepends = [ array base bytestring clock containers criterion deepseq lens linear megaparsec mtl parallel random split template-haskell text + vector ]; description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering"; license = lib.licenses.bsd3; @@ -60511,8 +60825,6 @@ self: { libraryHaskellDepends = [ base containers transformers vector ]; description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compactmap" = callPackage @@ -63073,8 +63385,8 @@ self: { }: mkDerivation { pname = "configuration-tools"; - version = "0.6.0"; - sha256 = "1lncsh3dfl8iz1yr2b0mmpcdyww3cbr3jglp85iqmpvzv66m2kbg"; + version = "0.6.1"; + sha256 = "1gindjq9vd0fmsw6smwd3syz3k3bfkzsgmchqg6jllr6bhgvykjy"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -63819,8 +64131,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.2.0.4"; - sha256 = "0rssm2ygr395djjzkrzcq3vylc83k58flwcpqb4cb3w1id55ph5r"; + version = "2.2.0.5"; + sha256 = "1ramqz680xfh47p5kijcp58nby687lm5vacfxpz57a3p01j39y8s"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -65050,6 +65362,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "core-data_0_2_1_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.1.10"; + sha256 = "151b8kym71dklgynyjsbzpggbyw7wysa8bv1pkpy94jdbflmlpaf"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + scientific text unordered-containers vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -65088,6 +65418,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_2_12_0" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.12.0"; + sha256 = "0gl1cv82h2ax8gf1jjqphkj2481plz64jqq497rvyy2cpqv72kvr"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text @@ -65105,6 +65457,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_4_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.4.0"; + sha256 = "1013s28p90fifkkqldh35wrdrs86fhan0r8q54imb7b8c7lasj3r"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -66543,8 +66913,8 @@ self: { pname = "criterion"; version = "1.5.10.0"; sha256 = "0akws27z3i9381xrb0p0h5qicz4w5nnxy8jq7gk68gi50gj0flxq"; - revision = "1"; - editedCabalFile = "0j5cmc0w5m4fy28531f79dmbv3la51zh7k14l3kq3ix835crmmbz"; + revision = "2"; + editedCabalFile = "11jdxivx971fbwrg8g0pq365kg6zr6gs06zc5jcjhj34pyr6xpdr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66568,6 +66938,44 @@ self: { license = lib.licenses.bsd3; }) {}; + "criterion_1_5_11_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, binary-orphans, bytestring + , cassava, code-page, containers, criterion-measurement, deepseq + , directory, exceptions, filepath, Glob, HUnit, js-chart + , microstache, mtl, mwc-random, optparse-applicative, parsec + , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers, transformers-compat, vector + , vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.5.11.0"; + sha256 = "1lwawng4rmhmqqn8gsalfn4xj2n19gwz7pl4wjssicl5qgmnvp8s"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat-batteries binary + binary-orphans bytestring cassava code-page containers + criterion-measurement deepseq directory exceptions filepath Glob + js-chart microstache mtl mwc-random optparse-applicative parsec + statistics text time transformers transformers-compat vector + vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat-batteries optparse-applicative + ]; + testHaskellDepends = [ + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + description = "Robust, reliable performance measurement and analysis"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "criterion-cmp" = callPackage ({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava , containers, filepath, optparse-applicative, vector @@ -67463,6 +67871,28 @@ self: { broken = true; }) {cryptohash-sha256-pure = null;}; + "cryptohash-sha256_0_11_102_1" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , SHA, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "cryptohash-sha256"; + version = "0.11.102.1"; + sha256 = "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"; + configureFlags = [ "-fuse-cbits" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base base16-bytestring bytestring SHA tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "Fast, pure and practical SHA-256 implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptohash-sha512" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , SHA, tasty, tasty-hunit, tasty-quickcheck @@ -67542,14 +67972,14 @@ self: { , criterion, cryptohash-sha1, deepseq, directory, exceptions, extra , filepath, ghc-prim, gitrev, GraphSCC, happy, haskeline, heredoc , integer-gmp, libBF, MemoTrie, monad-control, monadLib, mtl - , optparse-applicative, panic, parameterized-utils, pretty, process - , random, sbv, simple-smt, stm, strict, temporary, text, tf-random + , optparse-applicative, panic, parameterized-utils, prettyprinter + , process, sbv, simple-smt, stm, strict, temporary, text, tf-random , time, transformers, transformers-base, what4 }: mkDerivation { pname = "cryptol"; - version = "2.11.0"; - sha256 = "05h751lxyym27b5kfrcss5vjg4ifpl4lqgxvvp6fz4mpbigm7ds3"; + version = "2.12.0"; + sha256 = "13h5bd6xqh3x6jqdv8a25ffyj10wdyam0flzpdxi4zd23z5b2ihp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -67557,14 +67987,14 @@ self: { array async base base-compat bv-sized bytestring containers cryptohash-sha1 deepseq directory exceptions filepath ghc-prim gitrev GraphSCC heredoc integer-gmp libBF MemoTrie monad-control - monadLib mtl panic parameterized-utils pretty process random sbv + monadLib mtl panic parameterized-utils prettyprinter process sbv simple-smt stm strict text tf-random time transformers-base what4 ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ ansi-terminal base base-compat blaze-html containers directory - extra filepath haskeline monad-control mtl optparse-applicative - process temporary text transformers + exceptions extra filepath haskeline monad-control mtl + optparse-applicative process temporary text transformers ]; benchmarkHaskellDepends = [ base criterion deepseq directory filepath sbv text @@ -67790,8 +68220,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.4.1"; - sha256 = "0dyafw91ycsr71sxf7z3fbvfbp9vh8l260l9ygfxlrg37971l4pj"; + version = "5.4.3"; + sha256 = "00hd0sb1787cx7yppg2f3zkd3y8d75fsmf460qnsxc77m4qw5388"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -67808,8 +68238,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.7"; - sha256 = "1qx9qig18y89k4sxpn333hvqz74c6f56nbvaf8dfbawx5asar0jm"; + version = "0.3.8"; + sha256 = "0q94d228zsjrnjzl3w11i4cqdnx3w1mcvsrf3w6jrvysrn1zskbz"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse deriving-compat hashable transformers wl-pprint @@ -67841,8 +68271,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.5"; - sha256 = "1bid3wxg879l69w8c1vcana0xxrggxv30dw9bqi8zww2w23id54q"; + version = "0.2.7"; + sha256 = "1mh1mfyi2vx8ykyc1ca8vpbi545fkp7f0ss5nw6dkykl6zm7pj6d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -73770,8 +74200,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.4.4.0"; - sha256 = "1qknqh9j7nvyy15zfi3prx6bifp2nd72kgfd085p478z887i71r4"; + version = "0.4.5.0"; + sha256 = "0hmyfq7xkz3l7d2f3d9ax782b6h0vvq1cfcxxnj1dg29hrnpd1ja"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ base doctest mtl rank2classes sop-core tasty tasty-hunit @@ -73790,8 +74220,8 @@ self: { }: mkDerivation { pname = "dep-t-advice"; - version = "0.4.6.0"; - sha256 = "1v1nn0qbr3l7hh3f5aw6ril8ifzg6r8im7gpyj5plfbp272v4gs9"; + version = "0.4.6.1"; + sha256 = "1afr4qjzxvf4h56l0m1zjxy2m9vxs51wj1rcvxpqr3q9hvdg17vx"; libraryHaskellDepends = [ base dep-t sop-core transformers ]; testHaskellDepends = [ barbies base dep-t doctest mtl rank2classes sop-core tasty @@ -73852,10 +74282,12 @@ self: { pname = "dependent-literals"; version = "0.1.1.0"; sha256 = "0dw2xc5l8cmhsmr2akyyhyfj8m3qx02pz81fn52ii9mkhzs6rcjb"; + revision = "2"; + editedCabalFile = "1l3fns5gi8l5bav6z3ymvp93i1cq59f9b6p3dc496c0rmkh01kjq"; libraryHaskellDepends = [ base fin-int numeric-kinds sint snumber tagged wrapped ]; - description = "Provides library support for pseudo-dependently-typed int literals"; + description = "Library for dependent-literals-plugin"; license = lib.licenses.asl20; }) {}; @@ -73867,13 +74299,16 @@ self: { pname = "dependent-literals-plugin"; version = "0.1.0.1"; sha256 = "1rpjlcv3g150rcmxidn48n25xxv2ghdz4x9jnap1swkz0fb10i3a"; + revision = "2"; + editedCabalFile = "1bfsv402cxwhwz22gqj8p0grr4wb9ynsd2swnwy1m6xdsfi1wdy4"; libraryHaskellDepends = [ base ghc syb ]; testHaskellDepends = [ base dependent-literals fin-int numeric-kinds short-vec sint snumber wrapped ]; - description = "Rewrites integer literals to a pseudo-dependently-typed form"; + description = "Dependent integer literals"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "dependent-map_0_2_4_0" = callPackage @@ -74338,6 +74773,8 @@ self: { pname = "deriving-aeson"; version = "0.2.7"; sha256 = "02mx8z1cgqn9wgwcp94am2g655hhn7sn12sikmm8jhbldnyv3ziz"; + revision = "1"; + editedCabalFile = "0qgkjl7h1d4w119a97wrsznnqys02mlkwv9hic1715swg0cp05ix"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -78758,8 +79195,8 @@ self: { }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.6.1"; - sha256 = "136q893in07iw53m9pqr65h3mrnpvfda272bl4rq1b0z3hzpyhkm"; + version = "1.6.2"; + sha256 = "0kq4pf5dalifxd8qxz75fazfjspn36q0cmp8d1jd7w9zlzc3c4dz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens @@ -78986,29 +79423,6 @@ self: { }) {}; "dl-fedora" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , http-client, http-client-tls, http-directory, http-types - , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args - , text, time, unix, xdg-userdirs - }: - mkDerivation { - pname = "dl-fedora"; - version = "0.9.1"; - sha256 = "1ryvgccwfs8yzhywcvgd5s9imr4w3sxdif79npfw3zk1rcnl23v4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring directory extra filepath http-client - http-client-tls http-directory http-types optparse-applicative - regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs - ]; - testHaskellDepends = [ base simple-cmd ]; - description = "Fedora image download tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - }) {}; - - "dl-fedora_0_9_2" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , http-client, http-client-tls, http-directory, http-types , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args @@ -79697,6 +80111,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "doclayout_0_3_1_1" = callPackage + ({ mkDerivation, base, containers, criterion, emojis, mtl, safe + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "doclayout"; + version = "0.3.1.1"; + sha256 = "1p9kgjlf7y4p1symvkwndgs4lvyw2c45bsgld09y9r4aiqbhdrxp"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers emojis mtl safe text ]; + testHaskellDepends = [ + base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ base criterion mtl text ]; + description = "A prettyprinting library for laying out text documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text @@ -79780,20 +80214,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "doctemplates_0_10" = callPackage + "doctemplates_0_10_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text - , text-conversions, unordered-containers, vector + , text-conversions, vector }: mkDerivation { pname = "doctemplates"; - version = "0.10"; - sha256 = "1nwav01dqxhbbmf4si8ks70lmhkldmy70m1dw89xrndvcgcynmrx"; + version = "0.10.0.1"; + sha256 = "08l8lgmvn83xwbdlh4m2jljj5gcyxiq1vjd1ggysv36d81swsg1x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe - scientific text text-conversions unordered-containers vector + scientific text text-conversions vector ]; testHaskellDepends = [ aeson base bytestring containers doclayout filepath Glob tasty @@ -83047,6 +83481,8 @@ self: { pname = "ede"; version = "0.3.2.0"; sha256 = "1y78l8b6wnl621nlfm3jwf9qskfnyd4ian1sxjsmk2jw22z1yp4d"; + revision = "1"; + editedCabalFile = "0zgz0d3qj8slkbsg4r7jdhnrr5zlq506hviq6kw20d78mafh16c0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -84257,6 +84693,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "elf_0_31" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec }: + mkDerivation { + pname = "elf"; + version = "0.31"; + sha256 = "180h5kz8wmrm6hy4myp83b2sjss7dq8wxvlqryi79qscsrz9n0ln"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ base bytestring containers hspec ]; + description = "An Elf parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "eliminators" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons, template-haskell, th-abstraction, th-desugar @@ -85448,20 +85897,20 @@ self: { ({ mkDerivation, base, containers, HUnit, text }: mkDerivation { pname = "emojis"; - version = "0.1"; - sha256 = "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss"; + version = "0.1.1"; + sha256 = "1by9mr3vrqhfzdqv5vsqh5nfhkzpz4fibnk6xcw4wa0k8zvyzrvr"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base HUnit text ]; description = "Conversion between emoji characters and their names"; license = lib.licenses.bsd3; }) {}; - "emojis_0_1_1" = callPackage + "emojis_0_1_2" = callPackage ({ mkDerivation, base, containers, HUnit, text }: mkDerivation { pname = "emojis"; - version = "0.1.1"; - sha256 = "1by9mr3vrqhfzdqv5vsqh5nfhkzpz4fibnk6xcw4wa0k8zvyzrvr"; + version = "0.1.2"; + sha256 = "09x2xrppwypi369y7rzf3ln2g7c3g9qfckn2gydxpfzglcp9rziw"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base HUnit text ]; description = "Conversion between emoji characters and their names"; @@ -87200,34 +87649,6 @@ self: { }) {}; "esqueleto" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, hspec-core, monad-logger - , mtl, mysql, mysql-simple, persistent, persistent-mysql - , persistent-postgresql, persistent-sqlite, postgresql-simple - , QuickCheck, resourcet, tagged, text, time, transformers, unliftio - , unordered-containers - }: - mkDerivation { - pname = "esqueleto"; - version = "3.5.2.2"; - sha256 = "19m4lzxhjakf1zbsvwa0xmhcln1wb8ydbsnfyhiwhgvryrhvw9ga"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec hspec-core monad-logger mtl mysql mysql-simple - persistent persistent-mysql persistent-postgresql persistent-sqlite - postgresql-simple QuickCheck resourcet tagged text time - transformers unliftio unordered-containers - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - }) {}; - - "esqueleto_3_5_3_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -87253,7 +87674,25 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; + }) {}; + + "esqueleto-pgcrypto" = callPackage + ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent + , persistent-postgresql, QuickCheck, text, transformers, unliftio + }: + mkDerivation { + pname = "esqueleto-pgcrypto"; + version = "0.1.0.0"; + sha256 = "0xxs9nk6k3v7jjcrbgm0b85bncd6rzgrgflvw2w65i6dam0yr4ix"; + libraryHaskellDepends = [ base esqueleto text ]; + testHaskellDepends = [ + base esqueleto hspec monad-logger persistent persistent-postgresql + QuickCheck text transformers unliftio + ]; + description = "Esqueleto support for the pgcrypto PostgreSQL module"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ess" = callPackage @@ -88991,6 +89430,8 @@ self: { pname = "exiftool"; version = "0.2.0.0"; sha256 = "138d25fxqz3vg62mfgmva52flyzjxd8dxr0kc7ayfil1zk3bp4jg"; + revision = "1"; + editedCabalFile = "0sgi3w8x1zlch0v3zpxrjhisxd1s6wj1qznjlm0gz2r5d1pzc03z"; libraryHaskellDepends = [ aeson base base64 bytestring hashable process scientific string-conversions temporary text unordered-containers vector @@ -89276,6 +89717,7 @@ self: { ]; description = "Monoidal Quasiquote Interpolation"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "exotic-list-monads" = callPackage @@ -93308,15 +93750,13 @@ self: { }: mkDerivation { pname = "fin-int"; - version = "0.1.0.0"; - sha256 = "0ksjc8jz3l5jh6xd7aam424vpcq1ah7dcq2r5vmh4c7hcd48fakv"; - revision = "1"; - editedCabalFile = "0fq6cliihr0dhks62nim33f0sxqs2rwn4yd7gdd67h07acimcrzf"; + version = "0.2.0"; + sha256 = "0ra5lcd3ybmv1a0l7bisjlgi7b8mywa6c6pj7n82ppyi6rqssdlh"; libraryHaskellDepends = [ attenuation base data-default-class deepseq portray portray-diff QuickCheck sint ]; - description = "The type of finite sets with elements identified by the ordinals"; + description = "Finite sets of static size"; license = lib.licenses.asl20; }) {}; @@ -93618,6 +94058,8 @@ self: { pname = "finite-table"; version = "0.1.0.1"; sha256 = "17bn5wmv5sz89yh3lh39i1armi168wxxnz6l9smcfmw334lidlv6"; + revision = "1"; + editedCabalFile = "17marqdap2mhlv90khnhygy78mn4gj9068gbz2ld4xv7q2kf3vlm"; libraryHaskellDepends = [ adjunctions base cereal data-default-class deepseq distributive fin-int indexed-traversable lens portray portray-diff short-vec @@ -93631,6 +94073,7 @@ self: { ]; description = "Types isomorphic to Fin, and Tables indexed by them"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "finite-typelits" = callPackage @@ -94653,23 +95096,26 @@ self: { }) {}; "flatparse" = callPackage - ({ mkDerivation, attoparsec, base, bytesmith, bytestring - , containers, gauge, integer-gmp, megaparsec, parsec, primitive + ({ mkDerivation, attoparsec, base, bytestring, containers, gauge + , hspec, HUnit, integer-gmp, megaparsec, parsec, primitive , template-haskell }: mkDerivation { pname = "flatparse"; - version = "0.2.2.0"; - sha256 = "13cm882c2n0p52dwn802cqgfqrgkmlrb1kaxm2l89yfpb6wqynfz"; + version = "0.3.0.0"; + sha256 = "0x6q1dwk9zr9s7rx3knm127pjnkpcqmihdzajfcmvi0ayviq984i"; libraryHaskellDepends = [ base bytestring containers integer-gmp template-haskell ]; + testHaskellDepends = [ base bytestring hspec HUnit ]; benchmarkHaskellDepends = [ - attoparsec base bytesmith bytestring gauge integer-gmp megaparsec - parsec primitive + attoparsec base bytestring gauge integer-gmp megaparsec parsec + primitive ]; description = "High-performance parsing from strict bytestrings"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "flay" = callPackage @@ -96330,6 +96776,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "forma_1_2_0" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, mtl, text }: + mkDerivation { + pname = "forma"; + version = "1.2.0"; + sha256 = "13kyggzlf156d3d3mj453jwmafyz74vk4bim3f30zxyd6syl3m5v"; + revision = "1"; + editedCabalFile = "12336x0g41hp6brl4ynw0m32kj3n191945qfgp8xaabm5qrchinj"; + libraryHaskellDepends = [ aeson base containers mtl text ]; + testHaskellDepends = [ aeson base containers hspec mtl text ]; + description = "Parse and validate forms in JSON format"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "formal" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers , directory, file-embed, HTTP, indents, interpolatedstring-perl6 @@ -98985,8 +99446,6 @@ self: { ]; description = "Tools for functor combinator-based program design"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "functor-combinators_0_4_1_0" = callPackage @@ -99016,7 +99475,6 @@ self: { description = "Tools for functor combinator-based program design"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "functor-combo" = callPackage @@ -99505,8 +99963,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.20.3"; - sha256 = "1qz8grvf8zyn549zch6d3dkhzq8dmgqigf3q62141l1q7qa3b75q"; + version = "0.20.4"; + sha256 = "0yjm0s9risrc0aj1si8i403k6b1znr8szff1f8ksb5cr9j7nn7gn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101147,32 +101605,6 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, Cabal - , cabal-doctest, contravariant, criterion, deepseq, doctest - , generic-lens, ghc-boot-th, inspection-testing, one-liner - , QuickCheck, show-combinators, tasty, tasty-hunit - , template-haskell, unordered-containers - }: - mkDerivation { - pname = "generic-data"; - version = "0.9.2.0"; - sha256 = "00zwfr21kmgcdjfjvacn4pvs5i8bl6xbbzw95746g67ap5nz624d"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ap-normalize base base-orphans contravariant ghc-boot-th - show-combinators - ]; - testHaskellDepends = [ - base doctest generic-lens inspection-testing one-liner QuickCheck - show-combinators tasty tasty-hunit template-haskell - unordered-containers - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Deriving instances with GHC.Generics and related utilities"; - license = lib.licenses.mit; - }) {}; - - "generic-data_0_9_2_1" = callPackage ({ mkDerivation, ap-normalize, base, base-orphans, contravariant , criterion, deepseq, generic-lens, ghc-boot-th, inspection-testing , one-liner, show-combinators, tasty, tasty-hunit, template-haskell @@ -101193,7 +101625,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "generic-data-surgery" = callPackage @@ -102749,6 +103180,8 @@ self: { pname = "geojson"; version = "4.0.2"; sha256 = "0csbg4pdh686bxk689968bi94njx78iv1sm5g6lp915pg6cfnd66"; + revision = "1"; + editedCabalFile = "1ry2z0hwacbdwpxjbz1zfwc24094776xqshqdkq23r2gfgyy3m3k"; libraryHaskellDepends = [ aeson base containers deepseq lens scientific semigroups text transformers validation vector @@ -102845,18 +103278,20 @@ self: { }) {inherit (pkgs) geos;}; "gerrit" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , http-client, http-client-tls, tasty, tasty-hunit, text + ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers + , directory, http-client, http-client-openssl, tasty, tasty-hunit + , text, time }: mkDerivation { pname = "gerrit"; - version = "0.1.0.0"; - sha256 = "03lcf9xvyhypzkrs6lv7dnwsxnn52vnnl6mhsbbhmpv2bf59whq2"; + version = "0.1.1.0"; + sha256 = "0qkrcf0m2rq31sqd3fqij5c0yfp5pnzj2fx3dh9cwi7dqz24jwsg"; libraryHaskellDepends = [ - aeson base bytestring containers http-client http-client-tls text + aeson aeson-casing base bytestring containers http-client + http-client-openssl text time ]; testHaskellDepends = [ - aeson base bytestring directory tasty tasty-hunit + aeson base bytestring directory tasty tasty-hunit time ]; description = "A gerrit client library"; license = lib.licenses.asl20; @@ -106670,8 +107105,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210903"; - sha256 = "1p6zgk98jmxvqdin5xsdxhgq276bjdr2spi0wabj8x0ziry97rvl"; + version = "8.20211011"; + sha256 = "02s7921ihmbndp7lk1nhhiljky02ikq4qax4mhg609qjhbl6piwd"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -107199,8 +107634,8 @@ self: { }: mkDerivation { pname = "github"; - version = "0.26"; - sha256 = "1vbskrkhmz4d3fccn3w12zgz2dbl40b2gljsm7lyd5k8hz50kds8"; + version = "0.27"; + sha256 = "0vlqsdhhjnfw9wk5vn1i8cmwa45vgczhz4nn46mwgs600xfn94am"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -107216,6 +107651,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "github-backup" = callPackage @@ -107333,7 +107770,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "github-rest_1_1_0" = callPackage + "github-rest_1_1_1" = 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 @@ -107341,8 +107778,8 @@ self: { }: mkDerivation { pname = "github-rest"; - version = "1.1.0"; - sha256 = "0xyvmc8hj3rfglnhg6xcrdsd9gbii8yzh8qw5xjdyccmdsibckx3"; + version = "1.1.1"; + sha256 = "1wf4gs3324h4pfal5qcpb65lfpm4kpmxmv4fiv6asrvhas9cwglm"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types jwt mtl scientific text time transformers unliftio unliftio-core @@ -107587,15 +108024,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_3_1_1" = callPackage + "gitlab-haskell_0_3_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-client , http-conduit, http-types, tasty, tasty-hunit, temporary, text , time, transformers, unix }: mkDerivation { pname = "gitlab-haskell"; - version = "0.3.1.1"; - sha256 = "146azh83v963njnkbcf6lacj95qx89wcvi294s3nc89bp72z8igz"; + version = "0.3.2.0"; + sha256 = "1ibsb4wyavyb6s64czy1pdbcskfwn96wcky4vlpr0r1f8gjpym5s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-client http-conduit @@ -110079,6 +110516,8 @@ self: { pname = "gogol-core"; version = "0.5.0"; sha256 = "0xvlrx4hzhwp3slinh8apnxlgxmispjjnmwsfbpi4p9n451ilx93"; + revision = "1"; + editedCabalFile = "0k6nhsl0jh233ym25fh03nc2gja6q27hcav1kbs9lfpyf0qdvvyl"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit dlist exceptions hashable http-api-data http-client @@ -111595,6 +112034,8 @@ self: { pname = "google-drive"; version = "0.4.1"; sha256 = "1whpifspbvqgw9hg367fjhp14ci61nnirskivawpv2airzn45xzk"; + revision = "1"; + editedCabalFile = "02hpkgp1k5gsc6rrx6gzzskcrdjzqbcdcppxkmv36lq0r1sj5afw"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra directory filepath http-conduit http-types mtl random resourcet text time @@ -116818,6 +117259,8 @@ self: { pname = "haddock-library"; version = "1.10.0"; sha256 = "15ak06q8yp11xz1hwr0sg2jqi3r78p1n89ik05hicqvxl3awf1pq"; + revision = "1"; + editedCabalFile = "1r2mz68415wq3l194ryki8r8p7n7h21033m1ixrpd259s4yq6zdp"; libraryHaskellDepends = [ base bytestring containers parsec text transformers ]; @@ -121263,6 +121706,8 @@ self: { pname = "haskell-gi-base"; version = "0.25.0"; sha256 = "140f6amq69r39vj54i1p4c9q0ysxkvb3yjcrlbrrayf66bhw8mqy"; + revision = "1"; + editedCabalFile = "1pl2mzjdsnvvkfmr622jvw2vk9gxdql5flck4vb60nr9d970zg9r"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -125001,8 +125446,8 @@ self: { pname = "hastache"; version = "0.6.1"; sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc"; - revision = "5"; - editedCabalFile = "0fwd1jd6sqkscmy2yq1w3dcl4va4w9n8mhs6ldrilh1cj6b54r3f"; + revision = "6"; + editedCabalFile = "1d9a6algvdyhjl94ikbz6ccnpbh0f68x8dp6bmx6lljq4b2srx51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128304,8 +128749,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.2.2"; - sha256 = "1n0dxpvjxi38whqh37d930rbic96gq13g7x8mi8skw164n9vha4g"; + version = "0.2.3"; + sha256 = "10scykaf8kadvgvc5pxjdyn8zvxqmp5gkdy0n82p4mmf2chmdzqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131059,22 +131504,22 @@ self: { }) {}; "hinotify-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, filepath-bytestring - , hinotify, mtl, resourcet, stm, stm-chans, stm-conduit + ({ mkDerivation, async, base, bytestring, conduit, containers + , directory, filepath, filepath-bytestring, hinotify, hspec + , resourcet, stm, stm-chans, stm-conduit, temporary, unix }: mkDerivation { pname = "hinotify-conduit"; - version = "0.1.0.0"; - sha256 = "1gy914b7npldn0dvhra7cf6fx1bdv18w9p66ypdigy2x36dvfb8d"; - revision = "2"; - editedCabalFile = "0d7fpksxwfa7jjklb70lpnr6cnpa6s9qz98n6ci1d2w2y5xrbql4"; + version = "0.1.0.1"; + sha256 = "1377ws4rmafkjrnyn9x0a5wj98v5ysc85yzq6frg12aslc1bmvx9"; libraryHaskellDepends = [ - base bytestring conduit filepath-bytestring hinotify mtl resourcet - stm stm-chans stm-conduit + base bytestring conduit containers directory filepath + filepath-bytestring hinotify resourcet stm stm-chans stm-conduit ]; testHaskellDepends = [ - base bytestring conduit filepath-bytestring hinotify mtl resourcet - stm stm-chans stm-conduit + async base bytestring conduit containers directory filepath + filepath-bytestring hinotify hspec resourcet stm stm-chans + stm-conduit temporary unix ]; description = "inotify conduit sources"; license = lib.licenses.bsd3; @@ -132509,6 +132954,8 @@ self: { pname = "hledger-stockquotes"; version = "0.1.2.0"; sha256 = "064q6qz6rrahk9ri5hr1y6n17nmd4l124xb3l8q5rvm81x3hzp3x"; + revision = "1"; + editedCabalFile = "1dbcvypi8kcrcy38wbvhaadhs2fwjw1kh3xzzq07ss30a7gg3k8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132772,8 +133219,8 @@ self: { pname = "hlint"; version = "3.2.7"; sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g"; - revision = "1"; - editedCabalFile = "1wc66vjdcf0xdwiw7r2ias1xx328ipjw0227w1xfr48if5lgc4k1"; + revision = "2"; + editedCabalFile = "0p2d3pi268jkb3hz750apjn917kr40hhamc2apgiv08chqyk82bj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -132800,6 +133247,8 @@ self: { pname = "hlint"; version = "3.3.4"; sha256 = "030hvf0hmnf5pamrcqvr97zmm185b1vs0y28nq6vzlyyg15ap6qq"; + revision = "1"; + editedCabalFile = "10h1asqbk2qqmxac34amwjz9ybz2vahpa0dsrdljg3zw1r1yzkb8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -134961,6 +135410,32 @@ self: { license = lib.licenses.mit; }) {}; + "honeycomb" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, bytestring + , chronos, http-client, http-client-tls, http-conduit, http-types + , microlens, mmorph, monad-control, mtl, mwc-random, profunctors + , random, resource-pool, stm, text, unliftio, unordered-containers + , uuid, vector, zlib + }: + mkDerivation { + pname = "honeycomb"; + version = "0.0.0.3"; + sha256 = "0y1z9lcf7b1dzvp20flcq75jmh2jxx2dmynfw00dwsy6s2jabhx0"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring chronos http-client + http-client-tls http-conduit http-types microlens mmorph + monad-control mtl mwc-random profunctors random resource-pool stm + text unliftio unordered-containers uuid vector zlib + ]; + testHaskellDepends = [ + aeson async auto-update base bytestring chronos http-client + http-client-tls http-conduit http-types microlens mmorph + monad-control mtl mwc-random profunctors random resource-pool stm + text unliftio unordered-containers uuid vector zlib + ]; + license = lib.licenses.bsd3; + }) {}; + "honi" = callPackage ({ mkDerivation, base, bytestring, freenect, hspec, HUnit, OpenNI2 , text @@ -135265,6 +135740,8 @@ self: { pname = "hoogle"; version = "5.0.18.2"; sha256 = "1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7"; + revision = "1"; + editedCabalFile = "11ig5z81h27ify5sx2dyrx4kiv61gzd96k9qi8a11hvnk2w51a9y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136086,6 +136563,8 @@ self: { pname = "hpack"; version = "0.34.4"; sha256 = "1xszy00al5zzga64gh7nvgqc93242f61kqy8lb09jkm98a8fs4bl"; + revision = "1"; + editedCabalFile = "0gq6ax8a7yc5lp0n24kd60kq0dgpgsgcgl970jrf1hqnzf53pspk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136112,6 +136591,45 @@ self: { license = lib.licenses.mit; }) {}; + "hpack_0_34_5" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.34.5"; + sha256 = "0gmm6jgi1sgyilphww6apq1x04grqznm7xhyb7g1rj5j7my40ws2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -136698,8 +137216,10 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.12.0.0"; - sha256 = "0pxidphf0qzfy5zv1q7qhp49bgglf3pqd6r91qq0iawnvgzcyi7z"; + version = "1.12.0.1"; + sha256 = "0qpydy2hg6fmwhwg0azgraxhjijfarns3syrv2an4ynfqcxrds9k"; + revision = "1"; + editedCabalFile = "1brrz8ddm0hw3c5w1mf1f8a14qk5c9wiav5a0l5fi6p1k86pfv4j"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra fields-json hpqtypes lifted-base log-base monad-control mtl @@ -139903,8 +140423,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "3"; - editedCabalFile = "04mda3bwr2a00f5nbkqc84d46lmqfsk3gibzg3amdh74ngb451xq"; + revision = "4"; + editedCabalFile = "0249qf58s5dvqf98xqbqqigav055dgj5cx4dmz4ssl8ckk2dizdk"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -140008,6 +140528,29 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_1_3_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 + , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "1.3.0.2"; + sha256 = "0p39xm0mmxzs5x6aim11qkb7npn0d9h7li2kwfhry0dijd1vm18i"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers exceptions mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific @@ -140109,6 +140652,8 @@ self: { pname = "hslua-module-text"; version = "0.3.0.1"; sha256 = "1vmd15n905i2pcsx748hz3h9kv5nnv74y663rj57q8mp0b40cbfl"; + revision = "1"; + editedCabalFile = "04y4rjfgzsz3q3m2d7ph97ligxlld74v6vhhmncj0riyxdfvy6p9"; libraryHaskellDepends = [ base bytestring hslua text ]; testHaskellDepends = [ base hslua tasty tasty-hunit tasty-lua text @@ -143686,6 +144231,31 @@ self: { license = lib.licenses.publicDomain; }) {}; + "http-link-header_1_2_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, directory + , errors, hspec, hspec-attoparsec, http-api-data, network-uri + , QuickCheck, text, transformers + }: + mkDerivation { + pname = "http-link-header"; + version = "1.2.1"; + sha256 = "15pcav5k7j4pvqwkyyrqgcm7yxqippx4yiprsg9fpml4kywcr2ca"; + libraryHaskellDepends = [ + attoparsec base bytestring errors http-api-data network-uri text + ]; + testHaskellDepends = [ + attoparsec base bytestring errors hspec hspec-attoparsec + http-api-data network-uri QuickCheck text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion directory errors http-api-data + network-uri text transformers + ]; + description = "A parser and writer for the HTTP Link header per RFC 5988"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-listen" = callPackage ({ mkDerivation, base, bytestring, exceptions, HTTP, network , transformers @@ -144274,6 +144844,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "HTTP/3 library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "httpd-shed" = callPackage @@ -150619,27 +151191,23 @@ self: { "inline-asm" = callPackage ({ mkDerivation, base, bytestring, containers, either, ghc-prim - , hspec, hspec-core, megaparsec, mtl, parser-combinators + , hspec, hspec-core, megaparsec, mtl, parser-combinators, primitive , QuickCheck, template-haskell, uniplate }: mkDerivation { pname = "inline-asm"; - version = "0.4.0.2"; - sha256 = "01npi02i8wf9b0pa18cgl78ma6r9xqz0i7dc3khkj1725w5wkhvp"; + version = "0.5.0.0"; + sha256 = "02zxgkaa4wgacgj6si4158cxgk3cdf0gkvl5avmyrivbcc18xkdi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers either ghc-prim megaparsec mtl - parser-combinators template-haskell uniplate - ]; - executableHaskellDepends = [ - base bytestring containers either ghc-prim megaparsec mtl - parser-combinators template-haskell uniplate + parser-combinators primitive template-haskell uniplate ]; testHaskellDepends = [ base bytestring containers either ghc-prim hspec hspec-core - megaparsec mtl parser-combinators QuickCheck template-haskell - uniplate + megaparsec mtl parser-combinators primitive QuickCheck + template-haskell uniplate ]; description = "Inline some Assembly in ur Haskell!"; license = lib.licenses.bsd3; @@ -150830,8 +151398,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.5"; sha256 = "0bb3ggzic8z5zmvmzp1fsnb572c2v383740b0ddf1fwihpn52c1y"; - revision = "1"; - editedCabalFile = "12x4xi525ikbqvxh2kmnxsl7cqmbz2l8vqc5ym4lap0p21niiazr"; + revision = "2"; + editedCabalFile = "1xjrd1sn3wkhv8f40wi5p53y8n74lkj5pnr4psjlbpqqlr4hy2ya"; libraryHaskellDepends = [ aeson base base-compat deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids semigroups text transformers @@ -151779,8 +152347,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "1.0.0"; - sha256 = "1wd2z7ngw53krg3y5klrhlndm9dilmqpvmlipjda168gqisxsscp"; + version = "1.1.0"; + sha256 = "16xx8fw7xf8rrji9n34r3xchjpd6sh3wnlbz70a3mhbdl3yp55vq"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -152075,10 +152643,8 @@ self: { }: mkDerivation { pname = "invertible-grammar"; - version = "0.1.3"; - sha256 = "160hw7p5mpajwmv8fps2gicqj3x3yr9w239pfnv9i5gsf4irnn9n"; - revision = "2"; - editedCabalFile = "1fmw3v2g22n812ppba4yibgq1wlpfwkypsxa768calxafynb3i33"; + version = "0.1.3.1"; + sha256 = "0ibbf8nq81b533902wkh0ags4a1jydm5jq0gn6jp1pg465q6qn7j"; libraryHaskellDepends = [ base bifunctors containers mtl prettyprinter profunctors semigroups tagged template-haskell text transformers @@ -152087,15 +152653,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "invertible-grammar_0_1_3_1" = callPackage + "invertible-grammar_0_1_3_2" = callPackage ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter , profunctors, semigroups, tagged, template-haskell, text , transformers }: mkDerivation { pname = "invertible-grammar"; - version = "0.1.3.1"; - sha256 = "0ibbf8nq81b533902wkh0ags4a1jydm5jq0gn6jp1pg465q6qn7j"; + version = "0.1.3.2"; + sha256 = "14i0xf5j01j6ayvxix32qr2m0bz3818q26z3b4xyw41ikbhxmkp2"; libraryHaskellDepends = [ base bifunctors containers mtl prettyprinter profunctors semigroups tagged template-haskell text transformers @@ -152509,12 +153075,17 @@ self: { }) {}; "ip2proxy" = callPackage - ({ mkDerivation, base, binary, bytestring, iproute }: + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-types, iproute, uri-encode + }: mkDerivation { pname = "ip2proxy"; - version = "3.1.0"; - sha256 = "03naiwlxzfmym6ms03z0a9ap2x9f40aqlssyjbb37krhlmmnf0l8"; - libraryHaskellDepends = [ base binary bytestring iproute ]; + version = "3.2.0"; + sha256 = "0m50z5a32m28lfq6g8chkakvcgd6iplmx2ik0nbi2zsgfc0l209y"; + libraryHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls http-types + iproute uri-encode + ]; description = "IP2Proxy Haskell package for proxy detection"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -152606,25 +153177,24 @@ self: { , doctest, envy, flow, Glob, http-media, lens, lens-aeson , monad-logger, network-ip, QuickCheck, regex-compat, rio, servant , servant-client, servant-multipart, servant-multipart-api - , servant-multipart-client, servant-server, swagger2, text, vector - , yaml + , servant-multipart-client, swagger2, text, vector, yaml }: mkDerivation { pname = "ipfs"; - version = "1.3.2"; - sha256 = "11gy8szp41l1y6mnvj6knb5lhlax859gri9j31w5lzhidj0045df"; + version = "1.4.0"; + sha256 = "1lz5wbjlxd053805cc0l51hj69rwj4a2i4b5y72gmajjqrcw4hcd"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob http-media lens monad-logger network-ip regex-compat rio servant servant-client servant-multipart servant-multipart-api servant-multipart-client - servant-server swagger2 text vector + swagger2 text vector ]; testHaskellDepends = [ aeson base bytestring directory directory-tree doctest envy flow Glob http-media lens lens-aeson monad-logger network-ip QuickCheck regex-compat rio servant servant-client servant-multipart - servant-multipart-api servant-multipart-client servant-server - swagger2 text vector yaml + servant-multipart-api servant-multipart-client swagger2 text vector + yaml ]; description = "Access IPFS locally and remotely"; license = lib.licenses.asl20; @@ -156625,6 +157195,27 @@ self: { license = lib.licenses.mit; }) {}; + "jsonifier_0_1_2" = callPackage + ({ mkDerivation, aeson, base, buffer-builder, bytestring, gauge + , hedgehog, numeric-limits, ptr-poker, rerebase, scientific, text + , text-builder + }: + mkDerivation { + pname = "jsonifier"; + version = "0.1.2"; + sha256 = "14cgk8h7lasnm0z9qlddkn166vk557msnkrpahdzqpl7arwdddid"; + libraryHaskellDepends = [ + base bytestring ptr-poker scientific text + ]; + testHaskellDepends = [ aeson hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ + aeson buffer-builder gauge rerebase text-builder + ]; + description = "Fast and simple JSON encoding toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jsonnet" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , containers, data-fix, deriving-compat, directory, exceptions @@ -157540,10 +158131,8 @@ self: { }: mkDerivation { pname = "kansas-comet"; - version = "0.4"; - sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "22"; - editedCabalFile = "0ii81jv62cbrvj8dpj86m2rs75jjjwnp9kka63y8bvdbacchycvj"; + version = "0.4.1"; + sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -158751,8 +159340,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.6"; - sha256 = "1qv867aks1vgcri7gsgim3852g7mnznarnsr97x1j3lx4qfkppnv"; + version = "0.2.0.7"; + sha256 = "0x0915nnrm03fryvwp0rcwvvqsbs1n639yjv509iz2v7wdw5kas8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -161525,15 +162114,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "language-docker_10_1_2" = callPackage + "language-docker_10_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , hspec, hspec-megaparsec, HUnit, megaparsec, prettyprinter , QuickCheck, split, text, time }: mkDerivation { pname = "language-docker"; - version = "10.1.2"; - sha256 = "07h2qarbscgppn9drpl72pi2w9arigqpczrxb51q9m6xhfdx12n1"; + version = "10.2.0"; + sha256 = "193hi4ls55pzybal7q4dlzdz1a8da2155a501h02j1w4nb25glrq"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -162213,6 +162802,8 @@ self: { pname = "language-python"; version = "0.5.8"; sha256 = "1mf3czvnh9582klv0c9g7pcn1wx4qjwpvhv8la6afaifv6y5lki2"; + revision = "1"; + editedCabalFile = "13lc4d2b7id49yczxlqgs3zlms1g6gv0i8amk56g1jvswli6nsn9"; libraryHaskellDepends = [ array base containers monads-tf pretty transformers utf8-string ]; @@ -163504,8 +164095,8 @@ self: { }: mkDerivation { pname = "ldap-client"; - version = "0.4.1"; - sha256 = "0m253jicjn8rqdrkcqd75bcrdg7bdq313crx2b54yv5s3mz6cxi2"; + version = "0.4.2"; + sha256 = "025k631wlg6g6fcsxq403k7wn7cnqbk77w7vpmm87sngvk0i4q0v"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection containers fail network semigroups stm text @@ -164219,6 +164810,23 @@ self: { license = lib.licenses.mit; }) {}; + "lens-aeson_1_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, lens + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "lens-aeson"; + version = "1.1.2"; + sha256 = "0pdjjyjwlavcgm2wrv1fiz09l41hisl2xj6y67xbdix1h6h07hxz"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring lens scientific text + unordered-containers vector + ]; + description = "Law-abiding lenses for aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-core" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -165126,10 +165734,10 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "3.0.3.0"; - sha256 = "0zf2x317xkp7mnamm8aqp0wmc5xka6p6pljyadz0xbmy7ih55ylh"; + version = "3.0.3.1"; + sha256 = "1rkm6n2p41i6lxdfsrvpv5sbz2p3mgyp3xx6g437fcgjjbdsyx3q"; revision = "1"; - editedCabalFile = "0n0s9qfa6b0r2rwz834dlqqm68xz2hvlygzjw084dy85d6xmvl75"; + editedCabalFile = "0r48nmczidz00l19cbmq05f766wipc9dwkqb3xsvbwwcazapbjkz"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -167017,6 +167625,25 @@ self: { broken = true; }) {}; + "linear-generics" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "linear-generics"; + version = "0.1.0.1"; + sha256 = "0ck7gx1chrxyyn7lwbv4gn15zxgfgg7ai0i6404jprvvh72j7b8r"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Generic programming library for generalised deriving"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "linear-grammar" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { @@ -167194,12 +167821,13 @@ self: { }) {}; "linebreak" = callPackage - ({ mkDerivation, base, hyphenation }: + ({ mkDerivation, base, hspec, hyphenation }: mkDerivation { pname = "linebreak"; - version = "1.0.0.3"; - sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7"; + version = "1.1.0.0"; + sha256 = "1a1yzpdr1h9a1gnf1iwsqxzpv3w13vd7yb6c0djdc1yq25q0jg7d"; libraryHaskellDepends = [ base hyphenation ]; + testHaskellDepends = [ base hspec hyphenation ]; description = "breaks strings to fit width"; license = lib.licenses.bsd3; }) {}; @@ -169768,8 +170396,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.10.0.1"; - sha256 = "0h4b7hjxcc75swj43wx0axcp5znsndkrnhn9c8fm7f7a2gmvb8l1"; + version = "0.11.0.0"; + sha256 = "155lzi9x33rhiymfy1271k0dz7c4qm1r48cz6kc7gcwxvrfh8dxi"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control mtl semigroups stm text time transformers-base @@ -169843,8 +170471,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.12.1.0"; - sha256 = "07z0p5jcd5gjhk4dyf9ny74l68ja58ffa80mbfsyaz66ff6k4y6s"; + version = "0.12.1.1"; + sha256 = "0jrfrqydbg549d7gh38mq852kzd0nsaaaq6l5bi4ldfpj443kz8a"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-tls http-types log-base network-uri @@ -169864,8 +170492,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.8.0.1"; - sha256 = "0bc63v9w023xw1fq0pkfnk4ac336hgliayy21ny0zaz9xf39a24l"; + version = "0.8.0.2"; + sha256 = "167asvp7a5v8621sbr6r4j25byg18d125gqd2i4jrq57g5f2mivf"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -174011,29 +174639,6 @@ self: { }) {}; "markdown" = callPackage - ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , bytestring, call-stack, conduit, conduit-extra, containers - , data-default, directory, filepath, hspec, text, transformers - , xml-conduit, xml-types, xss-sanitize - }: - mkDerivation { - pname = "markdown"; - version = "0.1.17.4"; - sha256 = "1m7xf3r7wvpzdj2zic90w5b6adnjb6mjq9mycbnzcjibpr1fgqy2"; - libraryHaskellDepends = [ - attoparsec base blaze-html blaze-markup conduit conduit-extra - containers data-default text transformers xml-conduit xml-types - xss-sanitize - ]; - testHaskellDepends = [ - base blaze-html bytestring call-stack conduit conduit-extra - containers directory filepath hspec text transformers - ]; - description = "Convert Markdown to HTML, with XSS protection"; - license = lib.licenses.bsd3; - }) {}; - - "markdown_0_1_17_5" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup , bytestring, call-stack, conduit, conduit-extra, containers , data-default, directory, filepath, hspec, text, transformers @@ -174054,7 +174659,6 @@ self: { ]; description = "Convert Markdown to HTML, with XSS protection"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markdown-kate" = callPackage @@ -174489,23 +175093,19 @@ self: { license = lib.licenses.bsd3; }) {}; - "massiv_1_0_0_0" = callPackage + "massiv_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions - , mersenne-random-pure64, mwc-random, primitive, QuickCheck, random - , scheduler, splitmix, template-haskell, unliftio-core, vector + , primitive, random, scheduler, unliftio-core, vector }: mkDerivation { pname = "massiv"; - version = "1.0.0.0"; - sha256 = "0cb9riab486gz9xxx44sx5pagfjc8kv8936avywxpwpn3dhbxg6a"; + version = "1.0.1.0"; + sha256 = "1s47x3cya73mp4gxqn271yp8z23pfgw170pnlxbka61ap4kykmkk"; libraryHaskellDepends = [ base bytestring deepseq exceptions primitive random scheduler unliftio-core vector ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 mwc-random QuickCheck random - splitmix template-haskell - ]; + testHaskellDepends = [ base doctest ]; description = "Massiv (Массив) is an Array Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -174583,15 +175183,15 @@ self: { broken = true; }) {}; - "massiv-persist_1_0_0_0" = callPackage + "massiv-persist_1_0_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, hspec , hspec-discover, massiv, massiv-test, persist, primitive , QuickCheck }: mkDerivation { pname = "massiv-persist"; - version = "1.0.0.0"; - sha256 = "0kgw4ac6ywgx44mqyfyhhxpaxzyph9pgz27nvr625j4hg84mx552"; + version = "1.0.0.1"; + sha256 = "1j5vzk5m2r1cs5v5pzmf1i7p8zdlf29g0gdklf6snl9llk755pgy"; libraryHaskellDepends = [ base bytestring deepseq massiv persist primitive ]; @@ -174646,14 +175246,14 @@ self: { broken = true; }) {}; - "massiv-serialise_1_0_0_0" = callPackage + "massiv-serialise_1_0_0_1" = callPackage ({ mkDerivation, base, deepseq, doctest, hspec, hspec-discover , massiv, massiv-test, QuickCheck, serialise, vector }: mkDerivation { pname = "massiv-serialise"; - version = "1.0.0.0"; - sha256 = "18ahbfq54mggar7wknghdjybd4pbqjzgfaghv5lp5daccbxahgyd"; + version = "1.0.0.1"; + sha256 = "0zmikmfjjshf9p0fawcg05832hxdzj04kqqh11bz1kqcc1yc7yk0"; libraryHaskellDepends = [ base deepseq massiv serialise vector ]; testHaskellDepends = [ base doctest hspec massiv massiv-test QuickCheck serialise @@ -175174,23 +175774,24 @@ self: { }) {}; "matrix-client" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring - , doctest, exceptions, hashable, hspec, http-client + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base, base64 + , bytestring, containers, exceptions, hashable, hspec, http-client , http-client-tls, http-types, retry, SHA, text, time , unordered-containers }: mkDerivation { pname = "matrix-client"; - version = "0.1.1.0"; - sha256 = "13ncklhrwb10g6pki1zsli1gnja01ic9scil4f5nky8hdmaw9jq2"; + version = "0.1.2.0"; + sha256 = "18n5il56p3hr6iax2d1m0b7vximc0z4jzj0dav0rhv3yrwy8p5w2"; libraryHaskellDepends = [ - aeson base base64 bytestring exceptions hashable http-client - http-client-tls http-types retry SHA text time unordered-containers + aeson aeson-casing base base64 bytestring containers exceptions + hashable http-client http-client-tls http-types retry SHA text time + unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base base64 bytestring doctest exceptions - hashable hspec http-client http-client-tls http-types retry SHA - text time unordered-containers + aeson aeson-casing aeson-pretty base base64 bytestring containers + exceptions hashable hspec http-client http-client-tls http-types + retry SHA text time unordered-containers ]; description = "A matrix client library"; license = lib.licenses.asl20; @@ -178014,6 +178615,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "microstache_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, filepath, hspec, parsec, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "microstache"; + version = "1.0.2"; + sha256 = "0pirywb9304j2ylasskwq20k6d2srk616sh41l4s37yajsjggx5i"; + libraryHaskellDepends = [ + aeson base containers deepseq directory filepath parsec text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec parsec text + ]; + description = "Mustache templates for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microtimer" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -179364,27 +179986,28 @@ self: { }) {}; "mit-3qvpPyAi6mH" = callPackage - ({ mkDerivation, base, base64, clock, directory, free, process - , record-dot-preprocessor, record-hasfield, temporary, text - , text-ansi, unix + ({ mkDerivation, base, base64, clock, containers, directory, free + , ki, process, record-dot-preprocessor, record-hasfield, temporary + , text, text-ansi, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "3"; - sha256 = "0yy7j1ddnny5wq8ywkkmdas9qlfsi26pk0adklmh2c0kqfss4s3f"; + version = "4"; + sha256 = "14sfzb7ii0ldwkfx05r4jk4rc0nqxzi7nw81v8kgsyi0saa1ig0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base64 clock directory process record-dot-preprocessor - record-hasfield text text-ansi unix + base base64 clock containers directory ki process + record-dot-preprocessor record-hasfield text text-ansi unix ]; executableHaskellDepends = [ - base base64 clock directory process record-dot-preprocessor - record-hasfield text text-ansi unix + base base64 clock containers directory ki process + record-dot-preprocessor record-hasfield text text-ansi unix ]; testHaskellDepends = [ - base base64 clock directory free process record-dot-preprocessor - record-hasfield temporary text text-ansi unix + base base64 clock containers directory free ki process + record-dot-preprocessor record-hasfield temporary text text-ansi + unix ]; description = "A git wrapper with a streamlined UX"; license = lib.licenses.mit; @@ -179648,8 +180271,8 @@ self: { pname = "mmark"; version = "0.0.7.3"; sha256 = "1gfl9jhqm1jaqxi0yxd8r4z3ai5c3f1wv53vjs0ln84qjpcqp30s"; - revision = "1"; - editedCabalFile = "19yg41grkliim428x9cqwcynmjvkh83mqfyxiv2dc6fvid6fmcrk"; + revision = "2"; + editedCabalFile = "01cd2k4jz3f2ryhxdya8biypxdl44236mnavfqx7fm7bkjz4j5x0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -179692,6 +180315,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mmark-cli_0_0_5_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory + , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark + , mmark-ext, optparse-applicative, stache, text + }: + mkDerivation { + pname = "mmark-cli"; + version = "0.0.5.1"; + sha256 = "1an1rc7gdl2209d3agxx1dfl61zsc2wg5nx9cwdf50spmlgs3cr0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring directory ghc-syntax-highlighter gitrev lucid + megaparsec mmark mmark-ext optparse-applicative stache text + ]; + description = "Command line interface to the MMark markdown processor"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mmark-ext" = callPackage ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting @@ -182570,8 +183213,8 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.1.0.0"; - sha256 = "1a2cszh84sgyml9yxw2yln7g1ll249aq37lqd6aqjjb7mzb9fjxm"; + version = "1.1.1.0"; + sha256 = "0jv7yc3jclqkh6z5hq47ws6pia0bhqsig06r392k95y96kal07xr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182703,8 +183346,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "2"; - editedCabalFile = "1fvpzhfjpf2j01p2rwds6m82d2q0j77ak5v467nxsc8f161rfz21"; + revision = "3"; + editedCabalFile = "1j57vvb2vs0jd5jsq2dh0q5wpvxibwn43dwkg1l3ysl46k5sv58i"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -184172,18 +184815,21 @@ self: { }) {}; "msu" = callPackage - ({ mkDerivation, base, directory, filepath, mtl, parsec, process - , xdg-basedir + ({ mkDerivation, aeson, aeson-casing, base, bytestring, directory + , errors, filepath, hspec, parsec, process, unliftio, yaml }: mkDerivation { pname = "msu"; - version = "0.0.2"; - sha256 = "0bqzzk7y3dj60r02xn3cjlq955jzsrvcbq63pvav0w952bvxvx5c"; - isLibrary = false; + version = "0.2.0.0"; + sha256 = "15a0i7jwcqzl3ajw369xp0d9ixf0hcy9dblhywjrbalnml890sx4"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - base directory filepath mtl parsec process xdg-basedir + libraryHaskellDepends = [ + aeson aeson-casing base bytestring directory parsec process + unliftio yaml ]; + executableHaskellDepends = [ base directory filepath process ]; + testHaskellDepends = [ base bytestring errors hspec ]; description = "Monitor Setup Utility"; license = lib.licenses.mit; }) {}; @@ -185604,28 +186250,6 @@ self: { }) {}; "murmur3" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, cereal, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "murmur3"; - version = "1.0.4"; - sha256 = "022sadxhnywbzx8crwkgky7kndxwpaddc89nq3ya4a4ikq3qvbhm"; - revision = "1"; - editedCabalFile = "130ign0n566nsrzfp4ipb2sy5hq1ymxdlmqb80zbpdc0rdkqh0x0"; - libraryHaskellDepends = [ base bytestring cereal ]; - testHaskellDepends = [ - base base16-bytestring bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "murmur3_1_0_5" = callPackage ({ mkDerivation, base, base16, bytestring, cereal, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -186041,6 +186665,8 @@ self: { pname = "mustache"; version = "2.3.1"; sha256 = "0j5kzlirirnj2lscxgc6r9j0if8s3pvxswjblma6yxpw6qyzk2xc"; + revision = "1"; + editedCabalFile = "05qsxxpbqacfbvdzmz2y2yh3rpf2f0n2rvhvmhn33gsvydxvadbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186352,6 +186978,8 @@ self: { pname = "mx-state-codes"; version = "1.0.0.0"; sha256 = "1jxw7hh24rqs1c5y4b7bmllvcwq3gsrrn0rixq9lzhn2915ykaq6"; + revision = "1"; + editedCabalFile = "1fl0953329z4an76287q1ic4hygzg3xzv2w0zv7dqgkpdz3qbjx7"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base hspec QuickCheck text ]; description = "ISO 3166-2:MX State Codes and Names"; @@ -188538,6 +189166,21 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) libsodium;}; + "netcode-io_0_0_3" = callPackage + ({ mkDerivation, base, bindings-DSL, libsodium }: + mkDerivation { + pname = "netcode-io"; + version = "0.0.3"; + sha256 = "132rih1fd2qdshnpb8q3glhwgc8790pm8xpm3786hnrl3di1384z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ libsodium ]; + description = "Bindings to the low-level netcode.io library."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libsodium;}; + "netcore" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bimap, binary, binary-strict , bytestring, containers, fgl, HList, hslogger, HUnit, mtl @@ -188985,14 +189628,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_1_2_2" = callPackage + "network_3_1_2_5" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.1.2.2"; - sha256 = "1dhflq7im3sjc6ascf12z73mhw7cqv1aqfvv3y5m9izr485jq0am"; + version = "3.1.2.5"; + sha256 = "0l8qn0m1pza4iv0x14izgpggisbk91yfipwmwpjbmcb73j7c08zj"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -191899,27 +192542,6 @@ self: { }) {}; "nonempty-containers" = callPackage - ({ mkDerivation, aeson, base, comonad, containers, deepseq - , hedgehog, hedgehog-fn, nonempty-vector, semigroupoids, tasty - , tasty-hedgehog, text, these, vector - }: - mkDerivation { - pname = "nonempty-containers"; - version = "0.3.4.3"; - sha256 = "1k58xj3cvi4s79ga5xi3ci16lh6wcxsb9qsn9ipa1kvzj0p4i5g0"; - libraryHaskellDepends = [ - aeson base comonad containers deepseq nonempty-vector semigroupoids - these vector - ]; - testHaskellDepends = [ - base comonad containers hedgehog hedgehog-fn nonempty-vector - semigroupoids tasty tasty-hedgehog text these vector - ]; - description = "Non-empty variants of containers data types, with full API"; - license = lib.licenses.bsd3; - }) {}; - - "nonempty-containers_0_3_4_4" = callPackage ({ mkDerivation, aeson, base, comonad, containers, deepseq , hedgehog, hedgehog-fn, invariant, nonempty-vector, semigroupoids , tasty, tasty-hedgehog, text, these, vector @@ -191939,7 +192561,6 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nonempty-lift" = callPackage @@ -192258,6 +192879,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "notmuch" = callPackage @@ -192498,8 +193120,8 @@ self: { }: mkDerivation { pname = "nri-http"; - version = "0.1.0.1"; - sha256 = "11zrqfljnq922frbsyiwap8ayp8faq7cwbrmk0npg4qgv4gv2pz2"; + version = "0.1.0.3"; + sha256 = "1km4jv0g79455m3687cpihzz14pxg3wxw4r5b21mby7c8knzd1vl"; libraryHaskellDepends = [ aeson base bytestring conduit http-client http-client-tls http-types mime-types network-uri nri-observability nri-prelude @@ -192521,8 +193143,8 @@ self: { }: mkDerivation { pname = "nri-kafka"; - version = "0.1.0.0"; - sha256 = "0ifdmli7arrlpmh1l4q974rv0bw3xirfk96xrahfab3zp36r4x3y"; + version = "0.1.0.1"; + sha256 = "0sybcf7lx0gqhi79h6d1rqx0ckyz38m86h87imrh4grgbikxaic5"; libraryHaskellDepends = [ aeson async base bytestring conduit containers hw-kafka-client nri-env-parser nri-observability nri-prelude safe-exceptions stm @@ -192565,23 +193187,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-observability_0_1_1_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs + , bytestring, conduit, directory, hostname, http-client + , http-client-tls, nri-env-parser, nri-prelude, random + , safe-exceptions, stm, text, time, unordered-containers, uuid + }: + mkDerivation { + pname = "nri-observability"; + version = "0.1.1.2"; + sha256 = "0n4ap88ll5q86addjgfv8pf86zbnw1ic6wh7wc929fn4ygc6r2x5"; + libraryHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring conduit + directory hostname http-client http-client-tls nri-env-parser + nri-prelude random safe-exceptions stm text time + unordered-containers uuid + ]; + testHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring conduit + directory hostname http-client http-client-tls nri-env-parser + nri-prelude random safe-exceptions stm text time + unordered-containers uuid + ]; + description = "Report log spans collected by nri-prelude"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-postgresql" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath - , network, nri-env-parser, nri-observability, nri-prelude - , postgresql-typed, resource-pool, resourcet, safe-exceptions - , template-haskell, text, time + ({ mkDerivation, attoparsec, base, bytestring, filepath, network + , nri-env-parser, nri-observability, nri-prelude, postgresql-typed + , resource-pool, resourcet, safe-exceptions, template-haskell, text + , time }: mkDerivation { pname = "nri-postgresql"; - version = "0.1.0.1"; - sha256 = "1kl5wriqdshhc2fjaicj60hrwrw2c6y8vrq2pv4fagn0gxa78fvc"; + version = "0.1.0.2"; + sha256 = "0rm76z57zvvsswd0dyqmq7m1mrvamiff5kawkcwy4k4xkn4yl3py"; libraryHaskellDepends = [ - aeson attoparsec base bytestring filepath network nri-env-parser + attoparsec base bytestring filepath network nri-env-parser nri-observability nri-prelude postgresql-typed resource-pool resourcet safe-exceptions template-haskell text time ]; testHaskellDepends = [ - aeson attoparsec base bytestring filepath network nri-env-parser + attoparsec base bytestring filepath network nri-env-parser nri-observability nri-prelude postgresql-typed resource-pool resourcet safe-exceptions template-haskell text time ]; @@ -192618,6 +193267,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-prelude_0_6_0_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base + , bytestring, containers, directory, exceptions, filepath, ghc + , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text + , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text + , time, unix, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.6.0.4"; + sha256 = "0r2jgjrbjbkkvsk8ypg0d7r840qkadwinq0qyhng9bkjqrsrn78c"; + libraryHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-coloured-text-terminfo + safe-exceptions terminal-size text time unix vector + ]; + testHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-coloured-text-terminfo + safe-exceptions terminal-size text time unix vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-redis" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis , nri-env-parser, nri-observability, nri-prelude, resourcet @@ -192625,8 +193302,8 @@ self: { }: mkDerivation { pname = "nri-redis"; - version = "0.1.0.2"; - sha256 = "12z515bs17ig8ps1kq2pp1c80r6cn0rldvqa6rzfgc1nrd0p8hc9"; + version = "0.1.0.3"; + sha256 = "1mdzqvnx7gzr8j99c8nza40y518jg8ajxfrvdvf90gvbglknimb0"; libraryHaskellDepends = [ aeson async base bytestring conduit hedis nri-env-parser nri-observability nri-prelude resourcet safe-exceptions text @@ -192648,8 +193325,8 @@ self: { }: mkDerivation { pname = "nri-test-encoding"; - version = "0.1.1.0"; - sha256 = "0k21hyd0kbgdg3kmfwy20vf21r6963ygybz1v84wjmfzqbc5fcq5"; + version = "0.1.1.1"; + sha256 = "07hrkjbyp07p0yryx92q0bjqkkjji4d952sxcm9j2w5mdvlc08mq"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring filepath nri-prelude nri-redis servant servant-auth-server servant-server text @@ -193007,8 +193684,10 @@ self: { pname = "numeric-kinds"; version = "0.1.0.0"; sha256 = "0rdx39wa7kklx9a7i5rdwf541fxpz9v3n32rvy2fa6i7n4hr64s4"; + revision = "1"; + editedCabalFile = "0zbn5yxga0sknpa83a6v2gx3dhi1rgxlxh0p3d1gd37x2zyd8lxf"; libraryHaskellDepends = [ base ]; - description = "Type-level numeric types, classes, and instances"; + description = "Type-level numeric types and classes"; license = lib.licenses.asl20; }) {}; @@ -193031,14 +193710,14 @@ self: { pname = "numeric-logarithms"; version = "0.1.0.0"; sha256 = "1izd7gc9xdrs7a1wbzmhhkv8s9rw2mcq77agvr351dc5jyzdnwiy"; - revision = "1"; - editedCabalFile = "0a37gmm0xgjzh05i7ix3nkgr5d2qa824nsh2wg78ikyksfq46vfv"; + revision = "2"; + editedCabalFile = "11lxh2lz3adwdb1hgxgqh2p2igqzbclpwal072fhdk1hcz987acq"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base integer-gmp QuickCheck test-framework test-framework-quickcheck2 ]; - description = "Efficient rounded log2 algorithms on integral and rational types"; + description = "Integral and rational log2 algorithms"; license = lib.licenses.asl20; }) {}; @@ -195033,6 +195712,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_7_5_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.5.0"; + sha256 = "19y6a4qkzr8bm8fxwrlvlcjqvc12kagp0wrfqrr4gxvzi200plvr"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -195100,6 +195809,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "opc-xml-da-client" = callPackage + ({ mkDerivation, acc, attoparsec, attoparsec-data, base, base64 + , binary, bytestring, caerbannog, containers, data-default, domain + , domain-optics, hashable, hashable-time, http-client, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, time, transformers + , unordered-containers, vector, vector-instances, xml-conduit + , xml-parser + }: + mkDerivation { + pname = "opc-xml-da-client"; + version = "0.1"; + sha256 = "0wi2qv4594fz3z6jqdmqnxv17w1yp5ds8xwflnxawb6lpadprskp"; + libraryHaskellDepends = [ + acc attoparsec attoparsec-data base base64 bytestring containers + data-default domain domain-optics hashable hashable-time + http-client QuickCheck rerebase scientific text text-builder time + transformers unordered-containers vector vector-instances + xml-conduit xml-parser + ]; + testHaskellDepends = [ + attoparsec binary caerbannog data-default http-client QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + text-builder xml-conduit xml-parser + ]; + doHaddock = false; + description = "OPC XML-DA Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "open-adt" = callPackage ({ mkDerivation, base, constraints, recursion-schemes, row-types , template-haskell @@ -196421,32 +197161,19 @@ self: { }) {}; "operational" = callPackage - ({ mkDerivation, base, mtl, random }: - mkDerivation { - pname = "operational"; - version = "0.2.3.5"; - sha256 = "1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ base mtl random ]; - description = "Implementation of difficult monads made easy with operational semantics"; - license = lib.licenses.bsd3; - }) {}; - - "operational_0_2_4_0" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { pname = "operational"; version = "0.2.4.0"; sha256 = "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i"; + revision = "1"; + editedCabalFile = "1b5vjp87lh34lpp9i4mrwcmr6rs45r6azdamwinlhrxynn91n8ri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl ]; executableHaskellDepends = [ base mtl random ]; description = "Implementation of difficult monads made easy with operational semantics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "operational-alacarte" = callPackage @@ -197015,6 +197742,25 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "optparse-generic_1_4_6" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , system-filepath, text, time, transformers, transformers-compat + , void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.4.6"; + sha256 = "1ihr5ly5xkhhds7frifgy1djay1d7yvdc617qqb7h61h4930kl3k"; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative system-filepath text time + transformers transformers-compat void + ]; + description = "Auto-generate a command-line parser for your datatype"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -197588,7 +198334,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ormolu_0_3_0_1" = callPackage + "ormolu_0_3_1_0" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers , Diff, directory, dlist, exceptions, filepath, ghc-lib-parser , gitrev, hspec, hspec-discover, mtl, optparse-applicative, path @@ -197596,8 +198342,8 @@ self: { }: mkDerivation { pname = "ormolu"; - version = "0.3.0.1"; - sha256 = "1cp543ff0gng6v5l251fklrk73yqfgbymx824ldc7inwybmd6z03"; + version = "0.3.1.0"; + sha256 = "1517z6bi8ifzdmfclmqdiipi6zcnxagymf1sxr43sj2ipkglg2rs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197697,8 +198443,8 @@ self: { }: mkDerivation { pname = "os-release"; - version = "1.0.2"; - sha256 = "0wjf1z76pqfv091b88zc3w0hmqv8i2i6qsx21cfcgaym4r3zqpjf"; + version = "1.0.2.1"; + sha256 = "0fyf6mjk4lmxvjgkvsz7ypx2ir67ry816wa6j7s27a1754cz6cw3"; libraryHaskellDepends = [ aeson base megaparsec safe-exceptions text unordered-containers ]; @@ -199340,6 +200086,8 @@ self: { pname = "pandoc-types"; version = "1.22"; sha256 = "0kr5n9yw59513pw2rjc65qs55iq0prn16prk4781arqdh7g7a09q"; + revision = "1"; + editedCabalFile = "11gfc2syn2c0x3hyyw3c6z9hxmhs8jgv2xnzr43ql00r76ka9s95"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb text transformers @@ -199409,8 +200157,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.6"; - sha256 = "0x1wnrdbri1jcpi2iva69rw6bs6i9y192fymjamrab0w69bd9p4y"; + version = "0.4.7"; + sha256 = "1kda661i18kzrfj38si48n1shbqxh30p1sz97cb871ni2hlqsarj"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -199602,6 +200350,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.3"; + sha256 = "1pb9vr615rhh0lyi392ghxdnxq5pr15y0w8f372xh046i9dinj39"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -203733,6 +204523,8 @@ self: { pname = "persistent"; version = "2.13.1.2"; sha256 = "09si4h64i9drqr80a2sxpxhmsinacqx9bvsc3jah5zlm915q092y"; + revision = "1"; + editedCabalFile = "0xasbm1m5az7anp1wqfr69j0b7jycg82qdcq4kd97lqdn7rqvhsp"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -203756,6 +204548,45 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "persistent_2_13_2_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, criterion, deepseq + , fast-logger, file-embed, hspec, http-api-data, lift-type + , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances + , resource-pool, resourcet, scientific, shakespeare, silently + , template-haskell, text, th-lift-instances, time, transformers + , unliftio, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.13.2.1"; + sha256 = "13lp9i94f57qhifdmr1vnsrra34526f7kqa1sybcaj2jh2v3q85k"; + revision = "1"; + editedCabalFile = "15lx2kd8ijn91h65nhzxmd50hmmybhs6x6qfg5wnl3ylcmgi6glg"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data lift-type monad-logger + mtl path-pieces resource-pool resourcet scientific silently + template-haskell text th-lift-instances time transformers unliftio + unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data monad-logger mtl + path-pieces QuickCheck quickcheck-instances resource-pool resourcet + scientific shakespeare silently template-haskell text + th-lift-instances time transformers unliftio unliftio-core + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq file-embed template-haskell text + ]; + description = "Type-safe, multi-backend data serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -204208,6 +205039,40 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-postgresql_2_13_2_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.13.2.1"; + sha256 = "07pnr8m0nk43jaz6l293lzx4ivyqgnw94fjypazzm008b4irh7ir"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector + ]; + description = "Backend for the persistent library using postgresql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -205319,8 +206184,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.12.1.0"; - sha256 = "1scjdf6k36vqd4cdnsqwwhbb97dsicarrc320w4ybikr1rk42phd"; + version = "0.13.0.0"; + sha256 = "1zpbcp3ij8j2vmss511kvrzwzymnjmzqs628hv0n9nnzvgma5nn7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205357,8 +206222,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.1.4.0"; - sha256 = "1dsfnjjri15mhm31ny82j26djbsw6lgvvqpq9k7fzgj0inb5slns"; + version = "0.2.0.0"; + sha256 = "1v2v571rjmfxqzdnm7z2v3dygknlk5nyvfyv7dkgzf7apmlmnpd2"; libraryHaskellDepends = [ base heaps mmsyn2-array phonetic-languages-constraints-array phonetic-languages-ukrainian-array @@ -205404,8 +206269,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.2.1.0"; - sha256 = "1i05h0rd6svffwpwzsrryzf6yvjwxd0g3f4wasz8mkh1sdgj0r5g"; + version = "0.3.0.0"; + sha256 = "1ajgp4wyfdzvvnj5272r0cpl9jykps5bwzn93asmfbilzfdjaynz"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics ]; @@ -205928,6 +206793,21 @@ self: { license = lib.licenses.mit; }) {}; + "pid1_0_1_3_0" = callPackage + ({ mkDerivation, base, directory, process, unix }: + mkDerivation { + pname = "pid1"; + version = "0.1.3.0"; + sha256 = "1m2i03ncgn1y6h2352pnvhcqzif45505vlnxh11xngvjx47f85a1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory process unix ]; + executableHaskellDepends = [ base ]; + description = "Do signal handling and orphan reaping for Unix PID1 init processes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pidfile" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -209387,6 +210267,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-check" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , kind-generics, kind-generics-th, polysemy, polysemy-plugin + , QuickCheck + }: + mkDerivation { + pname = "polysemy-check"; + version = "0.5.0.0"; + sha256 = "0ch8dzzap6f6bfdyy8i9xdna9l7d3yvx9m7z3pz9pjb19vjxa3f6"; + libraryHaskellDepends = [ + base containers kind-generics kind-generics-th polysemy QuickCheck + ]; + testHaskellDepends = [ + base containers hspec kind-generics kind-generics-th polysemy + polysemy-plugin QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "QuickCheck for Polysemy"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-chronos" = callPackage ({ mkDerivation, aeson, base, chronos, containers, hedgehog , polysemy, polysemy-test, polysemy-time, relude, tasty @@ -210636,12 +211538,14 @@ self: { pname = "portray"; version = "0.2.0"; sha256 = "1kzzvwqphlg1dmd486ijkv6vsqmxnp8h05mwc8590yjxdln5vzdw"; + revision = "1"; + editedCabalFile = "0bl0kagjn1k58pq6zbdj2zyzhpdpzs7ra1vrr8a1qdkb11gmp4n2"; libraryHaskellDepends = [ base containers text wrapped ]; testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit text wrapped ]; - description = "A pseudo-Haskell syntax type and typeclass producing it"; + description = "Rendering to pseudo-Haskell syntax"; license = lib.licenses.asl20; }) {}; @@ -210651,10 +211555,12 @@ self: { pname = "portray-diff"; version = "0.1.0.1"; sha256 = "1da884cj865q6g1bd1fhcazyl1nzxb0pk2nvhcpp4iqkjvhyd8hw"; + revision = "1"; + editedCabalFile = "1dfl488jq79l0k8d8s2q1wxdibvnrrl64sz8gdy9mp0nkd6vaszl"; libraryHaskellDepends = [ base containers dlist portray text wrapped ]; - description = "Visualize the structural differences between two values"; + description = "Pretty structural diffs between two values"; license = lib.licenses.asl20; }) {}; @@ -210665,10 +211571,12 @@ self: { pname = "portray-diff-hunit"; version = "0.1.0.0"; sha256 = "0gig1gvw0s7cl4jbffqh53r7lfs08clkcjpdypjjbpk0815pk34h"; + revision = "1"; + editedCabalFile = "023p7j386zbcmzsbdk7xk85ygi8qq4llh6zp6811grsyq3hfnsa1"; libraryHaskellDepends = [ base HUnit portray-diff portray-pretty pretty ]; - description = "Equality assertion functions for HUnit based on portray-diff"; + description = "HUnit assertions based on portray-diff"; license = lib.licenses.asl20; }) {}; @@ -210678,10 +211586,12 @@ self: { pname = "portray-diff-quickcheck"; version = "0.1.0.0"; sha256 = "1kif82y8bapf5d3awkfv7wp3ih89q3p14djanyz6jfapryhccm12"; + revision = "1"; + editedCabalFile = "0nf5wxwvs9sad3bphb8dci5d3nr982nr05y99fmsy3vdifi366l2"; libraryHaskellDepends = [ base portray-diff portray-pretty QuickCheck ]; - description = "Equality assertion functions for QuickCheck based on portray-diff"; + description = "QuickCheck tests with portray-diff"; license = lib.licenses.asl20; }) {}; @@ -210693,12 +211603,14 @@ self: { pname = "portray-pretty"; version = "0.1.0.2"; sha256 = "1gh50r77yz1l8qkhdz96bds2l0d5zi75fkir27x3si406h7sdic9"; + revision = "1"; + editedCabalFile = "0v30gdwjb0339q5phkbnwxj687w33rgivy772j37vp51zpiylnak"; libraryHaskellDepends = [ base portray portray-diff pretty text ]; testHaskellDepends = [ base HUnit portray portray-diff pretty test-framework test-framework-hunit text ]; - description = "A portray backend using the pretty package"; + description = "Portray backend for pretty"; license = lib.licenses.asl20; }) {}; @@ -210711,6 +211623,8 @@ self: { pname = "portray-prettyprinter"; version = "0.2.0"; sha256 = "16g55vjcfawx1jxmgy3zgl6bqv67h831z00912fbfh878s1s24ic"; + revision = "1"; + editedCabalFile = "1w7y8j2sx9wjyv5iknxjyq3r02l1kym85k1gq6carr49lf05s567"; libraryHaskellDepends = [ base portray portray-diff prettyprinter prettyprinter-ansi-terminal text @@ -210720,7 +211634,7 @@ self: { prettyprinter-ansi-terminal QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - description = "A portray backend using the prettyprinter package"; + description = "Portray backend for prettyprinter"; license = lib.licenses.asl20; }) {}; @@ -211161,6 +212075,34 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_12_4_2" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances + , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.4.2"; + sha256 = "1bklkkf0r5dimdxgmgcviircv87ahv0g4nmkl34kc13pwn6l7xjm"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -211519,8 +212461,8 @@ self: { pname = "postgresql-simple"; version = "0.6.4"; sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; - revision = "2"; - editedCabalFile = "1kwjlj0bsc1yd4dgfc0ydawq9acfjlf0bymwc830dryp16wpj9zv"; + revision = "3"; + editedCabalFile = "1gx4vjk99lr10bcvdismr84i6rpl5ny0j08f7f7rq9j8hivj0frp"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -214659,8 +215601,6 @@ self: { testHaskellDepends = [ async base bytestring hspec unix ]; description = "Ergonomic process launching with extreme flexibility and speed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "procrastinating-structure" = callPackage @@ -215827,8 +216767,8 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.7.0.0"; - sha256 = "1dg73jwc9mis7igxdj3chkb8fz9a25wxw3d6nz11r98z3ambd8rs"; + version = "0.7.1.0"; + sha256 = "0b5wn89d23p87swjbafndrbmklix360amcq5jsl73zaqlh3vy4sy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim lens-family parsec @@ -215847,8 +216787,8 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.9"; - sha256 = "0ndh8jr9aybjpf1p6a6zs2qjci0z7h3c3v3i5hf28ls8w2g8zr4x"; + version = "0.1.2.10"; + sha256 = "1dx82fx4q2q58xavkw62ws34vikpg5g6p0w3mpvn0pigwykjnzda"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -215918,8 +216858,8 @@ self: { ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.1.7"; - sha256 = "0fskg0y66qp81z2x2r6jyvrisn7asmbynnq1zq2j97dn7003nqpa"; + version = "0.1.1.8"; + sha256 = "1y5ygqzwyvphxyj6qr5cnknjk06rs6h0xlbwa864p6hjwlayapcn"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; @@ -215936,8 +216876,8 @@ self: { }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.7.0.0"; - sha256 = "1db0z3394g1fzw80ilxldbvy7m3a4piks0fk2wmlaw5k6bza82c7"; + version = "0.7.1.0"; + sha256 = "0yrwif600lr2pmqfninwap348k4xg5mvzx9cqp99gdgkknfb88hn"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ base lens-family proto-lens proto-lens-runtime text @@ -215954,8 +216894,8 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.7.0.0"; - sha256 = "1k060lr5d54mzj6c7d2k19vg2432mfnp66wr7gs1qcgpj19q9yvs"; + version = "0.7.1.0"; + sha256 = "14lbal80mrwla51h3yax8v1hsd05mh5xyipc051n0jkxdifs1cv5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath ]; @@ -215974,8 +216914,8 @@ self: { }: mkDerivation { pname = "proto-lens-runtime"; - version = "0.7.0.0"; - sha256 = "0qxangmbldzdvm9qdvhw1cnjakx0zrxrq0nbscqvih2m2yzaxhad"; + version = "0.7.0.1"; + sha256 = "03dxnawrsz22s52qzfwgnzs18r7mdb1jvirsck2g62bh5incg80a"; libraryHaskellDepends = [ base bytestring containers deepseq filepath lens-family proto-lens text vector @@ -215990,8 +216930,8 @@ self: { }: mkDerivation { pname = "proto-lens-setup"; - version = "0.4.0.4"; - sha256 = "09ka0x4ril0lw3ppx2q26zw2r9g2cszsyqrbwy0amw78g1kxma8v"; + version = "0.4.0.5"; + sha256 = "1zl6srfsa4nizrrrbm7b69200w42rfmxmyzdzgb3cl0675ks2r28"; libraryHaskellDepends = [ base bytestring Cabal containers deepseq directory filepath process proto-lens-protoc temporary text @@ -216301,7 +217241,6 @@ self: { transformers ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proton-haskell" = callPackage @@ -216753,10 +217692,8 @@ self: { }: mkDerivation { pname = "publish"; - version = "2.2.2"; - sha256 = "19bvdldggklzq6wqgcbvnf4jjlbdbh1l80dm92aj0405a9rhsa28"; - revision = "2"; - editedCabalFile = "19ajwrsd1l9p4cm9ckii5i6nb5w28sxl7kr129xz8kwkpj4z6lfq"; + version = "2.2.3"; + sha256 = "150zvz40r7lwmrqv7hvn07wb0gs9rcyn37ivcdv0m0h96bzy84w3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -217134,25 +218071,26 @@ self: { "pure-zlib" = callPackage ({ mkDerivation, array, base, base-compat, bytestring - , bytestring-builder, containers, filepath, fingertree, HUnit + , bytestring-builder, containers, criterion, filepath, HUnit , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time }: mkDerivation { pname = "pure-zlib"; - version = "0.6.7"; - sha256 = "1ddj88zk94gqqhxiyvkachvhwi5n2la4pfaf5vppkc9ma7sjhyhn"; + version = "0.6.8"; + sha256 = "10rlgzq6p93irnhlh8hzj040xbf8gn8swszbkrmaln0b2kk1mncb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base base-compat bytestring bytestring-builder containers - fingertree ]; executableHaskellDepends = [ base base-compat bytestring ]; testHaskellDepends = [ base base-compat bytestring filepath HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; - benchmarkHaskellDepends = [ base base-compat bytestring time ]; + benchmarkHaskellDepends = [ + base base-compat bytestring criterion time + ]; description = "A Haskell-only implementation of zlib / DEFLATE"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -217179,6 +218117,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "pureMD5_2_1_4" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, crypto-api + , crypto-api-tests, pretty-hex, QuickCheck, tagged, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "pureMD5"; + version = "2.1.4"; + sha256 = "0qwkvxwi9wh6knn69rg2hvc8ngmv1if77kmpcnp0xqr0l30fwavq"; + libraryHaskellDepends = [ + base binary bytestring cereal crypto-api tagged + ]; + testHaskellDepends = [ + base binary bytestring cereal crypto-api-tests pretty-hex + QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "A Haskell-only implementation of the MD5 digest (hash) algorithm"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "purebred-email" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , case-insensitive, concise, deepseq, hedgehog, lens, QuickCheck @@ -218845,8 +219804,8 @@ self: { }: mkDerivation { pname = "quickbench"; - version = "1.0"; - sha256 = "09mrhwvz0jnjrxgj3as7d4jl739gakli5crxfmp390x6a0p2bzlb"; + version = "1.0.1"; + sha256 = "16bkhk5fskhhjqzklqwv51s1k7cxgcyr4p1vifmrd6smxvidb5rn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220034,8 +220993,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.0"; - sha256 = "0a322ji29s537kz1mazbl7grbg0s1wkz2cxg74zlvqa47xbk20k1"; + version = "0.3.5"; + sha256 = "1b1xwsh01d5p685r85w0mlnf6ldqzy57vrbcsnr9lgdn6bjhvlih"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -220490,8 +221449,8 @@ self: { }: mkDerivation { pname = "ralist"; - version = "0.3.0.0"; - sha256 = "1qy6y7fcylbp6lym7y1k0bg28imhrfxrkvlfrm9mxg3lhvl71mrf"; + version = "0.4.0.0"; + sha256 = "1axn2mh1jiz5d39ygf0hg7a0bkywnld4j8jjkflycks1yr7mxha1"; libraryHaskellDepends = [ base deepseq indexed-traversable transformers ]; @@ -222744,6 +223703,8 @@ self: { pname = "reanimate-svg"; version = "0.13.0.1"; sha256 = "1h31r0lrslxqfayh06955p1kv35g42g3drmqp4miydk6zibyn091"; + revision = "1"; + editedCabalFile = "1g8cqw8a4vy7pp9ic02d49564vd61px2kld1pin0la9f3vk5f296"; libraryHaskellDepends = [ attoparsec base bytestring containers double-conversion hashable JuicyPixels lens linear mtl scientific text transformers vector xml @@ -224204,8 +225165,8 @@ self: { }: mkDerivation { pname = "reflex-ghci"; - version = "0.1.5.1"; - sha256 = "1m4sphj2qhj9ckjxjy6m4yzb2d6lq68a0fynv5q9ibc6550bm1sx"; + version = "0.1.5.2"; + sha256 = "18w9n6sm9b0ykjxqa800228b7s3y6gg8ckl6jnms3860p0cskpqq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224407,10 +225368,8 @@ self: { }: mkDerivation { pname = "reflex-process"; - version = "0.3.1.0"; - sha256 = "1z86h7wkzg69d6kw0y37pzr4ldpg9qkl8wx5mw7r1h82isb9wgbl"; - revision = "1"; - editedCabalFile = "16vwrz7amccy8j2wn9146j8lif35f7ycpssd0p649ha746s7hrf4"; + version = "0.3.1.1"; + sha256 = "15f9qn5rx6dwjnkhg5szhagxsj7vnh3bh4ad7j4jsi87m627mlj2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227005,20 +227964,18 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "req_3_9_1" = callPackage + "req_3_9_2" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, exceptions, hspec , hspec-core, hspec-discover, http-api-data, http-client , http-client-tls, http-types, modern-uri, monad-control, mtl , QuickCheck, retry, template-haskell, text, time, transformers - , transformers-base, unliftio-core, unordered-containers + , transformers-base, unliftio-core }: mkDerivation { pname = "req"; - version = "3.9.1"; - sha256 = "0468ah4142jrqp5l3pw4izrw6f6kznisan888b30jhif4c6xncr0"; - revision = "3"; - editedCabalFile = "0xx161kb3j1givixs489yhd6zgiscajbn6hdkf00pdkwqdy59k75"; + version = "3.9.2"; + sha256 = "17xkj5pypn4k6ncsahjc0h827kg3cyx5iy5q6iv1gvk8dwdiim0g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -227030,7 +227987,7 @@ self: { testHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive hspec hspec-core http-client http-types modern-uri monad-control mtl - QuickCheck retry template-haskell text time unordered-containers + QuickCheck retry template-haskell text time ]; testToolDepends = [ hspec-discover ]; doCheck = false; @@ -229838,17 +230795,6 @@ self: { }) {}; "roles" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "roles"; - version = "0.2.0.0"; - sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2"; - libraryHaskellDepends = [ base containers ]; - description = "Composable class-based roles"; - license = lib.licenses.bsd3; - }) {}; - - "roles_0_2_1_0" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "roles"; @@ -229857,7 +230803,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Composable class-based roles"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rollbar" = callPackage @@ -233811,22 +234756,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "scheduler_2_0_0" = callPackage - ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions - , genvalidity-hspec, hspec, hspec-discover, mwc-random, primitive - , pvar, QuickCheck, template-haskell, unliftio, unliftio-core - , vector + "scheduler_2_0_0_1" = callPackage + ({ mkDerivation, atomic-primops, base, deepseq, exceptions + , genvalidity-hspec, hspec, hspec-discover, primitive, pvar + , QuickCheck, unliftio, unliftio-core }: mkDerivation { pname = "scheduler"; - version = "2.0.0"; - sha256 = "1i0fz2gj2q12gfl1h8ar0ikkqksznr1rij7fsx1v0qi6qg9d7cc3"; + version = "2.0.0.1"; + sha256 = "1hdqm04m3n5y3xrhilj0hykrmqdsjz5p6k2p9y1005khkj5dag9f"; libraryHaskellDepends = [ atomic-primops base deepseq exceptions primitive pvar unliftio-core ]; testHaskellDepends = [ - base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck - template-haskell unliftio vector + base deepseq genvalidity-hspec hspec QuickCheck unliftio ]; testToolDepends = [ hspec-discover ]; description = "Work stealing scheduler"; @@ -234319,8 +235262,8 @@ self: { pname = "scotty"; version = "0.12"; sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "5"; - editedCabalFile = "0fvxkpggysz6wfpllqwzx5xywgb2fnfmknw9xhvmxgk765v60jrn"; + revision = "6"; + editedCabalFile = "15gwvx9gdk4vxh1x2n5xvnrix8m0wl96a4aqbdmdfrka43sywfma"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types @@ -236348,6 +237291,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "semigroupoids_5_3_6" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, distributive, hashable, tagged + , template-haskell, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.3.6"; + sha256 = "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n"; + revision = "1"; + editedCabalFile = "0inbks8x588bpcw7kyap69iy0zrkygycp8hwgrd9yhbxlvj9hmh9"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable tagged template-haskell transformers + transformers-compat unordered-containers + ]; + description = "Semigroupoids: Category sans id"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "semigroupoids-do" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { @@ -237653,8 +238618,8 @@ self: { pname = "servant-benchmark"; version = "0.1.2.0"; sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; - revision = "2"; - editedCabalFile = "1xg1w1cy44a06sb1x2j5crid9splfgay8cj20bpjdnv5sj510gd2"; + revision = "3"; + editedCabalFile = "17pj6n143lpk5nsr6j8j1a6fj45y1bv61jcm16m0fwsdmhv01866"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml @@ -237772,7 +238737,6 @@ self: { ]; description = "Command line interface for Servant API clients"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-client" = callPackage @@ -238326,6 +239290,7 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "servant-haxl-client" = callPackage @@ -238844,8 +239809,8 @@ self: { }: mkDerivation { pname = "servant-pagination"; - version = "2.3.0"; - sha256 = "0kza7lr3akx3zviqbxlw74f1y66y8c6kys52n49brvrhqwnv4xwd"; + version = "2.4.1"; + sha256 = "181an5p0qfzbv3cirnaq8bw778iib4qhv53y60z1ssn16v2vxhq5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239716,8 +240681,8 @@ self: { }: mkDerivation { pname = "servant-to-elm"; - version = "0.4.2.0"; - sha256 = "1hbz6c9233wgpgmgnplg9qv5hrniynkn5n4zsmkyansw07gmaw05"; + version = "0.4.3.0"; + sha256 = "1s63x270bci7nyz595azff1ny868jjpqbilmy01rzbspjrfhwi7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240673,8 +241638,8 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "2.3.2"; - sha256 = "1rsa953pykrrfsf7lcnk4ds7vydb9p7s8irvaxvi1v4m2q2zg7a5"; + version = "2.3.3"; + sha256 = "0mil91bqzx5lrd7pl1in35ir7zwa6h8lmm9wvqifk7y241hg99gg"; libraryHaskellDepends = [ array base bytestring containers data-fix deepseq invertible-grammar prettyprinter recursion-schemes scientific @@ -240693,7 +241658,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "sexp-grammar_2_3_3" = callPackage + "sexp-grammar_2_3_3_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , criterion, data-fix, deepseq, happy, invertible-grammar , prettyprinter, QuickCheck, recursion-schemes, scientific @@ -240702,8 +241667,8 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "2.3.3"; - sha256 = "0mil91bqzx5lrd7pl1in35ir7zwa6h8lmm9wvqifk7y241hg99gg"; + version = "2.3.3.1"; + sha256 = "08sqpk5qgq3mqlxvz24sw43m52khynpf41cnd4yif4b4ri583mb9"; libraryHaskellDepends = [ array base bytestring containers data-fix deepseq invertible-grammar prettyprinter recursion-schemes scientific @@ -240711,9 +241676,9 @@ self: { ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ - base containers invertible-grammar prettyprinter QuickCheck - scientific semigroups tasty tasty-hunit tasty-quickcheck text - utf8-string + base bytestring containers invertible-grammar prettyprinter + QuickCheck scientific semigroups tasty tasty-hunit tasty-quickcheck + text ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq text @@ -241545,6 +242510,8 @@ self: { pname = "shakespeare"; version = "2.0.25"; sha256 = "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4"; + revision = "1"; + editedCabalFile = "0na31a7h3sq8ndrx79waywsfj5667pm0masy10gxzhzwmf6i3s1l"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -242360,8 +243327,8 @@ self: { pname = "short-vec"; version = "0.1.0.0"; sha256 = "0w651jipwxh7k4ng5rvq507br4347hzy8x8c47c1g7haryj80gzq"; - revision = "2"; - editedCabalFile = "1w56zmw085509grvk5ddlrv12pqpzfpmdprjd44lv4sgzv09bzfk"; + revision = "4"; + editedCabalFile = "1rwzaxdpkrn1v7p8jph4m91vyphdzm9h2yppnmanp636p0sjxzf4"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive fin-int indexed-traversable integer-gmp portray portray-diff QuickCheck @@ -242378,8 +243345,10 @@ self: { gauge indexed-traversable integer-gmp portray portray-diff QuickCheck semigroupoids sint ]; - description = "A length-indexed vector type build on 'SmallArray#'"; + description = "Length-indexed vectors using SmallArray#"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "short-vec-lens" = callPackage @@ -242390,11 +243359,14 @@ self: { pname = "short-vec-lens"; version = "0.1.0.0"; sha256 = "1afz1izz19xrjy0cdhmpy7b667waa5v8jh1ps3jpjfpgbmysjz3g"; + revision = "1"; + editedCabalFile = "1bkvx7csgqdn16kamih5h797pcg3ppcf6gln7lf01bw9pd5hpkkb"; libraryHaskellDepends = [ base fin-int indexed-traversable lens short-vec sint ]; description = "Lenses and related functionality for the `short-vec` package"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "shortbytestring" = callPackage @@ -248278,8 +249250,10 @@ self: { pname = "snumber"; version = "0.1.0.0"; sha256 = "0f340hzhhmiy342c5250m61f3gkcnfymjbd2a13alzdh7pmhb2mg"; + revision = "1"; + editedCabalFile = "0cc7chg4qhqlrkdv2m7y514gs9lm1hixwaw543dv47vqb12063im"; libraryHaskellDepends = [ base numeric-kinds ]; - description = "Indexed numeric types linking type-level and value-level numbers"; + description = "Integer singletons with flexible representation"; license = lib.licenses.asl20; }) {}; @@ -248660,6 +249634,8 @@ self: { pname = "solana-staking-csvs"; version = "0.1.1.0"; sha256 = "0ya63vgh0nf4p7hz6fj38m44wr77jj76bf2qxdgra3lpiziqsjd5"; + revision = "2"; + editedCabalFile = "1f55xdlmfj5g5r7dr71aw878g3ii9zaxj24znc370j2gd182nr13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -251445,6 +252421,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "stache_2_3_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, gitrev, hspec + , hspec-discover, hspec-megaparsec, megaparsec, mtl + , optparse-applicative, template-haskell, text, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "2.3.1"; + sha256 = "1a26pwg6y90588yf9sp18w4b2ahr64fxdhy1c3zv0c9pw7bv6k6q"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text vector + ]; + executableHaskellDepends = [ + aeson base filepath gitrev optparse-applicative text yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec template-haskell text yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + description = "Mustache templates for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal @@ -252313,6 +253322,8 @@ self: { pname = "stackcollapse-ghc"; version = "0.0.1.4"; sha256 = "1scqjjp1cpz3zzvqa6wmfz11qrhsbqwgq7h8qjg0d8ri3r9z82lb"; + revision = "1"; + editedCabalFile = "0k4gayvmjdfvfbyxjcmw1hk9vi90l0f9p3npi4rv2wwn1pl00vgm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -255832,8 +256843,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "string-interpreter"; - version = "0.5.3.0"; - sha256 = "0ny0py7fhcbv1zkr96ngypb9mf241avds0i77lynnpig96j1ay14"; + version = "0.5.4.1"; + sha256 = "1dgmqircw5gz62crxzx3d7gk2xyvmcwqdy15rpjgy2q7q5brcv7h"; libraryHaskellDepends = [ base ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; @@ -256490,6 +257501,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "structured_0_1_1" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, binary + , bytestring, containers, hashable, scientific, tagged, text + , time-compat, transformers, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "structured"; + version = "0.1.1"; + sha256 = "1mz02ys85z79nj24ylsmgh8v2m7zv2rixf7w0iqnwc49lax52w4q"; + libraryHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + hashable scientific tagged text time-compat transformers + unordered-containers uuid-types vector + ]; + description = "Structure (hash) of your data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "structured-cli" = callPackage ({ mkDerivation, base, data-default, exceptions, haskeline, mtl , split, transformers @@ -257894,6 +258925,7 @@ self: { libraryPkgconfigDepends = [ librsvg ]; description = "Binding to the libsvg-cairo library"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dalpd ]; }) {inherit (pkgs) librsvg;}; "svgone" = callPackage @@ -258405,7 +259437,7 @@ self: { license = "unknown"; }) {}; - "sydtest_0_4_0_0" = callPackage + "sydtest_0_4_1_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -258414,8 +259446,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.4.0.0"; - sha256 = "1r3isd8rjlzx7j1j5drgd1zjxdp8a1hvwsla513hpv32mkbqf0za"; + version = "0.4.1.0"; + sha256 = "1g63qq1hisfpnic9sl2a8bry1wyr6ccdcq0l2dagdnggripjgdl1"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -260101,8 +261133,8 @@ self: { }: mkDerivation { pname = "system-linux-proc"; - version = "0.1.1"; - sha256 = "12iq9vw5y0pvag9gj6pzm76lh9vfvziawzqzvi35mhdn1hjwhg4b"; + version = "0.1.1.1"; + sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors text ]; @@ -261650,8 +262682,8 @@ self: { pname = "taskwarrior"; version = "0.3.0.0"; sha256 = "1h24d799q1s6b36hd40bxa4c9m1izkgh6j7p2jv1p6cxngz28ni0"; - revision = "5"; - editedCabalFile = "1h7ybnxx5f0w1h13wzbx30ycf578dnv12wx4pqn3pfxqz1jz3gjg"; + revision = "6"; + editedCabalFile = "02jag4yib1fqf2fp9p323hb3vsbkrqm1k9zp2wag6ysl5kvvq1x6"; libraryHaskellDepends = [ aeson base bytestring containers process random text time unordered-containers uuid @@ -262226,6 +263258,8 @@ self: { pname = "tasty-lua"; version = "0.2.3.2"; sha256 = "0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53"; + revision = "1"; + editedCabalFile = "1m5mdn3riwwmvri430iq9m3yl09xsacvkp8w7vyqdmd70w3f9pcw"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; @@ -262363,7 +263397,7 @@ self: { license = lib.licenses.mit; }) {}; - "tasty-silver_3_3" = callPackage + "tasty-silver_3_3_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, silently, stm, tagged, tasty @@ -262371,8 +263405,8 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.3"; - sha256 = "1glhq2kkgnv5bf2664k7ph9kz9wcak758jb1jszl03wpv5c8idil"; + version = "3.3.1"; + sha256 = "1pd83mzx0iv3f396m09rxmgcpcfaya0a9818dl3h4vgw0hnqkmav"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -263726,6 +264760,8 @@ self: { pname = "ten"; version = "0.1.0.2"; sha256 = "0djvcb2l9dnnjbhivchi6yyaj5i96jmy7yhr9x3paiz1l54brrqx"; + revision = "1"; + editedCabalFile = "1dcr49q8g3wr1glhlawvg4bbz3mykvwnx7z9pw1ssvk9w7839z6r"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive hashable portray portray-diff some text transformers wrapped @@ -263735,7 +264771,7 @@ self: { HUnit portray portray-diff some test-framework test-framework-hunit text transformers wrapped ]; - description = "Typeclasses like Functor, etc. over arity-1 type constructors."; + description = "Functors et al. over arity-1 type constructors"; license = lib.licenses.asl20; }) {}; @@ -263760,6 +264796,8 @@ self: { pname = "ten-unordered-containers"; version = "0.1.0.2"; sha256 = "0y4aw77ix2ay43l8n17322hbmm1npcdr1bl7kdza377jd1ci20px"; + revision = "1"; + editedCabalFile = "196gjc39c0x4p444byh7mwnhf9ci7dxhmxl602ha52fr554cdh0j"; libraryHaskellDepends = [ base hashable portray portray-diff some ten unordered-containers wrapped @@ -263769,7 +264807,7 @@ self: { portray-pretty some ten ten-lens test-framework test-framework-hunit text transformers unordered-containers wrapped ]; - description = "A package providing one unordered container"; + description = "Higher-kinded hash containers"; license = lib.licenses.asl20; }) {}; @@ -265879,6 +266917,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-short_0_1_4" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim + , hashable, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "text-short"; + version = "0.1.4"; + sha256 = "1p56cjm6f883ajb54y8hmrl01sqda6a36xvbmgjv3mb9gxv953v4"; + libraryHaskellDepends = [ + base binary bytestring deepseq ghc-prim hashable template-haskell + text + ]; + testHaskellDepends = [ + base binary bytestring quickcheck-instances tasty tasty-hunit + tasty-quickcheck template-haskell text + ]; + description = "Memory-efficient representation of Unicode text strings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion @@ -267506,6 +268566,8 @@ self: { pname = "threepenny-gui"; version = "0.9.1.0"; sha256 = "00sjkfa9qfnnwqfdw68yb8hq6nm1y5qv9896rzn5aachr7mlfpx2"; + revision = "1"; + editedCabalFile = "0zdpkp0pl6z4aabikbq30md392gk988fxwcqw10khv1icm143pcc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -267929,8 +268991,8 @@ self: { pname = "tidal-midi"; version = "0.9.10"; sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4"; - revision = "1"; - editedCabalFile = "11wkj909j2jlq19ls7q5293av648vc2k6f2064hyrqwcd68mksnj"; + revision = "2"; + editedCabalFile = "1vc5ck25wdqz8ywk2zmn2nmg1mihwkihwp2wirxmmd0qxi1v2vpf"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -270220,8 +271282,8 @@ self: { pname = "tokyocabinet-haskell"; version = "0.0.7"; sha256 = "1fmj46wvl6ayx30r5r538vnygz32s1877m2f9zf7nb2zyiz5vmcb"; - revision = "1"; - editedCabalFile = "07kx002x3yh1klhxn9fq0bi2pfy4mdqacg3caqklmdl22dkh74lq"; + revision = "2"; + editedCabalFile = "0h9lc9cg5iwy9apjz48nwvblsmlkv7r5rvnivshvhys2xi1hfxja"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet ]; testHaskellDepends = [ base bytestring directory HUnit mtl ]; @@ -272156,6 +273218,34 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_2_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, bytestring, bytestring-builder, containers + , criterion, deepseq, Diff, hashable, parsec, parsers, pretty + , primitive, QuickCheck, scientific, semialign, strict, tagged + , tasty, tasty-golden, tasty-quickcheck, text, these, time + , trifecta, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.2.1"; + sha256 = "0bybi4qp7nj9117yza5qqgw2f7s6rk3i7q642jqd7sdn3bx5cnap"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + bytestring-builder containers deepseq hashable parsec parsers + pretty primitive QuickCheck scientific semialign strict tagged text + these time unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-compat parsec primitive + QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -275300,25 +276390,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers, unliftio-core - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.6.1"; - sha256 = "0w4c76qln49967nnhf7f1zj3gbdfqp2qgf5ym8svhqyhp5gh61ws"; - libraryHaskellDepends = [ - async base bytestring process stm transformers unliftio-core - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers unliftio-core - ]; - description = "Run external processes, with strong typing of streams"; - license = lib.licenses.mit; - }) {}; - - "typed-process_0_2_6_3" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core }: @@ -275335,7 +276406,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -283597,8 +284667,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.12.2"; - sha256 = "1vypjnwvvvd0rw99qsb00jnwpq792s9x1wi62zdyzq9cwlf47ici"; + version = "3.13"; + sha256 = "14cb1fg0x0fy2bvjyjmxvbq2sm56ixzvz9sqacs7nak961yyvdy0"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -283630,8 +284700,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.2"; - sha256 = "05h54dzci8ahnxshrcd7l6bpg1q8llnrwycgpbpn12cf6ddmdc59"; + version = "0.5.3"; + sha256 = "16p1yn72il988phw4h8ixs0p2dgk96xg26yp9lgbpri1l0da8kiq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -284066,6 +285136,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "wai-feature-flags_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, splitmix, text + , unordered-containers, wai, warp + }: + mkDerivation { + pname = "wai-feature-flags"; + version = "0.1.0.2"; + sha256 = "03w8hskgajvkhjsrj7ynxcx92qghqfd9rfxb5v4wm7wb6lag8qvh"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring splitmix text unordered-containers wai + ]; + executableHaskellDepends = [ base wai warp ]; + description = "Feature flag support for WAI applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -284163,10 +285253,8 @@ self: { }: mkDerivation { pname = "wai-handler-hal"; - version = "0.1.0.0"; - sha256 = "0sjw01k5dyhdi33ld1pd4mf9plpij0spzxf2b228cjyc8x5zx7rj"; - revision = "2"; - editedCabalFile = "0aj45x1czwd69hd4yxsc607njb1qwxz926izzh79axfkrzgiij9k"; + version = "0.1.1.0"; + sha256 = "1l9adjrh0iffph40pqymikr5h52ldlyp2q9l7qclcamwdwkawmz0"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai @@ -285881,6 +286969,8 @@ self: { ]; description = "Warp based on QUIC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "warp-static" = callPackage @@ -285919,23 +287009,6 @@ self: { }) {}; "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, unliftio - , wai, warp - }: - mkDerivation { - pname = "warp-tls"; - version = "3.3.1"; - sha256 = "1k8f3r0l36mgwm69fikprv6pyjzj15702kq25dr9nc3sv5lcs162"; - libraryHaskellDepends = [ - base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager unliftio wai warp - ]; - description = "HTTP over TLS support for Warp via the TLS package"; - license = lib.licenses.mit; - }) {}; - - "warp-tls_3_3_2" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, unliftio , wai, warp @@ -285950,7 +287023,6 @@ self: { ]; description = "HTTP over TLS support for Warp via the TLS package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -286025,10 +287097,8 @@ self: { ({ mkDerivation, base, mtl, time }: mkDerivation { pname = "watchdog"; - version = "0.3"; - sha256 = "0v8jbrnqg48x5ksdacsd0xazpxqv64ggzihg6k2y6pljqznrhn1i"; - revision = "1"; - editedCabalFile = "1hmjlva0pbvbbl3vcngqlqrisx32qzlc9pl96zh2rb6m25riisdg"; + version = "0.3.1"; + sha256 = "01zhj464c1lwjgb6zijqjlrzfcrknfmf2v2b2m1pmxy94jly2ww9"; libraryHaskellDepends = [ base mtl time ]; description = "Simple control structure to re-try an action with exponential backoff"; license = lib.licenses.bsd3; @@ -287514,6 +288584,32 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "weeder_2_3_0" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , dhall, directory, filepath, generic-lens, ghc, lens, mtl + , optparse-applicative, regex-tdfa, text, transformers + }: + mkDerivation { + pname = "weeder"; + version = "2.3.0"; + sha256 = "1l3g0afb0k91qb64kpj18nb53njbv3s5w06rkjf58p7qk6ynk9ig"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers dhall directory + filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa + text transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers + ]; + description = "Detect dead code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "weekdaze" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , cryptohash, data-default, deepseq, directory, extra, factory @@ -288413,6 +289509,8 @@ self: { pname = "witherable"; version = "0.4.1"; sha256 = "1jj2dq0ddaa2v3hksnrv1z1ll19fa4npsqlp7fs4nn5g6833y58b"; + revision = "1"; + editedCabalFile = "02l2gbcab7w72hqlbs1ikylgb1970a0iyrikn847nncivbzrc3gj"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -288426,6 +289524,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "witherable_0_4_2" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , indexed-traversable, indexed-traversable-instances, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.4.2"; + sha256 = "0121ic4xkv3k568j23zp22a5lrv0k11h94fq7cbijd18fjr2n3br"; + libraryHaskellDepends = [ + base base-orphans containers hashable indexed-traversable + indexed-traversable-instances transformers unordered-containers + vector + ]; + testHaskellDepends = [ + base containers hashable QuickCheck quickcheck-instances tasty + tasty-quickcheck transformers unordered-containers vector + ]; + description = "filterable traversable"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "witherable-class" = callPackage ({ mkDerivation, base, witherable }: mkDerivation { @@ -289367,8 +290489,10 @@ self: { pname = "wrapped"; version = "0.1.0.1"; sha256 = "00fvammhn4dlna5d1dc8lpwrdrigj9cnlyi8scwslibr6bjsjzfp"; + revision = "1"; + editedCabalFile = "0qfl0k0bsxhf5zibfdfm08jn82j1nm8pdnmv23znmhv77hpm4li8"; libraryHaskellDepends = [ base ]; - description = "Provides a single standardized place to hang DerivingVia instances"; + description = "Newtypes to carry DerivingVia instances"; license = lib.licenses.asl20; }) {}; @@ -289378,8 +290502,10 @@ self: { pname = "wrapped-generic-default"; version = "0.1.0.1"; sha256 = "10hbz8m98cw8lr2xj0wkc017pnypagb11ss1ihpp6lnc4w1hpj3f"; + revision = "1"; + editedCabalFile = "0i75biqz6qml17yzg3k4q0ms5vzvwph37da1wl3l5v8cjnw2yrs7"; libraryHaskellDepends = [ base data-default-class wrapped ]; - description = "Provides an orphan instance Default (Wrapped Generic a)"; + description = "A Generic instance of Default"; license = lib.licenses.asl20; }) {}; @@ -290647,28 +291773,6 @@ self: { }) {}; "xeno" = callPackage - ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib - , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl - , mutable-containers, time, vector, weigh, xml - }: - mkDerivation { - pname = "xeno"; - version = "0.4.2"; - sha256 = "0dvjzh7yyijwy2d6215wlxlln9h0ng6bnqasfh38prp6sllxk25j"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base bytestring deepseq mtl mutable-containers vector - ]; - testHaskellDepends = [ base bytestring hexml hspec ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-mmap bzlib criterion deepseq filepath - ghc-prim hexml hexpat time weigh xml - ]; - description = "A fast event-based XML parser in pure Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "xeno_0_4_3" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl , mutable-containers, time, vector, weigh, xml @@ -290688,7 +291792,6 @@ self: { ]; description = "A fast event-based XML parser in pure Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "xenstore" = callPackage @@ -291646,6 +292749,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "xml-syntax" = callPackage + ({ mkDerivation, array-builder, array-chunks, base, bytebuild + , byteslice, bytesmith, bytestring, primitive, tasty, tasty-hunit + , text-short + }: + mkDerivation { + pname = "xml-syntax"; + version = "0.1.0.0"; + sha256 = "1dbhh4rxvh0w17f9m2sd01bv6q20mg734wb87w6iqp4pv71mzhn3"; + libraryHaskellDepends = [ + array-builder array-chunks base bytebuild byteslice bytesmith + bytestring primitive text-short + ]; + testHaskellDepends = [ + base byteslice bytestring primitive tasty tasty-hunit + ]; + description = "Parse XML from bytes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "xml-to-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, curl , hashable, hxt, hxt-curl, hxt-expat, hxt-tagsoup, regex-posix @@ -292122,16 +293246,16 @@ self: { }) {}; "xmonad-dbus" = callPackage - ({ mkDerivation, base, dbus, utf8-string }: + ({ mkDerivation, base, dbus }: mkDerivation { pname = "xmonad-dbus"; - version = "0.1.0.0"; - sha256 = "18phy3wxags8cmgs9bdkhwb4gy8fr72j25b18nk44q8956a3060p"; + version = "0.1.0.1"; + sha256 = "15sqfk4y4arrv0bjzkrw49z1p7k3fqkn4w8pak2j7rki3915iyd4"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base dbus utf8-string ]; - executableHaskellDepends = [ base dbus utf8-string ]; - testHaskellDepends = [ base dbus utf8-string ]; + libraryHaskellDepends = [ base dbus ]; + executableHaskellDepends = [ base dbus ]; + testHaskellDepends = [ base dbus ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -293193,6 +294317,8 @@ self: { pname = "yaml"; version = "0.11.6.0"; sha256 = "0hxg9mfi1dn9a7kp3imzfvnk7jj4sdjdxi6xyqz9ra7lqg14np3r"; + revision = "1"; + editedCabalFile = "1yydwna0x7fj1zw0zkz3n1cfvnwdykblk19wz5bw9rcwp0i0mzkb"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -293211,6 +294337,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "yaml_0_11_7_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.11.7.0"; + sha256 = "0s08kw0hqxixxripwjmz7b4yh9130dws3jaj460x8ds8q4b6khbx"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath libyaml mtl resourcet scientific template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq + resourcet scientific template-haskell temporary text transformers + unordered-containers vector + ]; + description = "Support for parsing and rendering YAML documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -293549,8 +294705,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.13.2"; - sha256 = "004qly1sags94p7ks1j93xziixbpi3wsblbh2d2ws78gyywqdj9f"; + version = "0.13.3"; + sha256 = "08xs3m14rqpgkjghgp2b8ddalzzs50bzf11nd9kgi72xbg451yzi"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -295316,24 +296472,6 @@ self: { }) {}; "yesod-markdown" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, hspec, pandoc, persistent, shakespeare, text - , xss-sanitize, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-markdown"; - version = "0.12.6.11"; - sha256 = "044m6a949yifvyxbbc15ms11sdxvljvb68187h5v6xk0qw0p33i9"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring directory pandoc persistent - shakespeare text xss-sanitize yesod-core yesod-form - ]; - testHaskellDepends = [ base blaze-html hspec text ]; - description = "Tools for using markdown in a yesod application"; - license = lib.licenses.gpl2Only; - }) {}; - - "yesod-markdown_0_12_6_12" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , directory, hspec, pandoc, persistent, shakespeare, text , xss-sanitize, yesod-core, yesod-form @@ -295349,7 +296487,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-media-simple" = callPackage @@ -296309,6 +297446,8 @@ self: { pname = "yi-core"; version = "0.19.2"; sha256 = "1ipmycwf2fqk701x0d32bv03aviv7z57m0knpc3np5cvss9mjzvr"; + revision = "1"; + editedCabalFile = "1j3in75pnf72000hfia13z21d6z8vml3wg2sk35nsmr1x8r96xzf"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -296457,6 +297596,8 @@ self: { pname = "yi-keymap-emacs"; version = "0.19.0"; sha256 = "1pkdlkhs6am60whclfasd4axda8hlxzh7q38crmylcb89q90am1l"; + revision = "1"; + editedCabalFile = "1p9m3m25g31ysk4qkabr3vnd4nlycm4zgi56lmkzrlibbxvn6lja"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes text transformers-base yi-core yi-language yi-misc-modes yi-rope @@ -296476,6 +297617,8 @@ self: { pname = "yi-keymap-vim"; version = "0.19.0"; sha256 = "046552bqfd3wycx73zksffcnbakfl7xnfz1s2q9z5affpzi5iyrv"; + revision = "1"; + editedCabalFile = "0rm2nm6lki2248vx45rglslcmq9fc6cnqxrb7x8hyb56fxjyq1gz"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe text @@ -296561,6 +297704,8 @@ self: { pname = "yi-mode-javascript"; version = "0.19.0"; sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1"; + revision = "1"; + editedCabalFile = "09hdiy51i9piyh6889hzjhna8g9hlblrzgzkl8x6rc6pl12dg3wc"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -297295,6 +298440,40 @@ self: { license = lib.licenses.mit; }) {}; + "zenacy-html_2_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, dlist, extra, HUnit, mtl, pretty-show + , raw-strings-qq, safe, safe-exceptions, test-framework + , test-framework-hunit, text, transformers, vector, word8 + }: + mkDerivation { + pname = "zenacy-html"; + version = "2.0.4"; + sha256 = "05jy3w7a94ns52w4a1p6xhcph09p2zzqmvncf47db9wwq6xl5ad2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers data-default dlist extra mtl pretty-show + safe safe-exceptions text transformers vector word8 + ]; + executableHaskellDepends = [ + base bytestring containers data-default dlist extra pretty-show + text vector + ]; + testHaskellDepends = [ + base bytestring containers data-default dlist extra HUnit mtl + pretty-show raw-strings-qq test-framework test-framework-hunit text + transformers + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default dlist pretty-show + raw-strings-qq text + ]; + description = "A standard compliant HTML parsing library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "zenacy-unicode" = callPackage ({ mkDerivation, base, bytestring, HUnit, test-framework , test-framework-hunit, text, vector, word8 @@ -298409,14 +299588,16 @@ self: { }) {}; "zoovisitor" = callPackage - ({ mkDerivation, base, hspec, uuid, Z-Data, Z-IO, zookeeper_mt }: + ({ mkDerivation, async, base, hspec, uuid, Z-Data, Z-IO + , zookeeper_mt + }: mkDerivation { pname = "zoovisitor"; - version = "0.1.4.0"; - sha256 = "163aixwxjnrbd9gzh73mys2zkbni3sjxmjyg7z374fa1k08rrxya"; + version = "0.1.5.0"; + sha256 = "0sksa3sjgd2yg2cj6vr9ssk52zlhap45c93cwslk3q788c8krr35"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; - testHaskellDepends = [ base hspec uuid Z-Data ]; + testHaskellDepends = [ async base hspec uuid Z-Data ]; description = "A haskell binding to Apache Zookeeper C library(mt) using Haskell Z project"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -298505,26 +299686,6 @@ self: { }) {}; "zstd" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2, zlib - }: - mkDerivation { - pname = "zstd"; - version = "0.1.2.0"; - sha256 = "0vjw8r11k9kj6c63sfkwz8akq0g32g1bv6n6clvs4g2j12zq1xk8"; - libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base bytestring criterion ghc-prim zlib - ]; - description = "Haskell bindings to the Zstandard compression algorithm"; - license = lib.licenses.bsd3; - }) {}; - - "zstd_0_1_3_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2, zlib }: @@ -298542,7 +299703,6 @@ self: { ]; description = "Haskell bindings to the Zstandard compression algorithm"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "zsyntax" = callPackage diff --git a/pkgs/development/haskell-modules/patches/recursion-schemes-128.patch b/pkgs/development/haskell-modules/patches/recursion-schemes-128.patch new file mode 100644 index 000000000000..a40efc6f6334 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/recursion-schemes-128.patch @@ -0,0 +1,24 @@ +diff --git a/recursion-schemes.cabal b/recursion-schemes.cabal +index c35f2c6..e692ade 100644 +--- a/recursion-schemes.cabal ++++ b/recursion-schemes.cabal +@@ -93,6 +93,7 @@ library + Paths_recursion_schemes + + ghc-options: -Wall ++ ghc-prof-options: -DPROFILING_ENABLED + if impl(ghc >= 8.6) + ghc-options: -Wno-star-is-type + default-language: Haskell2010 +diff --git a/src/Data/Functor/Foldable/TH.hs b/src/Data/Functor/Foldable/TH.hs +index b3d5ac8..d4ef0e4 100644 +--- a/src/Data/Functor/Foldable/TH.hs ++++ b/src/Data/Functor/Foldable/TH.hs +@@ -1,4 +1,7 @@ + {-# LANGUAGE CPP, PatternGuards, Rank2Types #-} ++#if defined(PROFILING_ENABLED) ++{-# OPTIONS_GHC -O0 #-} ++#endif + module Data.Functor.Foldable.TH + ( MakeBaseFunctor(..) + , BaseRules diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 01d1b61cb801..7a6f62a55c89 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bats"; - version = "1.3.0"; + version = "1.4.1"; src = fetchzip { url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz"; - hash = "sha256-+dboExOx2YELxV8Cwk9SVwk9G3p8EoP0LdaJ3o7GT6c="; + hash = "sha256-bGZXjq6zG9MJgDccpVYATsgYhhb1Zf7Deoa/DoSv8QE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 3a153977cd9b..4d414dc04e1d 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -19,13 +19,13 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.pre+unstable=2021-10-05"; + version = "0.pre+unstable=2021-10-09"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; - rev = "e23dab20daff9c0dacc2561c616174af72029a3e"; - hash = "sha256-amVKKD9hD5A+LbqglXHLKEsYqFSSztdXs1FCoNJyCJ4="; + rev = "debc4e2afe313a3c54133df9f26969c2927dc8aa"; + hash = "sha256-ixFDmtq6hd2enmPbBT0JCv1bmxt84zle4zPQzz+rMCI="; }; dontConfigure = true; @@ -34,11 +34,12 @@ stdenv.mkDerivation rec { sed -i '/SHELL =.*/ d' makefile ''; - preBuild = '' - # otherwise cbqn defaults to clang - makeFlagsArray+=("CC=$CC") + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; - # inform make we are providing the runtime ourselves + preBuild = '' + # Purity: avoids git downloading bytecode files touch src/gen/customRuntime '' + (if genBytecode then '' ${bqn-path} genRuntime ${mbqn-source} diff --git a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix b/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix index 846d6a045a99..e9b6bdf83c78 100644 --- a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix +++ b/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix @@ -8,31 +8,34 @@ stdenv.mkDerivation rec { pname = "dbqn" + lib.optionalString buildNativeImage "-native"; - version = "0.pre+unstable=2021-10-05"; + version = "0.pre+date=2021-10-08"; src = fetchFromGitHub { owner = "dzaima"; repo = "BQN"; - rev = "c31ceef52bbf380e747723f5ffd09c5f006b21c5"; - sha256 = "1nzqgwpjawcky85mfrz5izs9lfb3aqlm96dc8syrxhgg20xrziwx"; + rev = "0001109a1c5a420421b368c79d34b1e93bfe606e"; + hash = "sha256-riHHclTLkrVbtzmcz9ungAIc7kaoFHS77+SNatsfNhc="; }; nativeBuildInputs = [ - makeWrapper jdk + makeWrapper ]; dontConfigure = true; + postPatch = '' + patchShebangs --build ./build8 + ''; + buildPhase = '' runHook preBuild - patchShebangs --build ./build8 ./build8 '' + lib.optionalString buildNativeImage '' native-image --report-unsupported-elements-at-runtime \ - -H:CLibraryPath=${lib.getLib jdk}/lib \ - -J-Dfile.encoding=UTF-8 -jar BQN.jar dbqn + -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ + -jar BQN.jar dbqn '' + '' runHook postBuild ''; diff --git a/pkgs/development/interpreters/dzaima-apl/default.nix b/pkgs/development/interpreters/dzaima-apl/default.nix new file mode 100644 index 000000000000..d061a6cb9cdf --- /dev/null +++ b/pkgs/development/interpreters/dzaima-apl/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub +, jdk +, makeWrapper +, buildNativeImage ? true +}: + +stdenv.mkDerivation rec { + pname = "dapl" + lib.optionalString buildNativeImage "-native"; + version = "0.2.0+date=2021-10-16"; + + src = fetchFromGitHub { + owner = "dzaima"; + repo = "APL"; + rev = "5eb0a4205e27afa6122096a25008474eec562dc0"; + hash = "sha256-UdumMytqT909JRpNqzhYPuKPw644m/vRUsEbIVF2a7U="; + }; + + nativeBuildInputs = [ + jdk + makeWrapper + ]; + + dontConfigure = true; + + postPatch = '' + patchShebangs --build ./build + ''; + + buildPhase = '' + runHook preBuild + + ./build + '' + lib.optionalString buildNativeImage '' + native-image --report-unsupported-elements-at-runtime \ + -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ + -jar APL.jar dapl + '' + '' + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + '' + (if buildNativeImage then '' + mv dapl $out/bin + '' else '' + mkdir -p $out/share/${pname} + mv APL.jar $out/share/${pname}/ + + makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dapl" \ + --add-flags "-jar $out/share/${pname}/APL.jar" + '') + '' + ln -s $out/bin/dapl $out/bin/apl + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/dzaima/APL"; + description = "An APL implementation in Java" + lib.optionalString buildNativeImage ", compiled as a native image"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (jdk.meta) platforms; + }; +} +# TODO: Processing app +# TODO: minimalistic JDK diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix new file mode 100644 index 000000000000..38f340233017 --- /dev/null +++ b/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -0,0 +1,203 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, wrapGAppsHook +, readline +, ncurses +, zlib +, gsl +, openmp +, graphicsmagick +, fftw +, fftwFloat +, fftwLongDouble +, proj +, shapelib +, expat +, udunits +, eigen +, pslib +, eccodes +, glpk +, libpng +, plplot +, libtiff +, libgeotiff +, libjpeg + # We enable it in hdf4 and use libtirpc as a dependency here from the passthru + # of hdf4 +, enableLibtirpc ? stdenv.isLinux +, libtirpc +, python3 +, enableMPI ? (stdenv.isLinux || stdenv.isDarwin) + # Choose MPICH over OpenMPI because it currently builds on AArch and Darwin +, mpi + # Unfree optional dependency for hdf4 and hdf5 +, enableSzip ? false +, szip +, enableHDF4 ? true +, hdf4 +, hdf4-forced ? null +, enableHDF5 ? true + # HDF5 format version (API version) 1.10 and 1.12 is not fully compatible + # Specify if the API version should default to 1.10 + # netcdf currently depends on hdf5 with `usev110Api=true` + # If you wish to use HDF5 API version 1.12 (`useHdf5v110Api=false`), + # you will need to turn NetCDF off. +, useHdf5v110Api ? true +, hdf5 +, hdf5-forced ? null +, enableNetCDF ? true +, netcdf +, netcdf-forced ? null +, plplot-forced ? null + # wxWidgets is preferred over X11 for this project but we only have it on Linux + # and Darwin. Also, we use the wxWidgets dependency here from the passthru of + # plplot. +, enableWX ? (stdenv.isLinux || stdenv.isDarwin) + # X11: OFF by default for platform consistency. Use X where WX is not available +, enableXWin ? (!stdenv.isLinux && !stdenv.isDarwin) +}: + +let + hdf4-custom = + if hdf4-forced != null + then hdf4-forced + else + hdf4.override { + uselibtirpc = enableLibtirpc; + szipSupport = enableSzip; + inherit szip; + }; + hdf5-custom = + if hdf5-forced != null + then hdf5-forced + else + hdf5.override { + usev110Api = useHdf5v110Api; + mpiSupport = enableMPI; + inherit mpi; + szipSupport = enableSzip; + inherit szip; + }; + netcdf-custom = + if netcdf-forced != null + then netcdf-forced + else + netcdf.override { + hdf5 = hdf5-custom; + }; + enablePlplotDrivers = enableWX || enableXWin; + plplot-with-drivers = + if plplot-forced != null + then plplot-forced + else + plplot.override { + inherit + enableWX + enableXWin + ; + }; +in +stdenv.mkDerivation rec { + pname = "gnudatalanguage"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = pname; + repo = "gdl"; + rev = "v${version}"; + sha256 = "sha256-Y9LVRaWjQqpWqjNngxB406PE/rl/9S8rs0u0CK5ivUA="; + }; + + buildInputs = [ + readline + ncurses + zlib + gsl + openmp + graphicsmagick + fftw + fftwFloat + fftwLongDouble + proj + shapelib + expat + mpi + udunits + eigen + pslib + eccodes + glpk + libpng + libtiff + libgeotiff + libjpeg + hdf4-custom + hdf5-custom + netcdf-custom + plplot-with-drivers + ] ++ lib.optional enableXWin plplot-with-drivers.libX11 + ++ lib.optional enableWX plplot-with-drivers.wxWidgets + ++ lib.optional enableMPI mpi + ++ lib.optional enableLibtirpc hdf4-custom.libtirpc + ++ lib.optional enableSzip szip; + + propagatedBuildInputs = [ + (python3.withPackages (ps: with ps; [ numpy ])) + ]; + + nativeBuildInputs = [ + cmake + ] ++ lib.optional enableWX wrapGAppsHook; + + cmakeFlags = lib.optional (!enableHDF4) "-DHDF=OFF" + ++ [ (if enableHDF5 then "-DHDF5DIR=${hdf5-custom}" else "-DHDF5=OFF") ] + ++ lib.optional (!enableNetCDF) "-DNETCDF=OFF" + ++ lib.optional (!enablePlplotDrivers) "-DINTERACTIVE_GRAPHICS=OFF" + ++ lib.optional (!enableWX) "-DWXWIDGETS=OFF" + ++ lib.optional enableSzip "-DSZIPDIR=${szip}" + ++ lib.optionals enableXWin [ "-DX11=ON" "-DX11DIR=${plplot-with-drivers.libX11}" ] + ++ lib.optionals enableMPI [ "-DMPI=ON" "-DMPIDIR=${mpi}" ]; + + doCheck = true; + + # Opt-out unstable tests + # https://github.com/gnudatalanguage/gdl/issues/482 + # https://github.com/gnudatalanguage/gdl/issues/1079 + # https://github.com/gnudatalanguage/gdl/issues/460 + preCheck = '' + checkFlagsArray+=("ARGS=-E 'test_tic_toc.pro|test_byte_conversion.pro|test_bytscl.pro|test_call_external.pro'") + ''; + + passthru = { + hdf4 = hdf4-custom; + hdf5 = hdf5-custom; + netcdf = netcdf-custom; + plplot = plplot-with-drivers; + python = python3; + inherit + enableMPI + mpi + useHdf5v110Api + enableSzip + enableWX + enableXWin + ; + }; + + meta = with lib; { + description = "Free incremental compiler of IDL"; + longDescription = '' + GDL (GNU Data Language) is a free/libre/open source incremental compiler + compatible with IDL (Interactive Data Language) and to some extent with PV-WAVE. + GDL is aimed as a drop-in replacement for IDL. + ''; + homepage = "https://github.com/gnudatalanguage/gdl"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ShamrockLee ]; + platforms = platforms.all; + mainProgram = "gdl"; + }; +} diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index e74649cab4a4..ff93e842eeae 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -25,7 +25,6 @@ pname # propagate build dependencies so in case we have A -> B -> C, # C can import package A propagated by B , propagatedBuildInputs ? [] -, propagatedNativeBuildInputs ? [] # used to disable derivation, useful for specific lua versions # TODO move from this setting meta.broken to a 'disabled' attribute on the @@ -50,7 +49,7 @@ pname # The latter is used to work-around luarocks having a problem with # multiple-output derivations as external deps: # https://github.com/luarocks/luarocks/issues/766 -, externalDeps ? lib.unique (lib.filter (drv: !drv ? luaModule) (propagatedBuildInputs ++ buildInputs)) +, externalDeps ? [] # Appended to the generated luarocks config , extraConfig ? "" @@ -74,7 +73,6 @@ pname let generatedRockspecFilename = "${rockspecDir}/${pname}-${version}.rockspec"; - # TODO fix warnings "Couldn't load rockspec for ..." during manifest # construction -- from initial investigation, appears it will require # upstream luarocks changes to fix cleanly (during manifest construction, @@ -83,7 +81,7 @@ let luarocks_config = "luarocks-config.lua"; luarocks_content = let generatedConfig = lua.pkgs.lib.generateLuarocksConfig { - inherit externalDeps; + externalDeps = externalDeps ++ externalDepsGenerated; inherit extraVariables; inherit rocksSubdir; inherit requiredLuaRocks; @@ -99,12 +97,13 @@ let # Filter out the lua derivation itself from the Lua module dependency # closure, as it doesn't have a rock tree :) requiredLuaRocks = lib.filter (d: d ? luaModule) - (lua.pkgs.requiredLuaModules propagatedBuildInputs); + (lua.pkgs.requiredLuaModules luarocksDrv.propagatedBuildInputs); # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] + externalDepsGenerated = lib.unique (lib.filter (drv: !drv ? luaModule) (luarocksDrv.propagatedBuildInputs ++ luarocksDrv.buildInputs)); externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; -in -toLuaModule ( lua.stdenv.mkDerivation ( + + luarocksDrv = toLuaModule ( lua.stdenv.mkDerivation ( builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariables"] // { name = namePrefix + pname + "-" + version; @@ -146,13 +145,12 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab runHook postConfigure ''; - # TODO could be moved to configurePhase buildPhase = '' runHook preBuild nix_debug "Using LUAROCKS_CONFIG=$LUAROCKS_CONFIG" - LUAROCKS=luarocks + LUAROCKS=${lua.pkgs.luarocks}/bin/luarocks if (( ''${NIX_DEBUG:-0} >= 1 )); then LUAROCKS="$LUAROCKS --verbose" fi @@ -195,6 +193,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab passthru = { inherit lua; # The lua interpreter inherit externalDeps; + inherit luarocks_content; } // passthru; meta = { @@ -203,4 +202,6 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab maintainers = (meta.maintainers or []) ++ [ ]; broken = disabled; } // meta; -})) +})); +in + luarocksDrv diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index a780e6ba49f1..de61714f2421 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -16,7 +16,8 @@ let overrides = packageOverrides; }; -plat = if stdenv.isLinux then "linux" +plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" + else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" else if stdenv.isDarwin then "macosx" else if stdenv.hostPlatform.isMinGW then "mingw" else if stdenv.isFreeBSD then "freebsd" diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index e8228d23b0c9..6a1d6c30cc18 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -114,12 +114,12 @@ let }; self = mkDerivation rec { - version = "6.2.0"; + version = "6.3.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-RX0f2oY0qDni/Xz8VbmL1W82tq5z0xu530Pd4wEsqnw="; + sha256 = "sha256-IyBl86cvwwE/6fF/Qpo99p1nLB9rYHcCmjHI881Ypm4="; }; buildInputs = [ diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index db5284e91278..5f29e0411284 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -42,6 +42,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; platforms = platforms.unix; - maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 899dafde76f2..ef3ba58e7e25 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aml"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "0mxmzlhiv88hm4sf8kyawyrml8qy1xis019hdyb5skl9g95z9yyf"; + sha256 = "1m911n3rd41ch4yk3k9k1lz29xp3h54k6jx122abq5kmngy9znqw"; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix index a16885ab2549..f22f81c87709 100644 --- a/pkgs/development/libraries/argtable/default.nix +++ b/pkgs/development/libraries/argtable/default.nix @@ -1,22 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake }: stdenv.mkDerivation rec { pname = "argtable"; - version = "3.1.5"; - srcVersion = "v${version}.1c1bb23"; + version = "3.2.1"; + srcVersion = "v${version}.52f24e5"; src = fetchFromGitHub { owner = "argtable"; repo = "argtable3"; rev = srcVersion; - sha256 = "sha256-sL6mnxsuL1K0DY26jLF/2Czo0RxHYJ3xU3VyavISiMM="; + hash = "sha256-HFsk91uJXQ0wpvAQxP4/yZwRQx9kLH7KgB3Y/+zcZC0="; }; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + postPatch = '' patchShebangs tools/build ''; @@ -37,4 +42,7 @@ stdenv.mkDerivation rec { platforms = with platforms; all; }; } -# TODO [ AndersonTorres ]: a NixOS test suite +# TODO: a NixOS test suite +# TODO: multiple outputs +# TODO: documentation +# TODO: build both shared and static libs diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 8413ae597f77..66b0c13646b5 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.40.3"; + version = "2.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5Jg3wq0w1x4fKcqOCWilS5UDAnL3/0C4m0iWhlPzelw="; + sha256 = "11p3lvmbm0hfck3p5xwxxycln8x0cf7l68jjz6an2g7sjh7a2pab"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/atkmm/2.36.nix b/pkgs/development/libraries/atkmm/2.36.nix new file mode 100644 index 000000000000..6b22c34e0c2f --- /dev/null +++ b/pkgs/development/libraries/atkmm/2.36.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchurl, atk, glibmm_2_68, pkg-config, gnome, meson, ninja, python3 }: + +stdenv.mkDerivation rec { + pname = "atkmm"; + version = "2.36.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-4RMkv+0bbjMKAtslzswUXcoD+w3/R/BxDIXjF2h9pFg="; + }; + + outputs = [ "out" "dev" ]; + + propagatedBuildInputs = [ atk glibmm_2_68 ]; + + nativeBuildInputs = [ pkg-config meson ninja python3 ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "atkmm_2_36"; + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + meta = { + description = "C++ wrappers for ATK accessibility toolkit"; + license = lib.licenses.lgpl21Plus; + homepage = "https://gtkmm.org"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index b357ed047259..7e3cecf12a92 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome }: +{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome, meson, ninja, python3 }: stdenv.mkDerivation rec { pname = "atkmm"; - version = "2.28.0"; + version = "2.28.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"; + sha256 = "sha256-oLtJdlzszCk6ssZzW6EAQxgH04T/oUwuvTDgeZP9L6Q="; }; outputs = [ "out" "dev" ]; propagatedBuildInputs = [ atk glibmm ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson python3 ninja ]; doCheck = true; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix new file mode 100644 index 000000000000..5969de54682e --- /dev/null +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-auth"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-auth"; + rev = "v${version}"; + sha256 = "120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 library implementation of AWS client-side authentication"; + homepage = "https://github.com/awslabs/aws-c-auth"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 6f3df977efa8..d0bcfc901084 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index ae47959dd3aa..c927ca53336a 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.9"; + version = "0.6.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bnKIL51AW+0T87BxEazXDZElYqiwOUHQVEDKOCUzsbM="; + sha256 = "sha256-JEaRB0k6zyk5UKuB2hEZUAsnp2SuI9mrok/EvwclUJk="; }; nativeBuildInputs = [ cmake ]; @@ -23,10 +23,20 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; + # aws-c-common misuses cmake modules, so we need + # to manually add a MODULE_PATH to its consumers + setupHook = ./setup-hook.sh; + # Prevent the execution of tests known to be flaky. - preCheck = '' + preCheck = let + ignoreTests = [ + "promise_test_multiple_waiters" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839 + ]; + in '' cat <CTestCustom.cmake - SET(CTEST_CUSTOM_TESTS_IGNORE promise_test_multiple_waiters) + SET(CTEST_CUSTOM_TESTS_IGNORE ${toString ignoreTests}) EOW ''; diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/development/libraries/aws-c-common/setup-hook.sh new file mode 100644 index 000000000000..e670f7cf8529 --- /dev/null +++ b/pkgs/development/libraries/aws-c-common/setup-hook.sh @@ -0,0 +1,5 @@ +addAwsCCommonModuleDir() { + cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}" +} + +postHooks+=(addAwsCCommonModuleDir) diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix new file mode 100644 index 000000000000..9d885278ff06 --- /dev/null +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-common +, cmake +}: + +stdenv.mkDerivation rec { + pname = "aws-c-compression"; + version = "0.2.14"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-compression"; + rev = "v${version}"; + sha256 = "0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-common + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of huffman encoding/decoding"; + homepage = "https://github.com/awslabs/aws-c-compression"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index b6468a8dae0a..24cb52d61a67 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix new file mode 100644 index 000000000000..0bde86d674b8 --- /dev/null +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-http"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-http"; + rev = "v${version}"; + sha256 = "1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of the HTTP/1.1 and HTTP/2 specifications"; + homepage = "https://github.com/awslabs/aws-c-http"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 012d96fca4d7..1ff28dccc9ef 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.5"; + version = "0.10.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+H6dUKgpgXG1fh8r6k7TpVFMBso4G762zRfLAZD+Nss="; + sha256 = "sha256-8v38NN9qrgdrshMx3l2wLrl7l77HjsW2GPu8IwkclJQ="; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix new file mode 100644 index 000000000000..92e5ad44b871 --- /dev/null +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, ninja +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-mqtt"; + version = "0.7.8"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-mqtt"; + rev = "v${version}"; + sha256 = "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of the MQTT 3.1.1 specification"; + homepage = "https://github.com/awslabs/aws-c-mqtt"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix new file mode 100644 index 000000000000..514fdee1d4e2 --- /dev/null +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-auth +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-s3"; + version = "0.1.27"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-s3"; + rev = "v${version}"; + sha256 = "sha256-GtBUC5cKMN9rd5GQbYoipVvxrUCCNKbb5vhHUGQpeH8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-auth + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 library implementation for communicating with the S3 service"; + homepage = "https://github.com/awslabs/aws-c-s3"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 75b26695e2f2..9042dc561544 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix new file mode 100644 index 000000000000..68414931e413 --- /dev/null +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-auth +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-event-stream +, aws-c-http +, aws-c-io +, aws-c-mqtt +, aws-c-s3 +, aws-checksums +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-crt-cpp"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-crt-cpp"; + rev = "v${version}"; + sha256 = "0ijvyg3hrh1d0npca62syz8qy6nkqh90fq54cqyln0p333z16q52"; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace '-Werror' "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + aws-c-auth + aws-c-cal + aws-c-common + aws-c-compression + aws-c-event-stream + aws-c-http + aws-c-io + aws-c-mqtt + aws-c-s3 + aws-checksums + s2n-tls + ]; + + cmakeFlags = [ + "-DBUILD_DEPS=OFF" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C++ wrapper around the aws-c-* libraries"; + homepage = "https://github.com/awslabs/aws-crt-cpp"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 69cb1cc22ae9..d58fabfd5ea2 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib +, aws-crt-cpp , aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -17,15 +18,23 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.8.130"; + version = "1.9.121"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs="; + sha256 = "sha256-VQpWauk0tdJ1QU0HmtdTwQdKbiAuTTXXsUo2cqpqmdU="; }; + postPatch = '' + # Includes aws-c-auth private headers, so only works with submodule build + rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # TestRandomURLMultiThreaded fails + rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp + ''; + # FIXME: might be nice to put different APIs in different outputs # (e.g. libaws-cpp-sdk-s3.so in output "s3"). outputs = [ "out" "dev" ]; @@ -33,6 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ + aws-crt-cpp curl openssl zlib ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/development/libraries/bearssl/default.nix index 36873f03f7e9..ba55c6d8932a 100644 --- a/pkgs/development/libraries/bearssl/default.nix +++ b/pkgs/development/libraries/bearssl/default.nix @@ -13,12 +13,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + "CC=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}cc" + "LDDLL=${stdenv.cc.targetPrefix}cc" + ] ++ lib.optional stdenv.hostPlatform.isStatic "DLL=no"; + installPhase = '' runHook preInstall install -D build/brssl $bin/brssl install -D build/testcrypto $bin/testcrypto - install -Dm644 build/libbearssl.so $lib/lib/libbearssl.so - install -Dm644 build/libbearssl.a $lib/lib/libbearssl.a + install -Dm644 -t $lib/lib build/libbearssl.* install -Dm644 -t $dev/include inc/*.h touch $out runHook postInstall diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 2d8d13482eac..fdc8f7c21f18 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -137,7 +137,6 @@ stdenv.mkDerivation { badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" ++ optionals (versionOlder version "1.73") lib.platforms.riscv; - maintainers = with maintainers; [ peti ]; }; preConfigure = optionalString useMpi '' diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index d6ab4fe0dfe5..47b61fe03510 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = "as-is"; platforms = lib.platforms.unix; # Once had cygwin problems - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 87b391d2ad0e..384b1b0e7cb1 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,18 +1,19 @@ -{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }: +{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx, meson, ninja }: + stdenv.mkDerivation rec { pname = "cairomm"; - version = "1.12.2"; + version = "1.14.3"; src = fetchurl { - url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz"; + url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz"; # gnome doesn't have the latest version ATM; beware: same name but different hash #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; + sha256 = "sha256-DTfgZ8XEyngIt87dq/4ZMsW9KnUK1k+zIeEhNTYpfng="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson ninja ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 713a49dbaa6c..0eaf6eda07a5 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -1,12 +1,15 @@ -{ lib, stdenv, fetchurl, capnproto, cmake }: +{ lib, stdenv, fetchFromGitHub, capnproto, cmake }: stdenv.mkDerivation rec { pname = "capnproto"; version = "0.9.0"; - src = fetchurl { - url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; - sha256 = "sha256-soBUp6K/6kK/w5LI0AljDZTXLozoaiOtbxi15yV0Bk8="; + # release tarballs are missing some ekam rules + src = fetchFromGitHub { + owner = "capnproto"; + repo = "capnproto"; + rev = "v${version}"; + sha256 = "038i40apywn8sg95kwld4mg9p9m08izcw5xj7mwkmshycmqw65na"; }; nativeBuildInputs = [ cmake ] diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 69e16a8922a5..09a407fc3bc3 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,27 +5,29 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.8"; + version = "2.9.9"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "sha256-nEICs1oAIXu6/5O4R3mbwig1OY+HDIWWeQjrcYnCwT0="; + hash = "sha256-DWyqVN7v+j2XCArv4jmrD45XKWMNhd2DddJHH3gQWQY="; }; + outputs = [ "out" "doc" ]; + installPhase = '' runHook preInstall + install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples install -m 644 CImg.h $out/include/ cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ cp README.txt $doc/share/doc/cimg/ + runHook postInstall ''; - outputs = [ "out" "doc" ]; - meta = with lib; { homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; diff --git a/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch b/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch new file mode 100644 index 000000000000..4ad8ec8ffc73 --- /dev/null +++ b/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch @@ -0,0 +1,29 @@ +From 7bc49f8edd9a49d675ee5b163ab61b405e2d0258 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Thu, 7 Oct 2021 21:42:26 +0200 +Subject: [PATCH] Fix build with Vala 0.54 + +Vala codegen now emits constructor methods so we need to skip @new +so that we can use a custom one from our VAPI overrides. + +https://gitlab.gnome.org/GNOME/vala/-/commit/472765b90cd98c1a628975d20005c46352d665f8 +--- + vapi/Dee-1.0.metadata | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vapi/Dee-1.0.metadata b/vapi/Dee-1.0.metadata +index 7e80de0..793ffd8 100644 +--- a/vapi/Dee-1.0.metadata ++++ b/vapi/Dee-1.0.metadata +@@ -1,6 +1,8 @@ + GListResultSet skip + GListResultSetClass skip + ++Filter ++ .new skip + FilterModel + .filter unowned + Model +-- +2.33.0 + diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index a023d164d8c3..25cf88253e6e 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "${src}/debian/patches/gtkdocize.patch" "${src}/debian/patches/strict-prototype.patch" "${src}/debian/patches/vapi-skip-properties.patch" + ./0001-Fix-build-with-Vala-0.54.patch # Fixes glib 2.62 deprecations (fetchpatch { diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 4a4eecfdc0f2..e8e384ac2a00 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { pname = "dleyna-core"; version = "0.6.0"; + outputs = [ "out" "dev" ]; + setupHook = ./setup-hook.sh; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index 09f2ad3ccad6..b1af825cccd8 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - version = "3.17.0"; + version = "3.26.4"; pname = "dxflib"; src = fetchurl { - url = "http://www.qcad.org/archives/dxflib/${pname}-${version}-src.tar.gz"; - sha256 = "09yjgzh8677pzkkr7a59pql5d11451c22pxksk2my30mapxsri96"; + url = "https://qcad.org/archives/dxflib/${pname}-${version}-src.tar.gz"; + sha256 = "0pwic33mj6bp4axai5jiyn4xqf31y0xmb1i0pcf55b2h9fav8zah"; }; nativeBuildInputs = [ qmake @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { + homepage = "https://qcad.org/en/90-dxflib"; maintainers = with lib.maintainers; [raskin]; platforms = lib.platforms.linux; description = "DXF file format library"; diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch index 407811736f83..e0b6df195893 100644 --- a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch +++ b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch @@ -7,7 +7,7 @@ index 9e885070..d02eeb8c 100644 "--unshare-net", "--unshare-pid", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", +- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", + "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "/run/current-system", "/run/current-system", "--ro-bind", validate_icon, validate_icon, diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 97410fda0d31..40e07c590742 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -49,18 +49,19 @@ , dconf , gsettings-desktop-schemas , librsvg +, makeWrapper }: stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.10.2"; + version = "1.12.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2xUnOdBy+P8pnk6IjYljobRTjaexDguGUlvkOPLh3eQ="; + sha256 = "df1eb464f9142c11627f99f04f6a5c02c868bbb145489b8902cb6c105e774b75"; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ @@ -90,25 +91,19 @@ stdenv.mkDerivation rec { # Patch taken from gtk-doc expression. ./respect-xml-catalog-files-var.patch - # Don’t hardcode flatpak binary path in launchers stored under user’s profile otherwise they will break after Flatpak update. - # https://github.com/NixOS/nixpkgs/issues/43581 - ./use-flatpak-from-path.patch - - # Hardcode flatpak binary path for flatpak-spawn. - # When calling the portal’s Spawn command with FLATPAK_SPAWN_FLAGS_CLEAR_ENV flag, - # it will clear environment, including PATH, making the flatpak run fail. - # https://github.com/flatpak/flatpak/pull/4174 - (fetchpatch { - url = "https://github.com/flatpak/flatpak/commit/495449daf6d3c072519a36c9e4bc6cc1da4d31db.patch"; - sha256 = "gOX/sGupAE7Yg3MVrMhFXzWHpFn+izVyjtkuPzIckuY="; - }) - # Nix environment hacks should not leak into the apps. # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. ./validate-icon-pixbuf.patch + + # Tests don't respect the FLATPAK_BINARY override that was added, this is a workaround. + # https://github.com/flatpak/flatpak/pull/4496 (Can be removed once included). + (fetchpatch { + url = "https://github.com/flatpak/flatpak/commit/96dbe28cfa96e80b23fa1d8072eb36edad41279c.patch"; + sha256 = "1jczk06ymfs98h3nsg245g0jwxvml7wg2x6pb7mrfpsdmrpz2czd"; + }) ]; nativeBuildInputs = [ @@ -189,7 +184,14 @@ stdenv.mkDerivation rec { in '' patchShebangs buildutil patchShebangs tests - PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler + PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Use flatpak from PATH in exported assets (e.g. desktop files). + --set FLATPAK_BINARY flatpak + ) ''; passthru = { diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch deleted file mode 100644 index 84534b7bc53a..000000000000 --- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c -index 52b222ea..9489441f 100644 ---- a/common/flatpak-dir.c -+++ b/common/flatpak-dir.c -@@ -6956,7 +6956,7 @@ export_desktop_file (const char *app, - - new_exec = g_string_new (""); - g_string_append_printf (new_exec, -- FLATPAK_BINDIR "/flatpak run --branch=%s --arch=%s", -+ "flatpak run --branch=%s --arch=%s", - escaped_branch, - escaped_arch); - -@@ -8290,8 +8290,8 @@ flatpak_dir_deploy (FlatpakDir *self, - error)) - return FALSE; - -- bin_data = g_strdup_printf ("#!/bin/sh\nexec %s/flatpak run --branch=%s --arch=%s %s \"$@\"\n", -- FLATPAK_BINDIR, escaped_branch, escaped_arch, escaped_app); -+ bin_data = g_strdup_printf ("#!/bin/sh\nexec flatpak run --branch=%s --arch=%s %s \"$@\"\n", -+ escaped_branch, escaped_arch, escaped_app); - if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data), NULL, FALSE, - G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) - return FALSE; -diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh -index d1682344..5e2b9a97 100755 ---- a/tests/test-bundle.sh -+++ b/tests/test-bundle.sh -@@ -67,7 +67,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files - assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export - assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop - # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" - assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png - assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png - -diff --git a/tests/test-run.sh b/tests/test-run.sh -index fecb756e..64043281 100644 ---- a/tests/test-run.sh -+++ b/tests/test-run.sh -@@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files - assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export - assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop - # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" - assert_has_file $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini - assert_file_has_content $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini "^DefaultDisabled=true$" - assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 720c274ad520..45d3f128c01c 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,5 +1,7 @@ -{ fetchurl -, lib, stdenv +{ stdenv +, lib +, fetchurl +, fetchpatch , pkg-config , meson , ninja @@ -43,6 +45,15 @@ stdenv.mkDerivation rec { sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU="; }; + patches = [ + # Fix build with evolution-data-server ≥ 3.41 + # https://gitlab.gnome.org/GNOME/folks/-/merge_requests/52 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/folks/-/commit/62d588b0c609de17df5b4d1ebfbc67c456267efc.patch"; + sha256 = "TDL/5kvVwHnvDMuKDdPLQmpmE1FTZhY+7HG8NxKqt5w="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 37238a5f59ec..9c97faaa45cb 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -11,6 +11,9 @@ , libtasn1 , gtk3 , pango +, libsecret +, openssh +, systemd , gobject-introspection , makeWrapper , libxslt @@ -22,22 +25,15 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.40.0"; + version = "3.41.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U="; + sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE="; }; - postPatch = '' - patchShebangs build/ gcr/fixtures/ - - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson @@ -56,6 +52,9 @@ stdenv.mkDerivation rec { libgcrypt libtasn1 pango + libsecret + openssh + systemd ]; propagatedBuildInputs = [ @@ -70,10 +69,22 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=false" + # We are still using ssh-agent from gnome-keyring. + # https://github.com/NixOS/nixpkgs/issues/140824 + "-Dssh_agent=false" ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + + postPatch = '' + patchShebangs build/ gcr/fixtures/ + + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + preFixup = '' wrapProgram "$out/bin/gcr-viewer" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" @@ -82,7 +93,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index d00b184cae43..62735dfa9b0c 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "--with-mysql=${getDev libmysqlclient}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" - "--with-spatialite=${libspatialite}" + "--with-spatialite=${libspatialite.dev}" "--with-python" # optional "--with-proj=${proj.dev}" # optional "--with-geos=${geos}/bin/geos-config" # optional diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 360094ea7655..410c0afd8a65 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -39,6 +39,14 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix for falling back to GeoIP when WiFi devices are not found + # https://gitlab.freedesktop.org/geoclue/geoclue/-/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494 + # NOTE: this should be removed when the next version is released + (fetchpatch { + url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494.patch"; + sha256 = "hv7t2Hmpv2oDXiPWA7JpYD9q+cuuk+En/lJJickvFII="; + }) + # Make the Mozilla API key configurable # https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported) (fetchpatch { diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index ff3e9ee52e99..a556b64f1d38 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,26 +1,69 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, exiv2 +, glib +, gnome +, gobject-introspection +, vala +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +}: stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.12.3"; + version = "0.14.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jt5cqL8b4QBULrR7XnBy+xnKVHhgMHh7DPKbHMMWfM="; + sha256 = "5YJ5pv8gtvZPpJlhXaXptXz2W6eFC3L6/fFyIanW1p4="; }; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib ]; - propagatedBuildInputs = [ exiv2 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + # Python binding overrides + python3 + python3.pkgs.pygobject3 + ]; + + propagatedBuildInputs = [ + exiv2 + ]; mesonFlags = [ "-Dgtk_doc=true" + "-Dpython3_girdir=${placeholder "out"}/${python3.sitePackages}/gi/overrides" ]; doCheck = true; + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running unit tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/gexiv2/libgexiv2.so.2 $out/lib/libgexiv2.so.2 + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -31,7 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.gnome.members; }; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 54f19d1756cb..29eb1b948247 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.68.3"; + version = "1.70.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ghx/T3jxUA2mpWxUY3I72P+A3mM8y6Q6WrA9jMyiHT8="; + sha256 = "sha256-SwYpNBoxigI3ThE6uX+anzMlQjJp/B4LBDpf+wGGHF8="; }; patches = [ diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 6842470be4c0..d5bc952597d4 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.68.2"; + version = "2.70.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "U168BU72l9tWpP/+2RvA4RyO4cmstIqtKMjh1cPVmU8="; + sha256 = "0dbg1na239mbavn4hknkax5sns9q2dbdnqw9wcpmhv58mzkhid36"; }; patches = [ diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 679a91d1bc3f..4825dd98976c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.4"; + version = "2.70.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; + sha256 = "0hh7hk02fkm1bn48k4z8f3kgv9qbni5z22gizd567fn527w7s390"; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index db713cf9ea5f..1ba18898ad89 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.68.1"; + version = "2.70.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ZmTifJqcyoHCnjVof0ny4NFzovyemMNCgxH3B9tTL4w="; + sha256 = "sha256-gAj9iu3cyGej+X8RPeYl9ulu+Yz3hgN5gTqcD+/9tSA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 344fcb43eba0..f409935372ee 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.64.5"; + version = "2.66.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-UI/IbiyRQRmKoWwiWxb9a5EZF8DTgXYCZShE0Jc+o4Y="; + sha256 = "sha256-sqTNe5rph3lMu1ob7MEM7LZRgrm7hBhoYl1ruxI+2x0="; }; outputs = [ "out" "dev" ]; @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 73061a3d2efd..ea6a7ee42310 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -75,7 +75,6 @@ let self = stdenv.mkDerivation rec { platforms = platforms.all; badPlatforms = [ "x86_64-darwin" ]; - maintainers = [ maintainers.peti ]; }; }; in self diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 177c15670526..6228b6aaab9e 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -82,7 +82,7 @@ let self = stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.peti maintainers.vrthra ]; + maintainers = [ maintainers.vrthra ]; }; }; in self diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index e6a1ad979b91..25b7770101d1 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.68.0"; + version = "1.70.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj"; + sha256 = "0jpwraip7pwl9bf9s59am3r7074p34fasvfb5ym1fb8hwc34jawh"; }; patches = [ diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 4194064a5a29..1f2966695d86 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/pkgs/development/libraries/goocanvas/3.x.nix b/pkgs/development/libraries/goocanvas/3.x.nix index c5decffe74e2..8a07f31b818d 100644 --- a/pkgs/development/libraries/goocanvas/3.x.nix +++ b/pkgs/development/libraries/goocanvas/3.x.nix @@ -9,6 +9,7 @@ , cairo , gtk3 , glib +, gnome }: stdenv.mkDerivation rec { @@ -39,6 +40,14 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 1bc763349a86..03268fb024c6 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; + versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index 4e706f409870..764208008656 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; attrPath = "goocanvasmm2"; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # stable version has not been released yet, last update 2015 }; }; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 13ec503fae0e..ed8f8edd656f 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.13"; + version = "0.3.14"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HEMF1nNkqTBUODbMGYLzDpRpc7j/avPv4x2HcJq1IPg="; + sha256 = "aGhEs07HOySTH/bMT2Az8AcpR6bbYKzcf7Pq8Velgcg="; }; patches = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "A collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 172ae39536e6..16897c6f0446 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,40 +1,62 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, vala +, glib +, liboauth +, gtk3 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, libxml2 +, gnome +, gobject-introspection +, libsoup +, totem-pl-parser +}: -let +stdenv.mkDerivation rec { pname = "grilo"; - version = "0.3.13"; # if you change minor, also change ./setup-hook.sh -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.3.14"; # if you change minor, also change ./setup-hook.sh outputs = [ "out" "dev" "man" "devdoc" ]; outputBin = "dev"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2021-39365.patch"; - url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/cd2472e506dafb1bb8ae510e34ad4797f63e263e.patch"; - sha256 = "1i1p21vlms43iawg4dl1dibnpsbnkx27kcfvllnx76q07bfrpwzm"; - }) - ]; - setupHook = ./setup-hook.sh; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "A2nQsAuw9Zul966oz8Zl843xSltBgtKMfB4s0VtRh0M="; + }; + mesonFlags = [ "-Denable-gtk-doc=true" ]; nativeBuildInputs = [ - meson ninja pkg-config gettext gobject-introspection vala - gtk-doc docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkg-config + gettext + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + liboauth + gtk3 + libxml2 + libsoup + totem-pl-parser ]; - buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { updateScript = gnome.updateScript { @@ -47,7 +69,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 2000bdccb008..5d2b58aa3dba 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -57,7 +57,12 @@ stdenv.mkDerivation rec { "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" - "-DCMAKE_CXX_STANDARD=17" + # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is + # only an issue with the useLLVM stdenv, not the darwin stdenv… + # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484 + (if (stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0" + then "-DCMAKE_CXX_STANDARD=11" + else "-DCMAKE_CXX_STANDARD=17") ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" ]; @@ -68,7 +73,12 @@ stdenv.mkDerivation rec { rm -vf BUILD ''; - preBuild = '' + # When natively compiling, grpc_cpp_plugin is executed from the build directory, + # needing to load dynamic libraries from the build directory, so we set + # LD_LIBRARY_PATH to enable this. When cross compiling we need to avoid this, + # since it can cause the grpc_cpp_plugin executable from buildPackages to + # crash if build and host architecture are compatible (e. g. pkgsLLVM). + preBuild = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index b4dc200f980a..483ee0b08496 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i"; + sha256 = "dyiZcuWW0ERYPwwFYwbY8dvYrc+RKRClDaCmY+ZTMu0="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index bcd39ce22733..13a8aaa2f198 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome }: +{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome, meson, ninja }: stdenv.mkDerivation rec { pname = "gsound"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; + sha256 = "06l80xgykj7x1kqkjvcq06pwj2rmca458zvs053qc55x3sg06bfa"; }; - nativeBuildInputs = [ pkg-config gobject-introspection libtool vala ]; + nativeBuildInputs = [ pkg-config meson ninja gobject-introspection libtool vala ]; buildInputs = [ glib libcanberra ]; passthru = { diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index aa89d947a012..de6ccd153780 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -233,6 +233,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + "-Dglib-asserts=disabled" # asserts should be disabled on stable releases "-Davtp=disabled" "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 86684893efd3..bc1656c191a4 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + "-Dglib-asserts=disabled" # asserts should be disabled on stable releases ] ++ lib.optionals (!qt5Support) [ "-Dqt5=disabled" ] ++ lib.optionals (!gtkSupport) [ diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 7123aa0d3ac1..76adcc1fae33 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = "gst_all_1.gstreamermm"; + attrPath = "gst_all_1.gstreamermm"; + packageName = "gstreamermm"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index e6c6d9391933..b7c2d5d3aa9c 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -9,19 +9,19 @@ , glib , gtk3 , freerdp -, nix-update-script +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "3.37.1-unstable-2020-10-26"; + version = "unstable-2021-10-01"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "805721e82ca1df6a50da3b5bd3b75d6747016482"; - sha256 = "q/UFKYj3LUkAzll3KeKd6oec0GJnDtTuFMTTatKFlcs="; + rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0"; + sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko="; }; nativeBuildInputs = [ @@ -39,8 +39,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = unstableGitUpdater { + # The updater tries src.url by default, which does not exist for fetchFromGitHub (fetchurl). + url = "${meta.homepage}.git"; + branch = "gtk-frdp-0-1"; }; }; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index f244a97edf24..f9d41916ecd6 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "gtk-mac-integration"; - version = "2.1.3"; + version = "3.0.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap"; + sha256 = "0sc0m3p8r5xfh5i4d7dg72kfixx9yi4f800y43bszyr88y52jkga"; }; nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc gobject-introspection ]; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7999d62b9112..499615a79c1c 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -202,6 +202,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtk+"; attrPath = "gtk3"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 8791d24ad361..78d9174d0953 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -19,15 +19,11 @@ , gdk-pixbuf , gobject-introspection , fribidi +, harfbuzz , xorg , epoxy -, json-glib , libxkbcommon , libxml2 -, librest -, libsoup -, ffmpeg -, gmp , gnome , gsettings-desktop-schemas , gst_all_1 @@ -37,6 +33,8 @@ , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux , libGL +# experimental and can cause crashes in inspector +, vulkanSupport ? false , vulkan-loader , vulkan-headers , wayland @@ -61,7 +59,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.2.1"; + version = "4.4.0"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -73,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "AjFpd13kPwof3gZvvBnXhUXqanViwZFavem4rkpzCeY="; + sha256 = "4KFQj0QWhsOiDf7EivUzsZpLLgF8GOruMdzNt9KSUFs="; }; nativeBuildInputs = [ @@ -86,27 +84,25 @@ stdenv.mkDerivation rec { python3 sassc gi-docgen + libxml2 # for xmllint ] ++ setupHooks; buildInputs = [ libxkbcommon epoxy - json-glib isocodes - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals vulkanSupport [ vulkan-headers ] ++ [ - librest - libsoup - ffmpeg gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad fribidi + harfbuzz ] ++ (with xorg; [ libICE libSM - libXcomposite libXcursor + libXdamage libXi libXrandr libXrender @@ -134,7 +130,7 @@ stdenv.mkDerivation rec { glib graphene pango - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals vulkanSupport [ vulkan-loader ] ++ [ # Required for GSettings schemas at runtime. @@ -148,10 +144,11 @@ stdenv.mkDerivation rec { "-Dbuild-tests=false" "-Dtracker=${if trackerSupport then "enabled" else "disabled"}" "-Dbroadway-backend=${lib.boolToString broadwaySupport}" + ] ++ lib.optionals vulkanSupport [ + "-Dvulkan=enabled" ] ++ lib.optionals (!cupsSupport) [ "-Dprint-cups=disabled" ] ++ lib.optionals stdenv.isDarwin [ - "-Dvulkan=disabled" "-Dmedia-gstreamer=disabled" # requires gstreamer-gl ] ++ lib.optionals (!x11Support) [ "-Dx11-backend=false" @@ -168,6 +165,7 @@ stdenv.mkDerivation rec { postPatch = '' files=( build-aux/meson/post-install.py + build-aux/meson/gen-demo-header.py demos/gtk-demo/geninclude.py gdk/broadway/gen-c-array.py gdk/gen-gdk-gresources-xml.py diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 2e43e58db42d..734cf833fd84 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "${pname}3"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 0a654d9518dc..67afc4026d1a 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.2.0"; + version = "4.4.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12x9j82y37r4v0ngs22rzp4wmw7k2bbb9d3bymcczzz7y8w4q328"; + sha256 = "LrRkMmCW5qQMgunNB0Fk2BA/teB4ZWecCmSeQXRwDdo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index eb92586ce84a..0095b6ca9e08 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -24,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.8.1"; + version = "4.8.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE="; + sha256 = "1k1pava84ywgq62xl5bz8y3zm7z2kz6kkgp423c0y02jrgjyfbc4"; }; patches = [ @@ -38,13 +37,6 @@ stdenv.mkDerivation rec { # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). # Since this is not generally true with Nix, let’s add $out/share unconditionally. ./4.x-nix_share_path.patch - - # fixes intermittent "gtksourceview-gresources.h: no such file" errors - (fetchpatch { - name = "ensure-access-to-resources-in-corelib-build.patch"; - url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch"; - sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0="; - }) ]; nativeBuildInputs = [ @@ -96,6 +88,7 @@ stdenv.mkDerivation rec { packageName = "gtksourceview"; attrPath = "gtksourceview4"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 3011a126c10d..5bdcc029c5c8 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "gtksourceviewmm4"; packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 2b9124032590..cdc96f3f1a04 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtksourceviewmm"; versionPolicy = "none"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index cd56b04c0346..31b620ae5d2e 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -15,7 +15,8 @@ , perlPackages , pythonBindings ? true , tclBindings ? true -, perlBindings ? true +, perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform +, buildPackages }: stdenv.mkDerivation rec { @@ -27,11 +28,15 @@ stdenv.mkDerivation rec { sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ swig pkg-config libtool - ]; + ] ++ lib.optionals pythonBindings [ python3 ] + ++ lib.optionals tclBindings [ tcl ] + ++ lib.optionals perlBindings [ perl ]; buildInputs = [ gd @@ -39,10 +44,12 @@ stdenv.mkDerivation rec { libusb-compat-0_1 boost ] ++ lib.optionals pythonBindings [ python3 ncurses ] - ++ lib.optionals tclBindings [ tcl ] - ++ lib.optionals perlBindings [ perl perlPackages.ExtUtilsMakeMaker ]; + ++ lib.optionals tclBindings [ tcl ]; - configureFlags = lib.optionals perlBindings [ "--with-perl-binding" ] + + configureFlags = [ + "CC_FOR_BUILD=${stdenv.cc.targetPrefix}cc" + ] ++ lib.optionals perlBindings [ "--with-perl-binding" ] ++ lib.optionals tclBindings [ "--with-tcl-binding" "--with-tcl=${tcl}/lib/" ] ++ lib.optionals pythonBindings [ "--with-python-binding" ]; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index c6271b13a855..6002b8c84bb3 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.3.4"; + version = "21.3.5"; outputs = [ "out" "dev" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr"; + sha256 = "1wc8qhz1j4z42jmnsr38y15kc0jhfqfx8ssnb5055kmmmvzwk1sh"; }; patches = [ diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 260be948ce1d..7a68f130663d 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm, zlib }: let common = import ./common.nix { inherit fetchzip; }; @@ -12,22 +12,29 @@ stdenv.mkDerivation rec { postPatch = '' sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp + '' + lib.optionalString stdenv.isAarch64 '' + substituteInPlace source/Irrlicht/Makefile \ + --replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0" ''; preConfigure = '' cd source/Irrlicht ''; - buildPhase = '' - make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm" + preBuild = '' + makeFlagsArray+=(sharedlib NDEBUG=1 LDFLAGS="-lX11 -lGL -lXxf86vm") ''; + enableParallelBuilding = true; + preInstall = '' sed -i s,/usr/local/lib,$out/lib, Makefile mkdir -p $out/lib ''; - buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; + buildInputs = [ + libGLU libGL libXrandr libX11 libXxf86vm + ] ++ lib.optional stdenv.isAarch64 zlib; meta = { homepage = "http://irrlicht.sourceforge.net/"; diff --git a/pkgs/development/libraries/isa-l/default.nix b/pkgs/development/libraries/isa-l/default.nix new file mode 100644 index 000000000000..1440065969b2 --- /dev/null +++ b/pkgs/development/libraries/isa-l/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, nasm }: + +stdenv.mkDerivation rec { + pname = "isa-l"; + version = "2.30.0"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "isa-l"; + rev = "v${version}"; + sha256 = "sha256-AAuSdDQfDW4QFRu0jHwCZ+ZCSjoVqlQiSW1OOFye1Rs="; + }; + + nativeBuildInputs = [ nasm autoreconfHook ]; + + preConfigure = '' + export AS=nasm + ''; + + meta = with lib; { + description = "A collection of optimised low-level functions targeting storage applications"; + license = licenses.bsd3; + homepage = "https://github.com/intel/isa-l"; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index b43bcd07ca6b..7618110e86c4 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI="; + sha256 = "wuPRYlfHJmzTkBiE4iN1V1v2Go4fZ1lsiODYeucNDvQ="; }; mesonFlags = [ diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 405598c69640..5889c6ee3acf 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -12,13 +12,16 @@ , vala , gobject-introspection , fribidi +, glib , gtk4 +, gnome +, gsettings-desktop-schemas , xvfb-run }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.0.0-alpha.2"; + version = "1.0.0.alpha.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - sha256 = "1yvjdzs5ipmr4gi0l4k6dkqhl9b090kpjc3ll8bv1a6i7yfaf53s"; + sha256 = "sha256-4ED2m8hZMWbu5sFbkH0W6q05+cYCCkx+ubeDqg3W3a0="; }; nativeBuildInputs = [ @@ -54,13 +57,31 @@ stdenv.mkDerivation rec { ]; checkInputs = [ + gnome.adwaita-icon-theme xvfb-run ]; doCheck = true; checkPhase = '' - xvfb-run meson test + runHook preCheck + + testEnvironment=( + # Disable portal since we cannot run it in tests. + ADW_DISABLE_PORTAL=1 + + # AdwSettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme. + # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name. + # See adw_settings_constructed function in https://gitlab.gnome.org/GNOME/libadwaita/commit/60ec69f0a5d49cad8a6d79e4ecefd06dc6e3db12 + "XDG_DATA_DIRS=${glib.getSchemaPath gsettings-desktop-schemas}/../.." + + # Tests need a cache directory + "HOME=$TMPDIR" + ) + env "''${testEnvironment[@]}" xvfb-run \ + meson test --print-errorlogs + + runHook postCheck ''; postInstall = '' diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 9b1654420e74..feb721dce45f 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc +{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libblockdev"; - version = "2.25"; + version = "2.26"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "sha256-eHUHTogKoNrnwwSo6JaI7NMxVt9JeMqfWyhR62bDMuQ="; + sha256 = "sha256-e7j5b1KbjgVN9JpJtK2o7RNEHZjKDoDyoY4f8GlIdyI="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -22,13 +22,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; sgdisk = "${gptfdisk}/bin/sgdisk"; }) - - # fix build with glib 2.68 (g_memdup is deprecated) - # https://github.com/storaged-project/libblockdev/pull/623 - (fetchpatch { - url = "https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940.patch"; - sha256 = "jxq4BLeyTMeNvBvY8k8QXIvYSJ2Gah0J75pq6FpG7PM="; - }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index d62614c56c76..426ffadf4c6e 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.40.0"; + version = "3.42.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv"; + sha256 = "09b9l56yiwad7xqr7g7ragmm4gmqxjnvc2pcx6741klw7lxpmrpa"; }; nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ]; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index b3f6e1a7cdd9..63acabb320e4 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -87,6 +87,7 @@ assert postgresSupport -> postgresql != null; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index ad5e0cbecd6e..34735e644e43 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # Should be odd-unstable but stable version has not been released yet. }; }; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 6fd108b3b7a6..87061ae6559a 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libgudev"; - version = "236"; + version = "237"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5"; + sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index df05754da589..397939103400 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { pname = "libgxps"; version = "0.3.2"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "bSeGclajXM+baSU+sqiKMrrKO5fV9O9/guNmf6Q1JRw="; diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/development/libraries/libjaylink/default.nix new file mode 100644 index 000000000000..6aac7675dcdc --- /dev/null +++ b/pkgs/development/libraries/libjaylink/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitLab, lib, stdenv +, autoreconfHook, pkg-config +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "libjaylink"; + version = "0.2.0"; + + src = fetchFromGitLab { + domain = "gitlab.zapb.de"; + owner = "libjaylink"; + repo = "libjaylink"; + rev = version; + sha256 = "0ndyfh51hiqyv2yscpj6qd091w7myxxjid3a6rx8f6k233vy826q"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libusb1 ]; + + postPatch = '' + patchShebangs autogen.sh + ''; + + postInstall = '' + install -Dm644 contrib/99-libjaylink.rules $out/lib/udev/rules.d/libjaylink.rules + ''; + + meta = with lib; { + homepage = "https://gitlab.zapb.de/libjaylink/libjaylink"; + description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices."; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ felixsinger ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 8a38aa36c097..2d4a1004d87f 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -35,6 +35,7 @@ , python3 , readline , soci +, boost , speex , sqlite , lib, stdenv @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { pango readline soci + boost speex sqlite udev diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index ee1b306c3e51..7f9c4d6ac94b 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,31 +1,23 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome, fetchpatch }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "libmediaart"; - version = "1.9.4"; + version = "1.9.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; + sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7"; }; nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib gdk-pixbuf ]; - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=792272 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libmediaart/commit/a704d0b6cfea091274bd79aca6d15f19b4f6e5b5.patch"; - sha256 = "0606qfmdqxcxrydv1fgwq11hmas34ba4a5kzbbqdhfh0h9ldgwkv"; - }) + mesonFlags = [ + "-Dgtk_doc=true" ]; - # FIXME: Turn on again when https://github.com/NixOS/nixpkgs/issues/53701 - # is fixed on master. - doCheck = false; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libressl/CVE-2021-41581.patch b/pkgs/development/libraries/libressl/CVE-2021-41581.patch new file mode 100644 index 000000000000..244792567192 --- /dev/null +++ b/pkgs/development/libraries/libressl/CVE-2021-41581.patch @@ -0,0 +1,53 @@ +Based on upstream https://github.com/openbsd/src/commit/62ceddea5b1d64a1a362bbb7071d9e15adcde6b1 +with paths switched to apply to libressl-portable and CVS header +hunk removed. + +--- a/crypto/x509/x509_constraints.c ++++ b/crypto/x509/x509_constraints.c +@@ -339,16 +339,16 @@ + if (c == '.') + goto bad; + } +- if (wi > DOMAIN_PART_MAX_LEN) +- goto bad; + if (accept) { ++ if (wi >= DOMAIN_PART_MAX_LEN) ++ goto bad; + working[wi++] = c; + accept = 0; + continue; + } + if (candidate_local != NULL) { + /* We are looking for the domain part */ +- if (wi > DOMAIN_PART_MAX_LEN) ++ if (wi >= DOMAIN_PART_MAX_LEN) + goto bad; + working[wi++] = c; + if (i == len - 1) { +@@ -363,7 +363,7 @@ + continue; + } + /* We are looking for the local part */ +- if (wi > LOCAL_PART_MAX_LEN) ++ if (wi >= LOCAL_PART_MAX_LEN) + break; + + if (quoted) { +@@ -383,6 +383,8 @@ + */ + if (c == 9) + goto bad; ++ if (wi >= LOCAL_PART_MAX_LEN) ++ goto bad; + working[wi++] = c; + continue; /* all's good inside our quoted string */ + } +@@ -412,6 +414,8 @@ + } + if (!local_part_ok(c)) + goto bad; ++ if (wi >= LOCAL_PART_MAX_LEN) ++ goto bad; + working[wi++] = c; + } + if (candidate_local == NULL || candidate_domain == NULL) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index fb362ebbad2f..d70672f63ac3 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,8 +1,16 @@ -{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch +{ stdenv +, fetchurl +, lib +, cmake +, cacert +, fetchpatch , buildShared ? !stdenv.hostPlatform.isStatic }: let + ldLibPathEnvName = if stdenv.isDarwin + then "DYLD_LIBRARY_PATH" + else "LD_LIBRARY_PATH"; generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec { pname = "libressl"; @@ -42,6 +50,15 @@ let substituteInPlace ./tls/tls_config.c --replace '"/etc/ssl/cert.pem"' '"${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; + doCheck = true; + preCheck = '' + export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName} + export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)" + ''; + postCheck = '' + export ${ldLibPathEnvName}=$PREVIOUS_${ldLibPathEnvName} + ''; + outputs = [ "bin" "dev" "out" "man" "nc" ]; postFixup = '' @@ -66,5 +83,15 @@ in { libressl_3_2 = generic { version = "3.2.5"; sha256 = "1zkwrs3b19s1ybz4q9hrb7pqsbsi8vxcs44qanfy11fkc7ynb2kr"; + patches = [ + ./CVE-2021-41581.patch + ]; + }; + libressl_3_4 = generic { + version = "3.4.0"; + sha256 = "1lhn76nd59p1dfd27b4636zj6wh3f5xsi8b3sxqnl820imsswbp5"; + patches = [ + ./CVE-2021-41581.patch + ]; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 05b7a00be590..03bd2eb96bc6 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.50.7"; + version = "2.52.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "//thsIzVKCqq4UegKzBRZqdCb60iqLlCdwjw8vxCbrw="; + sha256 = "14zkdd7a9mymnfs3laqj0gr69c16nwixvbc5a4gvd534w6riz0mx"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix new file mode 100644 index 000000000000..e987e5a892c4 --- /dev/null +++ b/pkgs/development/libraries/libshumate/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitLab +, gi-docgen +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, glib +, cairo +, sqlite +, libsoup +, gtk4 +, xvfb-run +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "libshumate"; + version = "unstable-2021-10-06"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # demo app + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libshumate"; + rev = "7a0a03f299881e8faaac7d904cc47b74795ae5dd"; + sha256 = "df8ZHn/wmkzaYH0L3E6ULUtqxqU71EqL0jSgKhWqlT8="; + }; + + nativeBuildInputs = [ + gi-docgen + meson + ninja + pkg-config + vala + gobject-introspection + ]; + + buildInputs = [ + glib + cairo + sqlite + libsoup + gtk4 + ]; + + checkInputs = [ + xvfb-run + ]; + + mesonFlags = [ + "-Ddemos=true" + ]; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + HOME=$TMPDIR xvfb-run meson test --print-errorlogs + + runHook postCheck + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libshumate-0.0 "$devdoc" + ''; + + passthru.updateScript = unstableGitUpdater { + url = meta.homepage; + }; + + meta = with lib; { + description = "GTK toolkit providing widgets for embedded maps"; + homepage = "https://gitlab.gnome.org/GNOME/libshumate"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index cbc2c8a617b4..d4583c74df0f 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.6"; + version = "2.10.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths="; + sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "libsigcxx"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix new file mode 100644 index 000000000000..b958ba307674 --- /dev/null +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -0,0 +1,102 @@ +{ stdenv +, lib +, fetchurl +, glib +, meson +, ninja +, pkg-config +, gnome +, libsysprof-capture +, sqlite +, glib-networking +, gobject-introspection +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform +, vala +, withVala ? stdenv.buildPlatform == stdenv.hostPlatform +, libpsl +, python3 +, brotli +, libnghttp2 +}: + +stdenv.mkDerivation rec { + pname = "libsoup"; + version = "3.0.1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-bwwxbRD4RYuW9WTHZEvjwgEb11rVBUyNsmr7DJqRvEc="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + glib + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withVala [ + vala + ]; + + buildInputs = [ + python3 + sqlite + libpsl + glib.out + brotli + libnghttp2 + ] ++ lib.optionals stdenv.isLinux [ + libsysprof-capture + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency + "-Dgssapi=disabled" + "-Dvapi=${if withVala then "enabled" else "disabled"}" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" + "-Dntlm=disabled" + # Requires wstest from autobahn-testsuite. + "-Dautobahn=disabled" + # Requires quart Python module. + "-Dhttp2_tests=disabled" + # Requires gnutls, not added for closure size. + "-Dpkcs11_tests=disabled" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsysprof=disabled" + ]; + + # TODO: For some reason the pkg-config setup hook does not pick this up. + PKG_CONFIG_PATH = "${libnghttp2.dev}/lib/pkgconfig"; + + # HSTS tests fail. + doCheck = false; + + postPatch = '' + patchShebangs libsoup/ + ''; + + passthru = { + propagatedUserEnvPackages = [ + glib-networking.out + ]; + updateScript = gnome.updateScript { + attrPath = "libsoup_3"; + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + meta = { + description = "HTTP client/server library for GNOME"; + homepage = "https://wiki.gnome.org/Projects/libsoup"; + license = lib.licenses.lgpl2Plus; + inherit (glib.meta) maintainers platforms; + }; +} diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 0cc4c8b3453a..f902d3203776 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -18,32 +18,30 @@ , libpsl , python3 , brotli -, fetchpatch }: stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.72.0"; + version = "2.74.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"; + sha256 = "sha256-M7HU4NY5RWxnXCJ4d+lKgHjXMSM+LVdonBGrzvfTxI4="; }; - patches = [ - (fetchpatch { - # https://gitlab.gnome.org/GNOME/libsoup/-/issues/222 - url = "https://gitlab.gnome.org/GNOME/libsoup/commit/b5e4f15a09d197b6a9b4b2d78b33779f27d828af.patch"; - sha256 = "1hqk8lqzc200hi0nwbwq9qm6f03z296cnd79d4ql30683s80xqws"; - }) + nativeBuildInputs = [ + meson + ninja + pkg-config + glib + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withVala [ + vala ]; - postPatch = '' - patchShebangs libsoup/ - ''; - - outputs = [ "out" "dev" ]; - buildInputs = [ python3 sqlite @@ -53,12 +51,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libsysprof-capture ]; - nativeBuildInputs = [ meson ninja pkg-config glib ] - ++ lib.optional withIntrospection gobject-introspection - ++ lib.optional withVala vala; - propagatedBuildInputs = [ glib libxml2 ]; - NIX_CFLAGS_COMPILE = [ "-lpthread" ]; + propagatedBuildInputs = [ + glib + libxml2 + ]; mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency @@ -71,13 +68,22 @@ stdenv.mkDerivation rec { "-Dsysprof=disabled" ]; + NIX_CFLAGS_COMPILE = "-lpthread"; + doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) + postPatch = '' + patchShebangs libsoup/ + ''; + passthru = { - propagatedUserEnvPackages = [ glib-networking.out ]; + propagatedUserEnvPackages = [ + glib-networking.out + ]; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 6c2cb095a818..f86edf1bfbcb 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -25,6 +26,14 @@ stdenv.mkDerivation rec { sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; }; + patches = [ + # Fix build with GLib 2.70 + (fetchpatch { + url = "https://gitlab.com/libvirt/libvirt-glib/-/commit/9a34c4ea55e0246c34896e48b8ecd637bc559ac7.patch"; + sha256 = "UU70uTi55EzPMuLYVKRzpVcd3WogeAtWAWEC2hWlR7k="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index dca856dbb571..0e5785e8c980 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -84,23 +84,24 @@ let in stdenv.mkDerivation rec { pname = "libvirt"; - version = "7.7.0"; + version = "7.8.0"; src = if buildFromTarball then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "1cjj48dn4ww13ayicd2g863a5kz0sc5jlbv2991bj54dq6cn0q8v"; + sha256 = "sha256-pyfNCke/ok+n3ih00j86n58Czra0m6FSiPbZoJixmSE="; } else - fetchFromGitLab { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-gv/tORDlzZP3L3YcU6/YPEpqHQSLzEWa6kEX8EzZM28="; - fetchSubmodules = true; - }; + fetchFromGitLab + { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/tSMJFgLPAiQXcZ2qZLM4XZqf96NtW3+zwKyrwGho2s="; + fetchSubmodules = true; + }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 39a1d505b652..c78cc192a7cf 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "3.36.0"; + version = "40.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM="; }; nativeBuildInputs = [ @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "${pname}${lib.versions.major version}"; - versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 67c5a0794ed5..19af942d759f 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "libxmlxx"; packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 41c842220c7d..b3ff59ad41e1 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { --replace 'docdir=''${datarootdir}' "docdir=$doc/share" ''; + passthru = { + updateScript = gnome.updateScript { + attrPath = "libxmlxx3"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix b/pkgs/development/libraries/libyaml-cpp/0.3.0.nix new file mode 100644 index 000000000000..a465b047a116 --- /dev/null +++ b/pkgs/development/libraries/libyaml-cpp/0.3.0.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libyaml-cpp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "release-${version}"; + sha256 = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8="; + }; + + # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \ + 'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})' + ''; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A YAML parser and emitter for C++"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index ebfe53b25138..0c3eb363a6bc 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "libyaml-cpp"; @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; }; - # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \ - 'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})' - ''; + patches = [ + # https://github.com/jbeder/yaml-cpp/issues/774 + # https://github.com/jbeder/yaml-cpp/pull/1037 + (fetchpatch { + url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; + sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; + }) + ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 81ad3bd8103b..6d6e8c519de7 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -5,6 +5,7 @@ , lib , soci , sqlite +, boost , stdenv }: @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-11vvvA+pud/eOyYsbRKVvGfiyhwdhNPfRQSfaquUro8="; }; - buildInputs = [ bctoolbox soci belle-sip sqlite ]; + buildInputs = [ bctoolbox soci belle-sip sqlite boost ]; nativeBuildInputs = [ cmake ]; # Do not build static libraries diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix index ca078a3f9d2a..c70298c4ff82 100644 --- a/pkgs/development/libraries/nanopb/default.nix +++ b/pkgs/development/libraries/nanopb/default.nix @@ -5,6 +5,7 @@ , protobuf , python3 , stdenv +, buildPackages }: stdenv.mkDerivation rec { @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,} "-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a - "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc" + "-Dnanopb_PROTOC_PATH=${buildPackages.protobuf}/bin/protoc" ]; postInstall = '' diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index d24078b91a27..711097757220 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -8,8 +8,7 @@ }: let - mpiSupport = hdf5.mpiSupport; - mpi = hdf5.mpi; + inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { pname = "netcdf"; version = "4.8.0"; # Remove patch mentioned below on upgrade @@ -44,8 +43,7 @@ in stdenv.mkDerivation rec { buildInputs = [ hdf5 curl mpi ]; passthru = { - mpiSupport = mpiSupport; - inherit mpi; + inherit mpiSupport mpi; }; configureFlags = [ diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 7b5316b144a2..6114c4c70d0f 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.52.21"; src = fetchurl { - url = "https://fedorahosted.org/releases/n/e/${pname}/${pname}-${version}.tar.gz"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://fedorahosted.org/newt/"; + homepage = "https://pagure.io/newt"; description = "Library for color text mode, widget based user interfaces"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/nss/3.53.nix b/pkgs/development/libraries/nss/3.53.nix index 4d22e9a1a7cf..2f18b466f981 100644 --- a/pkgs/development/libraries/nss/3.53.nix +++ b/pkgs/development/libraries/nss/3.53.nix @@ -151,13 +151,11 @@ stdenv.mkDerivation rec { in (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 - do '' + + do libfile="$out/lib/lib$libname${stdenv.hostPlatform.extensions.sharedLibrary}"'' + (if stdenv.isDarwin then '' - libfile="$out/lib/lib$libname.dylib" DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '' else '' - libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '') + '' ${nss}/bin/shlibsign -v -i "$libfile" diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index f8bd34a164de..c1b90a8da873 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -166,13 +166,11 @@ stdenv.mkDerivation rec { in (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 - do '' + + do libfile="$out/lib/lib$libname${stdenv.hostPlatform.extensions.sharedLibrary}"'' + (if stdenv.isDarwin then '' - libfile="$out/lib/lib$libname.dylib" DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '' else '' - libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '') + '' ${nss}/bin/shlibsign -v -i "$libfile" diff --git a/pkgs/development/libraries/nv-codec-headers/11_x.nix b/pkgs/development/libraries/nv-codec-headers/11_x.nix new file mode 100644 index 000000000000..a4bdd600282d --- /dev/null +++ b/pkgs/development/libraries/nv-codec-headers/11_x.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, fetchgit +}: + +stdenv.mkDerivation rec { + pname = "nv-codec-headers"; + version = "11.1.5.0"; + + src = fetchgit { + url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; + rev = "n${version}"; + sha256 = "5d6LCKQB31UZ0veanSeKJVrPkJ8o2nvQWRfIG8YuekM="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with lib; { + description = "FFmpeg version of headers for NVENC"; + homepage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; + license = licenses.mit; + maintainers = with maintainers; [ MP2E ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index c3f46d8e31ef..0263ef3096dd 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -13,6 +13,7 @@ , gflags , protobuf , config +, ocl-icd , enableJPEG ? true , libjpeg @@ -313,6 +314,8 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 2de005d885a1..d785146ecb07 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -1,6 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, darwin -, cmake, pkg-config -, asio, nettle, gnutls, msgpack, readline, libargon2 +{ lib +, stdenv +, fetchFromGitHub +, Security +, cmake +, pkg-config +, asio +, nettle +, gnutls +, msgpack +, readline +, libargon2 +, jsoncpp +, restinio +, http-parser +, openssl +, fmt +, enableProxyServerAndClient ? false +, enablePushNotifications ? false }: stdenv.mkDerivation rec { @@ -14,29 +30,42 @@ stdenv.mkDerivation rec { sha256 = "sha256-Os5PRYTZMVekQrbwNODWsHANTx6RSC5vzGJ5JoYtvtE="; }; - nativeBuildInputs = - [ cmake - pkg-config - ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = - [ asio - nettle - gnutls - msgpack - readline - libargon2 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + asio + nettle + gnutls + msgpack + readline + libargon2 + ] ++ lib.optionals enableProxyServerAndClient [ + jsoncpp + restinio + http-parser + openssl + fmt + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + cmakeFlags = lib.optionals enableProxyServerAndClient [ + "-DOPENDHT_PROXY_SERVER=ON" + "-DOPENDHT_PROXY_CLIENT=ON" + ] ++ lib.optionals enablePushNotifications [ + "-DOPENDHT_PUSH_NOTIFICATIONS=ON" + ]; outputs = [ "out" "lib" "dev" "man" ]; meta = with lib; { description = "A C++11 Kademlia distributed hash table implementation"; - homepage = "https://github.com/savoirfairelinux/opendht"; - license = licenses.gpl3Plus; + homepage = "https://github.com/savoirfairelinux/opendht"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch thoughtpolice ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 51e661eabb3b..08767680ffd6 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.7.9"; + version = "1.8.1"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck"; + sha256 = "sha256-JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A="; }; configureFlags = [ diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix index 9b105808b8bb..3b00ae17e910 100644 --- a/pkgs/development/libraries/opengrm-ngram/default.nix +++ b/pkgs/development/libraries/opengrm-ngram/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "opengrm-ngram"; - version = "1.3.11"; + version = "1.3.13"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz"; - sha256 = "0wwpcj8qncdr9f2pmi0vhlw277dyxr85ygdi8g57xp2ifysigm05"; + sha256 = "sha256-5CXf6OXs7owny3yZQrWYA6yhIyN0dgA2B8TSDEUTF1Q="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2d3f1c313caa..ca44788a289e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -75,6 +75,7 @@ let aarch64-darwin = "./Configure darwin64-arm64-cc"; x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + riscv64-linux = "./Configure linux64-riscv64"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" @@ -170,7 +171,6 @@ let description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; platforms = platforms.all; - maintainers = [ maintainers.peti ]; } // extraMeta; }; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index c75e33a0686e..513bfe2d17e6 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -24,14 +24,14 @@ let in stdenv.mkDerivation rec { pname = "pango"; - version = "1.48.5"; + version = "1.48.10"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0aivpd6l5687lj5293j859zd7vq97yxpzvad0b6jvh3kc54p87jh"; + sha256 = "IeH1eYvN/adeq8QoBRSwiWq1b2VtTn5mAwuaJTXs3Jg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index d5921a5afe25..f13dce99c135 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.42.2"; + version= "2.46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io="; + sha256 = "sha256-yIUBP+YaTFEX/aOVdw1QdWNBHGPkn0o6ztTJ7+NNmXU="; }; outputs = [ "out" "dev" ]; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index 05f12d0148be..92d74cab93bc 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib +, stdenv +, fetchurl +, cmake +, enableWX ? false +, wxGTK31, wxmac +, enableXWin ? false +, libX11 +}: -stdenv.mkDerivation rec { +let + wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK31); +in stdenv.mkDerivation rec { pname = "plplot"; version = "5.15.0"; @@ -11,6 +21,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional enableWX wxWidgets + ++ lib.optional enableXWin libX11; + + passthru = { + inherit + enableWX + wxWidgets + enableXWin + libX11 + ; + }; + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_TEST=ON" ]; doCheck = true; diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix new file mode 100644 index 000000000000..62608e390f8b --- /dev/null +++ b/pkgs/development/libraries/qcoro/default.nix @@ -0,0 +1,38 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, libpthreadstubs +, qtbase +}: + +mkDerivation rec { + pname = "qcoro"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "danvratil"; + repo = "qcoro"; + rev = "v${version}"; + sha256 = "09543hpy590dndmlxmcm8c58m97blhaii4wbjr655qxdanhhxgzi"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + qtbase + libpthreadstubs + ]; + + meta = with lib; { + description = "Library for using C++20 coroutines in connection with certain asynchronous Qt actions"; + homepage = "https://github.com/danvratil/qcoro"; + license = licenses.mit; + maintainers = with maintainers; [ smitop ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 7290b3830d07..c7a8a400a981 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.16.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "05ihjslnv7rrp4giwvvyaiig0dpfmw3jijfaadzax8jhbyscmxsq"; + sha256 = "sha256-sY2slI9ZVuEurBIEaJMxUiKiUNXx+h7UEwEZKKr7R2Y="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 8e99ca1be354..68e81866e1e6 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.8"; + version = "1.1.9"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc"; + sha256 = "188fh4l8wda1y9vxa9asbk8nw35gyapw7gyn4w2p2qspdjhi5mnq"; }; meta = with lib; { diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 2ad169f2a3f6..1ce6f2672104 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, openssl +}: stdenv.mkDerivation rec { pname = "s2n-tls"; @@ -11,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4="; }; + patches = [ + # Fix FindLibCrypto paths (https://github.com/aws/s2n-tls/pull/3067) + (fetchpatch { + url = "https://github.com/aws/s2n-tls/commit/bda649524402be4018c44bff07f6c64502a351ec.patch"; + sha256 = "02jmxsrd506vhjzlrgh1p2z1f1sn4v8klks25zisiykyqkyaczkv"; + }) + ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev"]; @@ -26,8 +39,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). postInstall = '' - substituteInPlace $out/lib/s2n/cmake/shared/s2n-targets.cmake \ - --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + # Glob for 'shared' or 'static' subdir + for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do + substituteInPlace "$f" \ + --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + done ''; meta = with lib; { diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 3233a29449aa..52822baca631 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.11"; + version = "1.13"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1mrq4mihzx37yqhj3sfz6da6mw49niia808bzsw2gkkgmadxvyng"; + sha256 = "sha256-8kB9+fl/C7awdlZXnkGhylEARkBntrIb+WKi6ksO/WU="; }; # perl is only used during the check phase. diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index 1130f5c44e70..b7f5f5f6d90e 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "avogadrolibs"; - version = "1.94.0"; + version = "1.95.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = pname; rev = version; - sha256 = "6bChJhqrjOxeEWZBNToq3JExHPu7DUMsEHWBDe75zAo="; + sha256 = "0zzVg8xNqFwDrK8gRkDm3tRgBt7fD4K3Uy/ajUBc+eQ="; }; postUnpack = '' diff --git a/pkgs/development/libraries/science/chemistry/libmsym/default.nix b/pkgs/development/libraries/science/chemistry/libmsym/default.nix index 8c605f3e07d4..fdcf7d00e3ba 100644 --- a/pkgs/development/libraries/science/chemistry/libmsym/default.nix +++ b/pkgs/development/libraries/science/chemistry/libmsym/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = " molecular point group symmetry lib"; - homepage = "https://github.com/rcsb/mmtf-cpp"; + homepage = "https://github.com/mcodev31/libmsym"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.sheepforce ]; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index b122a3121e4e..82237ef14341 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-r/qA3ux4kh+GM15vw/GLgK7+z0JPaldV6fL6DrBxDt8="; }; + dontAddWafCrossFlags = true; + nativeBuildInputs = [ pkg-config python3 wafHook ]; meta = with lib; { diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 2c87d421babe..5b8f93d7bc7b 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -1,25 +1,31 @@ { cmake , fetchFromGitHub , sqlite +, postgresql +, boost , lib, stdenv }: stdenv.mkDerivation rec { pname = "soci"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "SOCI"; repo = pname; - rev = version; - sha256 = "sha256-d4GtxDaB+yGfyCnbvnLRUYcrPSMkUF7Opu6+SZd8opM="; + rev = "v${version}"; + sha256 = "sha256-NE0ApbX8HG2VAQ9cg9+kX3kJQ4PR1XvWL9BlT8NphmE="; }; # Do not build static libraries cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ sqlite ]; + buildInputs = [ + sqlite + postgresql + boost + ]; meta = with lib; { description = "Database access library for C++"; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 820c577908ab..dee53bd3b2a7 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + ''; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ pcre ]; propagatedBuildInputs = [ serd ]; + dontAddWafCrossFlags = true; meta = with lib; { homepage = "http://drobilla.net/software/sord"; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index eec08f3cc2d0..ec20f68b6f48 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "spdk"; - version = "21.04"; + version = "21.07"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "sha256-Xmmgojgtt1HwTqG/1ZOJVo1BcdAH0sheu40d73OJ68w="; + sha256 = "sha256-/hynuYVdzIfiHUUfuuOY8SBJ18DqJr2Fos2JjQQVvbg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index a0a1ac0360e8..9682ac1637a3 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { license = "as-is"; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index a5553dd0d00a..2668de9b4612 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg="; + sha256 = "sha256-Bi+C3VSKYq7IUQWFAROskBpiK8UcbPxjIFY2Xof4GYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 0ee5e0fa5672..fc0ba54cbe7e 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , fetchpatch , gettext @@ -8,7 +9,6 @@ , asciidoc , gobject-introspection , python3 -, gtk-doc , docbook-xsl-nons , docbook_xml_dtd_45 , libxml2 @@ -22,6 +22,7 @@ , icu , libuuid , libsoup +, libsoup_3 , json-glib , systemd , dbus @@ -30,13 +31,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.1.1"; + version = "3.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc="; + sha256 = "sha256-8RelKHXUpNCceqmT+Mio0GRo1dz7FT642qUesThEUTo="; }; patches = [ @@ -44,16 +45,12 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit asciidoc; }) - - # Add missing build target dependencies to fix parallel building of docs. - # TODO: Upstream this. - ./fix-docs.patch - - # Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands - # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401 + ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ + # Upstream: https://gitlab.gnome.org/GNOME/tracker/-/issues/332 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker/merge_requests/401.patch"; - sha256 = "QEf+ciGkkCzanmtGO0aig6nAxd+NxjvuNi4RbNOwZEA="; + name = "i686-test.patch"; + url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/af707181a2c492a794daec7ce3f3062d67ffd9dc.patch"; + sha256 = "sha256-KOdkTy79w3oiQILrPG00UVrv+VBjAk4Y868I8jtifqk="; }) ]; @@ -67,7 +64,6 @@ stdenv.mkDerivation rec { libxslt wrapGAppsNoGuiHook gobject-introspection - gtk-doc docbook-xsl-nons docbook_xml_dtd_45 python3 # for data-generators @@ -81,6 +77,7 @@ stdenv.mkDerivation rec { sqlite icu libsoup + libsoup_3 libuuid json-glib libstemmer diff --git a/pkgs/development/libraries/tracker/fix-docs.patch b/pkgs/development/libraries/tracker/fix-docs.patch deleted file mode 100644 index a6ff84cda3e5..000000000000 --- a/pkgs/development/libraries/tracker/fix-docs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/docs/reference/libtracker-sparql/examples/meson.build b/docs/reference/libtracker-sparql/examples/meson.build -index 1cb1d9f3f..313c72345 100644 ---- a/docs/reference/libtracker-sparql/examples/meson.build -+++ b/docs/reference/libtracker-sparql/examples/meson.build -@@ -1,20 +1,20 @@ - executable( - 'readonly-example', - 'readonly-example.c', -- dependencies: tracker_sparql_dep, -+ dependencies: [tracker_common_dep, tracker_sparql_dep], - build_by_default: true - ) - - executable( - 'writeonly-example', - 'writeonly-example.c', -- dependencies: tracker_sparql_dep, -+ dependencies: [tracker_common_dep, tracker_sparql_dep], - build_by_default: true - ) - - executable( - 'writeonly-with-blank-nodes-example', - 'writeonly-with-blank-nodes-example.c', -- dependencies: tracker_sparql_dep, -+ dependencies: [tracker_common_dep, tracker_sparql_dep], - build_by_default: true - ) diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 2dac161bb4a4..d432fd158892 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -2,11 +2,11 @@ , lib , docbook-xsl-nons , fetchurl -, fetchpatch , glib , gobject-introspection , gtk-doc , libgudev +, libpcap , meson , ninja , pkg-config @@ -19,23 +19,15 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.15.4"; + version = "0.16.3"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg"; + sha256 = "TjHxqtz8mPhzpsMb5lXWdj8hx/whsadTfor4S2x4U2M="; }; - patches = [ - # Fix build with Vala 0.52 - (fetchpatch { - url = "https://github.com/martinpitt/umockdev/commit/a236f0b55fbb6ff50a6429da9d404703d6637d94.patch"; - sha256 = "sZs9Ove1r7te/a9vmWUmFetLVhyzhHmx7ijhkK/2S5o="; - }) - ]; - nativeBuildInputs = [ docbook-xsl-nons gobject-introspection @@ -50,6 +42,7 @@ stdenv.mkDerivation rec { glib systemd libgudev + libpcap ]; checkInputs = [ diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 14f41b015e9c..b766b933a656 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -57,7 +57,7 @@ passthru = { fancyName = "MariaDB"; - driver = if stdenv.isDarwin then "lib/libmaodbc.dylib" else "lib/libmaodbc.so"; + driver = "lib/libmaodbc${stdenv.hostPlatform.extensions.sharedLibrary}"; }; meta = with lib; { diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 502c50db1220..141c9edbd237 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "usbredir"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "spice"; repo = "usbredir"; rev = "${pname}-${version}"; - sha256 = "1dz8jms9l6gg2hw0k6p1p1lnchc9mcgmskgvm5gbdvw3j7wrhdbz"; + sha256 = "1ra8vpi6wdq1fvvqzx4ny2ga0p0q1cwz72gr15nghyfp75y3d31l"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index c3631cccbe01..0411086c78c3 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.64.1"; + version = "0.64.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EvtBqf+OA8XxcRtGVgkQpLmzECrsPp52Cc7vTfqYqio="; + sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg="; }; patches = [ diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 9165bb4be6f0..23307b0f36b7 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -15,6 +15,7 @@ , libnotify , gnutls , libgcrypt +, libgpg-error , gtk3 , wayland , libwebp @@ -41,6 +42,7 @@ , libGLU , mesa , libintl +, lcms2 , libmanette , openjpeg , enableGeoLocation ? true @@ -63,7 +65,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.32.4"; + version = "2.34.0"; outputs = [ "out" "dev" ]; @@ -71,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0"; + sha256 = "sha256-iAyO5ib2cBn2dVfKCeWaI+zyReYPYXMhXxqII8sJrzQ="; }; patches = lib.optionals stdenv.isLinux [ @@ -140,8 +142,10 @@ stdenv.mkDerivation rec { libGLU mesa # for libEGL headers libgcrypt + libgpg-error libidn libintl + lcms2 ] ++ lib.optionals stdenv.isLinux [ libmanette ] ++ [ @@ -193,6 +197,7 @@ stdenv.mkDerivation rec { "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" + "-DUSE_SOUP2=${if lib.versions.major libsoup.version == "2" then "ON" else "OFF"}" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index d1f6903961b7..9f9f330443c6 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.6.4"; + version = "4.7.3"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha256 = "sha256-fIm8xbNP7pjzvfBn7NgYmUtbVVh2aiaXQVANJQnrWCs="; + sha256 = "sha256-t8y4oq4p7ZMDELAkRVmoNguYRNG8spcW7MHnpdINN8g="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix new file mode 100644 index 000000000000..ad68f13fe0f1 --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, fontconfig +, glib +, gsettings-desktop-schemas +, gtk4 +, libadwaita +, xdg-desktop-portal +, wayland +, gnome +}: + +stdenv.mkDerivation rec { + pname = "xdg-desktop-portal-gnome"; + version = "41.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "u6FEGZ5+1LlJCyScGvZFqGnWKZMmXerDjyGb8EL//fI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + fontconfig + glib + gsettings-desktop-schemas # settings exposed by settings portal + gtk4 + libadwaita + xdg-desktop-portal + wayland # required by GTK 4 + ]; + + mesonFlags = [ + "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "Backend implementation for xdg-desktop-portal for the GNOME desktop environment"; + maintainers = teams.gnome.members; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 93a308a658da..08d695c15e53 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , libxml2 @@ -9,19 +11,33 @@ , glib , wrapGAppsHook , gsettings-desktop-schemas +, buildPortalsInGnome ? true }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "0987fwsdgkcd3mh3scvg2kyg4ay1rr5w16js4pl3pavw9yhl9lbi"; + sha256 = "7w+evZLtmTmDHVVsw25bJz99xtlSCE8qTFSxez9tlZk="; }; + patches = [ + # Fix broken translation. + # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/353 + (fetchpatch { + url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/e34f49ca8365801a7fcacccb46ab1e62aec17435.patch"; + sha256 = "umMsSP0fuSQgxlHLaZlg25ln1aAL1mssWzPMIWAOUt4="; + }) + (fetchpatch { + url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/19c5385b9f5fe0f8dac8ae7cc4493bb08f802de6.patch"; + sha256 = "nbmOb5er20zBOO4K2geYITafqBaNHbDpq1OOvIVD6hY="; + }) + ]; + nativeBuildInputs = [ autoreconfHook libxml2 @@ -38,6 +54,15 @@ stdenv.mkDerivation rec { gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; + configureFlags = lib.optionals buildPortalsInGnome [ + "--enable-wallpaper" + "--enable-screenshot" + "--enable-screencast" + "--enable-background" + "--enable-settings" + "--enable-appchooser" + ]; + meta = with lib; { description = "Desktop integration portals for sandboxed apps"; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 2b425300b31e..71674a6c3886 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , nixosTests , substituteAll @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.8.1"; + version = "1.10.1"; outputs = [ "out" "installedTests" ]; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "sha256-tuRKCBj9ELC7yFPs/Sut/EdO+L8nwW3S8NWU+XedAF8="; + sha256 = "Q1ZP/ljdIxJHg+3JaTL/LIZV+3cK2+dognsTC95udVA="; }; patches = [ diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix index e4927ee30464..0c8bc1814b53 100644 --- a/pkgs/development/lua-modules/default.nix +++ b/pkgs/development/lua-modules/default.nix @@ -15,7 +15,7 @@ let overridenPackages = import ./overrides.nix { inherit pkgs; }; generatedPackages = if (builtins.pathExists ./generated-packages.nix) then - pkgs.callPackage ./generated-packages.nix { } else (final: prev: {}); + (final: prev: pkgs.callPackage ./generated-packages.nix { inherit (final) callPackage; } final prev) else (final: prev: {}); extensible-self = lib.makeExtensible (extends overrides diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 441f83d10c0b..983efa4329de 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1,4 +1,3 @@ - /* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! Regenerate it with: nixpkgs$ ./maintainers/scripts/update-luarocks-packages @@ -6,11 +5,13 @@ nixpkgs$ ./maintainers/scripts/update-luarocks-packages You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -{ self, stdenv, lib, fetchurl, fetchgit, ... } @ args: -self: super: -with self; +{ self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: +final: prev: { -alt-getopt = buildLuarocksPackage { +alt-getopt = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; knownRockspec = (fetchurl { @@ -30,7 +31,7 @@ alt-getopt = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -39,9 +40,12 @@ alt-getopt = buildLuarocksPackage { maintainers = with lib.maintainers; [ arobyn ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -argparse = buildLuarocksPackage { +argparse = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "argparse"; version = "scm-2"; @@ -58,7 +62,7 @@ argparse = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -66,9 +70,12 @@ argparse = buildLuarocksPackage { description = "A feature-rich command-line argument parser"; license.fullName = "MIT"; }; -}; +}) {}; -basexx = buildLuarocksPackage { +basexx = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "basexx"; version = "scm-0"; rockspecDir = "dist"; @@ -78,7 +85,7 @@ basexx = buildLuarocksPackage { sha256 = "1x0d24aaj4zld4ifr7mi8zwrym5shsfphmwx5jzw2zg22r6xzlz1"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -86,9 +93,12 @@ basexx = buildLuarocksPackage { description = "A base2, base16, base32, base64 and base85 library for Lua"; license.fullName = "MIT"; }; -}; +}) {}; -binaryheap = buildLuarocksPackage { +binaryheap = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "binaryheap"; version = "0.4-1"; @@ -97,7 +107,7 @@ binaryheap = buildLuarocksPackage { sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -106,9 +116,12 @@ binaryheap = buildLuarocksPackage { maintainers = with lib.maintainers; [ vcunat ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -bit32 = buildLuarocksPackage { +bit32 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; knownRockspec = (fetchurl { @@ -128,7 +141,7 @@ bit32 = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -137,9 +150,12 @@ bit32 = buildLuarocksPackage { maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -busted = buildLuarocksPackage { +busted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua, lua_cliargs, luafilesystem, luasystem, dkjson, say, luassert, lua-term, penlight, mediator_lua +}: +buildLuarocksPackage { pname = "busted"; version = "2.0.0-1"; knownRockspec = (fetchurl { @@ -151,7 +167,7 @@ busted = buildLuarocksPackage { sha256 = "1ps7b3f4diawfj637mibznaw4x08gn567pyni0m2s50hrnw4v8zx"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; meta = { @@ -159,13 +175,16 @@ busted = buildLuarocksPackage { description = "Elegant Lua unit testing."; license.fullName = "MIT "; }; -}; +}) {}; -cassowary = buildLuarocksPackage { +cassowary = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, penlight +}: +buildLuarocksPackage { pname = "cassowary"; version = "2.3.1-2"; knownRockspec = (fetchurl { - url = "https://luarocks.org/cassowary-2.3.1-2.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cassowary-2.3.1-2.rockspec"; sha256 = "04y882f9ai1jhk0zwla2g0fvl56a75rwnxhsl9r3m0qa5i0ia1i5"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -181,7 +200,7 @@ cassowary = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; meta = { @@ -190,9 +209,12 @@ cassowary = buildLuarocksPackage { maintainers = with lib.maintainers; [ marsam alerque ]; license.fullName = "Apache 2"; }; -}; +}) {}; -compat53 = buildLuarocksPackage { +compat53 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "compat53"; version = "0.7-1"; knownRockspec = (fetchurl { @@ -204,7 +226,7 @@ compat53 = buildLuarocksPackage { sha256 = "1x3wv1qx7b2zlf3fh4q9pmi2xxkcdm024g7bf11rpv0yacnhran3"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -213,9 +235,12 @@ compat53 = buildLuarocksPackage { maintainers = with lib.maintainers; [ vcunat ]; license.fullName = "MIT"; }; -}; +}) {}; -cosmo = buildLuarocksPackage { +cosmo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lpeg +}: +buildLuarocksPackage { pname = "cosmo"; version = "16.06.04-1"; knownRockspec = (fetchurl { @@ -243,9 +268,11 @@ cosmo = buildLuarocksPackage { maintainers = with lib.maintainers; [ marsam ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -coxpcall = buildLuarocksPackage { +coxpcall = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit}: +buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; knownRockspec = (fetchurl { @@ -271,9 +298,12 @@ coxpcall = buildLuarocksPackage { description = "Coroutine safe xpcall and pcall"; license.fullName = "MIT/X11"; }; -}; +}) {}; -cqueues = buildLuarocksPackage { +cqueues = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "cqueues"; version = "20200726.52-0"; knownRockspec = (fetchurl { @@ -285,7 +315,7 @@ cqueues = buildLuarocksPackage { sha256 = "0lhd02ag3r1sxr2hx847rdjkddm04l1vf5234v5cz9bd4kfjw4cy"; }; - disabled = (lua.luaversion != "5.2"); + disabled = with lua; (luaversion != "5.2"); propagatedBuildInputs = [ lua ]; meta = { @@ -294,9 +324,12 @@ cqueues = buildLuarocksPackage { maintainers = with lib.maintainers; [ vcunat ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -cyrussasl = buildLuarocksPackage { +cyrussasl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "cyrussasl"; version = "1.1.0-1"; @@ -313,7 +346,7 @@ cyrussasl = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -321,18 +354,21 @@ cyrussasl = buildLuarocksPackage { description = "Cyrus SASL library for Lua 5.1+"; license.fullName = "BSD"; }; -}; +}) {}; -digestif = buildLuarocksPackage { +digestif = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, lpeg +}: +buildLuarocksPackage { pname = "digestif"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/astoff/digestif", - "rev": "9f8f299cf7094d72edbd32a455869751246028b7", - "date": "2021-09-25T14:32:42+02:00", - "path": "/nix/store/ln1zx9cw2b7q4x5vzd6hv5nd01c1gsy3-digestif", - "sha256": "1cf14m03jvfs1mwaywfgv759jh0ha3pxrnyj7jxjxlsj6cim89v0", + "rev": "505ca88a54012be5534654238baaa457f8446fed", + "date": "2021-10-06T21:27:45+02:00", + "path": "/nix/store/6wvpy0nsr5yf78by3dg8m2m0h0kf9xk4-digestif", + "sha256": "1prv5nqskvilyyx3z9b2jiz72lwpz2xcas57qjpbv6qq5l2si1xm", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -340,7 +376,7 @@ digestif = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.3"); + disabled = with lua; (luaOlder "5.3"); propagatedBuildInputs = [ lua lpeg ]; meta = { @@ -348,13 +384,16 @@ digestif = buildLuarocksPackage { description = "A code analyzer for TeX"; license.fullName = "MIT"; }; -}; +}) {}; -dkjson = buildLuarocksPackage { +dkjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "dkjson"; version = "2.5-3"; knownRockspec = (fetchurl { - url = "https://luarocks.org/dkjson-2.5-3.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/dkjson-2.5-3.rockspec"; sha256 = "18xngdzl2q207cil64aj81qi6qvj1g269pf07j5x4pbvamd6a1l3"; }).outPath; src = fetchurl { @@ -362,7 +401,7 @@ dkjson = buildLuarocksPackage { sha256 = "14wanday1l7wj2lnpabbxw8rcsa0zbvcdi1w88rdr5gbsq3xwasm"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -370,13 +409,16 @@ dkjson = buildLuarocksPackage { description = "David Kolf's JSON module for Lua"; license.fullName = "MIT/X11"; }; -}; +}) {}; -fifo = buildLuarocksPackage { +fifo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/fifo-0.2-0.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/fifo-0.2-0.rockspec"; sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq"; }).outPath; src = fetchurl { @@ -391,18 +433,21 @@ fifo = buildLuarocksPackage { description = "A lua library/'class' that implements a FIFO"; license.fullName = "MIT/X11"; }; -}; +}) {}; -gitsigns-nvim = buildLuarocksPackage { +gitsigns-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, plenary-nvim +}: +buildLuarocksPackage { pname = "gitsigns.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "7e5c1a831f555dc398dd1564489e2b8a5c867754", - "date": "2021-09-25T16:49:34+01:00", - "path": "/nix/store/a1h8xxb9w4kvvmq7q30m1ny2pq3zbmin-gitsigns.nvim", - "sha256": "02kssw0lpprf9k3il6gfd00gj9fbjbksipa4f6xqkgfdq5c9l9fr", + "rev": "552f114caeaec4ce97822cb55dfa7c7e5368136b", + "date": "2021-10-15T13:31:44+01:00", + "path": "/nix/store/40vkv3sc4h6gh9ac88k7pilszxmy38yv-gitsigns.nvim", + "sha256": "0qdafm3arjf8bcqpvv085dwzbikad3sr3xzvrn3gfa0dsls8pg6q", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -410,7 +455,7 @@ gitsigns-nvim = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (lua.luaversion != "5.1"); + disabled = with lua; (luaversion != "5.1"); propagatedBuildInputs = [ lua plenary-nvim ]; meta = { @@ -418,9 +463,12 @@ gitsigns-nvim = buildLuarocksPackage { description = "Git signs written in pure lua"; license.fullName = "MIT/X11"; }; -}; +}) {}; -http = buildLuarocksPackage { +http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua, compat53, bit32, cqueues, luaossl, basexx, lpeg, lpeg_patterns, binaryheap, fifo +}: +buildLuarocksPackage { pname = "http"; version = "0.3-0"; knownRockspec = (fetchurl { @@ -432,7 +480,7 @@ http = buildLuarocksPackage { sha256 = "13xyj8qx42mzn1z4lwwdfd7ha06a720q4b7d04ir6vvp2fwp3s4q"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; meta = { @@ -441,9 +489,12 @@ http = buildLuarocksPackage { maintainers = with lib.maintainers; [ vcunat ]; license.fullName = "MIT"; }; -}; +}) {}; -inspect = buildLuarocksPackage { +inspect = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "inspect"; version = "3.1.1-0"; knownRockspec = (fetchurl { @@ -455,7 +506,7 @@ inspect = buildLuarocksPackage { sha256 = "1nz0yqhkd0nkymghrj99gb2id40g50drh4a96g3v5k7h1sbg94h2"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -463,9 +514,12 @@ inspect = buildLuarocksPackage { description = "Lua table visualizer, ideal for debugging"; license.fullName = "MIT "; }; -}; +}) {}; -ldbus = buildLuarocksPackage { +ldbus = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "ldbus"; version = "scm-0"; knownRockspec = (fetchurl { @@ -485,7 +539,7 @@ ldbus = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -493,9 +547,12 @@ ldbus = buildLuarocksPackage { description = "A Lua library to access dbus."; license.fullName = "MIT/X11"; }; -}; +}) {}; -ldoc = buildLuarocksPackage { +ldoc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, penlight, markdown +}: +buildLuarocksPackage { pname = "ldoc"; version = "scm-3"; @@ -519,9 +576,12 @@ ldoc = buildLuarocksPackage { description = "A Lua Documentation Tool"; license.fullName = "MIT/X11"; }; -}; +}) {}; -lgi = buildLuarocksPackage { +lgi = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; knownRockspec = (fetchurl { @@ -541,7 +601,7 @@ lgi = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -549,9 +609,12 @@ lgi = buildLuarocksPackage { description = "Lua bindings to GObject libraries"; license.fullName = "MIT/X11"; }; -}; +}) {}; -linenoise = buildLuarocksPackage { +linenoise = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; @@ -560,7 +623,7 @@ linenoise = buildLuarocksPackage { sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -568,9 +631,12 @@ linenoise = buildLuarocksPackage { description = "A binding for the linenoise command line library"; license.fullName = "MIT/X11"; }; -}; +}) {}; -ljsyscall = buildLuarocksPackage { +ljsyscall = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "ljsyscall"; version = "0.12-1"; knownRockspec = (fetchurl { @@ -582,7 +648,7 @@ ljsyscall = buildLuarocksPackage { sha256 = "1w9g36nhxv92cypjia7igg1xpfrn3dbs3hfy6gnnz5mx14v50abf"; }; - disabled = (lua.luaversion != "5.1"); + disabled = with lua; (luaversion != "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -591,13 +657,16 @@ ljsyscall = buildLuarocksPackage { maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT"; }; -}; +}) {}; -lpeg = buildLuarocksPackage { +lpeg = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "lpeg"; version = "1.0.2-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lpeg-1.0.2-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg-1.0.2-1.rockspec"; sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89"; }).outPath; src = fetchurl { @@ -605,7 +674,7 @@ lpeg = buildLuarocksPackage { sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -614,9 +683,12 @@ lpeg = buildLuarocksPackage { maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -lpeg_patterns = buildLuarocksPackage { +lpeg_patterns = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua, lpeg +}: +buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; knownRockspec = (fetchurl { @@ -635,9 +707,12 @@ lpeg_patterns = buildLuarocksPackage { description = "a collection of LPEG patterns"; license.fullName = "MIT"; }; -}; +}) {}; -lpeglabel = buildLuarocksPackage { +lpeglabel = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "lpeglabel"; version = "1.6.0-1"; knownRockspec = (fetchurl { @@ -649,7 +724,7 @@ lpeglabel = buildLuarocksPackage { sha256 = "1i02lsxj20iygqm8fy6dih1gh21lqk5qj1mv14wlrkaywnv35wcv"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -657,13 +732,16 @@ lpeglabel = buildLuarocksPackage { description = "Parsing Expression Grammars For Lua with Labeled Failures"; license.fullName = "MIT/X11"; }; -}; +}) {}; -lpty = buildLuarocksPackage { +lpty = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "lpty"; version = "1.2.2-1"; knownRockspec = (fetchurl { - url = "https://luafr.org/luarocks/lpty-1.2.2-1.rockspec"; + url = "https://luarocks.org/lpty-1.2.2-1.rockspec"; sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg"; }).outPath; src = fetchurl { @@ -671,7 +749,7 @@ lpty = buildLuarocksPackage { sha256 = "071mvz79wi9vr6hvrnb1rv19lqp1bh2fi742zkpv2sm1r9gy5rav"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -679,9 +757,12 @@ lpty = buildLuarocksPackage { description = "A simple facility for lua to control other programs via PTYs."; license.fullName = "MIT"; }; -}; +}) {}; -lrexlib-gnu = buildLuarocksPackage { +lrexlib-gnu = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.1-1"; knownRockspec = (fetchurl { @@ -701,7 +782,7 @@ lrexlib-gnu = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -709,9 +790,12 @@ lrexlib-gnu = buildLuarocksPackage { description = "Regular expression library binding (GNU flavour)."; license.fullName = "MIT/X11"; }; -}; +}) {}; -lrexlib-pcre = buildLuarocksPackage { +lrexlib-pcre = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lrexlib-pcre"; version = "2.9.1-1"; knownRockspec = (fetchurl { @@ -731,7 +815,7 @@ lrexlib-pcre = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -740,9 +824,12 @@ lrexlib-pcre = buildLuarocksPackage { maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -lrexlib-posix = buildLuarocksPackage { +lrexlib-posix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.1-1"; knownRockspec = (fetchurl { @@ -762,7 +849,7 @@ lrexlib-posix = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -770,9 +857,12 @@ lrexlib-posix = buildLuarocksPackage { description = "Regular expression library binding (POSIX flavour)."; license.fullName = "MIT/X11"; }; -}; +}) {}; -lua-cjson = buildLuarocksPackage { +lua-cjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lua-cjson"; version = "2.1.0.6-1"; knownRockspec = (fetchurl { @@ -792,7 +882,7 @@ lua-cjson = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -800,9 +890,12 @@ lua-cjson = buildLuarocksPackage { description = "A fast JSON encoding/parsing module"; license.fullName = "MIT"; }; -}; +}) {}; -lua-cmsgpack = buildLuarocksPackage { +lua-cmsgpack = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; knownRockspec = (fetchurl { @@ -822,7 +915,7 @@ lua-cmsgpack = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -830,9 +923,12 @@ lua-cmsgpack = buildLuarocksPackage { description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license.fullName = "Two-clause BSD"; }; -}; +}) {}; -lua-iconv = buildLuarocksPackage { +lua-iconv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "lua-iconv"; version = "7-3"; knownRockspec = (fetchurl { @@ -844,7 +940,7 @@ lua-iconv = buildLuarocksPackage { sha256 = "02dg5x79fg5mwsycr0fj6w04zykdpiki9xjswkkwzdalqwaikny1"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -852,9 +948,12 @@ lua-iconv = buildLuarocksPackage { description = "Lua binding to the iconv"; license.fullName = "MIT/X11"; }; -}; +}) {}; -lua-lsp = buildLuarocksPackage { +lua-lsp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, dkjson, lpeglabel, inspect +}: +buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; knownRockspec = (fetchurl { @@ -874,7 +973,7 @@ lua-lsp = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua dkjson lpeglabel inspect ]; meta = { @@ -882,9 +981,12 @@ lua-lsp = buildLuarocksPackage { description = "A Language Server implementation for lua, the language"; license.fullName = "MIT"; }; -}; +}) {}; -lua-messagepack = buildLuarocksPackage { +lua-messagepack = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "lua-messagepack"; version = "0.5.2-1"; knownRockspec = (fetchurl { @@ -896,7 +998,7 @@ lua-messagepack = buildLuarocksPackage { sha256 = "1jgi944d0vx4zs9lrphys9pw0wrsibip93sh141qjwymrjyjg1nc"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -904,9 +1006,12 @@ lua-messagepack = buildLuarocksPackage { description = "a pure Lua implementation of the MessagePack serialization format"; license.fullName = "MIT/X11"; }; -}; +}) {}; -lua-resty-http = buildLuarocksPackage { +lua-resty-http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lua-resty-http"; version = "0.16.1-0"; knownRockspec = (fetchurl { @@ -926,7 +1031,7 @@ lua-resty-http = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -934,9 +1039,12 @@ lua-resty-http = buildLuarocksPackage { description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua."; license.fullName = "2-clause BSD"; }; -}; +}) {}; -lua-resty-jwt = buildLuarocksPackage { +lua-resty-jwt = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, lua-resty-openssl +}: +buildLuarocksPackage { pname = "lua-resty-jwt"; version = "0.2.3-0"; knownRockspec = (fetchurl { @@ -956,7 +1064,7 @@ lua-resty-jwt = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-openssl ]; meta = { @@ -964,9 +1072,12 @@ lua-resty-jwt = buildLuarocksPackage { description = "JWT for ngx_lua and LuaJIT."; license.fullName = "Apache License Version 2"; }; -}; +}) {}; -lua-resty-openidc = buildLuarocksPackage { +lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, lua-resty-http, lua-resty-session, lua-resty-jwt +}: +buildLuarocksPackage { pname = "lua-resty-openidc"; version = "1.7.4-1"; knownRockspec = (fetchurl { @@ -986,7 +1097,7 @@ lua-resty-openidc = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ]; meta = { @@ -994,13 +1105,15 @@ lua-resty-openidc = buildLuarocksPackage { description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality"; license.fullName = "Apache 2.0"; }; -}; +}) {}; -lua-resty-openssl = buildLuarocksPackage { +lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit}: +buildLuarocksPackage { pname = "lua-resty-openssl"; version = "0.7.5-1"; knownRockspec = (fetchurl { - url = "https://luafr.org/luarocks/lua-resty-openssl-0.7.5-1.rockspec"; + url = "https://luarocks.org/lua-resty-openssl-0.7.5-1.rockspec"; sha256 = "13v14in9cgmjgarmy6br9629ns1qlhw7a30c061y6gncjannnv6y"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -1022,9 +1135,12 @@ lua-resty-openssl = buildLuarocksPackage { description = "No summary"; license.fullName = "BSD"; }; -}; +}) {}; -lua-resty-session = buildLuarocksPackage { +lua-resty-session = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lua-resty-session"; version = "3.8-1"; knownRockspec = (fetchurl { @@ -1044,7 +1160,7 @@ lua-resty-session = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1052,13 +1168,15 @@ lua-resty-session = buildLuarocksPackage { description = "Session Library for OpenResty – Flexible and Secure"; license.fullName = "BSD"; }; -}; +}) {}; -lua-term = buildLuarocksPackage { +lua-term = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl}: +buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lua-term-0.7-1.rockspec"; + url = "https://luafr.org/luarocks/lua-term-0.7-1.rockspec"; sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; }).outPath; src = fetchurl { @@ -1072,9 +1190,12 @@ lua-term = buildLuarocksPackage { description = "Terminal functions for Lua"; license.fullName = "MIT/X11"; }; -}; +}) {}; -lua-toml = buildLuarocksPackage { +lua-toml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lua-toml"; version = "2.0-1"; knownRockspec = (fetchurl { @@ -1094,7 +1215,7 @@ lua-toml = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1102,13 +1223,16 @@ lua-toml = buildLuarocksPackage { description = "toml decoder/encoder for Lua"; license.fullName = "MIT"; }; -}; +}) {}; -lua-yajl = buildLuarocksPackage { +lua-yajl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lua-yajl"; version = "2.0-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lua-yajl-2.0-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-yajl-2.0-1.rockspec"; sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -1124,7 +1248,7 @@ lua-yajl = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1133,9 +1257,12 @@ lua-yajl = buildLuarocksPackage { maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -lua-zlib = buildLuarocksPackage { +lua-zlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "lua-zlib"; version = "1.2-1"; knownRockspec = (fetchurl { @@ -1155,7 +1282,7 @@ lua-zlib = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -1164,9 +1291,12 @@ lua-zlib = buildLuarocksPackage { maintainers = with lib.maintainers; [ koral ]; license.fullName = "MIT"; }; -}; +}) {}; -lua_cliargs = buildLuarocksPackage { +lua_cliargs = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "lua_cliargs"; version = "3.0-2"; @@ -1175,7 +1305,7 @@ lua_cliargs = buildLuarocksPackage { sha256 = "0vhpgmy9a8wlxp8a15pnfqfk0aj7pyyb5m41nnfxynx580a6y7cp"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1183,9 +1313,12 @@ lua_cliargs = buildLuarocksPackage { description = "A command-line argument parser."; license.fullName = "MIT "; }; -}; +}) {}; -luabitop = buildLuarocksPackage { +luabitop = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; @@ -1202,7 +1335,7 @@ luabitop = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; meta = { @@ -1210,21 +1343,24 @@ luabitop = buildLuarocksPackage { description = "Lua Bit Operations Module"; license.fullName = "MIT/X license"; }; -}; +}) {}; -luacheck = buildLuarocksPackage { +luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, argparse, luafilesystem +}: +buildLuarocksPackage { pname = "luacheck"; - version = "0.24.0-2"; + version = "0.25.0-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luacheck-0.24.0-2.rockspec"; - sha256 = "1x8n7w1mdr1bmmbw38syzi2612yyd7bbv4j2hnlk2k76qfcvkhf3"; + url = "https://luarocks.org/luacheck-0.25.0-1.rockspec"; + sha256 = "11mvbpnykibg0dx9sdh5x9gpvrhkmvrw76qvjz337x83f8gmvy91"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/luarocks/luacheck.git", - "rev": "6651c20d8495c380a49ca81662fcfd1ade6b2411", - "date": "2020-08-20T19:21:52-03:00", - "path": "/nix/store/8r4x8snxp0kjabn9bsxwh62pfczd8wma-luacheck", - "sha256": "08jsqibksdvpl6mvf8d6rlh5pii78hqm3fkhbkgzrs6k8kk5a7lf", + "rev": "abf7386a892df4ce566fef9e4640ddbf9af78411", + "date": "2021-08-10T12:19:20-03:00", + "path": "/nix/store/9cdlf6c3y0087qwh48ky8ysxxx3lirlj-luacheck", + "sha256": "1ymfkr0qmg6idrrxf9x6mfq14skag8h09kl2qlalwiykicrdljs1", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1232,7 +1368,7 @@ luacheck = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua argparse luafilesystem ]; meta = { @@ -1240,13 +1376,16 @@ luacheck = buildLuarocksPackage { description = "A static analyzer and a linter for Lua"; license.fullName = "MIT"; }; -}; +}) {}; -luacov = buildLuarocksPackage { +luacov = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "luacov"; version = "0.15.0-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luacov-0.15.0-1.rockspec"; + url = "https://luafr.org/luarocks/luacov-0.15.0-1.rockspec"; sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -1262,7 +1401,7 @@ luacov = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -1270,9 +1409,12 @@ luacov = buildLuarocksPackage { description = "Coverage analysis tool for Lua scripts"; license.fullName = "MIT"; }; -}; +}) {}; -luadbi = buildLuarocksPackage { +luadbi = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "luadbi"; version = "0.7.2-1"; knownRockspec = (fetchurl { @@ -1292,7 +1434,7 @@ luadbi = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -1300,13 +1442,16 @@ luadbi = buildLuarocksPackage { description = "Database abstraction layer"; license.fullName = "MIT/X11"; }; -}; +}) {}; -luadbi-mysql = buildLuarocksPackage { +luadbi-mysql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, luadbi +}: +buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.2-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.2-1.rockspec"; + url = "https://luarocks.org/luadbi-mysql-0.7.2-1.rockspec"; sha256 = "0gnyqnvcfif06rzzrdw6w6hchp4jrjiwm0rmfx2r8ljchj2bvml5"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -1322,7 +1467,7 @@ luadbi-mysql = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; meta = { @@ -1330,13 +1475,16 @@ luadbi-mysql = buildLuarocksPackage { description = "Database abstraction layer"; license.fullName = "MIT/X11"; }; -}; +}) {}; -luadbi-postgresql = buildLuarocksPackage { +luadbi-postgresql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, luadbi +}: +buildLuarocksPackage { pname = "luadbi-postgresql"; version = "0.7.2-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-postgresql-0.7.2-1.rockspec"; sha256 = "07rx4agw4hjyzf8157apdwfqh9s26nqndmkr3wm7v09ygjvdjiix"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -1352,7 +1500,7 @@ luadbi-postgresql = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; meta = { @@ -1360,9 +1508,12 @@ luadbi-postgresql = buildLuarocksPackage { description = "Database abstraction layer"; license.fullName = "MIT/X11"; }; -}; +}) {}; -luadbi-sqlite3 = buildLuarocksPackage { +luadbi-sqlite3 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, luadbi +}: +buildLuarocksPackage { pname = "luadbi-sqlite3"; version = "0.7.2-1"; knownRockspec = (fetchurl { @@ -1382,7 +1533,7 @@ luadbi-sqlite3 = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; meta = { @@ -1390,9 +1541,12 @@ luadbi-sqlite3 = buildLuarocksPackage { description = "Database abstraction layer"; license.fullName = "MIT/X11"; }; -}; +}) {}; -luaepnf = buildLuarocksPackage { +luaepnf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, lpeg +}: +buildLuarocksPackage { pname = "luaepnf"; version = "0.3-2"; knownRockspec = (fetchurl { @@ -1412,7 +1566,7 @@ luaepnf = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua lpeg ]; meta = { @@ -1420,9 +1574,12 @@ luaepnf = buildLuarocksPackage { description = "Extended PEG Notation Format (easy grammars for LPeg)"; license.fullName = "MIT"; }; -}; +}) {}; -luaevent = buildLuarocksPackage { +luaevent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "luaevent"; version = "0.4.6-1"; knownRockspec = (fetchurl { @@ -1434,7 +1591,7 @@ luaevent = buildLuarocksPackage { sha256 = "0pbh315d3p7hxgzmbhphkcldxv2dadbka96131b8j5914nxvl4nx"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1442,9 +1599,12 @@ luaevent = buildLuarocksPackage { description = "libevent binding for Lua"; license.fullName = "MIT"; }; -}; +}) {}; -luaexpat = buildLuarocksPackage { +luaexpat = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "luaexpat"; version = "1.3.0-1"; knownRockspec = (fetchurl { @@ -1456,7 +1616,7 @@ luaexpat = buildLuarocksPackage { sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1465,9 +1625,12 @@ luaexpat = buildLuarocksPackage { maintainers = with lib.maintainers; [ arobyn flosse ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -luaffi = buildLuarocksPackage { +luaffi = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; knownRockspec = (fetchurl { @@ -1487,7 +1650,7 @@ luaffi = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1495,9 +1658,12 @@ luaffi = buildLuarocksPackage { description = "FFI library for calling C functions from lua"; license.fullName = "BSD"; }; -}; +}) {}; -luafilesystem = buildLuarocksPackage { +luafilesystem = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "luafilesystem"; version = "1.7.0-2"; knownRockspec = (fetchurl { @@ -1517,7 +1683,7 @@ luafilesystem = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1526,9 +1692,12 @@ luafilesystem = buildLuarocksPackage { maintainers = with lib.maintainers; [ flosse ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -lualogging = buildLuarocksPackage { +lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, luasocket +}: +buildLuarocksPackage { pname = "lualogging"; version = "1.5.2-1"; knownRockspec = (fetchurl { @@ -1555,9 +1724,12 @@ lualogging = buildLuarocksPackage { description = "A simple API to use logging features"; license.fullName = "MIT/X11"; }; -}; +}) {}; -luaossl = buildLuarocksPackage { +luaossl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "luaossl"; version = "20200709-0"; knownRockspec = (fetchurl { @@ -1576,9 +1748,12 @@ luaossl = buildLuarocksPackage { description = "Most comprehensive OpenSSL module in the Lua universe."; license.fullName = "MIT/X11"; }; -}; +}) {}; -luaposix = buildLuarocksPackage { +luaposix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, bit32, lua +}: +buildLuarocksPackage { pname = "luaposix"; version = "34.1.1-1"; knownRockspec = (fetchurl { @@ -1590,7 +1765,7 @@ luaposix = buildLuarocksPackage { sha256 = "1xqx764ji054jphxdhkynsmwzqzkfgxqfizxkf70za6qfrvnl3yh"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ bit32 lua ]; meta = { @@ -1599,9 +1774,12 @@ luaposix = buildLuarocksPackage { maintainers = with lib.maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -luarepl = buildLuarocksPackage { +luarepl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "luarepl"; version = "0.9-1"; knownRockspec = (fetchurl { @@ -1613,7 +1791,7 @@ luarepl = buildLuarocksPackage { sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1621,9 +1799,12 @@ luarepl = buildLuarocksPackage { description = "A reusable REPL component for Lua, written in Lua"; license.fullName = "MIT/X11"; }; -}; +}) {}; -luasec = buildLuarocksPackage { +luasec = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, luasocket +}: +buildLuarocksPackage { pname = "luasec"; version = "1.0.2-1"; knownRockspec = (fetchurl { @@ -1643,7 +1824,7 @@ luasec = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; meta = { @@ -1652,13 +1833,16 @@ luasec = buildLuarocksPackage { maintainers = with lib.maintainers; [ flosse ]; license.fullName = "MIT"; }; -}; +}) {}; -luasocket = buildLuarocksPackage { +luasocket = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "luasocket"; version = "3.0rc1-2"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luasocket-3.0rc1-2.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.rockspec"; sha256 = "17fbkihp4zypv5wwgxz8dnghj37pf5bhpi2llg4gbljp1bl2f42c"; }).outPath; src = fetchurl { @@ -1666,7 +1850,7 @@ luasocket = buildLuarocksPackage { sha256 = "0x0fg07cg08ybgkpzif7zmzaaq5ga979rxwd9rj95kfws9bbrl0y"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1674,9 +1858,12 @@ luasocket = buildLuarocksPackage { description = "Network support for the Lua language"; license.fullName = "MIT"; }; -}; +}) {}; -luasql-sqlite3 = buildLuarocksPackage { +luasql-sqlite3 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "luasql-sqlite3"; version = "2.6.0-1"; knownRockspec = (fetchurl { @@ -1685,10 +1872,10 @@ luasql-sqlite3 = buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/keplerproject/luasql.git", - "rev": "69f68a858134d6adbe9b65a902dcd3f60cd6a7ce", - "date": "2021-08-27T15:17:22-03:00", - "path": "/nix/store/2374agarn72cnlnk2vripfy1zz2y50la-luasql", - "sha256": "13xs1g67d2p69x4wzxk1h97xh25388h0kkh9bjgw3l1yss9zlxhx", + "rev": "ce22164f63783afac9c644fd37c231e56fc097cb", + "date": "2021-10-14T09:38:24-03:00", + "path": "/nix/store/h8r8axcc76x7y6gwc2jzsmr7h2lqgbxa-luasql", + "sha256": "10gq3x7vqkafvfk9fs4039rl1xhnqpl2v60z4qpd96wbcy205gnk", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1696,7 +1883,7 @@ luasql-sqlite3 = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1705,9 +1892,12 @@ luasql-sqlite3 = buildLuarocksPackage { maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -luassert = buildLuarocksPackage { +luassert = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua, say +}: +buildLuarocksPackage { pname = "luassert"; version = "1.8.0-0"; knownRockspec = (fetchurl { @@ -1719,7 +1909,7 @@ luassert = buildLuarocksPackage { sha256 = "0xlwlb32215524bg33svp1ci8mdvh9wykchl8dkhihpxcd526mar"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; meta = { @@ -1727,9 +1917,12 @@ luassert = buildLuarocksPackage { description = "Lua Assertions Extension"; license.fullName = "MIT "; }; -}; +}) {}; -luasystem = buildLuarocksPackage { +luasystem = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "luasystem"; version = "0.2.1-0"; knownRockspec = (fetchurl { @@ -1741,7 +1934,7 @@ luasystem = buildLuarocksPackage { sha256 = "150bbklchh02gsvpngv56xrrlxxvwpqwrh0yy6z95fnvks7gd0qb"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1749,9 +1942,12 @@ luasystem = buildLuarocksPackage { description = "Platform independent system calls for Lua."; license.fullName = "MIT "; }; -}; +}) {}; -luautf8 = buildLuarocksPackage { +luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "luautf8"; version = "0.1.3-1"; knownRockspec = (fetchurl { @@ -1763,7 +1959,7 @@ luautf8 = buildLuarocksPackage { sha256 = "02rf8jmazmi8rp3i5v4jsz0d7mrf1747qszsl8i2hv1sl0ik92r0"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1772,9 +1968,12 @@ luautf8 = buildLuarocksPackage { maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT"; }; -}; +}) {}; -luazip = buildLuarocksPackage { +luazip = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; knownRockspec = (fetchurl { @@ -1794,7 +1993,7 @@ luazip = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -1802,9 +2001,12 @@ luazip = buildLuarocksPackage { description = "Library for reading files inside zip files"; license.fullName = "MIT"; }; -}; +}) {}; -luuid = buildLuarocksPackage { +luuid = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; knownRockspec = (fetchurl { @@ -1816,7 +2018,7 @@ luuid = buildLuarocksPackage { sha256 = "1bfkj613d05yps3fivmz0j1bxf2zkg9g1yl0ifffgw0vy00hpnvm"; }; - disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.2") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -1824,9 +2026,12 @@ luuid = buildLuarocksPackage { description = "A library for UUID generation"; license.fullName = "Public domain"; }; -}; +}) {}; -luv = buildLuarocksPackage { +luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "luv"; version = "1.42.0-0"; knownRockspec = (fetchurl { @@ -1838,7 +2043,7 @@ luv = buildLuarocksPackage { sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1846,13 +2051,16 @@ luv = buildLuarocksPackage { description = "Bare libuv bindings for lua"; license.fullName = "Apache 2.0"; }; -}; +}) {}; -lyaml = buildLuarocksPackage { +lyaml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "lyaml"; version = "6.2.7-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lyaml-6.2.7-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lyaml-6.2.7-1.rockspec"; sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja"; }).outPath; src = fetchurl { @@ -1860,7 +2068,7 @@ lyaml = buildLuarocksPackage { sha256 = "165mr3krf8g8070j4ax9z0j2plfbdwb8x2zk2hydpqaqa0kcdb0c"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -1869,9 +2077,12 @@ lyaml = buildLuarocksPackage { maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -markdown = buildLuarocksPackage { +markdown = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "markdown"; version = "0.33-1"; knownRockspec = (fetchurl { @@ -1891,7 +2102,7 @@ markdown = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -1899,9 +2110,12 @@ markdown = buildLuarocksPackage { description = "Markdown text-to-html markup system."; license.fullName = "MIT/X11"; }; -}; +}) {}; -mediator_lua = buildLuarocksPackage { +mediator_lua = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; knownRockspec = (fetchurl { @@ -1913,7 +2127,7 @@ mediator_lua = buildLuarocksPackage { sha256 = "16zzzhiy3y35v8advmlkzpryzxv5vji7727vwkly86q8sagqbxgs"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1921,9 +2135,12 @@ mediator_lua = buildLuarocksPackage { description = "Event handling through channels"; license.fullName = "MIT "; }; -}; +}) {}; -moonscript = buildLuarocksPackage { +moonscript = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, lpeg, alt-getopt, luafilesystem +}: +buildLuarocksPackage { pname = "moonscript"; version = "0.5.0-1"; knownRockspec = (fetchurl { @@ -1943,7 +2160,7 @@ moonscript = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ]; meta = { @@ -1952,29 +2169,34 @@ moonscript = buildLuarocksPackage { maintainers = with lib.maintainers; [ arobyn ]; license.fullName = "MIT"; }; -}; +}) {}; -mpack = buildLuarocksPackage { +mpack = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl}: +buildLuarocksPackage { pname = "mpack"; - version = "1.0.8-0"; + version = "1.0.9-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/mpack-1.0.8-0.rockspec"; - sha256 = "0hhpamw2bydnfrild274faaan6v48918nhslnw3kvi9y36b4i5ha"; + url = "https://luarocks.org/mpack-1.0.9-0.rockspec"; + sha256 = "1v10kmw3qw559bbm142z40ib26bwvcyi64qjrk0vf8v6n1mx8wcn"; }).outPath; src = fetchurl { - url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz"; - sha256 = "1sf93ffx7a3y1waknc4994l2yrxilrlf3hcp2cj2cvxmpm5inszd"; + url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.9/libmpack-lua-1.0.9.tar.gz"; + sha256 = "17lyjmnbychacwahqgs128nb00xky777g7zw5wf20vrzkiq7xl0g"; }; meta = { - homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz"; + homepage = "https://github.com/libmpack/libmpack-lua"; description = "Lua binding to libmpack"; license.fullName = "MIT"; }; -}; +}) {}; -nvim-client = buildLuarocksPackage { +nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua, mpack, luv, coxpcall +}: +buildLuarocksPackage { pname = "nvim-client"; version = "0.2.2-1"; @@ -1983,7 +2205,7 @@ nvim-client = buildLuarocksPackage { sha256 = "1h736im524lq0vwlpihv9b317jarpkf3j13a25xl5qq8y8asm8mr"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua mpack luv coxpcall ]; meta = { @@ -1991,9 +2213,12 @@ nvim-client = buildLuarocksPackage { description = "Lua client to Nvim"; license.fullName = "Apache"; }; -}; +}) {}; -penlight = buildLuarocksPackage { +penlight = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, luafilesystem +}: +buildLuarocksPackage { pname = "penlight"; version = "dev-1"; @@ -2010,10 +2235,8 @@ penlight = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; - checkInputs = [ busted busted ]; - doCheck = false; meta = { homepage = "https://lunarmodules.github.io/penlight"; @@ -2021,18 +2244,21 @@ penlight = buildLuarocksPackage { maintainers = with lib.maintainers; [ alerque ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -plenary-nvim = buildLuarocksPackage { +plenary-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, luassert +}: +buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "8c6cc07a68b65eb707be44598f0084647d495978", - "date": "2021-09-26T16:13:25+02:00", - "path": "/nix/store/j8hmr48blm4brq8rqv7b9m08vmalg8sp-plenary.nvim", - "sha256": "05h5n7jj33y9vs6gc8hqlfd628j6i33s3c8fmfl6ahxwfygx2wpd", + "rev": "80bb2b9bb74bdca38a46480b6f2e15af990406e4", + "date": "2021-10-06T19:20:08+02:00", + "path": "/nix/store/mw4r562qxr7giy1n43iylp3qb8ch0jqs-plenary.nvim", + "sha256": "11akcpxcp4m997a2y76ajknnmsifac2hj4nq9i4a8b1j08bxinim", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2040,7 +2266,7 @@ plenary-nvim = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luassert ]; meta = { @@ -2048,9 +2274,12 @@ plenary-nvim = buildLuarocksPackage { description = "lua functions you don't want to write "; license.fullName = "MIT/X11"; }; -}; +}) {}; -rapidjson = buildLuarocksPackage { +rapidjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "rapidjson"; version = "0.7.1-1"; @@ -2067,7 +2296,7 @@ rapidjson = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2075,9 +2304,12 @@ rapidjson = buildLuarocksPackage { description = "Json module based on the very fast RapidJSON."; license.fullName = "MIT"; }; -}; +}) {}; -readline = buildLuarocksPackage { +readline = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua, luaposix +}: +buildLuarocksPackage { pname = "readline"; version = "3.0-0"; knownRockspec = (fetchurl { @@ -2089,7 +2321,7 @@ readline = buildLuarocksPackage { sha256 = "1rr2b7q8w3i4bm1i634sd6kzhw6v1fpnh53mj09af6xdq1rfhr5n"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua luaposix ]; meta = { @@ -2097,9 +2329,12 @@ readline = buildLuarocksPackage { description = "Interface to the readline library"; license.fullName = "MIT/X11"; }; -}; +}) {}; -say = buildLuarocksPackage { +say = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "say"; version = "1.3-1"; @@ -2108,7 +2343,7 @@ say = buildLuarocksPackage { sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; }; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2116,9 +2351,12 @@ say = buildLuarocksPackage { description = "Lua String Hashing/Indexing Library"; license.fullName = "MIT "; }; -}; +}) {}; -std-_debug = buildLuarocksPackage { +std-_debug = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "std._debug"; version = "git-1"; @@ -2135,7 +2373,7 @@ std-_debug = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -2143,9 +2381,12 @@ std-_debug = buildLuarocksPackage { description = "Debug Hints Library"; license.fullName = "MIT/X11"; }; -}; +}) {}; -std-normalize = buildLuarocksPackage { +std-normalize = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, std-_debug +}: +buildLuarocksPackage { pname = "std.normalize"; version = "git-1"; @@ -2162,7 +2403,7 @@ std-normalize = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua std-_debug ]; meta = { @@ -2170,9 +2411,12 @@ std-normalize = buildLuarocksPackage { description = "Normalized Lua Functions"; license.fullName = "MIT/X11"; }; -}; +}) {}; -stdlib = buildLuarocksPackage { +stdlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { pname = "stdlib"; version = "41.2.2-1"; knownRockspec = (fetchurl { @@ -2184,7 +2428,7 @@ stdlib = buildLuarocksPackage { sha256 = "0is8i8lk4qq4afnan0vj1bwr8brialyrva7cjy43alzgwdphwynx"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -2193,9 +2437,12 @@ stdlib = buildLuarocksPackage { maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; -}; +}) {}; -vstruct = buildLuarocksPackage { +vstruct = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { pname = "vstruct"; version = "2.1.1-1"; @@ -2212,14 +2459,14 @@ vstruct = buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = (luaOlder "5.1"); + disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/ToxicFrog/vstruct"; description = "Lua library to manipulate binary data"; }; -}; +}) {}; } diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index 0d429b3ba6df..bd952e7b8ce7 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -5,8 +5,20 @@ let in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); # Check whether a derivation provides a lua module. hasLuaModule = drv: drv ? luaModule; + + + /* + Use this to override the arguments passed to buildLuarocksPackage + */ + overrideLuarocks = drv: f: (drv.override (args: args // { + buildLuarocksPackage = drv: (args.buildLuarocksPackage drv).override f; + })) // { + overrideScope = scope: overrideLuarocks (drv.overrideScope scope) f; + }; + in rec { + inherit overrideLuarocks; inherit hasLuaModule requiredLuaModules; luaPathList = [ diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 399dbd8269b7..f01fb7df1172 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1,11 +1,11 @@ -{ pkgs, ... }: -self: super: -with super; +{ pkgs }: +final: prev: +with prev; { ##########################################3 #### manual fixes for generated packages ##########################################3 - bit32 = super.bit32.override({ + bit32 = prev.bit32.overrideAttrs(oa: { # Small patch in order to no longer redefine a Lua 5.2 function that Luajit # 2.1 also provides, see https://github.com/LuaJIT/LuaJIT/issues/325 for # more @@ -14,7 +14,7 @@ with super; ]; }); - busted = super.busted.override({ + busted = prev.busted.overrideAttrs(oa: { postConfigure = '' substituteInPlace ''${rockspecFilename} \ --replace "'lua_cliargs = 3.0-1'," "'lua_cliargs >= 3.0-1'," @@ -25,14 +25,7 @@ with super; ''; }); - cqueues = super.cqueues.override(rec { - # Parse out a version number without the Lua version inserted - version = with pkgs.lib; let - version' = super.cqueues.version; - rel = splitVersion version'; - date = head rel; - rev = last (splitString "-" (last rel)); - in "${date}-${rev}"; + cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: { nativeBuildInputs = [ pkgs.gnum4 ]; @@ -41,9 +34,17 @@ with super; { name = "OPENSSL"; dep = pkgs.openssl; } ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; + })).overrideAttrs(oa: rec { + # Parse out a version number without the Lua version inserted + version = with pkgs.lib; let + version' = prev.cqueues.version; + rel = splitVersion version'; + date = head rel; + rev = last (splitString "-" (last rel)); + in "${date}-${rev}"; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua # version, which doesn't work well for us, so modify it - postConfigure = let inherit (super.cqueues) pname; in '' + postConfigure = let inherit (prev.cqueues) pname; in '' # 'all' target auto-detects correct Lua version, which is fine for us as # we only have the right one available :) sed -Ei ''${rockspecFilename} \ @@ -56,13 +57,13 @@ with super; ''; }); - cyrussasl = super.cyrussasl.override({ + cyrussasl = prev.lib.overrideLuarocks prev.cyrussasl (drv: { externalDeps = [ { name = "LIBSASL"; dep = pkgs.cyrus_sasl; } ]; }); - http = super.http.override({ + http = prev.http.overrideAttrs(oa: { patches = [ (pkgs.fetchpatch { name = "invalid-state-progression.patch"; @@ -76,7 +77,7 @@ with super; */ }); - ldbus = super.ldbus.override({ + ldbus = prev.lib.overrideLuarocks prev.ldbus (drv: { extraVariables = { DBUS_DIR="${pkgs.dbus.lib}"; DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include"; @@ -87,7 +88,7 @@ with super; ]; }); - ljsyscall = super.ljsyscall.override(rec { + ljsyscall = prev.ljsyscall.overrideAttrs(oa: rec { version = "unstable-20180515"; # package hasn't seen any release for a long time src = pkgs.fetchFromGitHub { @@ -106,7 +107,7 @@ with super; propagatedBuildInputs = with pkgs.lib; optional (!isLuaJIT) luaffi; }); - lgi = super.lgi.override({ + lgi = prev.lib.overrideLuarocks prev.lgi (drv: { nativeBuildInputs = [ pkgs.pkg-config ]; @@ -128,31 +129,31 @@ with super; ''; }); - lrexlib-gnu = super.lrexlib-gnu.override({ + lrexlib-gnu = prev.lib.overrideLuarocks prev.lrexlib-gnu (drv: { buildInputs = [ pkgs.gnulib ]; }); - lrexlib-pcre = super.lrexlib-pcre.override({ + lrexlib-pcre = prev.lib.overrideLuarocks prev.lrexlib-pcre (drv: { externalDeps = [ { name = "PCRE"; dep = pkgs.pcre; } ]; }); - lrexlib-posix = super.lrexlib-posix.override({ + lrexlib-posix = prev.lib.overrideLuarocks prev.lrexlib-posix (drv: { buildInputs = [ pkgs.glibc.dev ]; }); - lua-iconv = super.lua-iconv.override({ + lua-iconv = prev.lib.overrideLuarocks prev.lua-iconv (drv: { buildInputs = [ pkgs.libiconv ]; }); - lua-lsp = super.lua-lsp.override({ + lua-lsp = prev.lua-lsp.overrideAttrs(oa: { # until Alloyed/lua-lsp#28 postConfigure = '' substituteInPlace ''${rockspecFilename} \ @@ -160,14 +161,14 @@ with super; ''; }); - lua-zlib = super.lua-zlib.override({ + lua-zlib = prev.lib.overrideLuarocks prev.lua-zlib (drv: { buildInputs = [ pkgs.zlib.dev ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; }); - luadbi-mysql = super.luadbi-mysql.override({ + luadbi-mysql = prev.lib.overrideLuarocks prev.luadbi-mysql (drv: { extraVariables = { # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' MYSQL_INCDIR="${pkgs.libmysqlclient.dev}/include/mysql"; @@ -179,19 +180,19 @@ with super; ]; }); - luadbi-postgresql = super.luadbi-postgresql.override({ + luadbi-postgresql = prev.lib.overrideLuarocks prev.luadbi-postgresql (drv: { buildInputs = [ pkgs.postgresql ]; }); - luadbi-sqlite3 = super.luadbi-sqlite3.override({ + luadbi-sqlite3 = prev.lib.overrideLuarocks prev.luadbi-sqlite3 (drv: { externalDeps = [ { name = "SQLITE"; dep = pkgs.sqlite; } ]; }); - luaevent = super.luaevent.override({ + luaevent = prev.lib.overrideLuarocks prev.luaevent (drv: { propagatedBuildInputs = [ luasocket ]; @@ -201,7 +202,7 @@ with super; disabled = luaOlder "5.1" || luaAtLeast "5.4"; }); - luaexpat = super.luaexpat.override({ + luaexpat = prev.lib.overrideLuarocks prev.luaexpat (drv: { externalDeps = [ { name = "EXPAT"; dep = pkgs.expat; } ]; @@ -212,59 +213,57 @@ with super; # TODO Somehow automatically amend buildInputs for things that need luaffi # but are in luajitPackages? - luaffi = super.luaffi.override({ + luaffi = prev.lib.overrideLuarocks prev.luaffi (drv: { # The packaged .src.rock version is pretty old, and doesn't work with Lua 5.3 src = pkgs.fetchFromGitHub { owner = "facebook"; repo = "luaffifb"; rev = "532c757e51c86f546a85730b71c9fef15ffa633d"; sha256 = "1nwx6sh56zfq99rcs7sph0296jf6a9z72mxknn0ysw9fd7m1r8ig"; }; - knownRockspec = with super.luaffi; "${pname}-${version}.rockspec"; + knownRockspec = with prev.luaffi; "${pname}-${version}.rockspec"; disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; }); - luaossl = super.luaossl.override({ + luaossl = prev.lib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl; } { name = "OPENSSL"; dep = pkgs.openssl; } ]; }); - luasec = super.luasec.override({ + luasec = prev.lib.overrideLuarocks prev.luasec (drv: { externalDeps = [ { name = "OPENSSL"; dep = pkgs.openssl; } ]; }); - luasql-sqlite3 = super.luasql-sqlite3.override({ + luasql-sqlite3 = prev.lib.overrideLuarocks prev.luasql-sqlite3 (drv: { externalDeps = [ { name = "SQLITE"; dep = pkgs.sqlite; } ]; }); - luasystem = super.luasystem.override({ - buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ - pkgs.glibc - ]; - }); + luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: { buildInputs = [ pkgs.glibc.out ]; }); - luazip = super.luazip.override({ + luazip = prev.lib.overrideLuarocks prev.luazip (drv: { buildInputs = [ pkgs.zziplib ]; }); - lua-yajl = super.lua-yajl.override({ + lua-yajl = prev.lib.overrideLuarocks prev.lua-yajl (drv: { buildInputs = [ pkgs.yajl ]; }); - luuid = super.luuid.override(old: { + luuid = (prev.lib.overrideLuarocks prev.luuid (drv: { externalDeps = [ { name = "LIBUUID"; dep = pkgs.libuuid; } ]; - meta = old.meta // { + disabled = luaOlder "5.1" || (luaAtLeast "5.4"); + })).overrideAttrs(oa: { + meta = oa.meta // { platforms = pkgs.lib.platforms.linux; }; # Trivial patch to make it work in both 5.1 and 5.2. Basically just the @@ -276,13 +275,12 @@ with super; patches = [ ./luuid.patch ]; - postConfigure = let inherit (super.luuid) version pname; in '' + postConfigure = let inherit (prev.luuid) version pname; in '' sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|' ''; - disabled = luaOlder "5.1" || (luaAtLeast "5.4"); }); - luv = super.luv.override({ + luv = prev.lib.overrideLuarocks prev.luv (drv: { # Use system libuv instead of building local and statically linking # This is a hacky way to specify -DWITH_SHARED_LIBUV=ON which # is not possible with luarocks and the current luv rockspec @@ -296,8 +294,8 @@ with super; buildInputs = [ pkgs.libuv ]; passthru = { - libluv = self.luv.override ({ - preBuild = self.luv.preBuild + '' + libluv = final.luv.overrideAttrs (oa: { + preBuild = final.luv.preBuild + '' sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt @@ -312,32 +310,32 @@ with super; }; }); - lyaml = super.lyaml.override({ + lyaml = prev.lib.overrideLuarocks prev.lyaml (oa: { buildInputs = [ pkgs.libyaml ]; }); - mpack = super.mpack.override({ + mpack = prev.lib.overrideLuarocks prev.mpack (drv: { buildInputs = [ pkgs.libmpack ]; # the rockspec doesn't use the makefile so you may need to export more flags USE_SYSTEM_LUA = "yes"; USE_SYSTEM_MPACK = "yes"; }); - rapidjson = super.rapidjson.override({ + rapidjson = prev.rapidjson.overrideAttrs(oa: { preBuild = '' sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt ''; }); - readline = (super.readline.override ({ + readline = (prev.lib.overrideLuarocks prev.readline (drv: { unpackCmd = '' unzip "$curSrc" tar xf *.tar.gz ''; - propagatedBuildInputs = super.readline.propagatedBuildInputs ++ [ pkgs.readline ]; + propagatedBuildInputs = prev.readline.propagatedBuildInputs ++ [ pkgs.readline.out ]; extraVariables = rec { READLINE_INCDIR = "${pkgs.readline.dev}/include"; HISTORY_INCDIR = READLINE_INCDIR; @@ -349,14 +347,14 @@ with super; ''; }); - std-_debug = super.std-_debug.overrideAttrs(oa: { + std-_debug = prev.std-_debug.overrideAttrs(oa: { # run make to generate lib/std/_debug/version.lua preConfigure = '' make all ''; }); - std-normalize = super.std-normalize.overrideAttrs(oa: { + std-normalize = prev.std-normalize.overrideAttrs(oa: { # run make to generate lib/std/_debug/version.lua preConfigure = '' make all @@ -365,10 +363,10 @@ with super; # TODO just while testing, remove afterwards # toVimPlugin should do it instead - gitsigns-nvim = super.gitsigns-nvim.overrideAttrs(oa: { + gitsigns-nvim = prev.gitsigns-nvim.overrideAttrs(oa: { nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ pkgs.vimUtils.vimGenDocHook ]; }); # aliases - cjson = super.lua-cjson; + cjson = prev.lua-cjson; } diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index fc3be7421adb..d6864b80f9ed 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6"; + sha256 = "N/GswCvL5ooxuG4HwSmoOb0yduZW3Inrf8CpJ0bv8nI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index bbc9a804aa74..63f909b5d646 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -1,6 +1,7 @@ { pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }: let + inherit (pkgs) lib; since = (version: pkgs.lib.versionAtLeast nodejs.version version); before = (version: pkgs.lib.versionOlder nodejs.version version); super = import ./composition.nix { @@ -90,6 +91,22 @@ let ''; }; + mdctl-cli = super."@medable/mdctl-cli".override { + nativeBuildInputs = with pkgs; with darwin.apple_sdk.frameworks; [ + glib + libsecret + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Security + ]; + buildInputs = with pkgs; [ + nodePackages.node-gyp-build + nodePackages.node-pre-gyp + nodejs + ]; + }; + coc-imselect = super.coc-imselect.override { meta.broken = since "10"; }; @@ -318,26 +335,6 @@ let ''; }; - netlify-cli = - let - esbuild = pkgs.esbuild.overrideAttrs (old: rec { - version = "0.13.6"; - - src = fetchFromGitHub { - owner = "netlify"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; - }; - - }); - in - super.netlify-cli.override { - preRebuild = '' - export ESBUILD_BINARY_PATH="${esbuild}/bin/esbuild" - ''; - }; - ssb-server = super.ssb-server.override { buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ]; meta.broken = since "10"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2c9654d1b870..3f3bd8d4fe76 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -6,6 +6,7 @@ , "@commitlint/cli" , "@commitlint/config-conventional" , "@hyperspace/cli" +, "@medable/mdctl-cli" , "@nerdwallet/shepherd" , "@nestjs/cli" , "@squoosh/cli" @@ -184,7 +185,6 @@ , "multi-file-swagger" , "musescore-downloader" , "neovim" -, "netlify-cli" , "nijs" , "node-gyp" , "node-gyp-build" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 44790bb45df9..c63936112fe2 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.8" = { + "@angular-devkit/architect-0.1202.10" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1202.8"; + version = "0.1202.10"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.8.tgz"; - sha512 = "aPzwO3coRIuSjZa8FwFHy2y8OJarXG+afsqOk3muR6anvbdl+Av+m2RT8jjwj5J3D4N2eKZ7ob2q9HDUiHi4Pg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.10.tgz"; + sha512 = "/sLgtXaFsNouxub5M/bQ2sBkiMIlPubuz6QMh+pA2jia82vJ3hcRMt4AnJTXuXpVY+aew4FiG0i9nt/8HETQsw=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -67,6 +67,15 @@ let sha512 = "zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA=="; }; }; + "@angular-devkit/core-12.2.10" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "12.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.10.tgz"; + sha512 = "0qhmS7Qvl0hiRVTHxEC/ipFAfzYofPstw0ZITDpEMw+pgHlOZolOlnFrv8LyOXWNqlSIH5fS9D3WF7Hpm7ApYA=="; + }; + }; "@angular-devkit/core-12.2.7" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; @@ -76,15 +85,6 @@ let sha512 = "WeLlDZaudpx10OGDPfVcWu/CaEWiWzAaLTUQz0Ww/yM+01FxR/P8yeH1sYAV1MS6d6KHvXGw7Lpf8PV7IA/zHA=="; }; }; - "@angular-devkit/core-12.2.8" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "12.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.8.tgz"; - sha512 = "N13N1Lm7qllBXSVZYz4Khw75rnQnS3lu5QiJqlsaNklWgVfVz8jt99AAeGGvNGSLEbmZjlr35YLxu8ugD267Ug=="; - }; - }; "@angular-devkit/schematics-12.0.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -94,6 +94,15 @@ let sha512 = "iW3XuDHScr3TXuunlEjF5O01zBpwpLgfr1oEny8PvseFGDlHK4Nj8zNIoIn3Yg936aiFO4GJAC/UXsT8g5vKxQ=="; }; }; + "@angular-devkit/schematics-12.2.10" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "12.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.10.tgz"; + sha512 = "oQ2EWdkEDE+eAttHeviXsvBi85PsntQT+IffjKUZdbQU+Leuk/pKUpTeea1YosU1p4Cz3PKYF+P/Nl5Jy3B7IQ=="; + }; + }; "@angular-devkit/schematics-12.2.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -103,15 +112,6 @@ let sha512 = "E0hCFyyfbixjerf0Okt4ynC6F1dsT2Wl7MwAePe+wzPTHCnKIRTa2PQTxJzdWeTlSkQMkSK6ft2iyWOD/FODng=="; }; }; - "@angular-devkit/schematics-12.2.8" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "12.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.8.tgz"; - sha512 = "SPiMFoCi1TpFXY6h1xGCakgdwT25gGHdbis1MuHE5yMcPLvhl/yr7EQVY1GY00/iMrgeslTHg/UPp4D6xHyQxA=="; - }; - }; "@angular-devkit/schematics-cli-12.2.7" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -346,13 +346,13 @@ let sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/code-frame-7.14.5" = { + "@babel/code-frame-7.15.8" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.14.5"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz"; - sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz"; + sha512 = "2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg=="; }; }; "@babel/compat-data-7.15.0" = { @@ -373,13 +373,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.15.5" = { + "@babel/core-7.15.8" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.15.5"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz"; - sha512 = "pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz"; + sha512 = "3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og=="; }; }; "@babel/core-7.9.0" = { @@ -391,13 +391,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.15.4" = { + "@babel/generator-7.15.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.15.4"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz"; - sha512 = "d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz"; + sha512 = "ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g=="; }; }; "@babel/helper-annotate-as-pure-7.15.4" = { @@ -508,13 +508,13 @@ let sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; }; }; - "@babel/helper-module-transforms-7.15.7" = { + "@babel/helper-module-transforms-7.15.8" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.15.7"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz"; - sha512 = "ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz"; + sha512 = "DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg=="; }; }; "@babel/helper-optimise-call-expression-7.15.4" = { @@ -634,13 +634,13 @@ let sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; - "@babel/node-7.15.4" = { + "@babel/node-7.15.8" = { name = "_at_babel_slash_node"; packageName = "@babel/node"; - version = "7.15.4"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/node/-/node-7.15.4.tgz"; - sha512 = "UZue+j8p5aKTaVjvy5psYmqLHqmz+9cIboAFoa97S1xeZyUr0gT6KzXB8ZkfBIsP/u79biOdjGHVXBXnW3rVfw=="; + url = "https://registry.npmjs.org/@babel/node/-/node-7.15.8.tgz"; + sha512 = "JbgTCrnx6IUECznEbQ7e2rbVYtrXKixSbEG2bxxbMkV648WdUf3tdc+ZUW2++dvnnAswcpwc76cRwf0xEQqsrw=="; }; }; "@babel/parser-7.13.13" = { @@ -652,13 +652,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.15.7" = { + "@babel/parser-7.15.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.15.7"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz"; - sha512 = "rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz"; + sha512 = "BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" = { @@ -679,13 +679,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.15.4" = { + "@babel/plugin-proposal-async-generator-functions-7.15.8" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.15.4"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz"; - sha512 = "2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz"; + sha512 = "2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA=="; }; }; "@babel/plugin-proposal-class-properties-7.14.5" = { @@ -1318,13 +1318,13 @@ let sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; }; }; - "@babel/plugin-transform-runtime-7.15.0" = { + "@babel/plugin-transform-runtime-7.15.8" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.15.0"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz"; - sha512 = "sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.8.tgz"; + sha512 = "+6zsde91jMzzvkzuEA3k63zCw+tm/GvuuabkpisgbDMTPQsIMHllE3XczJFFtEHLjjhKQFZmGQVRdELetlWpVw=="; }; }; "@babel/plugin-transform-shorthand-properties-7.14.5" = { @@ -1336,13 +1336,13 @@ let sha512 = "xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g=="; }; }; - "@babel/plugin-transform-spread-7.14.6" = { + "@babel/plugin-transform-spread-7.15.8" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.14.6"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz"; - sha512 = "Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz"; + sha512 = "/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ=="; }; }; "@babel/plugin-transform-sticky-regex-7.14.5" = { @@ -1372,13 +1372,13 @@ let sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; }; }; - "@babel/plugin-transform-typescript-7.15.4" = { + "@babel/plugin-transform-typescript-7.15.8" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.15.4"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz"; - sha512 = "sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.8.tgz"; + sha512 = "ZXIkJpbaf6/EsmjeTbiJN/yMxWPFWvlr7sEG1P95Xb4S4IBcrf2n7s/fItIhsAmOf8oSh3VJPDppO6ExfAfKRQ=="; }; }; "@babel/plugin-transform-unicode-escapes-7.14.5" = { @@ -1399,13 +1399,13 @@ let sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; - "@babel/preset-env-7.15.6" = { + "@babel/preset-env-7.15.8" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.15.6"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.6.tgz"; - sha512 = "L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz"; + sha512 = "rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1498,13 +1498,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/standalone-7.15.7" = { + "@babel/runtime-corejs3-7.15.4" = { + name = "_at_babel_slash_runtime-corejs3"; + packageName = "@babel/runtime-corejs3"; + version = "7.15.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz"; + sha512 = "lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg=="; + }; + }; + "@babel/standalone-7.15.8" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.15.7"; + version = "7.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.7.tgz"; - sha512 = "1dPLi+eQEJE0g1GnUM0Ik2GcS5SMXivoxt6meQxQxGWEd/DCdSBRJClUVlQ25Vbqe49g1HG5Ej0ULhmsqtSMmg=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.8.tgz"; + sha512 = "EF2uQLeuwflnPRGetWH2Z400ITOSK7YbkXIKxY91EWSiOJ8xsbupT3sx3sFRwVyQgjsHSILFDzLcSo/rGspLhQ=="; }; }; "@babel/template-7.15.4" = { @@ -1552,13 +1561,13 @@ let sha512 = "dC98U54yUC/20GON74ToqMYk9/PKdLuI7tFSNVscAtaexMV6ETqpOcJEXB8FNwh/pot0sBCdPPevQiZtXvHNmQ=="; }; }; - "@blueprintjs/core-3.50.4" = { + "@blueprintjs/core-3.51.1" = { name = "_at_blueprintjs_slash_core"; packageName = "@blueprintjs/core"; - version = "3.50.4"; + version = "3.51.1"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.50.4.tgz"; - sha512 = "FYGr1ZMH1si2acdZaTI4gqhvwgb0yOWcv7otYdi/tvC4ReId2gsm2i+bDw/eBMYsH+OSFYZT0C6hFvHV3HrkPA=="; + url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.51.1.tgz"; + sha512 = "DYwnfoXspCWlBFNnp79OalXHXKMnBNHKFjHSM/VnVwHNRRiwqdGNfT8GrVBZdOTiZsJqQfzUBxN7illjeR/TPA=="; }; }; "@blueprintjs/icons-3.30.2" = { @@ -1579,22 +1588,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.11.0" = { + "@bugsnag/browser-7.13.2" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.11.0"; + version = "7.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.11.0.tgz"; - sha512 = "iOKXJcZzdl9XsjJnL62S+T4OQZJ21mUMCXXOiMRlLnDCrw30BwD4BoAZ5s3oQ0VE0azrv/CUsXQzU63NUcsb+Q=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.13.2.tgz"; + sha512 = "TNt6QhJxIqxvZ6wviLfwHu31V48EW+VnySxki0J2s4F++AF/lxCQ2o4ygFSQjOAHRMRChPI5jFM8OKDkx2q7mA=="; }; }; - "@bugsnag/core-7.11.0" = { + "@bugsnag/core-7.13.2" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.11.0"; + version = "7.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.11.0.tgz"; - sha512 = "xCaaONqQEAewifrvHC8v+yqN+Is4WNUcmK+sdeLcSb+ghLQ52y3BQ9nEDYzQxGuJRpv1zW3edCVIB4RN5eunSQ=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.13.2.tgz"; + sha512 = "nAQ0WNaI5Zf745ERFXbcwFmWAvrbm9Njtkk7ay45UxtlkINodP85SyV2XaktHRYCHJFjt0NQ9hbdNPeL4nTNGA=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1606,22 +1615,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.11.0" = { + "@bugsnag/js-7.13.2" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.11.0"; + version = "7.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.11.0.tgz"; - sha512 = "2KQZdiBUQRayrTweMrH8LuT+YFcZSYxPVb+RaAx5J1z3vWWFar7Lw3II34zA4e+zs/7wMSTKll5p+O7Wuz60/A=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.13.2.tgz"; + sha512 = "yXEhiVAiHgpzlP/luA3lDTo+pLgxa3TDl6cSXJtUTOvVqcgzA30k+SHG8h0KwSjXQ0MJWiQFwzPPVENdLAB5nA=="; }; }; - "@bugsnag/node-7.11.0" = { + "@bugsnag/node-7.13.2" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.11.0"; + version = "7.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.11.0.tgz"; - sha512 = "hwIG7LTE2lwaIjAes1JxYbjSoih9Eu07MSf+QJoMILY6tJoHMgxJ6v0/8AfldJeEAb753qBtlQLO8Rtr2LKHBA=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.13.2.tgz"; + sha512 = "/JexaiCDmN2f54StyvwgxkMbOSRL58kNPy1GHwlQL7zAPoEiMe9Jq0LOeHIVMLzgB/i0n7gULjLIuYKDT5udfQ=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1723,13 +1732,13 @@ let sha512 = "5XYkh0e9ehHjA7BxAHFpjPgr1qqbFY8OFG1wpBiAhycbYBtJnQmculA2wcwqTM40YCUBqEvWFdq86jTG8fbkMw=="; }; }; - "@commitlint/load-13.2.0" = { + "@commitlint/load-13.2.1" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "13.2.0"; + version = "13.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-13.2.0.tgz"; - sha512 = "Nhkv+hwWCCxWGjmE9jd1U8kfGGCkZVpwzlTtdKxpY+Aj2VCFg3BjY+qA81pMF3oAsIpxchSaZG5llb8kduVjYg=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-13.2.1.tgz"; + sha512 = "qlaJkj0hfa9gtWRfCfbgFBTK3GYQRmjZhba4l9mUu4wV9lEZ4ICFlrLtd/8kaLXf/8xbrPhkAPkVFOAqM0YwUQ=="; }; }; "@commitlint/message-13.2.0" = { @@ -2191,6 +2200,15 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; + "@eslint/eslintrc-1.0.3" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.3.tgz"; + sha512 = "DHI1wDPoKCBPoLZA3qDR91+3te/wDSc1YhKg3jR8NxKKRJq2hwHwcWv31cSwSYvIBrmbENoYMWcenW8uproQqg=="; + }; + }; "@exodus/schemasafe-1.0.0-rc.6" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; @@ -2578,13 +2596,13 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/import-6.5.0" = { + "@graphql-tools/import-6.5.4" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.5.0"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.5.0.tgz"; - sha512 = "q0zP95TVCVEQ1rfBxSDkPVgZAg5/7LptmPih9R4V0XZGY7aL1Hd4A1oe+Sr4B3sFy7OyWJpxhZek84nQBWNKmw=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.5.4.tgz"; + sha512 = "2I3m/RFisxMoRQAAsZi807Kqc4i8Ih/RoliqVBU08nYSkMg/TH67/BbV54pVUrlRF44o9GYjGaHlr5p2mwDoIQ=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -2695,13 +2713,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.2.4" = { + "@graphql-tools/utils-8.3.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.2.4"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.2.4.tgz"; - sha512 = "uB+JL7CqTKJ2Q5zXA+a2la1cA8YYPcc0RHO/3mK54hxlZa2Z5/9k9XrNfMof4LZQefTaBM7M6QWtaxGklJln4A=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.3.0.tgz"; + sha512 = "ksE0RxS0AFllo6KIJjvQsRgcUAzoyZUgUrDbCngv4SaQwyX9YxTfddTLN4uQmbiZB9h25fPp/Xgeyaa3ARCzgg=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -2740,6 +2758,15 @@ let sha512 = "CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA=="; }; }; + "@grpc/grpc-js-1.3.8" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.8.tgz"; + sha512 = "4qJqqn+CU/nBydz9ePJP+oa8dz0U42Ut/GejlbyaQ1xTkynCc+ndNHHnISlNeHawDsv4MOAyP3mV/EnDNUw2zA=="; + }; + }; "@grpc/proto-loader-0.6.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -2884,6 +2911,15 @@ let sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; }; }; + "@humanwhocodes/config-array-0.6.0" = { + name = "_at_humanwhocodes_slash_config-array"; + packageName = "@humanwhocodes/config-array"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz"; + sha512 = "JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A=="; + }; + }; "@humanwhocodes/object-schema-1.2.0" = { name = "_at_humanwhocodes_slash_object-schema"; packageName = "@humanwhocodes/object-schema"; @@ -3109,13 +3145,13 @@ let sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; }; - "@jcubic/lily-0.2.0" = { + "@jcubic/lily-0.3.0" = { name = "_at_jcubic_slash_lily"; packageName = "@jcubic/lily"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jcubic/lily/-/lily-0.2.0.tgz"; - sha512 = "KV+CBO6epprxj0AHBDOUI5vfcJZPfhuK5Bdf+AqoJFIVBapSJjuHlZsMGLGLTHCQW48oYvwv8wCC/olzRC/Ndw=="; + url = "https://registry.npmjs.org/@jcubic/lily/-/lily-0.3.0.tgz"; + sha512 = "4z6p4jLGSthc8gQ7wu4nHfGYn/IgCKFr+7hjuf80VdXUs7sm029mZGGDpS8sb29PVZWUBvMMTBCVGFhH2nN4Vw=="; }; }; "@jest/transform-25.5.1" = { @@ -3217,22 +3253,22 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/check-node-1.36.0" = { + "@jsii/check-node-1.39.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.36.0"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.36.0.tgz"; - sha512 = "/WgRJ93hg7a6H/VTOhE9366VjvrW5HU0wGtO/i3zskxBpK6LmpnYhw69AiGvmAZHyBaUuJ2KGCSa7TEge62NwA=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.39.0.tgz"; + sha512 = "tqx5o0Zw6WrVKmB9S1X0E8AajfXjWu9yoOUtUdYVCR6NAdi8mY/NQ3uYJ8II0AF1MtC0PdASOjb/6i3h02komw=="; }; }; - "@jsii/spec-1.36.0" = { + "@jsii/spec-1.39.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.36.0"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.36.0.tgz"; - sha512 = "CZrol5FphC3WZdaEYWRyCysbc6IRvaXjHOlFgjin4RJ9MrAdskcH0/x/Hyez1PwFkZl1f2qWFwVG3L9eA5+Fsg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.39.0.tgz"; + sha512 = "NbCmAYOB938uyWHwXj6fhdeIzznhHbxLmvl4Jtwe08Nrz5Gs4n79snV29XWIQulDMa4HYkNh1yqhBXOHkd+GAg=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3973,13 +4009,13 @@ let sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; }; }; - "@mdn/browser-compat-data-4.0.2" = { + "@mdn/browser-compat-data-4.0.5" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "4.0.2"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.0.2.tgz"; - sha512 = "XGLqWi1uOil0L4TJs9KOTMRl9FdEtRQLvBDaB7++AFnFf9G0QYihiUNRJ4eXZa53KI9VORsEi3Fj8p3N+m/Gdw=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.0.5.tgz"; + sha512 = "KPSNaHUl5aikqsQU7LpBntFzaPbhm5OJxD88Wv00OKDc4wudyid2wDFqLeb7VcYT9x5bND8PPFloWdK5DY0pHA=="; }; }; "@mdx-js/util-2.0.0-next.8" = { @@ -3991,6 +4027,132 @@ let sha512 = "T0BcXmNzEunFkuxrO8BFw44htvTPuAoKbLvTG41otyZBDV1Rs+JMddcUuaP5vXpTWtgD3grhcrPEwyx88RUumQ=="; }; }; + "@medable/mdctl-api-1.0.62" = { + name = "_at_medable_slash_mdctl-api"; + packageName = "@medable/mdctl-api"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.62.tgz"; + sha512 = "kXyaE+UH34LIR0AiO4nve/byQGARc9N/Q9Opf9wsbHgChHBUvv67/2i04eQs5N2CauLBVfI6H8UoXqzLUm7qAA=="; + }; + }; + "@medable/mdctl-core-1.0.62" = { + name = "_at_medable_slash_mdctl-core"; + packageName = "@medable/mdctl-core"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.62.tgz"; + sha512 = "1lRrAZw7gfaQF9iAlV5MgnOVzujetX7K5n/11wzCaIEZct9vBTSVNtI/zHNjWgyoud0LMC6w8qtRcjbgSgjcfQ=="; + }; + }; + "@medable/mdctl-core-schemas-1.0.62" = { + name = "_at_medable_slash_mdctl-core-schemas"; + packageName = "@medable/mdctl-core-schemas"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.62.tgz"; + sha512 = "nyq59XISru4gnueEk5mpU77TxuR9hsqtzpSo/I2IhA/ZbIjDoBatm+/HK3ttX9UA+rkueK1bngRLEanZFHjUeg=="; + }; + }; + "@medable/mdctl-core-utils-1.0.60" = { + name = "_at_medable_slash_mdctl-core-utils"; + packageName = "@medable/mdctl-core-utils"; + version = "1.0.60"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-core-utils/-/mdctl-core-utils-1.0.60.tgz"; + sha512 = "1l53ieD4cukz/P4Y3COsWov4mVK/+StI0lcdMUJ50jKalpFZP6kOPBMD1HzqQ1zak59ebIACKWneAH19HGET2w=="; + }; + }; + "@medable/mdctl-credentials-provider-keychain-1.0.62" = { + name = "_at_medable_slash_mdctl-credentials-provider-keychain"; + packageName = "@medable/mdctl-credentials-provider-keychain"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.62.tgz"; + sha512 = "pUG/9Ar7H2BGxoZl0SP2Z5y3WXFb600E7/YMY68SLYwR1Tp5a7whf4ttclAZyB73ukJ8cs7HcpAvg52Btd1vmg=="; + }; + }; + "@medable/mdctl-credentials-provider-pouchdb-1.0.62" = { + name = "_at_medable_slash_mdctl-credentials-provider-pouchdb"; + packageName = "@medable/mdctl-credentials-provider-pouchdb"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.62.tgz"; + sha512 = "yed0zon0Smo80UmfkhVezcsehgM6w3XMmLtkyxRVUK0xQOVXfJQZloWZtG75Be2VA0RITbdHKstzE2raGdx1tw=="; + }; + }; + "@medable/mdctl-docs-1.0.60" = { + name = "_at_medable_slash_mdctl-docs"; + packageName = "@medable/mdctl-docs"; + version = "1.0.60"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.60.tgz"; + sha512 = "9ytd1YTnsLd/hu9mGKYgsPGrTnR+5GzdbRNKFDnfBPwUsMwB1CCGE3nhb1hdjQAje9ggA4/1otnIrO/4mw8IWg=="; + }; + }; + "@medable/mdctl-export-adapter-console-1.0.60" = { + name = "_at_medable_slash_mdctl-export-adapter-console"; + packageName = "@medable/mdctl-export-adapter-console"; + version = "1.0.60"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-console/-/mdctl-export-adapter-console-1.0.60.tgz"; + sha512 = "k9KZqkV3d/2/8uYnt9/jMdF9jCNb1w/R6q2LPDZ0hNrt7UpvKKSF5RegRysW21p/xT6bvdjJhTphxXzO0qurVw=="; + }; + }; + "@medable/mdctl-export-adapter-tree-1.0.62" = { + name = "_at_medable_slash_mdctl-export-adapter-tree"; + packageName = "@medable/mdctl-export-adapter-tree"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.62.tgz"; + sha512 = "2LlmAm3kaqL2DUy1ZUzEV7hwR1vDNKQc0ySlvmRY1WR3aFsEEfJJA6hJEfjhzsE03A1jZZpW6m7KUIbosqLYWQ=="; + }; + }; + "@medable/mdctl-import-adapter-1.0.62" = { + name = "_at_medable_slash_mdctl-import-adapter"; + packageName = "@medable/mdctl-import-adapter"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.62.tgz"; + sha512 = "mjf0sx9dzZVpKCotYBZyWZopeOdyu2VnwQmIVI8oxwdVRIEN5LR0ohThs9Ca/aQT4rwlL2uvAPde5dXB3kRzuQ=="; + }; + }; + "@medable/mdctl-manifest-1.0.62" = { + name = "_at_medable_slash_mdctl-manifest"; + packageName = "@medable/mdctl-manifest"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.62.tgz"; + sha512 = "PDmfThH3tb3XQo2ot5UJR2hHtFODcQb7PAFNWbx7kfu7Vjg6g8XHYOsWGwSzFzKn+78V6+ksC8kBBcBQJus+1g=="; + }; + }; + "@medable/mdctl-node-utils-1.0.62" = { + name = "_at_medable_slash_mdctl-node-utils"; + packageName = "@medable/mdctl-node-utils"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.62.tgz"; + sha512 = "FtJId1P5hmZED6xv2SjMFb+wMswW2/7gjp4bRe21DmoCkcf4ryYUVUBzXRtfZmeMYh9zo71zRi485PHLpDylGw=="; + }; + }; + "@medable/mdctl-sandbox-1.0.62" = { + name = "_at_medable_slash_mdctl-sandbox"; + packageName = "@medable/mdctl-sandbox"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.62.tgz"; + sha512 = "xuRma0dvrtP0Su8BdWrZtdNVLeDAUIpwJ75mNAqNLK4vjxC6BJgFVHyD8pTgaDn/KYQoOZBLaY7LiMYXh8BSJw=="; + }; + }; + "@medable/mdctl-secrets-1.0.60" = { + name = "_at_medable_slash_mdctl-secrets"; + packageName = "@medable/mdctl-secrets"; + version = "1.0.60"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-secrets/-/mdctl-secrets-1.0.60.tgz"; + sha512 = "WgNIC0g3bGsy5u3a2tqdv+7RbsfmFr76vSlnkbsr/ZR4lzcXJes3qM37pvSqEZD+WN6HOPFRWTHQ0vO8biKqTw=="; + }; + }; "@medv/blessed-2.0.1" = { name = "_at_medv_slash_blessed"; packageName = "@medv/blessed"; @@ -4009,13 +4171,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.217" = { + "@microsoft/load-themed-styles-1.10.225" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.217"; + version = "1.10.225"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.217.tgz"; - sha512 = "r3iwLv8SwlJ/3V+4veN/evjtSqm9q1vH7jiu2bnMcpGUflZ10r1JBS6uZOQWicKx4kgoWrpyTorHc3y1FWnFjg=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.225.tgz"; + sha512 = "ARu2FwDnA5VcWHGpzGUnn5eB1K6lXmqCGHis7UoBKAW0uS2Asuo9Y7scblA2Fg/6lIFHLobWg4LGbzi0maYKpQ=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4090,13 +4252,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.13.7" = { + "@netlify/build-18.17.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.13.7"; + version = "18.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.13.7.tgz"; - sha512 = "maeTnUJ/onAtWDQfyx4OpgJ21W9CUuUMuwMgVXyqNxiH7n6hL0/cneSJ/rla5P4xcaoWOKKP1Uc16zRUNm6Zhw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.17.2.tgz"; + sha512 = "K4wmbfwQEtwB/ke/haibfhjZnesNP3j4MjtTUoUBHc/MXEBa1uFqb/7fchXMFZSbbmU+r/Ra8Fbt3NAIS15K5Q=="; }; }; "@netlify/cache-utils-2.0.4" = { @@ -4108,13 +4270,13 @@ let sha512 = "P6tomPTt5tdyFrrYbBWHIGBHTwiuewrElxVRMnYW1W4GfTP4Me4+iV5lOyU/Yw9OuTPg7dPzah2J0GA6cA1YCw=="; }; }; - "@netlify/config-15.6.4" = { + "@netlify/config-15.7.2" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "15.6.4"; + version = "15.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-15.6.4.tgz"; - sha512 = "E3vRhsaSe3dZsGpwNxRWIX0Ebq9aE7GAW8X+CztobOg+/HY4Hi/5RoA9ek99VheaPwkyyguVf+Tlxd/uL+nVsQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-15.7.2.tgz"; + sha512 = "hZO+vSJa+m1vpJjuTXSLh7ZyFMs8AIfElLZtllL4OTM7VMuLiC7+m7HHKWNX+xbW27lCox1G5jpUpGajtH0ajA=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4126,13 +4288,13 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.9.2" = { + "@netlify/framework-info-5.11.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.9.2"; + version = "5.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.9.2.tgz"; - sha512 = "2mzH9iOc57rUx698oIjOvw5wLRJJBHTgNBqLU6ZhUSn14Nj02jej5F2POeH4Zwi48u45YpTnJ0nnSIUjNExNWg=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.11.0.tgz"; + sha512 = "B6MW05c8vUuakO8x/ucp99ocpdYeikusCzPANqD0O1JamdLyDsDbhL7Z3j0QUhZjpY+bm+4g91Gaq7ynpX0ICg=="; }; }; "@netlify/functions-utils-2.0.2" = { @@ -4270,13 +4432,13 @@ let sha512 = "VCBXBJWBujVxyo5f+3r8ovLc9I7wJqpmgDn3ixs1fvdrER5Ac+SzYwYH4mUug9HI08mzTSAKZErzKeuadSez3w=="; }; }; - "@netlify/open-api-2.5.0" = { + "@netlify/open-api-2.5.1" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.5.0.tgz"; - sha512 = "KiXfYPO/X24p7EYQjcjBTizoyfY3U8zPv68Rte0EtayW2ZSqIslLLpNNd2gteqdh0Q83mzSiESdhlQHd0Ckjjg=="; + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.5.1.tgz"; + sha512 = "FBBgWU+09Xi4bxzPBtYiWB8p34NcGRvmUM+rxLDGus68U1r0M2+oFF+CIlfVvLMCJ+qJVTk6WV1R3+g4NrhYmg=="; }; }; "@netlify/plugin-edge-handlers-1.11.22" = { @@ -4288,22 +4450,22 @@ let sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; }; }; - "@netlify/plugins-list-4.0.0" = { + "@netlify/plugins-list-4.0.1" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-4.0.0.tgz"; - sha512 = "qF1KWhFzA0hQhavIeH1wMao1vtv3cg+h9sdbxhiOVt1H/fBww7miSCJTp8JTXE5hAS9V0/O2GWTpCYUPIK5z8Q=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-4.0.1.tgz"; + sha512 = "5SNHrs6dfW8YlyTmJvLGTIZsdxtADuYRMn8mlRapBLLDazd99yDokzMfC8oigACyu553ghn/dtetPHHxsdGuXQ=="; }; }; - "@netlify/routing-local-proxy-0.33.2" = { + "@netlify/routing-local-proxy-0.34.1" = { name = "_at_netlify_slash_routing-local-proxy"; packageName = "@netlify/routing-local-proxy"; - version = "0.33.2"; + version = "0.34.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.33.2.tgz"; - sha512 = "0y8PMy5f73PSttizvmxGk1MbrdZL6qKRZr9jH2Rk+OB29EhNlcsdJT56DHSjnIUxRAmeZVY0JnXDhHNI2cDapQ=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.34.1.tgz"; + sha512 = "FuzgxdxC7wJXUT08qPTtHiKwjFDHh3ViCDZwxwjm8CjOKYz+9NjhmIffkbEFl6R+uH6IV/3R6gVDL5Fb5hwRbQ=="; }; }; "@netlify/run-utils-2.0.1" = { @@ -4315,13 +4477,13 @@ let sha512 = "F1YcF2kje0Ttj+t5Cn5d6ojGQcKj4i/GMWgQuoZGVjQ31ToNcDXIbBm5SBKIkMMpNejtR1wF+1a0Q+aBPWiZVQ=="; }; }; - "@netlify/zip-it-and-ship-it-4.23.3" = { + "@netlify/zip-it-and-ship-it-4.25.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.23.3"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.23.3.tgz"; - sha512 = "Va40JVTeisKb6ryLWWhLm5sEVjZlLoJZeoEZlUXfzMsncgwZZqY5sGcVxlk6b8iMS1A93jLR7qWbuiMqwo+WWg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.25.0.tgz"; + sha512 = "4KhFSO7QWyNXVlQzFVCAmTEgdOnPnQGbkaX+Wo/5NS1boH6IvbKAzZKFqrP8fE2Vl4wIWrt9srPpQA3HpyO3NQ=="; }; }; "@node-red/editor-api-2.0.6" = { @@ -4423,13 +4585,13 @@ let sha512 = "CLnD+zXG9oijEEzViimz8fbOoFVb7hoypiaf7p6giJhvYtrxLAyY3cZAMPIFQvsG731+02eMDp3LqVBNo7BaZA=="; }; }; - "@npmcli/ci-detect-1.3.0" = { + "@npmcli/ci-detect-1.4.0" = { name = "_at_npmcli_slash_ci-detect"; packageName = "@npmcli/ci-detect"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz"; - sha512 = "oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="; + url = "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz"; + sha512 = "3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q=="; }; }; "@npmcli/fs-1.0.0" = { @@ -4684,13 +4846,13 @@ let sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; }; }; - "@octokit/openapi-types-10.6.4" = { + "@octokit/openapi-types-11.2.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "10.6.4"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.6.4.tgz"; - sha512 = "JVmwWzYTIs6jACYOwD6zu5rdrqGIYsiAsLzTCxdrWIPNKNVjEF6vPTL20shmgJ4qZsq7WPBcLXLsaQD+NLChfg=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz"; + sha512 = "PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4702,13 +4864,13 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.16.7" = { + "@octokit/plugin-paginate-rest-2.17.0" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.16.7"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.7.tgz"; - sha512 = "TMlyVhMPx6La1Ud4PSY4YxqAvb9YPEMs/7R1nBSbsw4wNqG73aBqls0r0dRRCWe5Pm0ZUGS9a94N46iAxlOR8A=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz"; + sha512 = "tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -4720,13 +4882,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.11.4" = { + "@octokit/plugin-rest-endpoint-methods-5.13.0" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.11.4"; + version = "5.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.11.4.tgz"; - sha512 = "iS+GYTijrPUiEiLoDsGJhrbXIvOPfm2+schvr+FxNMs7PeE9Nl4bAMhE8ftfNX3Z1xLxSKwEZh0O7GbWurX5HQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz"; + sha512 = "uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA=="; }; }; "@octokit/plugin-retry-3.0.9" = { @@ -4756,22 +4918,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.11.4" = { + "@octokit/rest-18.12.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.11.4"; + version = "18.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.11.4.tgz"; - sha512 = "QplypCyYxqMK05JdMSm/bDWZO8VWWaBdzQ9tbF9rEV9rIEiICh+v6q+Vu/Y5hdze8JJaxfUC+PBC7vrnEkZvZg=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz"; + sha512 = "gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q=="; }; }; - "@octokit/types-6.31.3" = { + "@octokit/types-6.34.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.31.3"; + version = "6.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz"; - sha512 = "IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz"; + sha512 = "s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw=="; }; }; "@opencensus/core-0.0.8" = { @@ -4819,310 +4981,328 @@ let sha512 = "a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA=="; }; }; - "@ot-builder/bin-composite-types-1.1.2" = { + "@ot-builder/bin-composite-types-1.2.0" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.1.2.tgz"; - sha512 = "o6dWvUCn6+kZbohKEe91vbiIXEjzSApv9mM9/B9p6s+aHdbCLu94/lch6Mwvc5FVPiDb8F5WIBKXz1/VCyOKWw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.2.0.tgz"; + sha512 = "AN2d2sVtQLq/2vrfzqIXhgOfmrXn/LeLIwqGkhGIAaqdFJt1shUAP0SMMjoNyA+27uQcBi6Cu9WqSVgUVvbNmw=="; }; }; - "@ot-builder/bin-util-1.1.2" = { + "@ot-builder/bin-util-1.2.0" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.1.2.tgz"; - sha512 = "zo7cq3gYB+ajwKi+mYp3ocXEzApE/8BYVCO5wz5BbeCm9wMLW/TmjxG2+415BW7b+nJi0he3jfFdBkHP5eUnKQ=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.2.0.tgz"; + sha512 = "0WNGJALiIKSMP54FtInc+WXPn0QyfHrQZfgpjUNb1EQjfk51uG0H1044mYqOAXginhxcm8yxH6m1/I4L7nmObQ=="; }; }; - "@ot-builder/cli-help-shower-1.1.2" = { + "@ot-builder/cli-help-shower-1.2.0" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.1.2.tgz"; - sha512 = "h7LudXn+nZjDZZcmNmmd9CoHzl88mpoXuWMC8LewkwYbJlhUGUr95L9V+yfHzA+hWlQb+H9jNk1bXfGwXGVfOA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.2.0.tgz"; + sha512 = "oXLxLsX0NQnXE86T6WlStGdWLiBq0MirxZLR11mtBtU9FqWTIHxRQwaVA9UzvuwMRiwYC5ZL6MkYfdUBf1043w=="; }; }; - "@ot-builder/cli-proc-1.1.2" = { + "@ot-builder/cli-proc-1.2.0" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.1.2.tgz"; - sha512 = "ob8T1LigHyd7efypJZ7GuGdRZ0cEDgJmT/VN1CoGzCJAy6EupMAmuTONp545l6ijoWZsausJov1TvVdJLsXjxA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.2.0.tgz"; + sha512 = "HeWBcJqRlrR8BT4GxV6BSeLajdr0J6sgKi9rU7eS1OQU06I85/DyQZMtMJecLYgaQ1tPFapxV3XH454/JGHnMQ=="; }; }; - "@ot-builder/cli-shared-1.1.2" = { + "@ot-builder/cli-shared-1.2.0" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.1.2.tgz"; - sha512 = "jIOqlkvrCpbXyla0g0Rnn3goaAjDn9Rl189UMmI3lhsvt3LX+Dvh5DoGdZxgET8cJdRwmpxETwQFGDOk+GNB/A=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.2.0.tgz"; + sha512 = "0qtfGBnID4RIg7jGfc0Cs4VhB9w6FhAvIzidUTWr4xdLubI4NqiKdxR44jfakP1SX4jMOyAG5ppNthUjpW8Xlg=="; }; }; - "@ot-builder/common-impl-1.1.2" = { + "@ot-builder/common-impl-1.2.0" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.1.2.tgz"; - sha512 = "b5djcK7F9+31lDp3l/CK6xYhdbaXRNIbNVPyPCccD8FWEWc+rdHMw64cuDqCpvvTYYxeJ4MsTiB1Wu6FGip7/w=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.2.0.tgz"; + sha512 = "vOGP77F2lFx+ssf6uvZFh7E4TAiXeTPkU8JyfxZYAfnVMuKVcj0yZdgUs2tr5Akg/oxfbSo3MVWCz4hHALWXHQ=="; }; }; - "@ot-builder/errors-1.1.2" = { + "@ot-builder/errors-1.2.0" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.1.2.tgz"; - sha512 = "/ISTVXtFkRppPABUvdCOa/Qvk2epPcsWuqwBsonXJjseSOKwJOpAqZ8GeGyoUkGITsl15RM6xQGRT+yhRyrmhw=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.2.0.tgz"; + sha512 = "bMVw+leFX8OhcAy72K5Eyn35LVz5TqTeUPzyZC8VXqf4xr+6o2PRPdmdIkDlxrB9HG0ZX3OQu4urT4m6eonNOw=="; }; }; - "@ot-builder/io-bin-cff-1.1.2" = { + "@ot-builder/io-bin-cff-1.2.0" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.1.2.tgz"; - sha512 = "XVNr5pE0p7tNNud1mkAYtPIK8is2a7mkw3O09sj4/hzpA/GwZ3oCxQBqzjqj/EnmzZsfiGQNOzE7C6bPF6w88A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.2.0.tgz"; + sha512 = "O9Snj8A7W/UI6jxcZ4cvcGhLv6Zia82BQVAZwjqaGagsyadaoVgBhd9EgHR4Pa0FFEdpG4JqC/JaP4c2Rj+I6A=="; }; }; - "@ot-builder/io-bin-encoding-1.1.2" = { + "@ot-builder/io-bin-encoding-1.2.0" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.1.2.tgz"; - sha512 = "+1L50dhuhPZbkoX8NRyiYta7Pwo7oaXD98ZHR5ViUbkeqAbBU+XtITq3kVQalawD/Y67QnvcvwPucsrNAcmkbA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.2.0.tgz"; + sha512 = "WjjghUL45GEB+23u0fgmaoCbapT7x7GzbkjcWbWFzshFOIjDyR+IFP+gicsgP5C3BQr4RGV8t/H/QfdjvjxnZA=="; }; }; - "@ot-builder/io-bin-ext-private-1.1.2" = { + "@ot-builder/io-bin-ext-private-1.2.0" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.1.2.tgz"; - sha512 = "70yML2r9T3MihFyzyx90l1yE/rA4PtWmQeInGwKb/3pijgMg8m/Qcdfwmgl2sx50wd4bEGLiTxXo8PJ1CDeVug=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.2.0.tgz"; + sha512 = "xZBEeXf+2DEMoBnloVv7GQ603IbeCNV5kcyLf6VtjyHpDF0Gwh4wtVM6eTR3vLjfy56BEf50Gp4xjMaTR98eyw=="; }; }; - "@ot-builder/io-bin-font-1.1.2" = { + "@ot-builder/io-bin-font-1.2.0" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.1.2.tgz"; - sha512 = "CY4VlN9N2GgwYo1s3TEe03JcEC7M+IXVtwern4RBueYBU8i03DYcaLRykXXKBUEM9KGuA4CcpafhlxJdLrKcHw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.2.0.tgz"; + sha512 = "R09LJQpAY33wJroy5dFUjggncXFC9hwTcE3rriIT0HjwAOQUd7NtRMtts7nAwTpPimGMhl4dDl9DWw9OPfsgXw=="; }; }; - "@ot-builder/io-bin-glyph-store-1.1.2" = { + "@ot-builder/io-bin-glyph-store-1.2.0" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.1.2.tgz"; - sha512 = "qw3GRaYN6fepIEOpELNQTxZSIrhFtisE2QhY+bj7Rg4OG0L8Mu+tR+AqbHidvaAFQaMleFY6s7vEk79/5ZCMdg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.2.0.tgz"; + sha512 = "pxJj4OtcRaMYvwSWAJEYvVyrug3S7XuRlSBvBLcl0lQ7jCADQBnQnSXGkUBRDWsIjM/t/EFBvCKeCfbS04HHFQ=="; }; }; - "@ot-builder/io-bin-layout-1.1.2" = { + "@ot-builder/io-bin-layout-1.2.0" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.1.2.tgz"; - sha512 = "LJvm+XshKqMEdMVM2MbILGtpTlo+izUPqmiWVpeDEtkzDKuKcES6zvb3VJLt550Ug7neJbE/k6wq+PUt+20wJw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.2.0.tgz"; + sha512 = "0HkF8xGSHozP8uof5GrgHtif5ahkHKsDKFz0O8KTRQEEEaZmN/4K76E18msa72EC/wDGFRdfSvoiapaQopUZGg=="; }; }; - "@ot-builder/io-bin-metadata-1.1.2" = { + "@ot-builder/io-bin-metadata-1.2.0" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.1.2.tgz"; - sha512 = "UAJzjPsDUtQozQJvVpGSPhCnKZiuoA0o4od74pnqRY7f6gDx0tHYM5fpv4ZIcQRS5ORG6XVxtRq3kLndDb4+3A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.2.0.tgz"; + sha512 = "dPb9w9IxjEv0McQN3E8zufxml8YyGV1/mSiT6x2yAhYQpuoef/cHfF1HJHpYhnqyzI2vlM5JP2UUr7XyuDvmsg=="; }; }; - "@ot-builder/io-bin-metric-1.1.2" = { + "@ot-builder/io-bin-metric-1.2.0" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.1.2.tgz"; - sha512 = "bKR4L7V2jnOaL7Ait0WIYLDM4vDgp/MbB9wDSXCquFWxdjOww7GBrVuOs6Dw4Aldp68wNre9OnwKB5oj3IKyIw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.2.0.tgz"; + sha512 = "SP5Rwv7yyptMvRErMPQLolt+96RSBFPY4ctsUvyolG61Jrz9Se6/FflCcBnSK79Xy1+9XepMMGaWvxTl57jwYQ=="; }; }; - "@ot-builder/io-bin-name-1.1.2" = { + "@ot-builder/io-bin-name-1.2.0" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.1.2.tgz"; - sha512 = "UtLy1XOcF03jhR31C1NXesjoZEc9MeGJTwtYU/hXzN0KKPxhl9ZDUjzTI7zWJ4K0tDYuS+LUcgJj1gdG21NnAA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.2.0.tgz"; + sha512 = "zMsPafrJC3fOEc/HmIBDB9ULn++QhcO5nXS7UTynW6t9ddgllaCGfBwqNdrCLYmBP1Sy0HTTL7kda/R5mfZVhg=="; }; }; - "@ot-builder/io-bin-sfnt-1.1.2" = { + "@ot-builder/io-bin-sfnt-1.2.0" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.1.2.tgz"; - sha512 = "hfAsJXdIyZuxu1tzjIVjH4hfLVLAmipsaRJXEJwf5VtvpyOheV0wUCJ57Fq0zSSQlMBEyPFDJ0ubDT6Z9tKJBg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.2.0.tgz"; + sha512 = "g0E0ltjDvBnsog7gIqMPEmlRmgs7tbIurYbDd1QmorGNmmcxaCQxbyKSiZF6tcHzDmSC9vLprdymbFKzzudFPQ=="; }; }; - "@ot-builder/io-bin-ttf-1.1.2" = { + "@ot-builder/io-bin-ttf-1.2.0" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.1.2.tgz"; - sha512 = "G/40yZStFXTAHjR5iQ7ZyoH7USJU6IMVbn8sEAMbvQc3GzDeHxhPADoyuxRn/nFzwaa0z6ut6ef85ebOgkFuww=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.2.0.tgz"; + sha512 = "VyZgZbycG8fwXweQ8hMBQTBHyMGg6J94lgg3eWmBJnxRWiI/odBtvQJZvFlgkgJCALOvWlMFQkftmFVn8lWpDw=="; }; }; - "@ot-builder/ot-1.1.2" = { + "@ot-builder/io-bin-vtt-private-1.2.0" = { + name = "_at_ot-builder_slash_io-bin-vtt-private"; + packageName = "@ot-builder/io-bin-vtt-private"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.2.0.tgz"; + sha512 = "W7PXVXigsCtAlxtzTlz1fd1CCc5s2rhJfCeOcJYMpH4BfYekE1e/0gM/eAR3QVP9k9a6L/tKICsJD+AHm4NmNw=="; + }; + }; + "@ot-builder/ot-1.2.0" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.1.2.tgz"; - sha512 = "hAQIxPEbElfXGydy5sYqSl7kzM5eHbTaDBN23RlUbgTwF3OCDdUYUXwCEOfh4pDebFRNLn/C7sue8pud62lp2Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.2.0.tgz"; + sha512 = "0lnFEXwOXy+HvzAHTnOhPiY04c0sgLkQ3z6UbtScapP7ppmowyJsoMCSnMzuuNNCxgPu+9E1/r6pdxY4SZV4fw=="; }; }; - "@ot-builder/ot-encoding-1.1.2" = { + "@ot-builder/ot-encoding-1.2.0" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.1.2.tgz"; - sha512 = "E+NYgSUpRLOWe+Iua/9WzfXSMZtJUdFBuJcAXdIaZoyUaGDPyEEvnc4PVYMH0dNuU8O+8D19ruX39L4OXiAH2Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.2.0.tgz"; + sha512 = "HE8UEBbFR2yj2YK4tmFPyC7I2JPCcxgQStS6Z6McwfXcVCY+QLIubhUO9vpDXps52jc+/OxGjuMtcksGOiTEIw=="; }; }; - "@ot-builder/ot-ext-private-1.1.2" = { + "@ot-builder/ot-ext-private-1.2.0" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.1.2.tgz"; - sha512 = "SLMlVkiWo36+5k2XpUfxOP9bHxlhEQbZ86ZXE3C7g9B7c/fCDKcOR6SaTSd66syc32WDNPEmeJWZ9OCW6Yh4cw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.2.0.tgz"; + sha512 = "Ha5VyFKLTj5wletYzbKXuieRr0w9QvjkpNzHdCuh7D1SVQfhuqF6s2F7adIVJLoaHx3zrDISO6LeO2wO8gqqZA=="; }; }; - "@ot-builder/ot-glyphs-1.1.2" = { + "@ot-builder/ot-glyphs-1.2.0" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.1.2.tgz"; - sha512 = "s+NXHOMl+p4uWtUwfL7qFUCyYSGbIpa0/MQsE2d8T1Gt1LhICpupiCc8yvbHntXjyD7FvQxHwbtdqz9uWIpn+A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.2.0.tgz"; + sha512 = "+XbeTewi1eNrKXEuyBxfhiYFmYGXdRhHefv+gmUrwV8YPHtMiMsjtTp0WB+1rRySJ6IYTI38su2qunK5pmHmeg=="; }; }; - "@ot-builder/ot-layout-1.1.2" = { + "@ot-builder/ot-layout-1.2.0" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.1.2.tgz"; - sha512 = "Ur/4xpO8FMdANPOIDi30M0vXo7ZyegUQjfEfFlUBtTdFqxrqS/1G5Wn0/f0Z0vmjItfFMSgPrS8zkmT9eTds1Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.2.0.tgz"; + sha512 = "VjDs3UPfUEKBLxpVekQMZboLUXxZ2+uG4mZD9EtE/fD6r7jrm3jf7wAT8eGbLGbEW0iH+U0Ta1dQWm2Sc4Q9TA=="; }; }; - "@ot-builder/ot-metadata-1.1.2" = { + "@ot-builder/ot-metadata-1.2.0" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.1.2.tgz"; - sha512 = "lsoAhFl0C2DM/xei5T9ITH1LakKyEjGJHYbvn6fQ1UR73JRK+Zr9696jcuRSB1iodCuHwpjDxcIb3u11NVNx3Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.2.0.tgz"; + sha512 = "xFd9MKcgKIwE7WlbgJPhxT/8urRuLTb0PfcxLgvwBB8LD7MSS13ji93ZNqDBwk0TfKrOUgh+ZW53fH4/lOGf7g=="; }; }; - "@ot-builder/ot-name-1.1.2" = { + "@ot-builder/ot-name-1.2.0" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.1.2.tgz"; - sha512 = "jpDfDbPkwgeHqKmf8XjP5WYMrElEZAwwbbwTEdsxC4BrWg1q0q5wVZ/xIxClRwUlMOBv1IdE16CiP0i/Ly4WCg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.2.0.tgz"; + sha512 = "vVO6uKDiI9mEOEcpvHxDriFiK4CcdMWMghE4BOgJ8BBq97IydJ5KpdbMiJnYSmOed+FMXHkUevJ46yBHpvmPEg=="; }; }; - "@ot-builder/ot-sfnt-1.1.2" = { + "@ot-builder/ot-sfnt-1.2.0" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.1.2.tgz"; - sha512 = "3WTPo5zEn5hCqi5aC8eKSLthsExQiGU/B9mgMLtDtBd1bIpjeFsLfqo7Ug//DGf9tW0DT7PXt8VZkDISmAoYBw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.2.0.tgz"; + sha512 = "An8mfyqo6QyHhnIE4n3TiWo8Y2hHPhk+ahQWEW4Ydw475WXAye/l5XhpC9/fORWjlniL55ouTfvM31VBEimzow=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.1.2" = { + "@ot-builder/ot-standard-glyph-namer-1.2.0" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.1.2.tgz"; - sha512 = "lzR22ycw2dF4QzMi26CU2Ezb2udwrayas9nM0KTNayN3Fqp5+7A5r8RmjCLdsT3I5aqQVzNQkyRAKdK6B7id3A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.2.0.tgz"; + sha512 = "1kkw1qdVJBuWegIjlGK/ZLWCoaZFPP+PhVowya4XTb0qP/EqgthZaP2uQ6+N5BMyVXn8XnaCyzjtBFZRspY37g=="; }; }; - "@ot-builder/prelude-1.1.2" = { + "@ot-builder/ot-vtt-private-1.2.0" = { + name = "_at_ot-builder_slash_ot-vtt-private"; + packageName = "@ot-builder/ot-vtt-private"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.2.0.tgz"; + sha512 = "/LgrrD2sdW6mbGWJtrKBKgaFrV8/Kgzs83FsqgC8YVvpRm2Ncb06XHs02MHCVztkTiBt7QN6MnNfZwycojGLMw=="; + }; + }; + "@ot-builder/prelude-1.2.0" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.1.2.tgz"; - sha512 = "NJ6bIfXqE752DJfIwjZbGM9hwBE8TKThHBb7wZO7EJ9EKy36RnDsOim8w/dO+e8XysYdhng/kl/qaF8dHFmQJw=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.2.0.tgz"; + sha512 = "Df7L2UqUbzimN5vODcdRAwsIwU4fDkUp8SObTsVsYlLWN8qtG+F5IltYw2BNVerufI5qiA1145WpSi+1Dr3J7g=="; }; }; - "@ot-builder/primitive-1.1.2" = { + "@ot-builder/primitive-1.2.0" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.1.2.tgz"; - sha512 = "sjWQytHNlW9WALbm1m77ue/om+8/4uWOOMXa9839nJU7VNg4CepwPEs4BgDbpQSAUiwSakGrsZqu8DYIGURndg=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.2.0.tgz"; + sha512 = "aiKTWfI91wrN2FMslnPi/gHQrnjyPpxtOWrxIY49rKBWNJKytnWLZf5qPc5r6CsFpywIqj/hOA0cIO+MTJCy9Q=="; }; }; - "@ot-builder/rectify-1.1.2" = { + "@ot-builder/rectify-1.2.0" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.1.2.tgz"; - sha512 = "Q/IzyHLV/LO68zWn0/DkpCTnf8uozVKOjUKEqT0ACawN2iFr6CM/YvOPu6lXhjv4Z+L4AoypJYeRgWEwT5Y9Bw=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.2.0.tgz"; + sha512 = "S341nLIehPw2BJWYau6sbunvymB+FZW94cPYhOubQqwMteURkKGleJrkVyCD2zVa04luZvcFJgGtUYNhcGPOzg=="; }; }; - "@ot-builder/stat-glyphs-1.1.2" = { + "@ot-builder/stat-glyphs-1.2.0" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.1.2.tgz"; - sha512 = "samD/GuqydGxLB67hkizsDrFb+RxeV5EuaW2Y3rhw4fkq9SkcBIjMf1qp7O5PyDTeWugZKE8Rnf0tNcmx6cAtg=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.2.0.tgz"; + sha512 = "tVTpC1Qwp5CZDHLmgiRjvn5NEmgo9uYgLKzj704orNvM6ptM4M9IADk8AYa1gXYkRezJgV8xfFyEMTXQdjFuyQ=="; }; }; - "@ot-builder/trace-1.1.2" = { + "@ot-builder/trace-1.2.0" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.1.2.tgz"; - sha512 = "8MDMqqhprb0H8pt8Oprn3WqmeTwBLsEW+GeZkdfU6qxPlH80ukZQy5dDzaARUaGHdNwl1I4uKpFnxlKHdx9csQ=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.2.0.tgz"; + sha512 = "UJSOfGjo9QkC/+3XU5DrLFl9H7J09TCJtRWdReTauFqiINSpoGtVS+7Qbc8M+eVvQ6KI0OdpjdXq9uKI3dKF0g=="; }; }; - "@ot-builder/var-store-1.1.2" = { + "@ot-builder/var-store-1.2.0" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.1.2.tgz"; - sha512 = "+uV8qPP3/ZPofaUMkfJZPy+aMzkzSpMT9Yp5POmNiwM8hbxBKvSZFCvZJGvwdTv+W68Tf3aT7EOzPYF3pPpRRA=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.2.0.tgz"; + sha512 = "nQYv0Ym67BnApIXSNtLnmTdfZxEGY9tihq0nFtlbh44BQQnlLVKhKQD3iKcJyPkZvV6NzPdNSLmBs99cT9YE0Q=="; }; }; - "@ot-builder/variance-1.1.2" = { + "@ot-builder/variance-1.2.0" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.1.2.tgz"; - sha512 = "gUgBg/WsZMDZDkg/6iRGjclbSL+IJGqpcgTLto5A5GSgyo8uj1m5/JsxE9RP6J4PCYU+70s2RsHgjy7KjYtV7g=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.2.0.tgz"; + sha512 = "B32KgSa8zM7ZTq7EQB1GsXQmQ+IRDYuAE2W/v5+BYqzcY2B448F8QmZVK0GCYDVdDzG61c8kb2kiOViSNz5bag=="; }; }; "@parcel/fs-1.11.0" = { @@ -5215,13 +5395,13 @@ let sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; }; }; - "@prisma/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f" = { + "@prisma/engines-3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f"; + version = "3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f.tgz"; - sha512 = "6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c.tgz"; + sha512 = "wnHODKLQGKkE2ZCHxHQEf/4Anq/EP0ZCvX++D5w34033mwZ94iZiOsEKZZ31fgki7MTh28F1VNF5ZSFdnRjgvQ=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -5377,13 +5557,13 @@ let sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.62" = { + "@redocly/openapi-core-1.0.0-beta.63" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.62"; + version = "1.0.0-beta.63"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.62.tgz"; - sha512 = "g4iPB7qpSNFCOpf/FgKiic+QCaCn4mdNQOWVEPuwpN7l72hlQ7J3YUa9cssJomkJXXxZ1zdP4h208s12LkhwVA=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.63.tgz"; + sha512 = "ZnIoUyZ6BJZ4wnkGM9YAHe8MqHNcgEHVTjM1IsZkvwoDQ6TTV/B7P7gHOKCcgkyBb/sQNShgSAO5Y+lIfKU2+g=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5476,13 +5656,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.2.8" = { + "@schematics/angular-12.2.10" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.2.8"; + version = "12.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.8.tgz"; - sha512 = "xkVcX6lTHC5JzDOjGdRAZutVVpxkRkT84vXtVlJwojyhNjAZg5dm/GC84+gVGfmVnO9vkUIYo/vGoN+/ydcSdA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.10.tgz"; + sha512 = "hjOWrC/RlZ97oYWO92f5VRu6LDzPHnowDcyGDGvI9wCrfipL4Y7Is6LgFAiVZxCHdRz71MCnES1IXSj5w6UuBA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5530,13 +5710,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/dashboard-plugin-5.4.5" = { + "@serverless/dashboard-plugin-5.4.8" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "5.4.5"; + version = "5.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.5.tgz"; - sha512 = "/GC25lNFBcUQ/jK4ArDkx7yJk8a+QVXPHa7jakb8zXYDUy1s9XbXW5R8Lj0X1s1e8NG52+rCh6y1gy53hGqvbQ=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.8.tgz"; + sha512 = "vAXlfM33fRsYDeHTjFLlgA6VCxeXEkB8rx/mqQv5kv48KO4gwRsmgV4/xzEnk2fSQVPlyHL66DG0IvgFyEeC3Q=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5593,13 +5773,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.17.0" = { + "@serverless/utils-5.18.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.17.0"; + version = "5.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.17.0.tgz"; - sha512 = "Xnkg1xPjXFCiXXvsIi+inl9lgWSyEyG6tUpGzaKbpPcPo16xruBUX+aRKtMd53QXe3WJVe7+1+MOzjiXbRzE1A=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.18.0.tgz"; + sha512 = "vq6tzG3RilZVugbJBvBOU5XBVRTzGce1XH6zvivMM8c+a6wmMUcRRfTD0SPTCWxD2hSdv4WrH3Yz27Ez55vrSA=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -6115,6 +6295,15 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; + "@tootallnate/once-2.0.0" = { + name = "_at_tootallnate_slash_once"; + packageName = "@tootallnate/once"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"; + sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; + }; + }; "@trysound/sax-0.2.0" = { name = "_at_trysound_slash_sax"; packageName = "@trysound/sax"; @@ -6304,13 +6493,13 @@ let sha512 = "20R/mDpKSPWdJs5TOpz3e7zqbeCNuMCPhV7Yndk9KU2Rbij2r5W4RzwDPkzC+2lzUqXYu9rFzTktCBnDjHuNQg=="; }; }; - "@types/component-emitter-1.2.10" = { + "@types/component-emitter-1.2.11" = { name = "_at_types_slash_component-emitter"; packageName = "@types/component-emitter"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz"; - sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; + url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz"; + sha512 = "SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ=="; }; }; "@types/connect-3.4.35" = { @@ -6448,13 +6637,13 @@ let sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ=="; }; }; - "@types/eslint-7.28.0" = { + "@types/eslint-7.28.1" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.28.0"; + version = "7.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz"; - sha512 = "07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.1.tgz"; + sha512 = "XhZKznR3i/W5dXqUhgU9fFdJekufbeBd5DALmkuXoeFcjbQcPk+2cL+WLHf6Q81HWAnM2vrslIHpGVyCAviRwg=="; }; }; "@types/eslint-scope-3.7.1" = { @@ -6709,13 +6898,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jquery-3.5.6" = { + "@types/jquery-3.5.7" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.6"; + version = "3.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz"; - sha512 = "SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.7.tgz"; + sha512 = "Why+9t1KuqWtIqYKtbk6wgWbE1PjyXJOyGkpmTUh0RX5p4HL7nnRuBkjAO9P2r9tGQP6bLWxl77jRLew3V5xXg=="; }; }; "@types/js-yaml-3.12.5" = { @@ -6979,13 +7168,13 @@ let sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; }; }; - "@types/node-12.20.27" = { + "@types/node-12.20.33" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.27"; + version = "12.20.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.27.tgz"; - sha512 = "qZdePUDSLAZRXXV234bLBEUM0nAQjoxbcSwp1rqSMUe1rZ47mwU6OjciR/JvF1Oo8mc0ys6GE0ks0HGgqAZoGg=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.33.tgz"; + sha512 = "5XmYX2GECSa+CxMYaFsr2mrql71Q4EvHjKS+ox/SiwSdaASMoBIWE6UmZqFO+VX1jIcsYLStI4FFoB6V7FeIYw=="; }; }; "@types/node-14.11.1" = { @@ -6997,13 +7186,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.17.20" = { + "@types/node-14.17.27" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.20"; + version = "14.17.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.20.tgz"; - sha512 = "gI5Sl30tmhXsqkNvopFydP7ASc4c2cLfGNQrVKN3X90ADFWFsPEsotm/8JHSUJQKTHbwowAHtcJPeyVhtKv0TQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz"; + sha512 = "94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw=="; }; }; "@types/node-15.14.9" = { @@ -7024,22 +7213,31 @@ let sha512 = "7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA=="; }; }; - "@types/node-16.10.2" = { + "@types/node-16.10.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.10.2"; + version = "16.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.10.2.tgz"; - sha512 = "zCclL4/rx+W5SQTzFs9wyvvyCwoK9QtBpratqz2IYJ3O8Umrn0m3nsTv0wQBk9sRGpvUe9CwPDrQFB10f1FIjQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz"; + sha512 = "ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ=="; }; }; - "@types/node-16.6.1" = { + "@types/node-16.10.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.6.1"; + version = "16.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.6.1.tgz"; - sha512 = "Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.10.4.tgz"; + sha512 = "EITwVTX5B4nDjXjGeQAfXOrm+Jn+qNjDmyDRtWoD+wZsl/RDPRTFRKivs4Mt74iOFlLOrE5+Kf+p5yjyhm3+cA=="; + }; + }; + "@types/node-16.11.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.11.0.tgz"; + sha512 = "8MLkBIYQMuhRBQzGN9875bYsOhPnf/0rgXGo66S2FemHkhbn9qtsz9ywV1iCG+vbjigE4WUNVvw37Dx+L0qsPg=="; }; }; "@types/node-16.7.3" = { @@ -7222,13 +7420,13 @@ let sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; }; }; - "@types/react-16.14.16" = { + "@types/react-16.14.17" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.16"; + version = "16.14.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.16.tgz"; - sha512 = "7waDQ0h1TkAk99S04wV0LUiiSXpT02lzrdDF4WZFqn2W0XE5ICXLBMtqXWZ688aX2dJislQ3knmZX/jH53RluQ=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.17.tgz"; + sha512 = "pMLc/7+7SEdQa9A+hN9ujI8blkjFqYAZVqh3iNXqdZ0cQ8TIR502HMkNJniaOGv9SAgc47jxVKoiBJ7c0AakvQ=="; }; }; "@types/react-dom-16.9.14" = { @@ -7447,6 +7645,15 @@ let sha512 = "FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg=="; }; }; + "@types/tough-cookie-2.3.8" = { + name = "_at_types_slash_tough-cookie"; + packageName = "@types/tough-cookie"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.8.tgz"; + sha512 = "7axfYN8SW9pWg78NgenHasSproWQee5rzyPVLC9HpaQSDgNArsnKJD88EaMfi4Pl48AyciO3agYCFqpHS1gLpg=="; + }; + }; "@types/tough-cookie-4.0.1" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; @@ -7519,13 +7726,13 @@ let sha512 = "ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g=="; }; }; - "@types/vscode-1.60.0" = { + "@types/vscode-1.61.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.60.0"; + version = "1.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.60.0.tgz"; - sha512 = "wZt3VTmzYrgZ0l/3QmEbCq4KAJ71K3/hmMQ/nfpv84oH8e81KKwPEoQ5v8dNCxfHFVJ1JabHKmCvqdYOoVm1Ow=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.61.0.tgz"; + sha512 = "9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg=="; }; }; "@types/webpack-4.41.31" = { @@ -7852,6 +8059,15 @@ let sha512 = "BZCHRz43Qfr0DwZlZQCcofR+3cr+H+HK72/ZPkZy1Uq0NYjJMlmZ3ahuMgvJxT9lfC1RA6eOEUlUsZ+gqKcMCg=="; }; }; + "@vercel/nft-0.15.1" = { + name = "_at_vercel_slash_nft"; + packageName = "@vercel/nft"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.15.1.tgz"; + sha512 = "ehD1bgCG9sZliAHku2fc1L+jKLad4wS+9HHWiIs4HT4SysA/JFSXRrfWuA+INumzuaFqrOKs3vQeLVhZ4o8lTw=="; + }; + }; "@vercel/node-1.12.1" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; @@ -7879,67 +8095,67 @@ let sha512 = "ZG2VxMHHSKocL57UWsfNc9UsblwYGm55/ujqGIBnkNUURnRgtUrwtWlEts1eJ4VHD754Lc/0/R1pfJXoN5SbRw=="; }; }; - "@vue/cli-shared-utils-4.5.13" = { + "@vue/cli-shared-utils-4.5.14" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.13"; + version = "4.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.13.tgz"; - sha512 = "HpnOrkLg42RFUsQGMJv26oTG3J3FmKtO2WSRhKIIL+1ok3w9OjGCtA3nMMXN27f9eX14TqO64M36DaiSZ1fSiw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.14.tgz"; + sha512 = "OJeabPep8yvQ7n2lgbsw6lzBXmjaBHlCt7k9wnsPiXKtNAnHsv40ejARRnj4HTOuMaW6i1QQ17X3WaozI0zaMw=="; }; }; - "@vue/cli-ui-4.5.13" = { + "@vue/cli-ui-4.5.14" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.13"; + version = "4.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.13.tgz"; - sha512 = "kXsmK+KAX9A2ribCJ+JuFcJ9ICEKluWuFtJEwUMOvo85O/l5UNupA7XoCrXeHoItdVtw32hAOv+bEV+KmyPyuQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.14.tgz"; + sha512 = "1bK/GvUH6vND8YH2ByTZwxAYgJ1azDwgUkmGDsedzwpeZC5Z6pjkOCp97eE3gcJaFqC4ABS6vWuCLq8Q4Ih3Jw=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.13" = { + "@vue/cli-ui-addon-webpack-4.5.14" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.13"; + version = "4.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.13.tgz"; - sha512 = "mtk174vPRza0aMqMvx80U/BBmprlOq8ngHr5v3+MYIC1tqzB7co5fCJvyGI/QJ4DjO6O0MaaTGBsxOp/YsqRaQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.14.tgz"; + sha512 = "DOe0+CZ2MKu8CDHplRwl9Nl9ubA7FvSV/wthdcHUZZuNP8UdAeD/Rst9ns5Nn3WnwEfgVgzWVLlhosJjC7IRow=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.13" = { + "@vue/cli-ui-addon-widgets-4.5.14" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.13"; + version = "4.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.13.tgz"; - sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.14.tgz"; + sha512 = "ejMRJG/YBlns22mFsCZGF127ZjORbsMhfTiK9Op2js8YTIYnDWyqd+ANS4M4erpRFM+P9nTJtn3/dhwusbGTKw=="; }; }; - "@vue/compiler-core-3.2.19" = { + "@vue/compiler-core-3.2.20" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.19"; + version = "3.2.20"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.19.tgz"; - sha512 = "8dOPX0YOtaXol0Zf2cfLQ4NU/yHYl2H7DCKsLEZ7gdvPK6ZSEwGLJ7IdghhY2YEshEpC5RB9QKdC5I07z8Dtjg=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.20.tgz"; + sha512 = "vcEXlKXoPwBXFP5aUTHN9GTZaDfwCofa9Yu9bbW2C5O/QSa9Esdt7OG4+0RRd3EHEMxUvEdj4RZrd/KpQeiJbA=="; }; }; - "@vue/compiler-dom-3.2.19" = { + "@vue/compiler-dom-3.2.20" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.19"; + version = "3.2.20"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.19.tgz"; - sha512 = "WzQoE8rfkFjPtIioc7SSgTsnz9g2oG61DU8KHnzPrRS7fW/lji6H2uCYJfp4Z6kZE8GjnHc1Ljwl3/gxDes0cw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.20.tgz"; + sha512 = "QnI77ec/JtV7R0YBbcVayYTDCRcI9OCbxiUQK6izVyqQO0658n0zQuoNwe+bYgtqnvGAIqTR3FShTd5y4oOjdg=="; }; }; - "@vue/shared-3.2.19" = { + "@vue/shared-3.2.20" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.19"; + version = "3.2.20"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.19.tgz"; - sha512 = "Knqhx7WieLdVgwCAZgTVrDCXZ50uItuecLh9JdLC8O+a5ayaSyIQYveUK3hCRNC7ws5zalHmZwfdLMGaS8r4Ew=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.20.tgz"; + sha512 = "FbpX+hD5BvXCQerEYO7jtAGHlhAkhTQ4KIV73kmLWNlawWhTiVuQxizgVb0BOkX5oG9cIRZ42EG++d/k/Efp0w=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -8437,31 +8653,31 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webpack-cli/configtest-1.0.4" = { + "@webpack-cli/configtest-1.1.0" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz"; - sha512 = "cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz"; + sha512 = "ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg=="; }; }; - "@webpack-cli/info-1.3.0" = { + "@webpack-cli/info-1.4.0" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz"; - sha512 = "ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz"; + sha512 = "F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw=="; }; }; - "@webpack-cli/serve-1.5.2" = { + "@webpack-cli/serve-1.6.0" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz"; - sha512 = "vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz"; + sha512 = "ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA=="; }; }; "@wry/context-0.6.1" = { @@ -8977,6 +9193,15 @@ let sha1 = "4d74628fc431b09cdcaa1fb2b23d1ec83c5d2f32"; }; }; + "acorn-1.2.2" = { + name = "acorn"; + packageName = "acorn"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; + sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + }; + }; "acorn-2.7.0" = { name = "acorn"; packageName = "acorn"; @@ -9049,6 +9274,15 @@ let sha512 = "yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="; }; }; + "acorn-class-fields-1.0.0" = { + name = "acorn-class-fields"; + packageName = "acorn-class-fields"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-class-fields/-/acorn-class-fields-1.0.0.tgz"; + sha512 = "l+1FokF34AeCXGBHkrXFmml9nOIRI+2yBnBpO5MaVAaTIJ96irWLtcCxX+7hAp6USHFCe+iyyBB4ZhxV807wmA=="; + }; + }; "acorn-globals-1.0.9" = { name = "acorn-globals"; packageName = "acorn-globals"; @@ -9130,6 +9364,24 @@ let sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; }; }; + "acorn-private-class-elements-1.0.0" = { + name = "acorn-private-class-elements"; + packageName = "acorn-private-class-elements"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-1.0.0.tgz"; + sha512 = "zYNcZtxKgVCg1brS39BEou86mIao1EV7eeREG+6WMwKbuYTeivRRs6S2XdWnboRde6G9wKh2w+WBydEyJsJ6mg=="; + }; + }; + "acorn-static-class-features-1.0.0" = { + name = "acorn-static-class-features"; + packageName = "acorn-static-class-features"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-static-class-features/-/acorn-static-class-features-1.0.0.tgz"; + sha512 = "XZJECjbmMOKvMHiNzbiPXuXpLAJfN3dAKtfIYbk1eHiWdsutlek+gS7ND4B8yJ3oqvHo1NxfafnezVmq7NXK0A=="; + }; + }; "acorn-walk-6.2.0" = { name = "acorn-walk"; packageName = "acorn-walk"; @@ -9202,22 +9454,31 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-3.14.0" = { + "addons-linter-3.20.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "3.14.0"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-3.14.0.tgz"; - sha512 = "vtumbG5Ma50K3JkQerx7Q03CfIYy4qZLl4jgwx42tdU8rSFy0vOWqr3t6pOnWD94r1dHAxcDoVglz2YcUrhBuQ=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-3.20.0.tgz"; + sha512 = "rHaahIZ34HSL1D7ZYCMs/QQPOp0pAnsOMqtNSy/zDSrkgVtlCQvSeMpx1a3ZnE2pGRVHjMIO506KWUmrN1lPRw=="; }; }; - "addons-scanner-utils-4.10.0" = { + "addons-moz-compare-1.2.0" = { + name = "addons-moz-compare"; + packageName = "addons-moz-compare"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/addons-moz-compare/-/addons-moz-compare-1.2.0.tgz"; + sha512 = "COG8qk2/dubPqabfcoJW4E7pm2EQDI43iMrHnhlobvq/uRMEzx/PYJ1KaUZ97Vgg44R3QdRG5CvDsTRbMUHcDw=="; + }; + }; + "addons-scanner-utils-5.0.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "4.10.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.10.0.tgz"; - sha512 = "QVpmVvcKuHHNEqz2aUKKqb5hA65xFSUP2aitkR8OSD2Fh1DGIBrVvjXP41nef3f2hLDJ+2oWrEK7toEK1wk2dQ=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-5.0.0.tgz"; + sha512 = "uENKmGryUeR07I1c8RonDZY/bkAG+zKfZ3T61JFusgY5wiARQJ5+8hI33m8sctXxPopjfxiIjHsG/g7cQzn4Yw=="; }; }; "addr-to-ip-port-1.5.4" = { @@ -9238,13 +9499,13 @@ let sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; }; }; - "adm-zip-0.5.7" = { + "adm-zip-0.5.9" = { name = "adm-zip"; packageName = "adm-zip"; - version = "0.5.7"; + version = "0.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.7.tgz"; - sha512 = "QLEo3eoC2B0i3+g/G5nNzKbGoVOjW2ingZ4TXl7/YeDM+FAl3SiHSNnokTZLFEuVHBn5CbZ42KJcIIsRji1EgQ=="; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz"; + sha512 = "s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg=="; }; }; "adverb-where-0.2.5" = { @@ -9319,6 +9580,15 @@ let sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; + "aggregate-error-4.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.0.tgz"; + sha512 = "8DGp7zUt1E9k0NE2q4jlXHk+V3ORErmwolEdRz9iV+LKJ40WhMHh92cxAvhqV2I+zEn/gotIoqoMs0NjF3xofg=="; + }; + }; "aglfn-1.0.2" = { name = "aglfn"; packageName = "aglfn"; @@ -9886,6 +10156,15 @@ let sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; }; }; + "ansi-styles-6.1.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz"; + sha512 = "VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ=="; + }; + }; "ansi-term-0.0.2" = { name = "ansi-term"; packageName = "ansi-term"; @@ -10030,13 +10309,13 @@ let sha512 = "y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA=="; }; }; - "apollo-datasource-3.1.0" = { + "apollo-datasource-3.2.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.1.0.tgz"; - sha512 = "ywcVjuWNo84eMB9uBOYygQI+00+Ne4ShyPIxJzT//sn1j1Fu3J+KStMNd6s1jyERWgjGZzxkiLn6nLmwsGymBg=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.2.0.tgz"; + sha512 = "2PK+p6dRFuQQM8F4JbBivGetnJxvb8ggQkY7XLeCSl4qVkBeBjX+mRtsiudk28NUTH3JEll7AgmKj2fHfxYpGQ=="; }; }; "apollo-graphql-0.9.3" = { @@ -10075,13 +10354,13 @@ let sha512 = "B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg=="; }; }; - "apollo-reporting-protobuf-3.0.0" = { + "apollo-reporting-protobuf-3.1.0" = { name = "apollo-reporting-protobuf"; packageName = "apollo-reporting-protobuf"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.0.0.tgz"; - sha512 = "jmCD+6gECt8KS7PxP460hztT/5URTbv2Kg0zgnR6iWPGce88IBmSUjcqf1Z6wJJq7Teb8Hu7WbyyMhn0vN5TxQ=="; + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.1.0.tgz"; + sha512 = "IP7SHrTQEGc1/RYzOihfcLLF56ALxxORywJj5ba/p1SX99y+Stt+6D5+3DA7XFF00C1BhXkIU+EkFHzPmypz0w=="; }; }; "apollo-server-caching-0.7.0" = { @@ -10093,13 +10372,13 @@ let sha512 = "MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw=="; }; }; - "apollo-server-caching-3.1.0" = { + "apollo-server-caching-3.2.0" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-3.1.0.tgz"; - sha512 = "bZ4bo0kSAsax9LbMQPlpuMTkQ657idF2ehOYe4Iw+8vj7vfAYa39Ii9IlaVAFMC1FxCYzLNFz+leZBm/Stn/NA=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-3.2.0.tgz"; + sha512 = "kR92WjoQVe1Z/EXyh365w6Vz8egkRCKmd3mE7KJvKgk+f0+AGO1LPPrez5IhbCXxAgChqzpHhq2FIyfOqEuLFQ=="; }; }; "apollo-server-core-2.25.2" = { @@ -10111,13 +10390,13 @@ let sha512 = "lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA=="; }; }; - "apollo-server-core-3.3.0" = { + "apollo-server-core-3.4.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.3.0.tgz"; - sha512 = "KmkzKVG3yjybouDyUX6Melv39u1EOFipvAKP17IlPis/TjVbubJmb6hkE0am/g2RipyhRvlpxAjHqPaCTXR1dQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.4.0.tgz"; + sha512 = "CbQTgoeijCdfaTFq3DHBrnWtat1M/SlPxS365iy2fb2/p4zbYatOA/S0RON7PMGp2gcMnopvOtokJIOxbNN/YA=="; }; }; "apollo-server-env-3.1.0" = { @@ -10129,13 +10408,13 @@ let sha512 = "iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ=="; }; }; - "apollo-server-env-4.0.3" = { + "apollo-server-env-4.1.0" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.0.3.tgz"; - sha512 = "B32+RUOM4GUJAwnQqQE1mT1BG7+VfW3a0A87Bp3gv/q8iNnhY2BIWe74Qn03pX8n27g3EGVCt0kcBuHhjG5ltA=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.1.0.tgz"; + sha512 = "pJIqIN7UXYDHcNY/IRi7H9AvdV+aHi96gv/nPmnLsP/LbWMJvMuQY3jQ2obW0P+rO3bx05oYHLsVjwHHaXlEQA=="; }; }; "apollo-server-errors-2.5.0" = { @@ -10147,13 +10426,13 @@ let sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; }; }; - "apollo-server-errors-3.1.0" = { + "apollo-server-errors-3.2.0" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.1.0.tgz"; - sha512 = "bUmobPEvtcBFt+OVHYqD390gacX/Cm5s5OI5gNZho8mYKAA6OjgnRlkm/Lti6NzniXVxEQyD5vjkC6Ox30mGFg=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.2.0.tgz"; + sha512 = "Y7YH3JVAaR1199ao4dae3j1UrF9D/6AJwHpsORTjI3BvrwjU1X7Nk1VvEHn9bZfZF6ONaqUM+uCLm5c8GPhffQ=="; }; }; "apollo-server-express-2.25.2" = { @@ -10165,13 +10444,13 @@ let sha512 = "A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ=="; }; }; - "apollo-server-express-3.3.0" = { + "apollo-server-express-3.4.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.3.0.tgz"; - sha512 = "qJedh77IxbfT+HpYsDraC2CGdy08wiWTwoKYXjRK4S/DHbe94A4957/1blw4boYO4n44xRKQd1k6zxiixCp+XQ=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.4.0.tgz"; + sha512 = "+J7Nu+I+JLCEnBQrQAzKmZfguHo9GQNb6XJZYuNlg9jdcomAvJpEJW5SKujXiGCT9CCIB6jvf8s102pJvBC9TQ=="; }; }; "apollo-server-plugin-base-0.13.0" = { @@ -10183,13 +10462,13 @@ let sha512 = "L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg=="; }; }; - "apollo-server-plugin-base-3.2.0" = { + "apollo-server-plugin-base-3.3.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.2.0.tgz"; - sha512 = "anjyiw79wxU4Cj2bYZFWQqZPjuaZ4mVJvxCoyvkFrNvjPua9dovCOfpng43C5NwdsqJpz78Vqs236eFM2QoeaA=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.3.0.tgz"; + sha512 = "4a4KpePhoU9FAIN2YjWm1Cfl7Y3AyRXLH8ZncSRCDcQFWww8gc/ZGqWZ+udRo4ejKvzLjnTwVyxfrd80sf9sHw=="; }; }; "apollo-server-types-0.9.0" = { @@ -10201,13 +10480,13 @@ let sha512 = "qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg=="; }; }; - "apollo-server-types-3.2.0" = { + "apollo-server-types-3.3.0" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.2.0.tgz"; - sha512 = "Fh7QP84ufDZHbLzoLyyxyzznlW8cpgEZYYkGsS1i36zY4VaAt5OUOp1f+FxWdLGehq0Arwb6D1W7y712IoZ/JQ=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.3.0.tgz"; + sha512 = "m+GyuXyuZ7YdZO1NIMJdJoOKsocCPx/WRVzBjDegYxNcAa/lDvNYU3hFyX87UGXt8Xsd9VIHxdhO88S6jkgCmw=="; }; }; "apollo-tracing-0.15.0" = { @@ -10462,6 +10741,15 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; + "argsarray-0.0.1" = { + name = "argsarray"; + packageName = "argsarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz"; + sha1 = "6e7207b4ecdb39b0af88303fa5ae22bda8df61cb"; + }; + }; "aribts-1.3.5" = { name = "aribts"; packageName = "aribts"; @@ -10921,6 +11209,15 @@ let sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="; }; }; + "arrify-3.0.0" = { + name = "arrify"; + packageName = "arrify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz"; + sha512 = "tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw=="; + }; + }; "as-array-1.0.0" = { name = "as-array"; packageName = "as-array"; @@ -11146,6 +11443,15 @@ let sha512 = "O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA=="; }; }; + "ast-types-0.8.15" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.8.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.8.15.tgz"; + sha1 = "8eef0827f04dff0ec8857ba925abe3fea6194e52"; + }; + }; "ast-types-0.9.6" = { name = "ast-types"; packageName = "ast-types"; @@ -11272,13 +11578,13 @@ let sha512 = "XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="; }; }; - "async-append-only-log-3.1.0" = { + "async-append-only-log-3.1.1" = { name = "async-append-only-log"; packageName = "async-append-only-log"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.1.0.tgz"; - sha512 = "vEnzpbpfnMvWK7xweZ4mX+Y4H6eYMtEvVLctsLleXjN3lWewCcGxPxSAscBq05MxH3Veh7q9JHnOfuOIoeJYVw=="; + url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.1.1.tgz"; + sha512 = "lYRaqf2GHt5ojw/jyGZqiHUSG3MJ3sZTUOPTsDUSVsuZhdJkIBL6jSowM437dqFnWtj7VXqYXZxl7E9SiVv+WA=="; }; }; "async-done-1.3.2" = { @@ -11596,13 +11902,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1000.0" = { + "aws-sdk-2.1009.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1000.0"; + version = "2.1009.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1000.0.tgz"; - sha512 = "PhL4WPIJ5fyOBbmWdEaskD6+qvu9VD4kVLEBK/SchcZXmivUKhED3POR6dbfskhwTksxwkrwa6G4NNI3yY7d1g=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1009.0.tgz"; + sha512 = "qKbmt+vzQ7ZSnfEvA+u6d7CkV09AcAGnxZAiNgOAEn8GFFEtERy6C39VoAuWfON/B2avJDYvtRocjVmAxWpgjQ=="; }; }; "aws-sdk-2.920.0" = { @@ -11668,6 +11974,24 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; + "axios-0.22.0" = { + name = "axios"; + packageName = "axios"; + version = "0.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz"; + sha512 = "Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w=="; + }; + }; + "axios-cookiejar-support-0.5.1" = { + name = "axios-cookiejar-support"; + packageName = "axios-cookiejar-support"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/axios-cookiejar-support/-/axios-cookiejar-support-0.5.1.tgz"; + sha512 = "mmMbNDjpkAKlyxVOYjkpvV6rDRoSjBXwHbfkWvnsplRTGYCergbHvZInRB1G3lqumllUQwo0A4uPoqEsYfzq3A=="; + }; + }; "azure-devops-node-api-11.0.1" = { name = "azure-devops-node-api"; packageName = "azure-devops-node-api"; @@ -12361,6 +12685,15 @@ let sha1 = "7b4174c2f94449753b11c2651c083da841a7b084"; }; }; + "base62-1.2.8" = { + name = "base62"; + packageName = "base62"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/base62/-/base62-1.2.8.tgz"; + sha512 = "V6YHUbjLxN1ymqNLb1DPHoU1CpfdL7d2YTIp5W3U4hhoG4hhxNmsFDs66M9EXxBiSEke5Bt5dwdfMwwZF70iLA=="; + }; + }; "base64-arraybuffer-0.1.2" = { name = "base64-arraybuffer"; packageName = "base64-arraybuffer"; @@ -12388,6 +12721,15 @@ let sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; }; }; + "base64-arraybuffer-1.0.1" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz"; + sha512 = "vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="; + }; + }; "base64-js-0.0.2" = { name = "base64-js"; packageName = "base64-js"; @@ -12514,13 +12856,13 @@ let sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; }; }; - "bcfg-0.1.6" = { + "bcfg-0.1.7" = { name = "bcfg"; packageName = "bcfg"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/bcfg/-/bcfg-0.1.6.tgz"; - sha512 = "BR2vwQZwu24aRm588XHOnPVjjQtbK8sF0RopRFgMuke63/REJMWnePTa2YHKDBefuBYiVdgkowuB1/e4K7Ue3g=="; + url = "https://registry.npmjs.org/bcfg/-/bcfg-0.1.7.tgz"; + sha512 = "+4beq5bXwfmxdcEoHYQsaXawh1qFzjLcRvPe5k5ww/NEWzZTm56Jk8LuPmfeGB7X584jZ8xGq6UgMaZnNDa5Ww=="; }; }; "bcrypt-5.0.1" = { @@ -12793,13 +13135,13 @@ let sha512 = "j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="; }; }; - "big-integer-1.6.49" = { + "big-integer-1.6.50" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.49"; + version = "1.6.50"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.49.tgz"; - sha512 = "KJ7VhqH+f/BOt9a3yMwJNmcZjG53ijWMTjSAGMveQWyLwqIiwkjNP5PFgDob3Snnx86SjDj6I89fIbv0dkQeNw=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz"; + sha512 = "+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ=="; }; }; "big.js-3.2.0" = { @@ -12856,13 +13198,13 @@ let sha1 = "dd3a862b2fedf66fee8471320069428d0d84427a"; }; }; - "bin-links-2.2.1" = { + "bin-links-2.3.0" = { name = "bin-links"; packageName = "bin-links"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/bin-links/-/bin-links-2.2.1.tgz"; - sha512 = "wFzVTqavpgCCYAh8SVBdnZdiQMxTkGR+T3b14CNpBXIBe2neJWaMGAZ55XWWHELJJ89dscuq0VCBqcVaIOgCMg=="; + url = "https://registry.npmjs.org/bin-links/-/bin-links-2.3.0.tgz"; + sha512 = "JzrOLHLwX2zMqKdyYZjkDgQGT+kHDkIhv2/IK2lJ00qLxV4TmFoHi8drDBb6H5Zrz1YfgHkai4e2MGPqnoUhqA=="; }; }; "bin-version-3.1.0" = { @@ -13270,13 +13612,13 @@ let sha512 = "S3jE7riCbWnAK8OT+ta4Z8RX/X6nfISxzn0SDIMFYuY90qUwqx7w7e9fIsc2m2ODwma7dFcXNwGSjyayfKd1DQ=="; }; }; - "blgr-0.1.9" = { + "blgr-0.2.0" = { name = "blgr"; packageName = "blgr"; - version = "0.1.9"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/blgr/-/blgr-0.1.9.tgz"; - sha512 = "ikJQoiQlhbJVIqcJ+CZxXXLD/et4bQ47/pdGpjdTq1p43qF5jfXtbWygZyWm05MInFruUicnw+U0oaoDgLx3PA=="; + url = "https://registry.npmjs.org/blgr/-/blgr-0.2.0.tgz"; + sha512 = "2jZdqajYCGD5rwGdOooQpxgjKsiAAV2g8LapwSnbTjAYTZAqmqBAS+GsVGFi+/y7t1Pspidv/5HsWBbJrsEuFw=="; }; }; "blob-0.0.2" = { @@ -13468,13 +13810,13 @@ let sha1 = "e16661697452d436bf9886238cc791b08d66a61a"; }; }; - "bns-0.14.0" = { + "bns-0.15.0" = { name = "bns"; packageName = "bns"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/bns/-/bns-0.14.0.tgz"; - sha512 = "lqxDpj9gX7OtihwAzMhlMk0w38ObZu+aRSF9fzG/wUfF6RfocFSFDGHA+KVbLNXudiTStzhWVGc8cJmcL4IHYw=="; + url = "https://registry.npmjs.org/bns/-/bns-0.15.0.tgz"; + sha512 = "iJWQVE399vQzPfhalFMJGEQ7k5Ot2D6Mz8dkoPeLO8huWAMOiJNJ1tHzOu5j+ZyNNew6ITgG/LsSyaRPxvkXuw=="; }; }; "bodec-0.1.0" = { @@ -14062,13 +14404,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.17.3" = { + "browserslist-4.17.4" = { name = "browserslist"; packageName = "browserslist"; - version = "4.17.3"; + version = "4.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz"; - sha512 = "59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.4.tgz"; + sha512 = "Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ=="; }; }; "brq-0.1.8" = { @@ -14378,6 +14720,24 @@ let sha512 = "RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="; }; }; + "buffer-from-1.1.0" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; + sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; + }; + }; + "buffer-from-1.1.1" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + }; "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; @@ -14495,13 +14855,13 @@ let sha1 = "69fdf13ad9d91222baee109945faadc431534f86"; }; }; - "bufferutil-4.0.4" = { + "bufferutil-4.0.5" = { name = "bufferutil"; packageName = "bufferutil"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.4.tgz"; - sha512 = "VNxjXUCrF3LvbLgwfkTb5LsFvk6pGIn7OBb9x+3o+iJ6mKw0JTUp4chBFc88hi1aspeZGeZG9jAIbpFYPQSLZw=="; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.5.tgz"; + sha512 = "HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A=="; }; }; "bufferview-1.0.1" = { @@ -15080,6 +15440,15 @@ let sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; }; }; + "camelcase-keys-7.0.1" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.1.tgz"; + sha512 = "P331lEls98pW8JLyodNWfzuz91BEDVA4VpW2/SwXnyv2K495tq1N777xzDbFgnEigfA7UIY0xa6PwR/H9jijjA=="; + }; + }; "camelize-1.0.0" = { name = "camelize"; packageName = "camelize"; @@ -15098,13 +15467,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001264" = { + "caniuse-lite-1.0.30001267" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001264"; + version = "1.0.30001267"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001264.tgz"; - sha512 = "Ftfqqfcs/ePiUmyaySsQ4PUsdcYyXG2rfoBVsk3iY1ahHaJEw65vfb7Suzqm+cEkwwPIv/XWkg27iCpRavH4zA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001267.tgz"; + sha512 = "r1mjTzAuJ9W8cPBGbbus8E0SKcUP7gn03R14Wk8FlAlqhH9hroy9nLqmpuXlfKEw/oILW+FGz47ipXV2O7x8lg=="; }; }; "canvas-2.8.0" = { @@ -15116,13 +15485,13 @@ let sha512 = "gLTi17X8WY9Cf5GZ2Yns8T5lfBOcGgFehDFb+JQwDqdOoBOcECS9ZWMEAqMSVcMYwXD659J8NyzjRY/2aE+C2Q=="; }; }; - "canvg-3.0.9" = { + "canvg-3.0.7" = { name = "canvg"; packageName = "canvg"; - version = "3.0.9"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/canvg/-/canvg-3.0.9.tgz"; - sha512 = "rDXcnRPuz4QHoCilMeoTxql+fvGqNAxp+qV/KHD8rOiJSAfVjFclbdUNHD2Uqfthr+VMg17bD2bVuk6F07oLGw=="; + url = "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz"; + sha512 = "4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA=="; }; }; "caporal-1.4.0" = { @@ -15269,22 +15638,22 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.57" = { + "cdk8s-1.1.3" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.57"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.57.tgz"; - sha512 = "AP0T2s0HubyA1riQ5m6c7ccwMqREhFD6xMZSmv4PTEfhMsx6IhUOjWnRMvrYm9MBMB47Gt1xxeUmKIq3EkurNw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.3.tgz"; + sha512 = "ZmFZYlv0ZgErU6GC4nnANZPXeLnsjX3h0tJgw6k1GI4VgadeC27UffGhTeMZOMXn4iTHOT2XmR2GTx0DHge4UA=="; }; }; - "cdk8s-plus-22-1.0.0-beta.9" = { + "cdk8s-plus-22-1.0.0-beta.21" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.9"; + version = "1.0.0-beta.21"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.9.tgz"; - sha512 = "j8I0b0yJ182mcSgF5KB0mIjjgqbmVUMJQQgajpTtgNzuko9HsYQfK+uFT29ua1PyFTtn8FHQLOT/goYJjg1SEQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.21.tgz"; + sha512 = "kprRywa6rIKlBNMlwCAS8+Y+zNRldwPVU1PYeoa1APy8r96ZvrfE1VdRfpO08r1JTS8oEAyQOzKw2oswXGyxgA=="; }; }; "cdktf-0.6.4" = { @@ -16115,6 +16484,15 @@ let sha512 = "lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg=="; }; }; + "clean-stack-4.1.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-4.1.0.tgz"; + sha512 = "dxXQYI7mfQVcaF12s6sjNFoZ6ZPDQuBBLp3QJ5156k9EvUFClUoZ11fo8HnLQO241DDVntHEug8MOuFO5PSfRg=="; + }; + }; "clean-webpack-plugin-3.0.0" = { name = "clean-webpack-plugin"; packageName = "clean-webpack-plugin"; @@ -16169,13 +16547,13 @@ let sha512 = "xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w=="; }; }; - "cli-color-2.0.0" = { + "cli-color-2.0.1" = { name = "cli-color"; packageName = "cli-color"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-color/-/cli-color-2.0.0.tgz"; - sha512 = "a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A=="; + url = "https://registry.npmjs.org/cli-color/-/cli-color-2.0.1.tgz"; + sha512 = "eBbxZF6fqPUNnf7CLAFOersUnyYzv83tHFLSlts+OAHsNendaqv2tHCq+/MO+b3Y+9JeoUlIvobyxG/Z8GNeOg=="; }; }; "cli-cursor-1.0.2" = { @@ -16340,6 +16718,15 @@ let sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; }; + "cli-truncate-3.1.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz"; + sha512 = "wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA=="; + }; + }; "cli-ux-4.9.3" = { name = "cli-ux"; packageName = "cli-ux"; @@ -16430,6 +16817,15 @@ let sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; }; }; + "clipboardy-3.0.0" = { + name = "clipboardy"; + packageName = "clipboardy"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-3.0.0.tgz"; + sha512 = "Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg=="; + }; + }; "clipper-lib-6.4.2" = { name = "clipper-lib"; packageName = "clipper-lib"; @@ -16817,13 +17213,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.36.0" = { + "codemaker-1.39.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.36.0"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.36.0.tgz"; - sha512 = "Ey1aIPW5OkkKyRcqoWE61MAc5ghfDrnxysGUmauTy0RyL6sXPjYuxZXQWjqsHHQ35fCH5i7/rifoifE+jkZQhQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.39.0.tgz"; + sha512 = "1PPD7ZCC05nrkN47elPcno3zm4Md7XSkG52CvIbNsEcXddc0Ma2xgoMZnWPu+Ab6801FunSqov9X4O+OZle95A=="; }; }; "codepage-1.4.0" = { @@ -16979,13 +17375,13 @@ let sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; }; }; - "colorette-2.0.14" = { + "colorette-2.0.16" = { name = "colorette"; packageName = "colorette"; - version = "2.0.14"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-2.0.14.tgz"; - sha512 = "TLcu0rCLNjDIdKGLGqMtPEAOAZmavC1QCX4mEs3P0mrA/DDoU/tA+Y4UQK/862FkX2TTlbyVIkREZNbf7Y9YwA=="; + url = "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz"; + sha512 = "hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="; }; }; "colorette-2.0.7" = { @@ -17879,22 +18275,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.5" = { + "constructs-10.0.9" = { name = "constructs"; packageName = "constructs"; - version = "10.0.5"; + version = "10.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.5.tgz"; - sha512 = "IwOwekzrASFC3qt4ozCtV09rteAIAesuCGsW0p+uBfqHd2XcvA5CXqJjgf4eUqm6g8e/noXlVCMDWwC8GaLtrg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.9.tgz"; + sha512 = "C9la/fcnCKe3XIjKPbWuD49mnOYqSWdiMI6TNJmF0ao3pJw6Hap03Q4nsmCxpWMXuMzM546Kw/WnW7ElB3g4OA=="; }; }; - "constructs-3.3.156" = { + "constructs-3.3.161" = { name = "constructs"; packageName = "constructs"; - version = "3.3.156"; + version = "3.3.161"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.156.tgz"; - sha512 = "rlgYsGqXLi3tMSVz251MvzFjXXBCrGPy/8pIfjeh2fuBjPsvIx9I6AMNHnlhEVaEt7YRPHHuYKoVs1488ifAWA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.161.tgz"; + sha512 = "/27vW3fo0iyb3py4vKI1BduEYmv8vv8uJgLXvI+5F0Jbnn0/E+As2wkGMa7bumhzCd0Ckv/USkAXstGYVXTYQA=="; }; }; "consume-http-header-1.0.0" = { @@ -17970,22 +18366,22 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.42.0" = { + "contentful-management-7.44.1" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.42.0"; + version = "7.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.42.0.tgz"; - sha512 = "Ux0l6iUEG1Tnc1Vl89jXEwddsRfo8/v06pFTpA/+N6tGdTvwF3RtQWLOpVxKWuy+9NK5TJh4oUnpc+zPsynoQA=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.44.1.tgz"; + sha512 = "N6cRMl2O7bkpIulPe0nQD78uVC8uaWQBm0XeDnmfUFJHVrPsaU0ix2QR2TjLsFKu6OT6nqxeyl0RS+dlboDV5A=="; }; }; - "contentful-sdk-core-6.10.1" = { + "contentful-sdk-core-6.10.3" = { name = "contentful-sdk-core"; packageName = "contentful-sdk-core"; - version = "6.10.1"; + version = "6.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.10.1.tgz"; - sha512 = "q1dh5AHL3FoBc3CZThQMtnaxgFbs9BrJW8wDysdp/IT/Q2edgUQASh2fvj02T6cCh3ftMspRRe/HMfZDF9FfIQ=="; + url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.10.3.tgz"; + sha512 = "IUBkAU1sJuVaEa2Nv1NKK5ImqpBZ5Q3EmaCFmMZx/UHKa+i98nDCSTUBOL1aJnpZ/s3AaSramsh73VQ4aK2kyA=="; }; }; "continuable-1.1.8" = { @@ -18447,13 +18843,13 @@ let sha512 = "bxXk6H3FtGXpCtlO+XyXM4pa72azQomdurNeHbZai9eYBzA5vjyPnsgxsYcylLUc1wQFeR+XWQVfgJitx6ghEw=="; }; }; - "cordova-lib-10.0.0" = { + "cordova-lib-10.1.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.0.0.tgz"; - sha512 = "azU/WH0x/3fQg33tU5bKCtj+Weh/bHelz9FWCVdXqVOHXmjzbi3p6p61z5Si967Tfh3TkmHRrodNxS0ovZ7iFQ=="; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.1.0.tgz"; + sha512 = "JY/r/5RKRjgrjJ1a8z0x/NEU33/97mTFB76PCCcvQOySnmZ0rygRBYmwl2+XwFuUR0LP+fnbieePv6LiPc9UkA=="; }; }; "cordova-serve-4.0.0" = { @@ -18474,40 +18870,40 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.17.2" = { + "core-js-3.18.0" = { name = "core-js"; packageName = "core-js"; - version = "3.17.2"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.17.2.tgz"; - sha512 = "XkbXqhcXeMHPRk2ItS+zQYliAMilea2euoMsnpRRdDad6b2VY6CQQcwz1K8AnWesfw4p165RzY0bTnr3UrbYiA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.18.0.tgz"; + sha512 = "WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w=="; }; }; - "core-js-3.18.1" = { + "core-js-3.18.3" = { name = "core-js"; packageName = "core-js"; - version = "3.18.1"; + version = "3.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.18.1.tgz"; - sha512 = "vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.18.3.tgz"; + sha512 = "tReEhtMReZaPFVw7dajMx0vlsz3oOb8ajgPoHVYGxr8ErnZ6PcYEvvmjGmXlfpnxpkYSdOQttjB+MvVbCGfvLw=="; }; }; - "core-js-compat-3.18.1" = { + "core-js-compat-3.18.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.18.1"; + version = "3.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.1.tgz"; - sha512 = "XJMYx58zo4W0kLPmIingVZA10+7TuKrMLPt83+EzDmxFJQUMcTVVmQ+n5JP4r6Z14qSzhQBRi3NSWoeVyKKXUg=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.3.tgz"; + sha512 = "4zP6/y0a2RTHN5bRGT7PTq9lVt3WzvffTNjqnTKsXhkAYNDTkdCLOIfAdOLcQ/7TDdyRj3c+NeHe1NmF1eDScw=="; }; }; - "core-js-pure-3.18.1" = { + "core-js-pure-3.18.3" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.18.1"; + version = "3.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.18.1.tgz"; - sha512 = "kmW/k8MaSuqpvA1xm2l3TVlBuvW+XBkcaOroFUpO3D4lsTGQWBTb/tBDCf/PNkkPLrwgrkQRIYNPB0CeqGJWGQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.18.3.tgz"; + sha512 = "qfskyO/KjtbYn09bn1IPkuhHl5PlJ6IzJ9s9sraJ1EqcuGyLGKzhSM1cY0zgyL9hx42eulQLZ6WaeK5ycJCkqw=="; }; }; "core-util-is-1.0.2" = { @@ -19221,13 +19617,13 @@ let sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; }; }; - "css-what-5.0.1" = { + "css-what-5.1.0" = { name = "css-what"; packageName = "css-what"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz"; - sha512 = "FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg=="; + url = "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz"; + sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; }; }; "cssauron-1.4.0" = { @@ -19356,6 +19752,15 @@ let sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; }; }; + "cssom-0.5.0" = { + name = "cssom"; + packageName = "cssom"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz"; + sha512 = "iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="; + }; + }; "cssstyle-0.2.37" = { name = "cssstyle"; packageName = "cssstyle"; @@ -20571,6 +20976,15 @@ let sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; }; }; + "data-urls-3.0.1" = { + name = "data-urls"; + packageName = "data-urls"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/data-urls/-/data-urls-3.0.1.tgz"; + sha512 = "Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw=="; + }; + }; "dataloader-2.0.0" = { name = "dataloader"; packageName = "dataloader"; @@ -22335,13 +22749,13 @@ let sha512 = "QgcYXSZFBBbPuiQskEAVnW3qSShSCSisLNt2wQZXupBQ/x1lFIyvVfWXk4OQqWoatHyAfUBiXDNx9eRXkmSALQ=="; }; }; - "doctoc-2.0.1" = { + "doctoc-2.1.0" = { name = "doctoc"; packageName = "doctoc"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctoc/-/doctoc-2.0.1.tgz"; - sha512 = "JsxnSVZtLCThKehjFPBDhP1+ZLmdfXQynZH/0ABAwrnd1Zf3AV6LigC9oWJyaZ+c6RXCDnlGUNJ7I+1v8VaaRg=="; + url = "https://registry.npmjs.org/doctoc/-/doctoc-2.1.0.tgz"; + sha512 = "0darEVEuWKLyIlpGOzE5cILf/pgUu25qUs6YwCqLqfxb8+3b9Cl4iakA8vwYrBQOkJ5SwpHKEPVMu2KOMrTA7A=="; }; }; "doctrine-2.1.0" = { @@ -22524,6 +22938,15 @@ let sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; }; }; + "domexception-4.0.0" = { + name = "domexception"; + packageName = "domexception"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz"; + sha512 = "A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw=="; + }; + }; "domhandler-2.2.1" = { name = "domhandler"; packageName = "domhandler"; @@ -22578,15 +23001,6 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "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=="; - }; - }; "dompurify-2.3.3" = { name = "dompurify"; packageName = "dompurify"; @@ -23091,13 +23505,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.5.1" = { + "electron-13.5.2" = { name = "electron"; packageName = "electron"; - version = "13.5.1"; + version = "13.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.5.1.tgz"; - sha512 = "ZyxhIhmdaeE3xiIGObf0zqEyCyuIDqZQBv9NKX8w5FNzGm87j4qR0H1+GQg6vz+cA1Nnv1x175Zvimzc0/UwEQ=="; + url = "https://registry.npmjs.org/electron/-/electron-13.5.2.tgz"; + sha512 = "CPakwDpy5m8dL0383F5uJboQcVtn9bT/+6/wdDKo8LuTUO9aER1TF41v7feZgZW2c+UwoGPWa814ElSQ3qta2A=="; }; }; "electron-notarize-1.1.1" = { @@ -23136,13 +23550,13 @@ let sha512 = "9oxNmKlDCaf651c+yJWCDIBpF6A9aY+wQtasLEeR5AsPYPuOKEX6xHnC2+WgCLOC94JEpCZznecyC84fbwZq4A=="; }; }; - "electron-to-chromium-1.3.859" = { + "electron-to-chromium-1.3.870" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.859"; + version = "1.3.870"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.859.tgz"; - sha512 = "gXRXKNWedfdiKIzwr0Mg/VGCvxXzy+4SuK9hp1BDvfbCwx0O5Ot+2f4CoqQkqEJ3Zj/eAV/GoAFgBVFgkBLXuQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.870.tgz"; + sha512 = "PiJMshfq6PL+i1V+nKLwhHbCKeD8eAz8rvO9Cwk/7cChOHJBtufmjajLyYLsSRHguRFiOCVx3XzJLeZsIAYfSA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23507,13 +23921,13 @@ let sha512 = "aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w=="; }; }; - "engine.io-5.2.0" = { + "engine.io-6.0.0" = { name = "engine.io"; packageName = "engine.io"; - version = "5.2.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-5.2.0.tgz"; - sha512 = "d1DexkQx87IFr1FLuV+0f5kAm1Hk1uOVijLOb+D1sDO2QMb7YjE02VHtZtxo7xIXMgcWLb+vl3HRT0rI9tr4jQ=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.0.0.tgz"; + sha512 = "Ui7yl3JajEIaACg8MOUwWvuuwU7jepZqX3BKs1ho7NQRuP4LhN4XIykXhp8bEy+x/DhA0LBZZXYSCkZDqrwMMg=="; }; }; "engine.io-client-1.3.1" = { @@ -23588,6 +24002,15 @@ let sha512 = "xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA=="; }; }; + "engine.io-parser-5.0.0" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.0.tgz"; + sha512 = "wn6QavHEqXoM+cg+x8uUG7GhxLBCfKEKNEsCNc7V2ugj3gB3lK91l1MuZiy6xFB2V9D1eew0aWkmpiT/aBb/KA=="; + }; + }; "enhanced-resolve-2.3.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -23867,13 +24290,13 @@ let sha512 = "MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw=="; }; }; - "es-module-lexer-0.9.2" = { + "es-module-lexer-0.9.3" = { name = "es-module-lexer"; packageName = "es-module-lexer"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.2.tgz"; - sha512 = "YkAGWqxZq2B4FxQ5y687UwywDwvLQhIMCZ+SDU7ZW729SDHOEI6wVFXwTRecz+yiwJzCsVwC6V7bxyNbZSB1rg=="; + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"; + sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; }; }; "es-to-primitive-1.2.1" = { @@ -23885,6 +24308,15 @@ let sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; + "es3ify-0.2.2" = { + name = "es3ify"; + packageName = "es3ify"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es3ify/-/es3ify-0.2.2.tgz"; + sha1 = "5dae3e650e5be3684b88066513d528d092629862"; + }; + }; "es5-ext-0.10.53" = { name = "es5-ext"; packageName = "es5-ext"; @@ -24029,13 +24461,13 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esc-exit-2.0.2" = { + "esc-exit-3.0.0" = { name = "esc-exit"; packageName = "esc-exit"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/esc-exit/-/esc-exit-2.0.2.tgz"; - sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; + url = "https://registry.npmjs.org/esc-exit/-/esc-exit-3.0.0.tgz"; + sha512 = "b/3X0RwP3Oq0C/SLVwsGkdOWIAigA1BRpF1ArZSI6+KCqp7kgtxh0lB57jhDIYOyRxlP3QPtI8DHxOrPvnFbRg=="; }; }; "escalade-3.1.1" = { @@ -24119,6 +24551,15 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; + "escape-string-regexp-5.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz"; + sha512 = "/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="; + }; + }; "escodegen-1.14.3" = { name = "escodegen"; packageName = "escodegen"; @@ -24227,13 +24668,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.19.0" = { + "eslint-plugin-vue-7.19.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.19.0"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.19.0.tgz"; - sha512 = "pqsJY1q0cjdQerWSlGHo+NfnWZ8Xuc5tetddljJJ7726auWsnHty7F5qgj/EcjkPgyj8s5Lw4YGuhsFHkzIrkQ=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.19.1.tgz"; + sha512 = "e2pD7nW2sTY04ThH+66BgToNwC4n6dqfNhKE+ypdJFtZgn3Zn+nP8ZEIFPG0PGqCKQ3qxy8dJk1bzUsuQd3ANA=="; }; }; "eslint-scope-3.7.3" = { @@ -24263,6 +24704,15 @@ let sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; + "eslint-scope-6.0.0" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-6.0.0.tgz"; + sha512 = "uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA=="; + }; + }; "eslint-utils-1.4.3" = { name = "eslint-utils"; packageName = "eslint-utils"; @@ -24326,6 +24776,15 @@ let sha1 = "d9bb37b8f8eafbf4e6d4ed6b7aa2956abbd3c4c2"; }; }; + "esmangle-evaluator-1.0.1" = { + name = "esmangle-evaluator"; + packageName = "esmangle-evaluator"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esmangle-evaluator/-/esmangle-evaluator-1.0.1.tgz"; + sha1 = "620d866ef4861b3311f75766d52a8572bb3c6336"; + }; + }; "esniff-1.1.0" = { name = "esniff"; packageName = "esniff"; @@ -24371,13 +24830,13 @@ let sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; - "espree-8.0.0" = { + "espree-9.0.0" = { name = "espree"; packageName = "espree"; - version = "8.0.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-8.0.0.tgz"; - sha512 = "y/+i23dwTjIDJrYCcjcAMr3c3UGbPIjC6THMQKjWmhP97fW0FPiI89kmpKfmgV/5jrkIi6toQP+CMm3qBE1Hig=="; + url = "https://registry.npmjs.org/espree/-/espree-9.0.0.tgz"; + sha512 = "r5EQJcYZ2oaGbeR0jR0fFVijGOcwai07/690YRXLINuhmVeRY4UKSAsQPe/0BNuDgwP7Ophoc1PRsr2E3tkbdQ=="; }; }; "esprima-1.1.1" = { @@ -24443,6 +24902,24 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; + "esprima-fb-15001.1.0-dev-harmony-fb" = { + name = "esprima-fb"; + packageName = "esprima-fb"; + version = "15001.1.0-dev-harmony-fb"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz"; + sha1 = "30a947303c6b8d5e955bee2b99b1d233206a6901"; + }; + }; + "esprima-fb-15001.1001.0-dev-harmony-fb" = { + name = "esprima-fb"; + packageName = "esprima-fb"; + version = "15001.1001.0-dev-harmony-fb"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz"; + sha1 = "43beb57ec26e8cf237d3dd8b33e42533577f2659"; + }; + }; "esquery-1.4.0" = { name = "esquery"; packageName = "esquery"; @@ -24605,13 +25082,13 @@ let sha512 = "w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ=="; }; }; - "ethereumjs-util-7.1.2" = { + "ethereumjs-util-7.1.3" = { name = "ethereumjs-util"; packageName = "ethereumjs-util"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.2.tgz"; - sha512 = "xCV3PTAhW8Q2k88XZn9VcO4OrjpeXAlDm5LQTaOLp81SjNSSY6+MwuGXrx6vafOMheWSmZGxIXUbue5e9UvUBw=="; + url = "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.3.tgz"; + sha512 = "y+82tEbyASO0K0X1/SRhbJJoAlfcvq8JbrG4a5cjrOks7HS/36efU/0j2flxCPOUM++HFahk33kr/ZxyC4vNuw=="; }; }; "ethjs-unit-0.1.6" = { @@ -24623,15 +25100,6 @@ let sha1 = "c665921e476e87bce2a9d588a6fe0405b2c41699"; }; }; - "ethjs-util-0.1.6" = { - name = "ethjs-util"; - packageName = "ethjs-util"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz"; - sha512 = "CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w=="; - }; - }; "eve-0.5.4" = { name = "eve"; packageName = "eve"; @@ -25280,13 +25748,13 @@ let sha1 = "f5fc2f9fa9e9a8578634f10e86ba5a4346b96f4f"; }; }; - "express-validator-6.12.2" = { + "express-validator-6.13.0" = { name = "express-validator"; packageName = "express-validator"; - version = "6.12.2"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-validator/-/express-validator-6.12.2.tgz"; - sha512 = "UMVck7ZWrKH7eX75CRYk/pAc9jxZk8Ddsdkukw1R7LTWuQNiDaooz6nVfIdg33qZUHCuv2m2o+RS4pTMaLjGmA=="; + url = "https://registry.npmjs.org/express-validator/-/express-validator-6.13.0.tgz"; + sha512 = "gvLqMFPwEm+C1CQlF3l695ubY1Shd3AtfI5JDYXM0Ju0A2GsGX+VjjQN7TcHXF6cO8wPgU8hSSFqWecBR0Gx1g=="; }; }; "express-ws-2.0.0" = { @@ -25559,6 +26027,15 @@ let sha1 = "0f908faf4e6ec02524e54a57e432c5c013e08c9f"; }; }; + "falafel-1.2.0" = { + name = "falafel"; + packageName = "falafel"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/falafel/-/falafel-1.2.0.tgz"; + sha1 = "c18d24ef5091174a497f318cd24b026a25cddab4"; + }; + }; "falafel-2.2.4" = { name = "falafel"; packageName = "falafel"; @@ -25955,6 +26432,15 @@ let sha512 = "MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="; }; }; + "fetch-cookie-0.10.1" = { + name = "fetch-cookie"; + packageName = "fetch-cookie"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.10.1.tgz"; + sha512 = "beB+VEd4cNeVG1PY+ee74+PkuCQnik78pgLi5Ah/7qdUfov8IctU0vLUbBT8/10Ma5GMBeI4wtxhGrEfKNYs2g=="; + }; + }; "fetch-everywhere-1.0.5" = { name = "fetch-everywhere"; packageName = "fetch-everywhere"; @@ -26594,13 +27080,13 @@ let sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; - "firefox-profile-4.2.0" = { + "firefox-profile-4.2.1" = { name = "firefox-profile"; packageName = "firefox-profile"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-4.2.0.tgz"; - sha512 = "Z+/6GQ0JEW2eqgj63EYNbgKSgoIz7w1yXlkOWAIRkCNnj50rkfnQIz8uYwJkobxwYQM8vjFIbYiVtYuQV8US2A=="; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-4.2.1.tgz"; + sha512 = "KyA5ruS7V1nXpaHlJrKPW1jkoc9bq/WKquaKuca/ETembuxcBQPEPpxAp0biwjQCPf3sBslN/heZLdfa5Eotzg=="; }; }; "first-chunk-stream-2.0.0" = { @@ -26630,13 +27116,13 @@ let sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; - "fkill-7.2.1" = { + "fkill-8.0.0" = { name = "fkill"; packageName = "fkill"; - version = "7.2.1"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-7.2.1.tgz"; - sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; + url = "https://registry.npmjs.org/fkill/-/fkill-8.0.0.tgz"; + sha512 = "ItJHI5BDPAzmTg7IuFRRMI2liFOthzaRPhJaplkWqrIf7ss7e+zR+sVzOCljv7zauaFiSjca5b8NHmqT4VgyRQ=="; }; }; "flagged-respawn-1.0.1" = { @@ -26783,13 +27269,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.161.0" = { + "flow-parser-0.162.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.161.0"; + version = "0.162.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.161.0.tgz"; - sha512 = "QRGREwIVspAeffxidkelrU6yPnEF/US4iYoGuf73+y4ZEXgCJUFje4jYfgE4g59TbSLHntdWfM69wiN9Y9swKw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.162.0.tgz"; + sha512 = "tqn7GkffCpBkGl6cFPHk08gug2Gb+KgE4ShDJmYVUFAARKvwtgxiLbLk2pv22KMLtzin+OPeCku3UoBE66nQDg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -27215,13 +27701,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.11.4" = { + "fp-ts-2.11.5" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.11.4"; + version = "2.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.4.tgz"; - sha512 = "lhV7tGEbs2qoVw4vmqOovChS7CAoIYU0gdiPEF8Vc4bLZct+PAMMeXrCqRyBNEo33XOvwvAmFDEDIrHPWH2/fg=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.5.tgz"; + sha512 = "OqlwJq1BdpB83BZXTqI+dNcA6uYk6qk4u9Cgnt64Y+XS7dwdbp/mobx8S2KXf2AXH+scNmA/UVK3SEFHR3vHZA=="; }; }; "fraction.js-4.1.1" = { @@ -27818,6 +28304,15 @@ let sha512 = "6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ=="; }; }; + "gaxios-2.3.4" = { + name = "gaxios"; + packageName = "gaxios"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz"; + sha512 = "US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA=="; + }; + }; "gaxios-4.3.2" = { name = "gaxios"; packageName = "gaxios"; @@ -28448,13 +28943,13 @@ let sha512 = "0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw=="; }; }; - "gl-matrix-3.4.0" = { + "gl-matrix-3.4.3" = { name = "gl-matrix"; packageName = "gl-matrix"; - version = "3.4.0"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.0.tgz"; - sha512 = "n7fF4meQ6jbBSw91jGmP83I/wkQud5kIRSW/dr5z+9YJdQz61GWpgmRK9k7c4O/1QsXaIXu9o2vf/q2Gu3Ybow=="; + url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz"; + sha512 = "wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA=="; }; }; "glob-3.2.11" = { @@ -28980,13 +29475,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.10.0" = { + "google-auth-library-7.10.1" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.10.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.10.0.tgz"; - sha512 = "ICsqaU+lxMHVlDUzMrfVIEqnARw2AwBiZ/2KnNM6BcTf9Nott+Af87DTIzmlnW865p3REUP2MVL0xkPC3a61aQ=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.10.1.tgz"; + sha512 = "nQxgM1ZopUMcpMnu95kOSzI+9tJl4YDOZJomSTBGlRLpxfBopdwto7WvzoI87HuN0nQqVETgOsHi/C/po1rppA=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -28998,13 +29493,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.27.0" = { + "google-gax-2.27.1" = { name = "google-gax"; packageName = "google-gax"; - version = "2.27.0"; + version = "2.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.27.0.tgz"; - sha512 = "xcLCeNKCqNm/w0At7/vdZHV/zol/iRS+PSAZTu7i6xNGBra/kWI3cfn4M6ZLQXeUEGbTVLJ4zGm53TVc4lvbDA=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.27.1.tgz"; + sha512 = "8j8hfY42mGZt52C1L23srr2WTxOsOGUsC3s07Aw/f1UrbofsHdRaGf72Jax4jWEFXe/2x1MVBkwMvZxHMbO1Ag=="; }; }; "google-p12-pem-3.1.2" = { @@ -29250,13 +29745,13 @@ let sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w=="; }; }; - "graphql-15.6.0" = { + "graphql-15.6.1" = { name = "graphql"; packageName = "graphql"; - version = "15.6.0"; + version = "15.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-15.6.0.tgz"; - sha512 = "WJR872Zlc9hckiEPhXgyUftXH48jp2EjO5tgBBOyNMRJZ9fviL2mJBD6CAysk6N5S0r9BTs09Qk39nnJBkvOXQ=="; + url = "https://registry.npmjs.org/graphql/-/graphql-15.6.1.tgz"; + sha512 = "3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw=="; }; }; "graphql-compose-7.25.1" = { @@ -30474,13 +30969,13 @@ let sha512 = "L9fSE/eMnJat/9TtlOVKFAiw2SlvB5RH/QbtSaNcYW/oWX1lBxwdrVTTcNOCWnSNLhDBgg5llxj9oM2SACB8WA=="; }; }; - "hs-client-0.0.9" = { + "hs-client-0.0.10" = { name = "hs-client"; packageName = "hs-client"; - version = "0.0.9"; + version = "0.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.9.tgz"; - sha512 = "TAsexmpPhSVdCQ1iiX4bBnuqlThTSdGz/YKq+vjLSS1TZ2TwKxERJ8vZh1Wd6GGaMGLZl99uQR+2wUyk4HLSbg=="; + url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.10.tgz"; + sha512 = "15tfeQEMRS1FZA0q9gFbQ1jYs8v4z9oKw9xFwVEyRuckn72hoVAglN4IrFxkOCDMYV7TWCY/nO/yNZp5njYFBw=="; }; }; "hsl-regex-1.0.0" = { @@ -30519,6 +31014,15 @@ let sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; }; }; + "html-encoding-sniffer-3.0.0" = { + name = "html-encoding-sniffer"; + packageName = "html-encoding-sniffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"; + sha512 = "oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA=="; + }; + }; "html-entities-1.4.0" = { name = "html-entities"; packageName = "html-entities"; @@ -30798,12 +31302,12 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-node-git://github.com/feross/http-node#webtorrent" = { + "http-node-git://github.com/webtorrent/http-node#webtorrent" = { name = "http-node"; packageName = "http-node"; version = "1.2.0"; src = fetchgit { - url = "git://github.com/feross/http-node"; + url = "git://github.com/webtorrent/http-node"; rev = "342ef8624495343ffd050bd0808b3750cf0e3974"; sha256 = "d7408d01b05fcbd5bb4fb44fd3d7d71463bafd5124d7e69c6f3e97cef8c65368"; }; @@ -30853,6 +31357,15 @@ let sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; }; }; + "http-proxy-agent-5.0.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; + sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; + }; + }; "http-proxy-middleware-0.19.1" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; @@ -31717,6 +32230,15 @@ let sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; }; }; + "indent-string-5.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz"; + sha512 = "m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg=="; + }; + }; "indexes-of-1.0.1" = { name = "indexes-of"; packageName = "indexes-of"; @@ -31753,6 +32275,15 @@ let sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; }; }; + "inflection-1.13.1" = { + name = "inflection"; + packageName = "inflection"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inflection/-/inflection-1.13.1.tgz"; + sha512 = "dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA=="; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -31861,22 +32392,22 @@ let sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; }; }; - "ink-3.0.9" = { + "ink-3.2.0" = { name = "ink"; packageName = "ink"; - version = "3.0.9"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-3.0.9.tgz"; - sha512 = "BN+SyJ1rLbKzGPxGYkk22dYB0b58OtyMI4uN0dYucQ8MlIu5TpXJzaP6Bt8Mgqi1dkNZT55bjGyZ2iVLTkJ70w=="; + url = "https://registry.npmjs.org/ink/-/ink-3.2.0.tgz"; + sha512 = "firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg=="; }; }; - "ink-spinner-4.0.2" = { + "ink-spinner-4.0.3" = { name = "ink-spinner"; packageName = "ink-spinner"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ink-spinner/-/ink-spinner-4.0.2.tgz"; - sha512 = "vQGmhWUEh3IG1IxK1Hl2w6RfH6aaRIJWw9lrG8CvFFyrQ23UpJ8GClJs5/sFBxkNvsrrK9sKNEGlGnsqTYiUww=="; + url = "https://registry.npmjs.org/ink-spinner/-/ink-spinner-4.0.3.tgz"; + sha512 = "uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ=="; }; }; "ink-text-input-4.0.1" = { @@ -31897,6 +32428,15 @@ let sha512 = "rVsqnw4tQEAJUoknU09+zHdDf30GJdkumkHr0iz/TOYMYEZJkYqziQSGJAM+Z+M603EDfO89+Nxyn/Ko2Zknfw=="; }; }; + "inline-process-browser-1.0.0" = { + name = "inline-process-browser"; + packageName = "inline-process-browser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inline-process-browser/-/inline-process-browser-1.0.0.tgz"; + sha1 = "46a61b153dd3c9b1624b1a00626edb4f7f414f22"; + }; + }; "inline-source-map-0.6.2" = { name = "inline-source-map"; packageName = "inline-source-map"; @@ -32032,13 +32572,13 @@ let sha512 = "DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q=="; }; }; - "inquirer-8.1.5" = { + "inquirer-8.2.0" = { name = "inquirer"; packageName = "inquirer"; - version = "8.1.5"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-8.1.5.tgz"; - sha512 = "G6/9xUqmt/r+UvufSyrPpt84NYwhKZ9jLsgMbQzlx804XErNupor8WQdBnBRrXmBfTPpuwf1sV+ss2ovjgdXIg=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.0.tgz"; + sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ=="; }; }; "inquirer-autocomplete-prompt-1.4.0" = { @@ -32779,13 +33319,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.7.0" = { + "is-core-module-2.8.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz"; - sha512 = "ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; + sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; }; }; "is-data-descriptor-0.1.4" = { @@ -33013,6 +33553,15 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; + "is-fullwidth-code-point-4.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz"; + sha512 = "O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ=="; + }; + }; "is-function-1.0.2" = { name = "is-function"; packageName = "is-function"; @@ -34183,13 +34732,13 @@ let sha512 = "0RHjbtw9QXeSYnIEY5Yrp2QZrdtz21xBDV9C/GIlY2POmgoS6a7qjkYS5siRKXScnuAj5/SPv1C3YForNCHTJA=="; }; }; - "istanbul-lib-coverage-3.0.1" = { + "istanbul-lib-coverage-3.0.2" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.1.tgz"; - sha512 = "GvCYYTxaCPqwMjobtVcVKvSHtAGe48MNhGjpK8LtVF8K0ISX7hCKl85LgtuaSneWVyQmaGcW3iXVV3GaZSLpmQ=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz"; + sha512 = "o5+eTUYzCJ11/+JhW5/FUCdfsdoYVdQ/8I/OveE2XsjehYn5DdeSnNQAbjYaO8gQ6hvGTN6GM6ddQqpTVG5j8g=="; }; }; "istanbul-lib-instrument-4.0.3" = { @@ -34426,13 +34975,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.2.4" = { + "jest-worker-27.2.5" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.2.4"; + version = "27.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.4.tgz"; - sha512 = "Zq9A2Pw59KkVjBBKD1i3iE2e22oSjXhUKKuAK1HGX8flGwkm6NMozyEYzKd41hXc64dbd/0eWFeEEuxqXyhM+g=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz"; + sha512 = "HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw=="; }; }; "jimp-compact-0.16.1" = { @@ -34444,13 +34993,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-3.4.0" = { + "jitdb-3.4.2" = { name = "jitdb"; packageName = "jitdb"; - version = "3.4.0"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.4.0.tgz"; - sha512 = "TQUrWpifF3trL4Xk2e1DJn/Wk/FYPZE9QP+0yNzvo3KNDHlBtOYdufnH+otZh13kn1Nh0nt+ZWK8ENB2F34q8Q=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.4.2.tgz"; + sha512 = "iPxNlKIXZEbHWdxoHyDa99eZPKQsF0faLA0Ui1rkL2+m3QGaCe/Xso+73hzkSwow0D4s8AwAurJ7L93bPvOuCw=="; }; }; "jju-1.4.0" = { @@ -34580,13 +35129,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.29.2" = { + "jquery.terminal-2.29.4" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.29.2"; + version = "2.29.4"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.29.2.tgz"; - sha512 = "pRJHCT9v29VYkZNWNLxaW1+ABgzgCsRB4uVjMkTjGsUqPfXiQAGWPszca0qbcsKnF/64vEuQ5BNOVpyoYPCaTw=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.29.4.tgz"; + sha512 = "ugzctBbbJmw3ZGIhYziBFEK8QnWAZy2q6sZUtmPgjni4ILg59tO0WJI9DkKiDZ4LQtdCVexQ5oP0J90jMN+TzA=="; }; }; "js-base64-2.6.4" = { @@ -34805,6 +35354,15 @@ let sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; }; }; + "jsdoc-3.6.7" = { + name = "jsdoc"; + packageName = "jsdoc"; + version = "3.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz"; + sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; + }; + }; "jsdom-11.12.0" = { name = "jsdom"; packageName = "jsdom"; @@ -34841,6 +35399,15 @@ let sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; }; + "jsdom-18.0.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "18.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-18.0.0.tgz"; + sha512 = "HVLuBcFmwdWulStv5U+J59b1AyzXhM92KXlM8HQ3ecYtRM2OQEUCPMa4oNuDeCBmtRcC7tJvb0Xz5OeFXMOKTA=="; + }; + }; "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; @@ -34877,49 +35444,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.36.0" = { + "jsii-1.39.0" = { name = "jsii"; packageName = "jsii"; - version = "1.36.0"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.36.0.tgz"; - sha512 = "7wuW6iv3lnYxdUb2W9KRPqFDP7xPPhVMmt3eDQbLQGCcMNQ65QgPWgun23+1X1X1ImCcoh5GWaRS0oF0NAJbQA=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.39.0.tgz"; + sha512 = "2ReD7t6rGhT+c41xovFoAMc4XU5/O2VqGRh3Ud/wN+Nn1ISjZFQa4doQ1xtZLFb1065Vxyv5VCqWp80t6Xw2iA=="; }; }; - "jsii-pacmak-1.36.0" = { + "jsii-pacmak-1.39.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.36.0"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.36.0.tgz"; - sha512 = "wRJk6S81OTi1KeXQhpasvWQ3kBXURtg1d99wBBSktDAJAfAj17x/0XbVe43DRFsD/wZARyVj2g1EDC5MexXJZw=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.39.0.tgz"; + sha512 = "+B2Z62v/MQ8fQcvd1nhKUWv+ZoNEArwa6OiTSvAuMsRoZpZ7Uvabscu71Uu3zq1XzJ6WQStw90ENHkw40l/o7w=="; }; }; - "jsii-reflect-1.36.0" = { + "jsii-reflect-1.39.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.36.0"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.36.0.tgz"; - sha512 = "MWhRxSTv29QetIAhtoVO9Awne6TofUPmVeK9SU3G0RqoxCx7F6erbLxcSYIa1KqcBbI6fmT1/JT1kdmCgg0QmQ=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.39.0.tgz"; + sha512 = "HEMpGHJBDtUbhdnfYUH0M/NTrYxaXrb0B2DXglzN/EYzKJsdp4FAmDPzpKEwnGVK3ReJLZ68YRogTq3msyuQDQ=="; }; }; - "jsii-rosetta-1.36.0" = { + "jsii-rosetta-1.39.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.36.0"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.36.0.tgz"; - sha512 = "TML7uw5ihRy0S5QKV8nNRxERzIblIeMTn/+eDG9dw/FOpx3oB3dBo9A277skVbs4QPbZuU8ceWb5n1kg/PlbOw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.39.0.tgz"; + sha512 = "Fx+kQ+IDEMILQvTESW9TMXLxzQa7h/nm4EKXuDKAeglr5RNhzvTvhsgJy+WshJoMsNcT9ImCV8gmvqAqdSBrWA=="; }; }; - "jsii-srcmak-0.1.357" = { + "jsii-srcmak-0.1.369" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.357"; + version = "0.1.369"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.357.tgz"; - sha512 = "J7+bWGLFLkUQw9uSKJsuKu7RjkM0FSNJCMiC7j4reKAYuPGtmz+a9FMcnPfW2RJK6MwgM4YfTBhoXqhf4IlsFA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.369.tgz"; + sha512 = "lxMMIzpBkaabuLLNz8WaFKMFoE7oCXFzSm7dMYrStrv/MfG1N2adqw3//B1CDVCNLgPYEwXsA77ToPAtfcrZhA=="; }; }; "json-bigint-1.0.0" = { @@ -35210,13 +35777,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.33" = { + "json2jsii-0.2.40" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.33"; + version = "0.2.40"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.33.tgz"; - sha512 = "bqB5/ljrDE3rRGhulVhpWVNXPJJx2paV7+dcytC3zb7AgzRfGop0Ke4TVa7vuy3pEYtKao4IwtXzROqTlzgzWw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.40.tgz"; + sha512 = "XtopwIXyLJWiyBydDjczRk7i51H31Nno5BnWf34zbjyAm5SUxzJ6IsqwVfuANys06tFkJYct+ghO/v52qsCAAw=="; }; }; "json3-3.2.6" = { @@ -35525,6 +36092,15 @@ let sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; + "jstransform-11.0.3" = { + name = "jstransform"; + packageName = "jstransform"; + version = "11.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransform/-/jstransform-11.0.3.tgz"; + sha1 = "09a78993e0ae4d4ef4487f6155a91f6190cb4223"; + }; + }; "jstransformer-1.0.0" = { name = "jstransformer"; packageName = "jstransformer"; @@ -35867,6 +36443,15 @@ let sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; + "keytar-4.13.0" = { + name = "keytar"; + packageName = "keytar"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keytar/-/keytar-4.13.0.tgz"; + sha512 = "qdyZ3XDuv11ANDXJ+shsmc+j/h5BHPDSn33MwkUMDg2EA++xEBleNkghr3Jg95cqVx5WgDYD8V/m3Q0y7kwQ2w=="; + }; + }; "keytar-7.7.0" = { name = "keytar"; packageName = "keytar"; @@ -36578,6 +37163,15 @@ let sha512 = "9HaAeBGk1nKTRFRHkt7nzxqCvnkWTjn1pdjKgcUnZxj0FyOP4CnhgFhMdrFfgNsukijBGyBLpP2m2uKT1vuWhQ=="; }; }; + "lie-3.0.4" = { + name = "lie"; + packageName = "lie"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.0.4.tgz"; + sha1 = "bc7ae1ebe7f1c8de39afdcd4f789076b47b0f634"; + }; + }; "lie-3.1.1" = { name = "lie"; packageName = "lie"; @@ -36632,15 +37226,6 @@ let sha512 = "z/bfkDEAKyN0HtN7rkiyVlDA3J5L/jxXsE4YuGfQPa8TyPWovyLdo6/aHP0mMy8n+G4tq0g2oKZ/1Z5ONJAVqA=="; }; }; - "lightning-4.1.0" = { - name = "lightning"; - packageName = "lightning"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.1.0.tgz"; - sha512 = "ngS2829bxBMgK/MFanm6jypvpIbxzxBX/vFbUKyFrj3MxcSKvMQzr1sXRppYxZXHwOuqyiN91QnaKNg3upQ9sg=="; - }; - }; "lightning-4.1.3" = { name = "lightning"; packageName = "lightning"; @@ -36650,13 +37235,22 @@ let sha512 = "DI21mqAdwBM/Os3pcAnBrpUCoaKQzJFTEv2c+DEJUzPBnpxRGGKGurlT5FDz9QZSTag7YgBb5ghsqtjQ2MlFWg=="; }; }; - "lightning-4.10.1" = { + "lightning-4.10.3" = { name = "lightning"; packageName = "lightning"; - version = "4.10.1"; + version = "4.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.10.1.tgz"; - sha512 = "MNX67mGzWx7hkd2GUPtCt/vzLSaROg/aDmg/WcW9mdrXY6PQVyGW/gdaTRy9e2hJZ4R8KGMuZ7wZqsDPpRRawQ=="; + url = "https://registry.npmjs.org/lightning/-/lightning-4.10.3.tgz"; + sha512 = "dXiEe6n8eGKznThE8yJ9BRXHHju5LgVF2sPsal5Vw933dvi76NIuMPL+Z7XV2sVfKKsnrI7Uktm9Wn5edmXIcA=="; + }; + }; + "lightning-4.10.7" = { + name = "lightning"; + packageName = "lightning"; + version = "4.10.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-4.10.7.tgz"; + sha512 = "V2IkR55hA0nqMNfjmkgJSGDvkiu+v3hegz2Kj4az3kVFqUMIN9Eb8uFqZ8xKM5PZFBQHaZ59Tm1EZHPPFCNi6A=="; }; }; "lightning-4.5.0" = { @@ -36668,15 +37262,6 @@ let sha512 = "oKH9EVKxgPIWm2f3/7vLImQAZQVP2souwAMMg5njGdCPAlekA8KH+/r+Ltuv5jd1vQigwmQMkfmdZzd4qmOI8Q=="; }; }; - "lightning-4.6.0" = { - name = "lightning"; - packageName = "lightning"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.6.0.tgz"; - sha512 = "ZCDSFomdsUvDDaINbABPdglLEJfg+9iMs4BHa8Or+fW5FYwM0HA8l2D/yMxfCMx2DFZg7uuiZVpM8x/7/AbS0Q=="; - }; - }; "lightning-4.7.0" = { name = "lightning"; packageName = "lightning"; @@ -36866,15 +37451,6 @@ let sha512 = "X+AFuuw54NEr8UqbkJlEtqkmlpIpmji7BX+bYmYrEOZOtJca7PbaqspVWq+YB9qWw/OiuI76ly67KGTYM0QbCw=="; }; }; - "ln-service-52.0.1" = { - name = "ln-service"; - packageName = "ln-service"; - version = "52.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.0.1.tgz"; - sha512 = "ETL/rpidWMS7nCsZoRb3/0vU5nk7RE1PRtn3YBnmUWJcdhjREPhQRLHm7/vZ+JFRdAwvW7V/lqCvOkDZXCKo6w=="; - }; - }; "ln-service-52.0.3" = { name = "ln-service"; packageName = "ln-service"; @@ -36884,13 +37460,22 @@ let sha512 = "upswAJU9Mrfh3l+q46rvmRu8Pf7iYR2vkKyq16dgiBgxKw7fzvI8aL2Xi0xrtyoRUOUODOyEzO7/MRRhNKcvMA=="; }; }; - "ln-service-52.10.1" = { + "ln-service-52.11.0" = { name = "ln-service"; packageName = "ln-service"; - version = "52.10.1"; + version = "52.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.10.1.tgz"; - sha512 = "T1Vjud0X8pbRBh1tKSqzyELHGy4Cxt/71q9q4sd81m8IFw9htsOXYQEkliMmYK33EzLrT2qzFTCJF/YF9UwYvQ=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.11.0.tgz"; + sha512 = "1QFz35rg00RDTiRctYTaKvkDHcYc9/+9liiQhNaJEblJQnQyNoA5Cid6G7oHOkIj2k7fVTJpEgyflI+qG3u2Og=="; + }; + }; + "ln-service-52.12.1" = { + name = "ln-service"; + packageName = "ln-service"; + version = "52.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.12.1.tgz"; + sha512 = "kjWrvVQf51DHARckDgqwWyHQbsSYHqtF4yeuuRFowD7xxd3ONvsysManz1RTQnnQgjAYHHi1FBtkx/x2b8Lrzw=="; }; }; "ln-service-52.4.0" = { @@ -36911,15 +37496,6 @@ let sha512 = "tLJMrknIzK6MMIx/N1r8iRjVWBPFmt0S1hI2l+DNL6+ln930nSUN+/aW3SUZho48ACLPBJDSgXwAU50ExrC+rQ=="; }; }; - "ln-sync-2.0.0" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-2.0.0.tgz"; - sha512 = "BrqRO1pxeRhaCTw8GdnLGwCsFQSnrJohXkVxuDQCQ4OCgLFKFS7TpFKS7INoJrLE1XpcGS8NtLLXjsA0Akcd3A=="; - }; - }; "ln-sync-2.0.2" = { name = "ln-sync"; packageName = "ln-sync"; @@ -36929,13 +37505,22 @@ let sha512 = "tPT6irw2Ad6W/uoLZ9H0mT3S59XPMRY7j7ygu+ALztbAcuixEOn3kv80+3hFjOzqXXFo/FDsXHw3DWfO2dDDng=="; }; }; - "ln-telegram-3.3.0" = { + "ln-sync-2.0.3" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-2.0.3.tgz"; + sha512 = "krtCggshBHgzL203L0ZBLS28SStlyuoz9siauS5hiqUQ+/UaJ5/ROYt81s6GVp008K2GF5KTRLZjaIhCMkf3Vw=="; + }; + }; + "ln-telegram-3.3.1" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.3.0.tgz"; - sha512 = "rWrS5lO2oZhLbts7R58QDh1Hf/A/QIGA8Jew0iZrIFix9afiz3+xwJi5LFkB0nIaFnWvpOeFP4deDq3ADcF3Hw=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.3.1.tgz"; + sha512 = "W/Wu6Mb5zwYpD97Oa+1wfz2/kgRGqueJ47pHQ0bAcpEB5vFVLG0R347Gr3MNIlFRY7liGdCmO4xvB8bCxtg8uQ=="; }; }; "load-bmfont-1.4.1" = { @@ -38351,13 +38936,13 @@ let sha1 = "ec6662e4896408ed4ab6c542a3990b72cc080020"; }; }; - "log-6.2.0" = { + "log-6.3.1" = { name = "log"; packageName = "log"; - version = "6.2.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/log/-/log-6.2.0.tgz"; - sha512 = "W1sDY5FqR6wlpygW8ZFSxCfBhKx/RzCHK5S+Br8zA14bAnwSgCm5hToIWzi0Yhy6x9Ppw7pyIV06r8F5cSRHUw=="; + url = "https://registry.npmjs.org/log/-/log-6.3.1.tgz"; + sha512 = "McG47rJEWOkXTDioZzQNydAVvZNeEkSyLJ1VWkFwfW+o1knW+QSi8D1KjPn/TnctV+q99lkvJNe1f0E1IjfY2A=="; }; }; "log-driver-1.2.7" = { @@ -39197,13 +39782,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "mapbox-gl-1.13.1" = { + "mapbox-gl-1.13.2" = { name = "mapbox-gl"; packageName = "mapbox-gl"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.1.tgz"; - sha512 = "GSyubcoSF5MyaP8z+DasLu5v7KmDK2pp4S5+VQ5WdVQUOaAqQY4jwl4JpcdNho3uWm2bIKs7x1l7q3ynGmW60g=="; + url = "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.2.tgz"; + sha512 = "CPjtWygL+f7naL+sGHoC2JQR0DG7u+9ik6WdkjjVmz2uy0kBC2l+aKfdi3ZzUR7VKSQJ6Mc/CeCN+6iVNah+ww=="; }; }; "mark.js-8.11.1" = { @@ -40178,6 +40763,15 @@ let sha512 = "ctDyraFPyJDXi6RWgWZ8SyDk2bAsFaBpobprCl7xbcfQamjtfuaN8+lcWUt8ARYfQKb1f8mcPVhQ+Q2ObeD/3A=="; }; }; + "meow-10.1.1" = { + name = "meow"; + packageName = "meow"; + version = "10.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-10.1.1.tgz"; + sha512 = "uzOAEBTGujHAD6bVzIQQk5kDTgatxmpVmr1pj9QhwsHLEG2AiB+9F08/wmjrZIk4h5pWxERd7+jqGZywYx3ZFw=="; + }; + }; "meow-3.7.0" = { name = "meow"; packageName = "meow"; @@ -40322,13 +40916,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.13.2" = { + "mermaid-8.13.3" = { name = "mermaid"; packageName = "mermaid"; - version = "8.13.2"; + version = "8.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.13.2.tgz"; - sha512 = "qTFI7MfC2d+x0Hft5gx063EH9tZg36lERG8o7Zq0Ag+MnO8CgVaMZEU6oA8gzTtTn9upMdy4UlYSLVmavu27cQ=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.13.3.tgz"; + sha512 = "w6KmDtSzkk856WUVqlBsyLZX0q4Jr35IlxiHTPTaWwMgWHFpI8rEJzcxWoyrpxeT/Rac/vvvSFOZymDTeA0iiA=="; }; }; "meros-1.1.4" = { @@ -41249,22 +41843,22 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mobx-6.3.3" = { + "mobx-6.3.5" = { name = "mobx"; packageName = "mobx"; - version = "6.3.3"; + version = "6.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.3.3.tgz"; - sha512 = "JoNU50rO6d1wHwKPJqKq4rmUMbYnI9CsJmBo+Cu4exBYenFvIN77LWrZENpzW6reZPADtXMmB1DicbDSfy8Clw=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.3.5.tgz"; + sha512 = "MeDfqtiSbhVoJgXqQsrJwvq2klj7Xk9pPdMThCdFiwFt33vgWJe82ATppPwVzQoz0AI3QpSSwQzcp3TBDK4syg=="; }; }; - "mobx-react-7.2.0" = { + "mobx-react-7.2.1" = { name = "mobx-react"; packageName = "mobx-react"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.2.0.tgz"; - sha512 = "KHUjZ3HBmZlNnPd1M82jcdVsQRDlfym38zJhZEs33VxyVQTvL77hODCArq6+C1P1k/6erEeo2R7rpE7ZeOL7dg=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.2.1.tgz"; + sha512 = "LZS99KFLn75VWDXPdRJhILzVQ7qLcRjQbzkK+wVs0Qg4kWw5hOI2USp7tmu+9zP9KYsVBmKyx2k/8cTTBfsymw=="; }; }; "mobx-react-lite-3.2.1" = { @@ -41303,13 +41897,13 @@ let sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; - "mocha-9.1.2" = { + "mocha-9.1.3" = { name = "mocha"; packageName = "mocha"; - version = "9.1.2"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.2.tgz"; - sha512 = "ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz"; + sha512 = "Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw=="; }; }; "mock-require-3.0.3" = { @@ -42050,6 +42644,15 @@ let sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }; }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; "nan-2.14.2" = { name = "nan"; packageName = "nan"; @@ -42122,13 +42725,13 @@ let sha512 = "2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ=="; }; }; - "nanocolors-0.2.12" = { + "nanocolors-0.2.13" = { name = "nanocolors"; packageName = "nanocolors"; - version = "0.2.12"; + version = "0.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz"; - sha512 = "SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug=="; + url = "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.13.tgz"; + sha512 = "0n3mSAQLPpGLV9ORXT5+C/D4mwew7Ebws69Hx4E2sgz2ZA5+32Q80B9tL8PbL7XHnRDiAxH/pnrUJ9a4fkTNTA=="; }; }; "nanoguard-1.3.0" = { @@ -42167,13 +42770,13 @@ let sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; }; }; - "nanoid-3.1.28" = { + "nanoid-3.1.30" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.28"; + version = "3.1.30"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.28.tgz"; - sha512 = "gSu9VZ2HtmoKYe/lmyPFES5nknFrHa+/DT9muUFWFMi6Jh9E1I7bkvlQ8xxf1Kos9pi9o8lBnIOkatMhKX/YUw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz"; + sha512 = "zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="; }; }; "nanoiterator-1.2.1" = { @@ -42591,13 +43194,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-8.0.1" = { + "netlify-8.0.2" = { name = "netlify"; packageName = "netlify"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-8.0.1.tgz"; - sha512 = "bAUay/JDmUdmFSfW6BQuUGHuj498ALr/aS4Se3Juhgv1N0q1Whrp1uwGlkIgatrlP0lLL/zkTWc6hxmG1TqQcQ=="; + url = "https://registry.npmjs.org/netlify/-/netlify-8.0.2.tgz"; + sha512 = "qOOcIgLjZL000JiUWBAJeSlqwvueNe/KjTHr0Oi7U/7gJIeCIUM0ktENJht2wF18jikO2zm1POZudYCzdQOnJw=="; }; }; "netlify-headers-parser-4.0.1" = { @@ -42870,15 +43473,6 @@ let sha512 = "Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="; }; }; - "node-addon-api-3.0.2" = { - name = "node-addon-api"; - packageName = "node-addon-api"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz"; - sha512 = "+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg=="; - }; - }; "node-addon-api-3.2.1" = { name = "node-addon-api"; packageName = "node-addon-api"; @@ -42888,6 +43482,15 @@ let sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; }; }; + "node-addon-api-4.2.0" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz"; + sha512 = "eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q=="; + }; + }; "node-api-version-0.1.4" = { name = "node-api-version"; packageName = "node-api-version"; @@ -43024,6 +43627,15 @@ let sha512 = "NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ=="; }; }; + "node-fetch-2.6.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"; + sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="; + }; + }; "node-fetch-2.6.1" = { name = "node-fetch"; packageName = "node-fetch"; @@ -43267,6 +43879,15 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; + "node-pre-gyp-0.13.0" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz"; + sha512 = "Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ=="; + }; + }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -43285,13 +43906,13 @@ let sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d"; }; }; - "node-red-admin-2.2.0" = { + "node-red-admin-2.2.1" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.0.tgz"; - sha512 = "dBljNubVsolJkgfXUAF3KrCAO+hi5AXz+cftGjfHT76PyVB9pFUbAgTrkjZmKciC/B/14kEV5Ds+SwonqyTMfg=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.1.tgz"; + sha512 = "xYp6mZaRbAWLR8nO4HRVvthYZoPGBotPvetAGho4AXpRJW7fXw38XwK0KPSffvLSis6cxaskJq9nZBLp3PJtng=="; }; }; "node-releases-1.1.77" = { @@ -43303,6 +43924,15 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; + "node-releases-2.0.0" = { + name = "node-releases"; + packageName = "node-releases"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.0.tgz"; + sha512 = "aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA=="; + }; + }; "node-source-walk-4.2.0" = { name = "node-source-walk"; packageName = "node-source-walk"; @@ -43438,13 +44068,13 @@ let sha512 = "FbuXC+lK+GU2+63D1kC1ETiZo+Z7SIi7B+mxKTCH1byrh6WFvfBCN/wpherFz0a0bjGd7EKTst/cz0yLeNngug=="; }; }; - "nofilter-3.0.3" = { + "nofilter-3.1.0" = { name = "nofilter"; packageName = "nofilter"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nofilter/-/nofilter-3.0.3.tgz"; - sha512 = "TN/MCrQmXQk5DyUJ8TGUq1Il8rv4fTsjddLmMopV006QP8DMkglmGgYfQKD5620vXLRXfr8iGI6ZZ4/ZWld2cQ=="; + url = "https://registry.npmjs.org/nofilter/-/nofilter-3.1.0.tgz"; + sha512 = "l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g=="; }; }; "noise-peer-2.1.1" = { @@ -43483,6 +44113,15 @@ let sha512 = "K9nTVFOGUOYutaG8ywiKpCdVu458RFxSgSJ0rribUxtf5iLM9B2+raFJgkID3p5op0+twmoQqFaPnu9KYz6qzg=="; }; }; + "noop-fn-1.0.0" = { + name = "noop-fn"; + packageName = "noop-fn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/noop-fn/-/noop-fn-1.0.0.tgz"; + sha1 = "5f33d47f13d2150df93e0cb036699e982f78ffbf"; + }; + }; "noop-logger-0.1.1" = { name = "noop-logger"; packageName = "noop-logger"; @@ -44014,13 +44653,13 @@ let sha1 = "201095a487e1ad36081b3432fa3cada4f8d071b0"; }; }; - "num-sort-2.1.0" = { + "num-sort-3.0.0" = { name = "num-sort"; packageName = "num-sort"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/num-sort/-/num-sort-2.1.0.tgz"; - sha512 = "1MQz1Ed8z2yckoBeSfkQHHO9K1yDRxxtotKSJ9yvcTUUxSvfvzEq5GwBrjjHEpMlq/k5gvXdmJ1SbYxWtpNoVg=="; + url = "https://registry.npmjs.org/num-sort/-/num-sort-3.0.0.tgz"; + sha512 = "N5dLIfqCzlJm7M14KqmX/sl+6Zg5WH0E04HKfuVHbPj9jIaY1T2zuCS+xe0qeT/YN3UpYQ6lIIXcE/3Xbwg3Xw=="; }; }; "num2fraction-1.2.2" = { @@ -44204,6 +44843,15 @@ let sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; }; }; + "object-assign-2.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"; + sha1 = "43c36e5d569ff8e4816c4efa8be02d26967c18aa"; + }; + }; "object-assign-3.0.0" = { name = "object-assign"; packageName = "object-assign"; @@ -44708,13 +45356,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.36.0" = { + "oo-ascii-tree-1.39.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.36.0"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.36.0.tgz"; - sha512 = "VGo4IhIbwJgYnwBAtk5+6puhwOjyMdaviPhxZgEteh6/twR7m8T6C47kSNuXIX51H6ogh6y8GeuOIuWyPcc9Cg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.39.0.tgz"; + sha512 = "a0g33GTdCizt5jnQzY9j6cRNyx5xITmZb+b3C21+KNweaERltcR1BQO/tLUuuVEFRVWvZcUqrFDVa8f8nqOafA=="; }; }; "opal-runtime-1.0.11" = { @@ -44789,6 +45437,15 @@ let sha512 = "rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ=="; }; }; + "open-8.3.0" = { + name = "open"; + packageName = "open"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.3.0.tgz"; + sha512 = "7INcPWb1UcOwSQxAXTnBJ+FxVV4MPs/X++FWWBtgY69/J5lc+tCteMt/oFK1MnkyHC4VILLa9ntmwKTwDR4Q9w=="; + }; + }; "openapi-default-setter-2.1.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; @@ -45410,22 +46067,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.1.2" = { + "ot-builder-1.2.0" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.1.2.tgz"; - sha512 = "pAs1thg6T5e3fjsMEeOY+gn0fMWNYOlOIAygjTJ33Xr1ejDep3cebWdw4dqydFhRiChWC1KOmfK353froAFl9A=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.2.0.tgz"; + sha512 = "zVVOHksH1kdHx8FSuiNFXbFW2nJg8QgoK1Kng9fw7vR6r8EXl0hGuqkHtknsydL+kLX07JC4apwG6ftNu6TKYQ=="; }; }; - "otb-ttc-bundle-1.1.2" = { + "otb-ttc-bundle-1.2.0" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.1.2.tgz"; - sha512 = "i6o/Cp5bEZ4k0U7rPiDLFroYa/nwsI2og6Hkd8GVEvBMxwoTDqhqIHYd610NPj3w4babTdb5R+Xyk7NYNB7Xnw=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.2.0.tgz"; + sha512 = "RwPZjepVm3WJnr49jnZvw8iS5Gkf7y9TJO3lMBI8Mb2//CqCmZ37hDnZB4cu1Q5EsYXpheZmh6ldOp/o1r0Bkg=="; }; }; "ow-0.21.0" = { @@ -47174,6 +47831,15 @@ let sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; }; }; + "picocolors-1.0.0" = { + name = "picocolors"; + packageName = "picocolors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + }; + }; "picomatch-2.2.3" = { name = "picomatch"; packageName = "picomatch"; @@ -47210,13 +47876,13 @@ let sha512 = "OlE82n3yMOE5dY9RMOwxhoWefeMlxwk5IVxoj0sSzSFIlmvhN4obzTvO3s/d/b5JhcgXikjaspsy/HuUDTqbBg=="; }; }; - "pid-port-0.1.1" = { + "pid-port-0.2.0" = { name = "pid-port"; packageName = "pid-port"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pid-port/-/pid-port-0.1.1.tgz"; - sha512 = "boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg=="; + url = "https://registry.npmjs.org/pid-port/-/pid-port-0.2.0.tgz"; + sha512 = "xVU9H1FCRSeGrD9Oim5bLg2U7B2BgW0qzK2oahpV5BIf9hwzqQaWyOkOVC0Kgbsc90A9x6525beawx+QK+JduQ=="; }; }; "pidusage-2.0.21" = { @@ -47318,13 +47984,13 @@ let sha512 = "drPtqkkSf0ufx2gaea3TryFiBHdNIdXKf5LN0hTM82SXI4xVIve2wLwNg92e1MT6m3jASLu6VO7eGY6+mmGeyw=="; }; }; - "pino-6.13.2" = { + "pino-6.13.3" = { name = "pino"; packageName = "pino"; - version = "6.13.2"; + version = "6.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.13.2.tgz"; - sha512 = "vmD/cabJ4xKqo9GVuAoAEeQhra8XJ7YydPV/JyIP+0zDtFTu5JSKdtt8eksGVWKtTSrNGcRrzJ4/IzvUWep3FA=="; + url = "https://registry.npmjs.org/pino/-/pino-6.13.3.tgz"; + sha512 = "tJy6qVgkh9MwNgqX1/oYi3ehfl2Y9H0uHyEEMsBe74KinESIjdMrMQDWpcZPpPicg3VV35d/GLQZmo4QgU2Xkg=="; }; }; "pino-std-serializers-3.2.0" = { @@ -47832,15 +48498,6 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.3.6" = { - name = "postcss"; - packageName = "postcss"; - version = "8.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; - sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; - }; - }; "postcss-8.3.9" = { name = "postcss"; packageName = "postcss"; @@ -48255,13 +48912,13 @@ let sha512 = "rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg=="; }; }; - "postcss-reporter-7.0.3" = { + "postcss-reporter-7.0.4" = { name = "postcss-reporter"; packageName = "postcss-reporter"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.3.tgz"; - sha512 = "WoYHwtStmiR74UQDO3vZMbkhOBXSXyteWnhMCVbAK6KRRKLTS0EnTZxOxvbUEnQiMZ+3xRG04x41HhHnLBtQfA=="; + url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.4.tgz"; + sha512 = "jY/fnpGSin7kwJeunXbY35STp5O3VIxSFdjee5JkoPQ+FfGH5JW3N+Xe9oAPcL9UkjWjkK+JC72o8XH4XXKdhw=="; }; }; "postcss-resolve-nested-selector-0.1.1" = { @@ -48498,6 +49155,249 @@ let sha512 = "15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw=="; }; }; + "pouchdb-abstract-mapreduce-7.2.2" = { + name = "pouchdb-abstract-mapreduce"; + packageName = "pouchdb-abstract-mapreduce"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.2.2.tgz"; + sha512 = "7HWN/2yV2JkwMnGnlp84lGvFtnm0Q55NiBUdbBcaT810+clCGKvhssBCrXnmwShD1SXTwT83aszsgiSfW+SnBA=="; + }; + }; + "pouchdb-adapter-node-websql-7.0.0" = { + name = "pouchdb-adapter-node-websql"; + packageName = "pouchdb-adapter-node-websql"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-adapter-node-websql/-/pouchdb-adapter-node-websql-7.0.0.tgz"; + sha512 = "fNaOMO8bvMrRTSfmH4RSLSpgnKahRcCA7Z0jg732PwRbGvvMdGbreZwvKPPD1fg2tm2ZwwiXWK2G3+oXyoqZYw=="; + }; + }; + "pouchdb-adapter-utils-7.0.0" = { + name = "pouchdb-adapter-utils"; + packageName = "pouchdb-adapter-utils"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.0.0.tgz"; + sha512 = "UWKPC6jkz6mHUzZefrU7P5X8ZGvBC8LSNZ7BIp0hWvJE6c20cnpDwedTVDpZORcCbVJpDmFOHBYnOqEIblPtbA=="; + }; + }; + "pouchdb-adapter-websql-core-7.0.0" = { + name = "pouchdb-adapter-websql-core"; + packageName = "pouchdb-adapter-websql-core"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-adapter-websql-core/-/pouchdb-adapter-websql-core-7.0.0.tgz"; + sha512 = "NyMaH0bl20SdJdOCzd+fwXo8JZ15a48/MAwMcIbXzsRHE4DjFNlRcWAcjUP6uN4Ezc+Gx+r2tkBBMf71mIz1Aw=="; + }; + }; + "pouchdb-binary-utils-7.0.0" = { + name = "pouchdb-binary-utils"; + packageName = "pouchdb-binary-utils"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.0.0.tgz"; + sha512 = "yUktdOPIPvOVouCjJN3uop+bCcpdPwePrLm9eUAZNgEYnUFu0njdx7Q0WRsZ7UJ6l75HinL5ZHk4bnvEt86FLw=="; + }; + }; + "pouchdb-binary-utils-7.2.2" = { + name = "pouchdb-binary-utils"; + packageName = "pouchdb-binary-utils"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz"; + sha512 = "shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw=="; + }; + }; + "pouchdb-changes-filter-7.2.2" = { + name = "pouchdb-changes-filter"; + packageName = "pouchdb-changes-filter"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-changes-filter/-/pouchdb-changes-filter-7.2.2.tgz"; + sha512 = "1txJnTtL/C7zrq+spLt3pH9EDHTWmLLwp2zx8zUQrkt6eQtuLuXUI7G84xe+hfpU0rQvUzp/APYMnko0/6Rw0A=="; + }; + }; + "pouchdb-collate-7.2.2" = { + name = "pouchdb-collate"; + packageName = "pouchdb-collate"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz"; + sha512 = "/SMY9GGasslknivWlCVwXMRMnQ8myKHs4WryQ5535nq1Wj/ehpqWloMwxEQGvZE1Sda3LOm7/5HwLTcB8Our+w=="; + }; + }; + "pouchdb-collections-7.0.0" = { + name = "pouchdb-collections"; + packageName = "pouchdb-collections"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.0.0.tgz"; + sha512 = "DaoUr/vU24Q3gM6ghj0va9j/oBanPwkbhkvnqSyC3Dm5dgf5pculNxueLF9PKMo3ycApoWzHMh6N2N8KJbDU2Q=="; + }; + }; + "pouchdb-collections-7.2.2" = { + name = "pouchdb-collections"; + packageName = "pouchdb-collections"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz"; + sha512 = "6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew=="; + }; + }; + "pouchdb-core-7.2.2" = { + name = "pouchdb-core"; + packageName = "pouchdb-core"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-core/-/pouchdb-core-7.2.2.tgz"; + sha512 = "AnMmSH+xx12Vk6oASDRQoElXfV9fSn8MIwfus0oa2lqkxowx4bvidofZbhZfKEiE6QgKwFEOBzs56MS3znI8TQ=="; + }; + }; + "pouchdb-errors-7.0.0" = { + name = "pouchdb-errors"; + packageName = "pouchdb-errors"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.0.0.tgz"; + sha512 = "dTusY8nnTw4HIztCrNl7AoGgwvS1bVf/3/97hDaGc4ytn72V9/4dK8kTqlimi3UpaurohYRnqac0SGXYP8vgXA=="; + }; + }; + "pouchdb-errors-7.2.2" = { + name = "pouchdb-errors"; + packageName = "pouchdb-errors"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz"; + sha512 = "6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g=="; + }; + }; + "pouchdb-extend-0.1.2" = { + name = "pouchdb-extend"; + packageName = "pouchdb-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-extend/-/pouchdb-extend-0.1.2.tgz"; + sha1 = "d1ce511bf704ed2e29f7bf428a416acfffa124b8"; + }; + }; + "pouchdb-fetch-7.2.2" = { + name = "pouchdb-fetch"; + packageName = "pouchdb-fetch"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-fetch/-/pouchdb-fetch-7.2.2.tgz"; + sha512 = "lUHmaG6U3zjdMkh8Vob9GvEiRGwJfXKE02aZfjiVQgew+9SLkuOxNw3y2q4d1B6mBd273y1k2Lm0IAziRNxQnA=="; + }; + }; + "pouchdb-find-7.2.2" = { + name = "pouchdb-find"; + packageName = "pouchdb-find"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-find/-/pouchdb-find-7.2.2.tgz"; + sha512 = "BmFeFVQ0kHmDehvJxNZl9OmIztCjPlZlVSdpijuFbk/Fi1EFPU1BAv3kLC+6DhZuOqU/BCoaUBY9sn66pPY2ag=="; + }; + }; + "pouchdb-json-7.0.0" = { + name = "pouchdb-json"; + packageName = "pouchdb-json"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-json/-/pouchdb-json-7.0.0.tgz"; + sha512 = "w0bNRu/7VmmCrFWMYAm62n30wvJJUT2SokyzeTyj3hRohj4GFwTRg1mSZ+iAmxgRKOFE8nzZstLG/WAB4Ymjew=="; + }; + }; + "pouchdb-mapreduce-utils-7.2.2" = { + name = "pouchdb-mapreduce-utils"; + packageName = "pouchdb-mapreduce-utils"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.2.2.tgz"; + sha512 = "rAllb73hIkU8rU2LJNbzlcj91KuulpwQu804/F6xF3fhZKC/4JQMClahk+N/+VATkpmLxp1zWmvmgdlwVU4HtQ=="; + }; + }; + "pouchdb-md5-7.0.0" = { + name = "pouchdb-md5"; + packageName = "pouchdb-md5"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.0.0.tgz"; + sha512 = "yaSJKhLA3QlgloKUQeb2hLdT3KmUmPfoYdryfwHZuPTpXIRKTnMQTR9qCIRUszc0ruBpDe53DRslCgNUhAyTNQ=="; + }; + }; + "pouchdb-md5-7.2.2" = { + name = "pouchdb-md5"; + packageName = "pouchdb-md5"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz"; + sha512 = "c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw=="; + }; + }; + "pouchdb-merge-7.0.0" = { + name = "pouchdb-merge"; + packageName = "pouchdb-merge"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-merge/-/pouchdb-merge-7.0.0.tgz"; + sha512 = "tci5u6NpznQhGcPv4ho1h0miky9rs+ds/T9zQ9meQeDZbUojXNaX1Jxsb0uYEQQ+HMqdcQs3Akdl0/u0mgwPGg=="; + }; + }; + "pouchdb-merge-7.2.2" = { + name = "pouchdb-merge"; + packageName = "pouchdb-merge"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-merge/-/pouchdb-merge-7.2.2.tgz"; + sha512 = "6yzKJfjIchBaS7Tusuk8280WJdESzFfQ0sb4jeMUNnrqs4Cx3b0DIEOYTRRD9EJDM+je7D3AZZ4AT0tFw8gb4A=="; + }; + }; + "pouchdb-promise-5.4.3" = { + name = "pouchdb-promise"; + packageName = "pouchdb-promise"; + version = "5.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-promise/-/pouchdb-promise-5.4.3.tgz"; + sha1 = "331d670b1989d5a03f268811214f27f54150cb2b"; + }; + }; + "pouchdb-selector-core-7.2.2" = { + name = "pouchdb-selector-core"; + packageName = "pouchdb-selector-core"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz"; + sha512 = "XYKCNv9oiNmSXV5+CgR9pkEkTFqxQGWplnVhO3W9P154H08lU0ZoNH02+uf+NjZ2kjse7Q1fxV4r401LEcGMMg=="; + }; + }; + "pouchdb-utils-7.0.0" = { + name = "pouchdb-utils"; + packageName = "pouchdb-utils"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.0.0.tgz"; + sha512 = "1bnoX1KdZYHv9wicDIFdO0PLiVIMzNDUBUZ/yOJZ+6LW6niQCB8aCv09ZztmKfSQcU5nnN3fe656tScBgP6dOQ=="; + }; + }; + "pouchdb-utils-7.2.2" = { + name = "pouchdb-utils"; + packageName = "pouchdb-utils"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz"; + sha512 = "XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ=="; + }; + }; + "pouchdb-wrappers-4.1.0" = { + name = "pouchdb-wrappers"; + packageName = "pouchdb-wrappers"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pouchdb-wrappers/-/pouchdb-wrappers-4.1.0.tgz"; + sha512 = "L94K7zgb2tFSvU/iAj1EHK8fC13vKWzzy8kc9HBu9s1jtZSfD34cbWG6qUIvlu61Fso2byp8fsOvp+l5hFiRmg=="; + }; + }; "prebuild-install-5.3.0" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -49110,6 +50010,15 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; + "promise-nodify-1.0.2" = { + name = "promise-nodify"; + packageName = "promise-nodify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-nodify/-/promise-nodify-1.0.2.tgz"; + sha1 = "0d0fb143c33400b0061b47e581257557047d4c5a"; + }; + }; "promise-polyfill-6.1.0" = { name = "promise-polyfill"; packageName = "promise-polyfill"; @@ -49227,13 +50136,13 @@ let sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ=="; }; }; - "prompts-2.4.1" = { + "prompts-2.4.2" = { name = "prompts"; packageName = "prompts"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz"; - sha512 = "EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz"; + sha512 = "NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q=="; }; }; "promzard-0.3.0" = { @@ -50442,13 +51351,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.175" = { + "pyright-1.1.178" = { name = "pyright"; packageName = "pyright"; - version = "1.1.175"; + version = "1.1.178"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.175.tgz"; - sha512 = "LCYO4t/wvZPSipRgz5wCRNQWqLBhiVx2H05sU7Xr6db6tesS1mPfwyBoa0X7oMCUycwoEmApdPCSQvrggXQ1oQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.178.tgz"; + sha512 = "OhEoC5HfKZqvY5GVCsHeroYDx85xp4CZwevhNsePxNzZyW+W491K4bfLTvuOBnvcnMWip+aMQ7zzFDkw74Gtkg=="; }; }; "q-0.9.7" = { @@ -51252,13 +52161,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.19.1" = { + "react-devtools-core-4.20.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.19.1"; + version = "4.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.19.1.tgz"; - sha512 = "2wJiGffPWK0KggBjVwnTaAk+Z3MSxKInHmdzPTrBh1mAarexsa93Kw+WMX88+XjN+TtYgAiLe9xeTqcO5FfJTw=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.20.0.tgz"; + sha512 = "85889TaQpU4HImySgOjVwsGE1vkS9dgEjtruRHutnXlBN3IZN8lDRuqRBLmhFkS50BEmfpTR28qV7bHAqwHooA=="; }; }; "react-dom-16.14.0" = { @@ -51369,6 +52278,15 @@ let sha512 = "gAGnwWkf+NOTig9oOowqid9O0HjTDC+XVGBCAmJYYJ2A2cN/O4gDdIuuUQjv8A4v6GDwVfJkagpBBLW5OW9HSw=="; }; }; + "react-reconciler-0.26.2" = { + name = "react-reconciler"; + packageName = "react-reconciler"; + version = "0.26.2"; + src = fetchurl { + url = "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.26.2.tgz"; + sha512 = "nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q=="; + }; + }; "react-refresh-0.4.3" = { name = "react-refresh"; packageName = "react-refresh"; @@ -51612,6 +52530,15 @@ let sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; }; }; + "read-pkg-6.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz"; + sha512 = "X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q=="; + }; + }; "read-pkg-up-1.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -51657,6 +52584,15 @@ let sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; }; }; + "read-pkg-up-8.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz"; + sha512 = "snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ=="; + }; + }; "read-torrent-1.3.1" = { name = "read-torrent"; packageName = "read-torrent"; @@ -51855,6 +52791,15 @@ let sha512 = "v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q=="; }; }; + "recast-0.10.43" = { + name = "recast"; + packageName = "recast"; + version = "0.10.43"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz"; + sha1 = "b95d50f6d60761a5f6252e15d80678168491ce7f"; + }; + }; "recast-0.11.23" = { name = "recast"; packageName = "recast"; @@ -51972,6 +52917,15 @@ let sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; }; }; + "redent-4.0.0" = { + name = "redent"; + packageName = "redent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz"; + sha512 = "tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag=="; + }; + }; "redeyed-2.1.1" = { name = "redeyed"; packageName = "redeyed"; @@ -52017,13 +52971,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.56" = { + "redoc-2.0.0-rc.57" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.56"; + version = "2.0.0-rc.57"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.56.tgz"; - sha512 = "ir2TtQ2d/1FqZWIoLmUZ3qvAAnO6jg8dt0SV75TanmfCXpEABcElXWH3mtUf6qKlvgDVt40diDCVuSvyPPxkAw=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.57.tgz"; + sha512 = "f8XIqvZF1agphq6xmOU9jTDVNDFHJt3MzDq1lUgZojb/7YY4eqLyDi6er/yCWYkY9DuB+v2jHCOn5UUbMuKAfg=="; }; }; "reduce-component-1.0.1" = { @@ -53979,13 +54933,13 @@ let sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; - "rlp-2.2.6" = { + "rlp-2.2.7" = { name = "rlp"; packageName = "rlp"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/rlp/-/rlp-2.2.6.tgz"; - sha512 = "HAfAmL6SDYNWPUOJNrM500x4Thn4PZsEy5pijPh40U9WfNk0z15hUYzO9xVIMAdIHdFtD8CBDHd75Td1g36Mjg=="; + url = "https://registry.npmjs.org/rlp/-/rlp-2.2.7.tgz"; + sha512 = "d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ=="; }; }; "rndm-1.2.0" = { @@ -54393,13 +55347,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.3.1" = { + "rxjs-7.4.0" = { name = "rxjs"; packageName = "rxjs"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.3.1.tgz"; - sha512 = "vNenx7gqjPyeKpRnM6S5Ksm/oFTRijWWzYlRON04KaehZ3YjDwEmVjGUGo0TKWVjeNXOujVRlh0K1drUbcdPkw=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz"; + sha512 = "7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w=="; }; }; "s3-stream-upload-2.0.2" = { @@ -54600,13 +55554,13 @@ let sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; }; }; - "sass-1.42.1" = { + "sass-1.43.2" = { name = "sass"; packageName = "sass"; - version = "1.42.1"; + version = "1.43.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.42.1.tgz"; - sha512 = "/zvGoN8B7dspKc5mC6HlaygyCBRvnyzzgD5khiaCfglWztY99cYoiTUksVx11NlnemrcfH5CEaCpsUKoW0cQqg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.43.2.tgz"; + sha512 = "DncYhjl3wBaPMMJR0kIUaH3sF536rVrOcqqVGmTZHQRRzj7LQlyGV7Mb8aCKFyILMr5VsPHwRYtyKpnKYlmQSQ=="; }; }; "sax-0.5.8" = { @@ -55680,13 +56634,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-3.8.0" = { + "sign-addon-3.9.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "3.8.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.8.0.tgz"; - sha512 = "/KVjGIMGN/8nbSTzpq3orQzYs4YhlYOZF8OkZuG8TSIBns8sUR2vlUNvcgvJPGdpNJkrlienwFDsO1UkbDij1w=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.9.0.tgz"; + sha512 = "a8IzM3jNPSHcf2wSkhLgME4QrIe+rKTb8y/qYwGGzby5ktODAH+WBsKIgGZ9p5d2mpppPwbNEsA+YzcL117bbA=="; }; }; "signal-exit-3.0.5" = { @@ -56085,6 +57039,15 @@ let sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; }; }; + "slice-ansi-5.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz"; + sha512 = "FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ=="; + }; + }; "sliced-1.0.1" = { name = "sliced"; packageName = "sliced"; @@ -56580,13 +57543,13 @@ let sha512 = "mbkiyA2clyfwAyOFIzMvsV6ny2KrKEIhFVASJxWfsmgfUEymgLIS2MLHHcGIQMkrcKhPErRaMR5Dzv0EEn+BWg=="; }; }; - "sodium-native-3.2.1" = { + "sodium-native-3.3.0" = { name = "sodium-native"; packageName = "sodium-native"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-3.2.1.tgz"; - sha512 = "EgDZ/Z7PxL2kCasKk7wnRkV8W9kvwuIlHuHXAxkQm3FF0MgVsjyLBXGjSRGhjE6u7rhSpk3KaMfFM23bfMysIQ=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-3.3.0.tgz"; + sha512 = "rg6lCDM/qa3p07YGqaVD+ciAbUqm6SoO4xmlcfkbU5r1zIGrguXztLiEtaLYTV5U6k8KSIUFmnU3yQUSKmf6DA=="; }; }; "sodium-universal-2.0.0" = { @@ -56877,6 +57840,24 @@ let sha1 = "c4b9a8d41cf7b0845423a821824f8dffa0f51b7c"; }; }; + "spark-md5-3.0.0" = { + name = "spark-md5"; + packageName = "spark-md5"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.0.tgz"; + sha1 = "3722227c54e2faf24b1dc6d933cc144e6f71bfef"; + }; + }; + "spark-md5-3.0.1" = { + name = "spark-md5"; + packageName = "spark-md5"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.1.tgz"; + sha512 = "0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig=="; + }; + }; "sparkles-1.0.1" = { name = "sparkles"; packageName = "sparkles"; @@ -57219,6 +58200,15 @@ let sha512 = "2PNlcs3j5JflQKcg4wpdqpZ+AjhQJ2OZEo34NXDtlB0tIPG84xaaXhpA8XFacFiwjKA4m49UOYG83y3hbMn/gQ=="; }; }; + "sqlite3-4.2.0" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz"; + sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; + }; + }; "sqlite3-5.0.0" = { name = "sqlite3"; packageName = "sqlite3"; @@ -57273,13 +58263,13 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-bendy-butt-0.12.3" = { + "ssb-bendy-butt-0.12.4" = { name = "ssb-bendy-butt"; packageName = "ssb-bendy-butt"; - version = "0.12.3"; + version = "0.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.3.tgz"; - sha512 = "fo3Sspdr+cjQzq8F+EKRJiibm06Mt/pzmtAjf0HEOl/pZPTHGFolfsGtZlU4U+RuKOqqZMhxzTXNAwoJ+trdDw=="; + url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.4.tgz"; + sha512 = "zyVPwizCuW6T3Q2j8XerTPpdhNYY9tLlIVieg/FFQb5wlda3Ce360mYjGngx7586HXgysBi010JpM9emMQhhtA=="; }; }; "ssb-bfe-3.1.1" = { @@ -57354,13 +58344,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.6.0" = { + "ssb-db2-2.6.5" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.6.0"; + version = "2.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.6.0.tgz"; - sha512 = "xQq//UoHFdXObMFGMaMH4a2M2CTCY++1YmvXkD8RXZ/KdxmQx4UqrfI9gAr+EepUYWYoAV/sSphmTUoX39gm6Q=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.6.5.tgz"; + sha512 = "MFMQQEs1kdYl/eKp/7Bb4Ru/W/6nSUbHeJJhKuYg1iF4R9XJR2R8J5nyECI0y2DTRvz2UCEiVdGWu58+Y6Y2lA=="; }; }; "ssb-ebt-5.6.7" = { @@ -57633,22 +58623,22 @@ let sha512 = "nzj5EQnhm5fBGXgtzuuWgxv45dW+CJJm4eCLZKiOxyG1NE/WJZwju2DmqZfiE9zr9bC2T2hPHkckDP0CCP8v8w=="; }; }; - "ssb-validate2-0.1.1" = { + "ssb-validate2-0.1.2" = { name = "ssb-validate2"; packageName = "ssb-validate2"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate2/-/ssb-validate2-0.1.1.tgz"; - sha512 = "EG6CEgx7qX02Ekx8bhkEexs1foaMAt6BAmE91d3BRpim/+i+16jEYf9DzYcifKymxlsM9AUz2P0TyRxbMXreOQ=="; + url = "https://registry.npmjs.org/ssb-validate2/-/ssb-validate2-0.1.2.tgz"; + sha512 = "B1UMy/+sZLbVo0KvdiAvOeSCalYWSaFXxxEmuZ0K0wRqIkn/KU7vdXeaXxp+bRmTTnABdu+k/O7qRJtdiD6e0w=="; }; }; - "ssb-validate2-rsjs-node-1.0.0" = { + "ssb-validate2-rsjs-node-1.0.1" = { name = "ssb-validate2-rsjs-node"; packageName = "ssb-validate2-rsjs-node"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate2-rsjs-node/-/ssb-validate2-rsjs-node-1.0.0.tgz"; - sha512 = "kg/4JNzXEgFCRkvbhAuYZwq14n2sgXF03hClL5Hc9XsMWlQeQ/UHUvClMvy2veFUivz7A6PGT8MaL5BDxW0LiQ=="; + url = "https://registry.npmjs.org/ssb-validate2-rsjs-node/-/ssb-validate2-rsjs-node-1.0.1.tgz"; + sha512 = "DoJDRrdJ0fHH/71QmnQ4D2XxtlLopIUVUH/+3nLFtOp8x563VVimwskQsOO/LzvwsstJ/XZSx9c7f+txApLNfg=="; }; }; "ssb-ws-6.2.3" = { @@ -57660,13 +58650,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.85" = { + "sscaff-1.2.96" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.85"; + version = "1.2.96"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.85.tgz"; - sha512 = "SJqw5nwHNDsH6NevVODqvMIytAd0HfdEkmPOdVbvA6ij5aX/qoo5Y9PDcAvwul9E/FiQEAAavJAiKoHeTx6T+A=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.96.tgz"; + sha512 = "0Hp9NxV7Ba+ZJU5f3DAPZsvGi7pGKmFPGB2q0F1KHW4V6GVydK1lsyYTqSWmY4tKecN7DKi3mmyGSt01fKqxxw=="; }; }; "ssh-config-1.1.6" = { @@ -58317,13 +59307,13 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; - "streamx-2.11.2" = { + "streamx-2.11.3" = { name = "streamx"; packageName = "streamx"; - version = "2.11.2"; + version = "2.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.11.2.tgz"; - sha512 = "CoIBTrCoMKzhTMXZlMwlkjxCH+8e5H5C7WeuWKSlY5ldtCUMkkrLh5UT2+2OHAnpTPrjTimKQl/aXxgbhZtH5Q=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.11.3.tgz"; + sha512 = "NhcjG/xi33S4O2LRXZnBg7TLhnlE7RKWTeUx3N08K/89PKZ6MehEtSE+aToT5f2Cer2ArX9FwUhVfZbsUjnvrw=="; }; }; "strftime-0.10.0" = { @@ -58425,6 +59415,15 @@ let sha512 = "Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA=="; }; }; + "string-natural-compare-2.0.3" = { + name = "string-natural-compare"; + packageName = "string-natural-compare"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-2.0.3.tgz"; + sha512 = "4Kcl12rNjc+6EKhY8QyDVuQTAlMWwRiNbsxnVwBUKFr7dYPQuXVrtNU4sEkjF9LHY0AY6uVbB3ktbkIH4LC+BQ=="; + }; + }; "string-padding-1.0.2" = { name = "string-padding"; packageName = "string-padding"; @@ -58497,6 +59496,15 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; + "string-width-5.0.1" = { + name = "string-width"; + packageName = "string-width"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-5.0.1.tgz"; + sha512 = "5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g=="; + }; + }; "string.prototype.repeat-0.2.0" = { name = "string.prototype.repeat"; packageName = "string.prototype.repeat"; @@ -58857,6 +59865,15 @@ let sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; }; }; + "strip-indent-4.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz"; + sha512 = "mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA=="; + }; + }; "strip-json-comments-0.1.3" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -59118,13 +60135,13 @@ let sha1 = "3a26ab96e06f78cf4ace8d083f6227fa55970947"; }; }; - "sucrase-3.20.1" = { + "sucrase-3.20.2" = { name = "sucrase"; packageName = "sucrase"; - version = "3.20.1"; + version = "3.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/sucrase/-/sucrase-3.20.1.tgz"; - sha512 = "BIG59HaJOxNct9Va6KvT5yzBA/rcMGetzvZyTx0ZdCcspIbpJTPS64zuAfYlJuOj+3WaI5JOdA+F0bJQQi8ZiQ=="; + url = "https://registry.npmjs.org/sucrase/-/sucrase-3.20.2.tgz"; + sha512 = "EdJ5M6VEvToIZwIWiZ71cxe4CklDRG8PdSjUSst+BZCUGlaEhnrdQo/LOXsuq3MjWRbfepg1XTffClK0Tmo0HQ=="; }; }; "sudo-block-1.2.0" = { @@ -59226,13 +60243,13 @@ let sha512 = "DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A=="; }; }; - "supercluster-7.1.3" = { + "supercluster-7.1.4" = { name = "supercluster"; packageName = "supercluster"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/supercluster/-/supercluster-7.1.3.tgz"; - sha512 = "7+bR4FbF5SYsmkHfDp61QiwCKtwNDyPsddk9TzfsDA5DQr5Goii5CVD2SXjglweFCxjrzVZf945ahqYfUIk8UA=="; + url = "https://registry.npmjs.org/supercluster/-/supercluster-7.1.4.tgz"; + sha512 = "GhKkRM1jMR6WUwGPw05fs66pOFWhf59lXq+Q3J3SxPvhNcmgOtLRV6aVQPMRsmXdpaeFJGivt+t7QXUPL3ff4g=="; }; }; "superstatic-7.1.0" = { @@ -59397,13 +60414,13 @@ let sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"; }; }; - "svg-pathdata-6.0.3" = { + "svg-pathdata-5.0.5" = { name = "svg-pathdata"; packageName = "svg-pathdata"; - version = "6.0.3"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz"; - sha512 = "qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw=="; + url = "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; + sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; }; }; "svg-tags-1.0.0" = { @@ -59415,13 +60432,13 @@ let sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764"; }; }; - "svg2img-0.9.3" = { + "svg2img-0.9.4" = { name = "svg2img"; packageName = "svg2img"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.3.tgz"; - sha512 = "xuBToDg/iFg0T8dhMTpu8CGfnsinswF2zgBa22HbcK6fSAKkl/bsX84qbic50kA4McKTLK5QZ+fzavy8quEIVA=="; + url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.4.tgz"; + sha512 = "1XquM9CorP9Em58gS9NjTaKpoRrIBM4gSSGSOHnoU70Y4AB3D+vILbdcHfvyGcLJ80IdYTbcpznp8NVNKkCedQ=="; }; }; "svgo-0.6.6" = { @@ -59667,13 +60684,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.9.4" = { + "systeminformation-5.9.7" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.9.4"; + version = "5.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.4.tgz"; - sha512 = "FOsiTn0CyJZoj9kIhla11ndsMzbbwwuriul81wpqIBt9IpbxHZ6P/oZCphIFgJrwqjTnme0Qp1HDzIkUD9Xr/g=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.7.tgz"; + sha512 = "Vcmc8HaWPMFM4DoasuKN2lpvIwS2AqaoPuEGZc4HCT6tlRJH+IQ5GhA2BrUgjpBDJjFMj2Bti6qLOzP3T1arCw=="; }; }; "table-3.8.3" = { @@ -59712,15 +60729,6 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-6.7.1" = { - name = "table"; - packageName = "table"; - version = "6.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.7.1.tgz"; - sha512 = "ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg=="; - }; - }; "table-6.7.2" = { name = "table"; packageName = "table"; @@ -59794,13 +60802,13 @@ let sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; }; }; - "tail-2.2.3" = { + "tail-2.2.4" = { name = "tail"; packageName = "tail"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/tail/-/tail-2.2.3.tgz"; - sha512 = "XbBmVsJZ636kncPew2Y+pOxOsb9GsNFZ1bcAGCDn23ME/JPJ+TImZYjnqBnMLdw+K11Hql5ZgiUQmRvDHaFc6w=="; + url = "https://registry.npmjs.org/tail/-/tail-2.2.4.tgz"; + sha512 = "PX8klSxW1u3SdgDrDeewh5GNE+hkJ4h02JvHfV6YrHqWOVJ88nUdSQqtsUf/gWhgZlPAws3fiZ+F1f8euspcuQ=="; }; }; "taketalk-1.0.0" = { @@ -59974,6 +60982,15 @@ let sha512 = "5KcOFzPvd1nGFVrmB7H4+QAWVjYOf//+QTbOj0GpXbqtqbKGWVczG+rq6VhXAtdtlKLTs16NAmHRyF5vbggQ2w=="; }; }; + "taskkill-4.0.0" = { + name = "taskkill"; + packageName = "taskkill"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/taskkill/-/taskkill-4.0.0.tgz"; + sha512 = "h+BGQ8ExIUZ81h4iHRvatZY5eeBBl2WZk31MmMdFG9LBTc5eCH5u/bzZ7phaPH3bsiB7WhM7YTkOyB2dyFQfXg=="; + }; + }; "tasklist-3.1.1" = { name = "tasklist"; packageName = "tasklist"; @@ -60775,6 +61792,15 @@ let sha512 = "pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="; }; }; + "tiny-queue-0.2.1" = { + name = "tiny-queue"; + packageName = "tiny-queue"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-queue/-/tiny-queue-0.2.1.tgz"; + sha1 = "25a67f2c6e253b2ca941977b5ef7442ef97a6046"; + }; + }; "tiny-secp256k1-1.1.6" = { name = "tiny-secp256k1"; packageName = "tiny-secp256k1"; @@ -61369,6 +62395,24 @@ let sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; }; }; + "tr46-3.0.0" = { + name = "tr46"; + packageName = "tr46"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz"; + sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; + }; + }; + "transform-pouch-1.1.5" = { + name = "transform-pouch"; + packageName = "transform-pouch"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/transform-pouch/-/transform-pouch-1.1.5.tgz"; + sha512 = "X8hcWl3GnvSG3QMSBwsvVRCg9yRP3rSQd0wvZx2ZCGtZSrPxxe/l2wsjvETppD48rgA83XycxfPQ2fyOYRMU2w=="; + }; + }; "transliteration-1.6.6" = { name = "transliteration"; packageName = "transliteration"; @@ -61414,13 +62458,13 @@ let sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="; }; }; - "tree-kit-0.7.3" = { + "tree-kit-0.7.4" = { name = "tree-kit"; packageName = "tree-kit"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.3.tgz"; - sha512 = "BVxfUGNHKXS6TEOwKHioWSBivg6b5zfbdXtOWEE5ZpgQxG6gPtvFvjnsoKXTp2ASFmzSe6PhXemutmx8zUxFQQ=="; + url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.4.tgz"; + sha512 = "Of3tPmVs3b6BhzyUJ7t0olisf47kYr9qAm0XaUpURMjdBn6TwiVaaMuTFoKkkvPGojd9trKAHlrGGcGKcdR1DA=="; }; }; "tree-sitter-0.17.2" = { @@ -61504,6 +62548,15 @@ let sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; }; }; + "trim-newlines-4.0.2" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.0.2.tgz"; + sha512 = "GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew=="; + }; + }; "trim-repeated-1.0.0" = { name = "trim-repeated"; packageName = "trim-repeated"; @@ -62134,6 +63187,15 @@ let sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; }; }; + "type-fest-1.4.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz"; + sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -62287,13 +63349,13 @@ let sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; }; }; - "typescript-4.4.3" = { + "typescript-4.4.4" = { name = "typescript"; packageName = "typescript"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; - sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"; + sha512 = "DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -62719,6 +63781,15 @@ let sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; }; }; + "uni-global-1.0.0" = { + name = "uni-global"; + packageName = "uni-global"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uni-global/-/uni-global-1.0.0.tgz"; + sha512 = "WWM3HP+siTxzIWPNUg7hZ4XO8clKi6NoCAJJWnuRL+BAqyFXF8gC03WNyTefGoUXYc47uYgXxpKLIEvo65PEHw=="; + }; + }; "unicode-canonical-property-names-ecmascript-2.0.0" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; @@ -63349,6 +64420,15 @@ let sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; }; }; + "unreachable-branch-transform-0.3.0" = { + name = "unreachable-branch-transform"; + packageName = "unreachable-branch-transform"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unreachable-branch-transform/-/unreachable-branch-transform-0.3.0.tgz"; + sha1 = "d99cc4c6e746d264928845b611db54b0f3474caa"; + }; + }; "unset-value-1.0.0" = { name = "unset-value"; packageName = "unset-value"; @@ -63754,13 +64834,13 @@ let sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6"; }; }; - "usb-1.7.2" = { + "usb-1.8.0" = { name = "usb"; packageName = "usb"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/usb/-/usb-1.7.2.tgz"; - sha512 = "SfVSItgsD9+YfEpcK1UZ8tQ7e8GdxQ0xoQtB773omNBKTVj3IuFJNKjwSnpE58FGcV4tUoKLHmBMc018RUY5SA=="; + url = "https://registry.npmjs.org/usb/-/usb-1.8.0.tgz"; + sha512 = "lA0q2tjDEAq1YUsW6nQ+asw92TtFrQ8rhMd11jAoFhK3xItZUupJ7npZDSmVOpQqQhhdFmX/YciqyywupA/wOQ=="; }; }; "use-3.1.1" = { @@ -63845,13 +64925,13 @@ let sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb"; }; }; - "utf-8-validate-5.0.6" = { + "utf-8-validate-5.0.7" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.6.tgz"; - sha512 = "hoY0gOf9EkCw+nimK21FVKHUIG1BMqSiRwxB/q3A9yKZOrOI99PP77BxmarDqWz6rG3vVYiBWfhG8z2Tl+7fZA=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.7.tgz"; + sha512 = "vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q=="; }; }; "utf7-1.0.2" = { @@ -64088,6 +65168,15 @@ let sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; + "uuid-3.2.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; + sha512 = "jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="; + }; + }; "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; @@ -64115,6 +65204,15 @@ let sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; }; }; + "uuid-8.1.0" = { + name = "uuid"; + packageName = "uuid"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz"; + sha512 = "CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="; + }; + }; "uuid-8.3.0" = { name = "uuid"; packageName = "uuid"; @@ -65033,13 +66131,13 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.3" = { + "vm2-3.9.4" = { name = "vm2"; packageName = "vm2"; - version = "3.9.3"; + version = "3.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.3.tgz"; - sha512 = "smLS+18RjXYMl9joyJxMNI9l4w7biW8ilSDaVRvFBDwOH8P0BK1ognFQTpg0wyQ6wIKLTblHJvROW692L/E53Q=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.4.tgz"; + sha512 = "sOdharrJ7KEePIpHekiWaY1DwgueuiBeX/ZBJUPgETsVlJsXuEx0K0/naATq2haFvJrvZnRiORQRubR0b7Ye6g=="; }; }; "voc-1.2.0" = { @@ -65285,13 +66383,13 @@ let sha512 = "dEmliPZGbSyIcEeKRGzosCy7y7zsc8FXg1l5BBOGgMUbemlo3vUnsa2GFqpILJwJvlbvkRcF2QASNwIlKe9J7g=="; }; }; - "vscode-jsonrpc-8.0.0-next.2" = { + "vscode-jsonrpc-8.0.0-next.3" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "8.0.0-next.2"; + version = "8.0.0-next.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.2.tgz"; - sha512 = "gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.3.tgz"; + sha512 = "2wRiBR5tZAXZ4UxIO4F0cT/zN6OpruoWO0vc7EpQZxVfumb0pYiSegB+PaOzXCuFQzh7YEshW/XMg4zTz3FGVQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -65393,13 +66491,13 @@ let sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; }; }; - "vscode-languageserver-8.0.0-next.2" = { + "vscode-languageserver-8.0.0-next.3" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "8.0.0-next.2"; + version = "8.0.0-next.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.2.tgz"; - sha512 = "7qCEXTeGZKkI8BGvlKh0JPXTY7BaWoiwQYKCcGaUgnMs34wt6F/yaKcxoC3XIouBBVyRxiI6Ml/JdztM3XYEaA=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.3.tgz"; + sha512 = "uxL/tKUa/gRdvQINVmMnK32d6LwfTPTvF7l1iZIFDuAdhGrQ+Po+4lS3w4hwQSeUmapM1WMELXNBFca/u3H5Uw=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -65456,13 +66554,13 @@ let sha512 = "f1kGsoOpISB5jSqQNeMDl2446enxVahyux2e5vZap6pu/TC+2UlvPT4DCR0gPph95KOQZweL9zq1SzLoPdqhuA=="; }; }; - "vscode-languageserver-protocol-3.17.0-next.8" = { + "vscode-languageserver-protocol-3.17.0-next.9" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.17.0-next.8"; + version = "3.17.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.8.tgz"; - sha512 = "P89vSuJ+FA5JzFmcOoZN13Ig1yd6LsiPOig0O5m5BSGuO/rplQegCd9J0wKpaTy7trf/SYHRoypnbUBdzy14sg=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.9.tgz"; + sha512 = "DGkRmbI1hRBMY6HU6MOyza5AvYp0+HcbMf2qdmI98luyQJ26dOfHY5K38OS4hlTHhdJg9RypTQ/uBbLZehmn1Q=="; }; }; "vscode-languageserver-protocol-3.5.1" = { @@ -65492,13 +66590,13 @@ let sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw=="; }; }; - "vscode-languageserver-textdocument-1.0.1" = { + "vscode-languageserver-textdocument-1.0.2" = { name = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz"; - sha512 = "UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="; + url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.2.tgz"; + sha512 = "T7uPC18+f8mYE4lbVZwb3OSmvwTZm3cuFhrdx9Bn2l11lmp3SvSuSVjy2JtvrghzjAo4G6Trqny2m9XGnFnWVA=="; }; }; "vscode-languageserver-types-3.14.0" = { @@ -65573,6 +66671,15 @@ let sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg=="; }; }; + "vscode-languageserver-types-3.17.0-next.4" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.17.0-next.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.4.tgz"; + sha512 = "MraVkZDhfqa3ftnKW9rEDeqsV+ji8OrtEjx6mVjzVGm5U2XXT+mdqDWyQ+y0Gvb2/aa2oJJQyTAaDmRTUKiUbg=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -65753,6 +66860,15 @@ let sha512 = "ikg8ruE17tIXF9mrVvKoOR3oyM9nk0TcmUHyeBWod5ILEH9DRN0+seX4gwsSbjdxMYlIIvmnCFPQeMdlcJqPJQ=="; }; }; + "vuvuzela-1.0.3" = { + name = "vuvuzela"; + packageName = "vuvuzela"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vuvuzela/-/vuvuzela-1.0.3.tgz"; + sha1 = "3be145e58271c73ca55279dd851f12a682114b0b"; + }; + }; "w3c-hr-time-1.0.2" = { name = "w3c-hr-time"; packageName = "w3c-hr-time"; @@ -65780,6 +66896,15 @@ let sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; }; }; + "w3c-xmlserializer-3.0.0" = { + name = "w3c-xmlserializer"; + packageName = "w3c-xmlserializer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz"; + sha512 = "3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg=="; + }; + }; "wait-port-0.2.9" = { name = "wait-port"; packageName = "wait-port"; @@ -65906,13 +67031,13 @@ let sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c"; }; }; - "wavedrom-2.8.1" = { + "wavedrom-2.8.3" = { name = "wavedrom"; packageName = "wavedrom"; - version = "2.8.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.8.1.tgz"; - sha512 = "UTU27qnkfv+qLCwilm+T+m6zcPzSFP7i5HgtZkihbDeVIUasa3npnWhK3ogJ6gmOYhTK1lIh8KDztEuod2CM/g=="; + url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.8.3.tgz"; + sha512 = "Ey9A/uABN6rpjC8iFU6ZfL/NhIoXyrQ7h2+gH83kQxRvl6h9VFkJYglGayse2NfU9DDdm2C2uRDE0UpxNMde0w=="; }; }; "wawoff2-2.0.0" = { @@ -66059,6 +67184,15 @@ let sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; }; }; + "webidl-conversions-7.0.0" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; + sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; + }; + }; "webmscore-0.18.0" = { name = "webmscore"; packageName = "webmscore"; @@ -66104,13 +67238,13 @@ let sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; - "webpack-5.56.1" = { + "webpack-5.58.2" = { name = "webpack"; packageName = "webpack"; - version = "5.56.1"; + version = "5.58.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.56.1.tgz"; - sha512 = "MRbTPooHJuSAfbx7Lh/qEMRUe/d0p4cRj2GPo/fq+4JUeR/+Q1EfLvS1lexslbMcJZyPXxxz/k/NzVepkA5upA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.58.2.tgz"; + sha512 = "3S6e9Vo1W2ijk4F4PPWRIu6D/uGgqaPmqw+av3W3jLDujuNkdxX5h5c+RQ6GkjVR+WwIPOfgY8av+j5j4tMqJw=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -66131,13 +67265,13 @@ let sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; }; - "webpack-cli-4.8.0" = { + "webpack-cli-4.9.0" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz"; - sha512 = "+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.0.tgz"; + sha512 = "n/jZZBMzVEl4PYIBs+auy2WI0WTQ74EnJDiyD98O2JZY6IVIHJNitkYp/uTXOviIOMfgzrNvC9foKv/8o8KSZw=="; }; }; "webpack-core-0.6.9" = { @@ -66311,13 +67445,22 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.5.5" = { + "websql-1.0.0" = { + name = "websql"; + packageName = "websql"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/websql/-/websql-1.0.0.tgz"; + sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; + }; + }; + "webtorrent-1.5.6" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.5.5"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.5.5.tgz"; - sha512 = "YAEtWZxxf8N6DvdLgt79fQlIXSJU0G61YEkcWyBA+aopQGV0vCAMp1N/ifKIFt760pgKV+qzwRSbVP+/lBJ08g=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.5.6.tgz"; + sha512 = "P9+0ylzpvtz/bdEPOfYQYA0gjngvaMSP6U9hHI4eSaFDGZBGiGGs6cdSemV1rCStRUtH4t5PQ7nPKL19MV2N4Q=="; }; }; "well-known-symbols-2.0.0" = { @@ -66338,6 +67481,15 @@ let sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; + "whatwg-encoding-2.0.0" = { + name = "whatwg-encoding"; + packageName = "whatwg-encoding"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"; + sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg=="; + }; + }; "whatwg-fetch-3.6.2" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; @@ -66356,6 +67508,24 @@ let sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; }; + "whatwg-mimetype-3.0.0" = { + name = "whatwg-mimetype"; + packageName = "whatwg-mimetype"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz"; + sha512 = "nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="; + }; + }; + "whatwg-url-10.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz"; + sha512 = "CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w=="; + }; + }; "whatwg-url-5.0.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -66536,6 +67706,15 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; + "wide-align-1.1.5" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; + }; + }; "widest-line-1.0.0" = { name = "widest-line"; packageName = "widest-line"; @@ -67148,15 +68327,6 @@ let sha512 = "BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="; }; }; - "ws-8.1.0" = { - name = "ws"; - packageName = "ws"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.1.0.tgz"; - sha512 = "0UWlCD2s3RSclw8FN+D0zDTUyMO+1kHwJQQJzkgUh16S8d3NYON0AKCEQPffE0ez4JyRFu76QDA9KR5bOG/7jw=="; - }; - }; "ws-8.2.0" = { name = "ws"; packageName = "ws"; @@ -67355,6 +68525,15 @@ let sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; }; }; + "xml-name-validator-4.0.0" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; + sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; + }; + }; "xml-parse-from-string-1.0.1" = { name = "xml-parse-from-string"; packageName = "xml-parse-from-string"; @@ -67671,13 +68850,13 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; - "xss-1.0.9" = { + "xss-1.0.10" = { name = "xss"; packageName = "xss"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.9.tgz"; - sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz"; + sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw=="; }; }; "xstate-4.25.0" = { @@ -67779,15 +68958,6 @@ let sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; - "yaml-2.0.0-7" = { - name = "yaml"; - packageName = "yaml"; - version = "2.0.0-7"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.0.0-7.tgz"; - sha512 = "RbI2Tm3hl9AoHY4wWyWvGvJfFIbHOzuzaxum6ez1A0vve+uXgNor03Wys4t+2sgjJSVSe+B2xerd1/dnvqHlOA=="; - }; - }; "yaml-2.0.0-8" = { name = "yaml"; packageName = "yaml"; @@ -67851,15 +69021,6 @@ let sha512 = "GQ2eRE5GcKBK8XVKBIcMyOfC8WMZmEs6gogtVc6knLKE6pG+e5L/lOMfBxZzAt2lqye5itMggQ9+6stXAVhMsw=="; }; }; - "yaml-language-server-parser-0.1.3" = { - name = "yaml-language-server-parser"; - packageName = "yaml-language-server-parser"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.3.tgz"; - sha512 = "xD2I+6M/vqQvcy4ded8JpXUaDHXmZMdhIO3OpuiFxstutwnW4whrfDzNcrsfXVdgMWqOUpdv3747Q081PFN1+g=="; - }; - }; "yamljs-0.3.0" = { name = "yamljs"; packageName = "yamljs"; @@ -68424,15 +69585,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.2.8"; + version = "12.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.8.tgz"; - sha512 = "MkTVkQbI+58W1izHKpGdpj0YAFfQnf7oQIyMom13/8l83yuOJdNzFTG/Lt77hx19qaKemEdmqTqdEOOrzaqggw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.10.tgz"; + sha512 = "gx2XlOUjAAYyJBBIz4QkgsLLRMdFTQbcOR41/Yv0kgpR6AStrOWhz7tpYPbU6vWMjehpuTaWv4NE5eGjwVTZqg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1202.8" - sources."@angular-devkit/core-12.2.8" - sources."@angular-devkit/schematics-12.2.8" + sources."@angular-devkit/architect-0.1202.10" + sources."@angular-devkit/core-12.2.10" + sources."@angular-devkit/schematics-12.2.10" sources."@gar/promisify-1.1.2" sources."@npmcli/fs-1.0.0" sources."@npmcli/git-2.1.0" @@ -68441,7 +69602,7 @@ in sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" - sources."@schematics/angular-12.2.8" + sources."@schematics/angular-12.2.10" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -68557,12 +69718,12 @@ in sources."ini-2.0.0" (sources."inquirer-8.1.2" // { dependencies = [ - sources."rxjs-7.3.1" + sources."rxjs-7.4.0" sources."tslib-2.1.0" ]; }) sources."ip-1.1.5" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -68683,14 +69844,7 @@ in }) sources."wcwidth-1.0.1" sources."which-2.0.2" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."wide-align-1.1.5" sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; @@ -69154,7 +70308,7 @@ in sources."node-forge-0.10.0" sources."nwsapi-2.2.0" sources."onetime-5.1.2" - sources."open-8.2.1" + sources."open-8.3.0" sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."papaparse-5.3.1" @@ -69213,13 +70367,13 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "13.2.0"; + version = "13.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-13.2.0.tgz"; - sha512 = "RqG0cxxiwaL9OgQbA2ZEfZaVIRJmbtsZgnj5G07AjN7///s/40grSN4/kDl8YjUgvAZskPfJRoGGYNvHJ4zHWA=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-13.2.1.tgz"; + sha512 = "JGzYk2ay5JkRS5w+FLQzr0u/Kih52ds4HPpa3vnwVOQN8Q+S1VYr8Nk/6kRm6uNYsAcC1nejtuDxRdLcLh/9TA=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -69236,7 +70390,7 @@ in sources."@commitlint/format-13.2.0" sources."@commitlint/is-ignored-13.2.0" sources."@commitlint/lint-13.2.0" - sources."@commitlint/load-13.2.0" + sources."@commitlint/load-13.2.1" sources."@commitlint/message-13.2.0" sources."@commitlint/parse-13.2.0" sources."@commitlint/read-13.2.0" @@ -69312,7 +70466,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" @@ -69394,6 +70548,7 @@ in sources."ts-node-9.1.1" sources."tslib-2.3.1" sources."type-fest-0.18.1" + sources."typescript-4.4.4" sources."universalify-2.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -69462,7 +70617,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.10.2" + sources."@types/node-16.11.0" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -69649,7 +70804,6 @@ in sources."immediate-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" sources."inspect-custom-symbol-1.1.1" sources."internal-slot-1.0.3" sources."ipv4-peers-2.0.0" @@ -69658,7 +70812,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-2.0.5" sources."is-callable-1.2.4" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -69842,7 +70996,7 @@ in sources."nanoassert-2.0.0" ]; }) - sources."sodium-native-3.2.1" + sources."sodium-native-3.3.0" (sources."sodium-universal-3.0.4" // { dependencies = [ sources."nanoassert-2.0.0" @@ -69854,7 +71008,7 @@ in sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.11.2" + sources."streamx-2.11.3" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -69911,7 +71065,7 @@ in ]; }) sources."varint-5.0.0" - sources."vm2-3.9.3" + sources."vm2-3.9.4" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" @@ -69956,6 +71110,918 @@ in bypassCache = true; reconstructLock = true; }; + "@medable/mdctl-cli" = nodeEnv.buildNodePackage { + name = "_at_medable_slash_mdctl-cli"; + packageName = "@medable/mdctl-cli"; + version = "1.0.62"; + src = fetchurl { + url = "https://registry.npmjs.org/@medable/mdctl-cli/-/mdctl-cli-1.0.62.tgz"; + sha512 = "7EpRhhrJqICbMGjLkdthQYLLGMXNCsrsq8/xxYX1cdRiNwoGb84yjL1WFBrnQtaM8rXShOvhf4lrM2W0K9m4lQ=="; + }; + dependencies = [ + sources."@babel/parser-7.15.8" + sources."@medable/mdctl-api-1.0.62" + sources."@medable/mdctl-core-1.0.62" + sources."@medable/mdctl-core-schemas-1.0.62" + sources."@medable/mdctl-core-utils-1.0.60" + sources."@medable/mdctl-credentials-provider-keychain-1.0.62" + sources."@medable/mdctl-credentials-provider-pouchdb-1.0.62" + sources."@medable/mdctl-docs-1.0.60" + sources."@medable/mdctl-export-adapter-console-1.0.60" + (sources."@medable/mdctl-export-adapter-tree-1.0.62" // { + dependencies = [ + sources."glob-7.2.0" + sources."globby-10.0.2" + ]; + }) + sources."@medable/mdctl-import-adapter-1.0.62" + (sources."@medable/mdctl-manifest-1.0.62" // { + dependencies = [ + sources."pluralize-8.0.0" + ]; + }) + sources."@medable/mdctl-node-utils-1.0.62" + sources."@medable/mdctl-sandbox-1.0.62" + sources."@medable/mdctl-secrets-1.0.60" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@types/glob-7.1.4" + sources."@types/minimatch-3.0.5" + sources."@types/node-16.11.0" + sources."@types/tough-cookie-2.3.8" + sources."abbrev-1.1.1" + sources."abort-controller-3.0.0" + sources."acorn-5.7.4" + sources."agent-base-6.0.2" + sources."ajv-6.12.6" + sources."amdefine-1.0.1" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.7" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."argparse-1.0.10" + sources."argsarray-0.0.1" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-union-2.1.0" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."ast-types-0.9.6" + sources."async-2.6.3" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."axios-0.21.4" + sources."axios-cookiejar-support-0.5.1" + sources."balanced-match-1.0.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base62-1.2.8" + sources."bcrypt-pbkdf-1.0.2" + (sources."bl-1.2.3" // { + dependencies = [ + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + ]; + }) + sources."bluebird-3.7.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browserify-aes-1.2.0" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-equal-constant-time-1.0.1" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.0" + sources."buffer-xor-1.0.3" + sources."cache-base-1.0.1" + sources."call-me-maybe-1.0.1" + sources."camelcase-5.3.1" + sources."caseless-0.12.0" + sources."catharsis-0.9.0" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."chardet-0.7.0" + sources."chownr-1.1.4" + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-cursor-2.1.0" + sources."cli-table-0.3.6" + sources."cli-width-2.2.1" + (sources."cliui-4.1.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colors-1.0.3" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commoner-0.10.8" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" + sources."dashdash-1.14.1" + sources."debug-4.3.2" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.4" + sources."define-property-2.0.2" + sources."defined-1.0.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."detective-4.7.1" + sources."dir-glob-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."end-of-stream-1.4.4" + sources."entities-2.0.3" + sources."es3ify-0.2.2" + sources."escape-string-regexp-2.0.0" + (sources."escodegen-1.14.3" // { + dependencies = [ + sources."esprima-4.0.1" + sources."source-map-0.6.1" + ]; + }) + sources."esmangle-evaluator-1.0.1" + sources."esprima-2.7.3" + sources."esprima-fb-15001.1.0-dev-harmony-fb" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."event-target-shim-5.0.1" + sources."evp_bytestokey-1.0.3" + (sources."execa-1.0.0" // { + dependencies = [ + sources."is-stream-1.1.0" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + sources."expand-template-2.0.3" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + (sources."falafel-1.2.0" // { + dependencies = [ + sources."acorn-1.2.2" + sources."isarray-0.0.1" + ]; + }) + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.7" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.13.0" + sources."fetch-cookie-0.10.1" + (sources."figures-2.0.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."fill-range-7.0.1" + sources."find-up-3.0.0" + sources."follow-redirects-1.14.4" + sources."for-in-1.0.2" + sources."foreach-2.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fragment-cache-0.2.1" + sources."fs-constants-1.0.0" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."gauge-2.7.4" + sources."gaxios-2.3.4" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."github-from-package-0.0.0" + sources."glob-5.0.15" + sources."glob-parent-5.1.2" + sources."glob-to-regexp-0.3.0" + (sources."globby-9.2.0" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."dir-glob-2.2.2" + sources."fast-glob-2.2.7" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."glob-7.2.0" + sources."glob-parent-3.1.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."graceful-fs-4.2.8" + (sources."handlebars-4.7.7" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + 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-unicode-2.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."hash-base-3.1.0" + sources."hasurl-1.0.0" + sources."http-signature-1.2.0" + sources."https-proxy-agent-5.0.0" + sources."iconv-lite-0.4.24" + sources."ignore-5.1.8" + sources."ignore-walk-3.0.4" + sources."immediate-3.0.6" + sources."inflection-1.13.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."inline-process-browser-1.0.0" + (sources."inquirer-6.5.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + ]; + }) + sources."interpret-1.4.0" + sources."invert-kv-2.0.0" + sources."ip-regex-2.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-core-module-2.8.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" + sources."is-plain-object-2.0.4" + sources."is-redirect-1.0.0" + sources."is-stream-2.0.1" + sources."is-typedarray-1.0.0" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + (sources."js-yaml-3.14.1" // { + dependencies = [ + sources."esprima-4.0.1" + ]; + }) + sources."js2xmlparser-4.0.1" + sources."jsbn-0.1.1" + (sources."jsdoc-3.6.7" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."strip-json-comments-3.1.1" + ]; + }) + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + (sources."jsonpath-1.1.1" // { + dependencies = [ + sources."esprima-1.2.2" + sources."underscore-1.12.1" + ]; + }) + sources."jsonwebtoken-8.5.1" + sources."jsprim-1.4.1" + (sources."jstransform-11.0.3" // { + dependencies = [ + sources."object-assign-2.1.1" + ]; + }) + sources."jwa-1.4.1" + sources."jws-3.2.2" + sources."keytar-4.13.0" + sources."kind-of-6.0.3" + sources."klaw-3.0.0" + sources."lcid-2.0.0" + sources."levn-0.3.0" + sources."lie-3.0.4" + sources."linkify-it-2.2.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.21" + sources."lodash.includes-4.3.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.once-4.1.1" + sources."lodash.sortby-4.7.0" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."markdown-it-10.0.0" + sources."markdown-it-anchor-5.3.0" + sources."marked-2.1.3" + sources."md5.js-1.3.5" + sources."mdurl-1.0.1" + (sources."mem-4.3.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."mime-2.5.2" + sources."mime-db-1.50.0" + sources."mime-types-2.1.33" + sources."mimic-fn-1.2.0" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."mute-stream-0.0.7" + sources."nan-2.14.0" + sources."nanomatch-1.2.13" + sources."napi-build-utils-1.0.2" + (sources."ndjson-1.5.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + (sources."needle-2.9.1" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."node-abi-2.30.1" + sources."node-fetch-2.6.5" + sources."node-pre-gyp-0.11.0" + sources."noop-fn-1.0.0" + sources."noop-logger-0.1.1" + sources."nopt-4.0.3" + sources."npm-bundled-1.1.2" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.8" + sources."npm-run-path-2.0.2" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optionator-0.8.3" + sources."os-homedir-1.0.2" + sources."os-locale-3.1.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" + sources."path-type-4.0.0" + sources."performance-now-2.1.0" + sources."picomatch-2.3.0" + sources."pify-4.0.1" + sources."pluralize-7.0.0" + sources."posix-character-classes-0.1.1" + (sources."pouchdb-abstract-mapreduce-7.2.2" // { + dependencies = [ + sources."buffer-from-1.1.1" + sources."immediate-3.3.0" + sources."pouchdb-binary-utils-7.2.2" + sources."pouchdb-collections-7.2.2" + sources."pouchdb-errors-7.2.2" + sources."pouchdb-md5-7.2.2" + sources."pouchdb-utils-7.2.2" + sources."spark-md5-3.0.1" + sources."uuid-8.1.0" + ]; + }) + sources."pouchdb-adapter-node-websql-7.0.0" + sources."pouchdb-adapter-utils-7.0.0" + sources."pouchdb-adapter-websql-core-7.0.0" + sources."pouchdb-binary-utils-7.0.0" + (sources."pouchdb-changes-filter-7.2.2" // { + dependencies = [ + sources."buffer-from-1.1.1" + sources."immediate-3.3.0" + sources."pouchdb-binary-utils-7.2.2" + sources."pouchdb-collections-7.2.2" + sources."pouchdb-errors-7.2.2" + sources."pouchdb-md5-7.2.2" + sources."pouchdb-utils-7.2.2" + sources."spark-md5-3.0.1" + sources."uuid-8.1.0" + ]; + }) + sources."pouchdb-collate-7.2.2" + sources."pouchdb-collections-7.0.0" + (sources."pouchdb-core-7.2.2" // { + dependencies = [ + sources."buffer-from-1.1.1" + sources."immediate-3.3.0" + sources."pouchdb-binary-utils-7.2.2" + sources."pouchdb-collections-7.2.2" + sources."pouchdb-errors-7.2.2" + sources."pouchdb-md5-7.2.2" + sources."pouchdb-merge-7.2.2" + sources."pouchdb-utils-7.2.2" + sources."spark-md5-3.0.1" + sources."uuid-8.1.0" + ]; + }) + (sources."pouchdb-errors-7.0.0" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."pouchdb-extend-0.1.2" + (sources."pouchdb-fetch-7.2.2" // { + dependencies = [ + sources."node-fetch-2.6.0" + ]; + }) + (sources."pouchdb-find-7.2.2" // { + dependencies = [ + sources."buffer-from-1.1.1" + sources."immediate-3.3.0" + sources."pouchdb-binary-utils-7.2.2" + sources."pouchdb-collections-7.2.2" + sources."pouchdb-errors-7.2.2" + sources."pouchdb-md5-7.2.2" + sources."pouchdb-utils-7.2.2" + sources."spark-md5-3.0.1" + sources."uuid-8.1.0" + ]; + }) + sources."pouchdb-json-7.0.0" + (sources."pouchdb-mapreduce-utils-7.2.2" // { + dependencies = [ + sources."buffer-from-1.1.1" + sources."immediate-3.3.0" + sources."pouchdb-binary-utils-7.2.2" + sources."pouchdb-collections-7.2.2" + sources."pouchdb-errors-7.2.2" + sources."pouchdb-md5-7.2.2" + sources."pouchdb-utils-7.2.2" + sources."spark-md5-3.0.1" + sources."uuid-8.1.0" + ]; + }) + sources."pouchdb-md5-7.0.0" + sources."pouchdb-merge-7.0.0" + sources."pouchdb-promise-5.4.3" + (sources."pouchdb-selector-core-7.2.2" // { + dependencies = [ + sources."buffer-from-1.1.1" + sources."immediate-3.3.0" + sources."pouchdb-binary-utils-7.2.2" + sources."pouchdb-collections-7.2.2" + sources."pouchdb-errors-7.2.2" + sources."pouchdb-md5-7.2.2" + sources."pouchdb-utils-7.2.2" + sources."spark-md5-3.0.1" + sources."uuid-8.1.0" + ]; + }) + (sources."pouchdb-utils-7.0.0" // { + dependencies = [ + sources."inherits-2.0.3" + sources."uuid-3.2.1" + ]; + }) + sources."pouchdb-wrappers-4.1.0" + (sources."prebuild-install-5.3.0" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."prelude-ls-1.1.2" + sources."private-0.1.8" + sources."process-nextick-args-2.0.1" + sources."promise-nodify-1.0.2" + sources."psl-1.8.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.2" + sources."queue-microtask-1.2.3" + sources."randombytes-2.1.0" + sources."rc-1.2.8" + sources."readable-stream-3.6.0" + (sources."recast-0.11.23" // { + dependencies = [ + sources."esprima-3.1.3" + sources."source-map-0.5.7" + ]; + }) + sources."rechoir-0.6.2" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + (sources."request-2.88.2" // { + dependencies = [ + sources."tough-cookie-2.5.0" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."requizzle-0.2.3" + sources."resolve-1.20.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."reusify-1.0.4" + (sources."rimraf-2.7.1" // { + dependencies = [ + sources."glob-7.2.0" + ]; + }) + sources."ripemd160-2.0.2" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + (sources."shelljs-0.8.4" // { + dependencies = [ + sources."glob-7.2.0" + ]; + }) + sources."signal-exit-3.0.5" + sources."simple-concat-1.0.1" + sources."simple-get-2.8.1" + sources."slash-3.0.0" + sources."slugify-1.6.1" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + sources."source-map-0.5.7" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.4.4" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.1" + sources."spark-md5-3.0.0" + sources."split-string-3.1.0" + (sources."split2-2.2.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."sprintf-js-1.0.3" + sources."sqlite3-4.2.0" + sources."sshpk-1.16.1" + sources."static-eval-2.0.2" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."string-natural-compare-2.0.3" + sources."string-width-1.0.2" + sources."string_decoder-1.3.0" + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" + sources."taffydb-2.6.2" + sources."tar-4.4.19" + (sources."tar-fs-1.16.3" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + (sources."tar-stream-1.6.2" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."through-2.3.8" + (sources."through2-0.6.5" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.0.34" + sources."string_decoder-0.10.31" + ]; + }) + sources."tiny-queue-0.2.1" + sources."tmp-0.0.33" + sources."to-buffer-1.1.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."tough-cookie-3.0.1" + sources."tr46-0.0.3" + (sources."transform-pouch-1.1.5" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."tslib-1.14.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."uc.micro-1.0.6" + sources."uglify-js-3.14.2" + sources."underscore-1.13.1" + sources."union-value-1.0.1" + (sources."universal-url-2.0.0" // { + dependencies = [ + sources."tr46-1.0.1" + sources."webidl-conversions-4.0.2" + sources."whatwg-url-7.1.0" + ]; + }) + (sources."unreachable-branch-transform-0.3.0" // { + dependencies = [ + sources."ast-types-0.8.15" + sources."esprima-fb-15001.1001.0-dev-harmony-fb" + sources."recast-0.10.43" + sources."source-map-0.5.7" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."uri-js-4.4.1" + sources."urix-0.1.0" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."verror-1.10.0" + sources."vuvuzela-1.0.3" + sources."webidl-conversions-3.0.1" + (sources."websql-1.0.0" // { + dependencies = [ + sources."immediate-3.3.0" + ]; + }) + sources."whatwg-url-5.0.0" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.5" + sources."word-wrap-1.2.3" + sources."wordwrap-1.0.0" + sources."wrap-ansi-2.1.0" + sources."wrappy-1.0.2" + sources."xmlcreate-2.0.3" + sources."xtend-4.0.2" + sources."y18n-4.0.3" + sources."yallist-3.1.1" + (sources."yargs-12.0.5" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."yargs-parser-11.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Medable Developer Tools :: Cli tool"; + homepage = "https://github.com/Medable/mdctl#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@nerdwallet/shepherd" = nodeEnv.buildNodePackage { name = "_at_nerdwallet_slash_shepherd"; packageName = "@nerdwallet/shepherd"; @@ -69973,15 +72039,15 @@ in sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.6.4" - sources."@octokit/plugin-paginate-rest-2.16.7" + sources."@octokit/openapi-types-11.2.0" + sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.11.4" + sources."@octokit/plugin-rest-endpoint-methods-5.13.0" sources."@octokit/plugin-retry-3.0.9" sources."@octokit/request-5.6.2" sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.11.4" - sources."@octokit/types-6.31.3" + sources."@octokit/rest-18.12.0" + sources."@octokit/types-6.34.0" sources."@sideway/address-4.1.2" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" @@ -70080,11 +72146,11 @@ in dependencies = [ sources."chalk-4.1.2" sources."inquirer-8.1.2" - sources."rxjs-7.3.1" + sources."rxjs-7.4.0" sources."tslib-2.1.0" ]; }) - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -70106,12 +72172,12 @@ in sources."ora-5.4.0" ]; }) - sources."@types/eslint-7.28.0" + sources."@types/eslint-7.28.1" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" sources."@types/json5-0.0.29" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -70146,11 +72212,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -70176,7 +72242,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -70234,7 +72300,7 @@ in sources."interpret-1.4.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -70243,7 +72309,7 @@ in sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.2.4" // { + (sources."jest-worker-27.2.5" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -70276,7 +72342,7 @@ in sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.11.0" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -70296,7 +72362,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" sources."pluralize-8.0.0" sources."pump-3.0.0" @@ -70481,10 +72547,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.5.13"; + version = "4.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.13.tgz"; - sha512 = "KAU300YbT0/7zG472KzJgHKdFex4nr5Xoo80gQJwT+y7pkepMhTxjrmxrJ/XR8QirUvPnBiX5n6BX5FrlMuUGQ=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.14.tgz"; + sha512 = "FRToN2L72rmtKcm3dxPFyhkT+6Xvr5kzwiYOoNPZsI/jTp6uYhwj7v5JJNT38l+d6F0OptIAGhMzjHTHvCkx7w=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -70496,10 +72562,10 @@ in sources."@apollographql/apollo-tools-0.5.1" sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.5" - sources."@babel/generator-7.15.4" + sources."@babel/core-7.15.8" + sources."@babel/generator-7.15.8" sources."@babel/helper-annotate-as-pure-7.15.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" sources."@babel/helper-compilation-targets-7.15.4" @@ -70512,7 +72578,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -70525,9 +72591,9 @@ in sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" - sources."@babel/plugin-proposal-async-generator-functions-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.8" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -70585,14 +72651,14 @@ in sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" sources."@babel/plugin-transform-shorthand-properties-7.14.5" - sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-spread-7.15.8" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" - sources."@babel/plugin-transform-typescript-7.15.4" + sources."@babel/plugin-transform-typescript-7.15.8" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.15.6" + sources."@babel/preset-env-7.15.8" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.15.0" @@ -70659,28 +72725,28 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.13.10" sources."@types/through-0.0.30" sources."@types/ws-7.4.7" - sources."@vue/cli-shared-utils-4.5.13" - (sources."@vue/cli-ui-4.5.13" // { + sources."@vue/cli-shared-utils-4.5.14" + (sources."@vue/cli-ui-4.5.14" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.13" - sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.2.19" // { + sources."@vue/cli-ui-addon-webpack-4.5.14" + sources."@vue/cli-ui-addon-widgets-4.5.14" + (sources."@vue/compiler-core-3.2.20" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.19" - sources."@vue/shared-3.2.19" + sources."@vue/compiler-dom-3.2.20" + sources."@vue/shared-3.2.20" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -70777,7 +72843,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -70797,7 +72863,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.30001264" + sources."caniuse-lite-1.0.30001267" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -70853,12 +72919,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.18.1" // { + (sources."core-js-compat-3.18.3" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.18.1" + sources."core-js-pure-3.18.3" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -70924,7 +72990,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.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -71007,7 +73073,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.161.0" + sources."flow-parser-0.162.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -71121,7 +73187,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -71263,7 +73329,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -71330,7 +73396,7 @@ in sources."path-type-3.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" (sources."pid-from-port-1.1.3" // { dependencies = [ @@ -71672,7 +73738,7 @@ in sources."ws-7.5.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xss-1.0.9" + sources."xss-1.0.10" sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -71821,11 +73887,11 @@ in sha512 = "7SWOLN+1eZ5e9gohQPVdA8XQstGIYei/70T5kmLP6vC41zy8BBYNt35OgLZmbpg3iOQ1vWT17ZMhVikSJySSRg=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.15.4" + sources."@babel/code-frame-7.15.8" + sources."@babel/generator-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/template-7.15.4" sources."@babel/types-7.15.6" sources."@webassemblyjs/ast-1.11.1" @@ -71901,14 +73967,14 @@ in sha512 = "kiIlTMDCEP1PP9QtFQywlN/P/Ji0V+zbwCWkG8gF6V6uRIytd2bkpHP4iaFdV7fQJTrQSd9h71Wj4x60jGt6Mg=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.5" // { + (sources."@babel/core-7.15.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.15.4" // { + (sources."@babel/generator-7.15.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -71919,7 +73985,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" @@ -71928,7 +73994,7 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" sources."@babel/types-7.15.6" @@ -71938,8 +74004,8 @@ in sources."async-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.3" - sources."caniuse-lite-1.0.30001264" + sources."browserslist-4.17.4" + sources."caniuse-lite-1.0.30001267" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -71949,7 +74015,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.859" + sources."electron-to-chromium-1.3.870" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -71976,7 +74042,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.8" sources."is-3.3.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" (sources."jake-10.8.2" // { @@ -71995,7 +74061,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -72005,7 +74071,7 @@ in }) sources."parse-passwd-1.0.0" sources."path-parse-1.0.7" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."pkginfo-0.4.1" sources."resolve-1.20.0" sources."safe-buffer-5.1.2" @@ -72044,7 +74110,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -72078,12 +74144,16 @@ in sha512 = "EmGpu0nnQVmMhX8ROoJ7Mx8mKYPlcUHuxkwrRYEYMz85lu7H09v8w6R1P0JPdn/hKU32GjpLBFEOuIlDWCRWvg=="; }; dependencies = [ - sources."browserslist-4.17.3" - sources."caniuse-lite-1.0.30001264" - sources."electron-to-chromium-1.3.859" + (sources."browserslist-4.17.4" // { + dependencies = [ + sources."picocolors-1.0.0" + ]; + }) + sources."caniuse-lite-1.0.30001267" + sources."electron-to-chromium-1.3.870" sources."escalade-3.1.1" sources."fraction.js-4.1.1" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."normalize-range-0.1.2" sources."picocolors-0.2.1" sources."postcss-value-parser-4.1.0" @@ -72108,14 +74178,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1000.0" // { + (sources."aws-sdk-2.1009.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -72148,7 +74218,7 @@ in sources."concat-map-0.0.1" sources."core-util-is-1.0.3" sources."css-select-4.1.3" - sources."css-what-5.0.1" + sources."css-what-5.1.0" sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.2" sources."deep-is-0.1.4" @@ -72200,7 +74270,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.1.5" + sources."inquirer-8.2.0" sources."ip-1.1.5" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -72255,7 +74325,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - (sources."rxjs-7.3.1" // { + (sources."rxjs-7.4.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -72319,10 +74389,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.2.1"; + version = "11.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.2.1.tgz"; - sha512 = "+PhZ0vTiHHeHmrRpVIm4hhl5YT7PQgVaAPj2pairo+lmDmcAFSJQApolr3fJpt3V88wWw6Y687TJfIJmRma27w=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.6.2.tgz"; + sha512 = "/FXZqX/ntG2fkpcYCaxg042n4sdHcR0M0ETp3ZQEw5lzPwBm0idG7JmFzsUIU1TlWjmN9VR0b+JCXZMjjHRq3w=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -72331,7 +74401,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.7" // { dependencies = [ - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" ]; }) sources."@grpc/proto-loader-0.6.4" @@ -72491,7 +74561,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-2.0.14" + sources."colorette-2.0.16" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-6.2.1" @@ -72597,7 +74667,7 @@ in sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.1.5" // { + (sources."inquirer-8.2.0" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -72672,49 +74742,46 @@ in sources."ws-8.2.2" ]; }) - (sources."ln-service-52.10.1" // { + (sources."ln-service-52.12.1" // { dependencies = [ sources."@grpc/proto-loader-0.6.5" - sources."@types/node-16.10.2" + sources."@types/node-16.10.4" sources."@types/ws-8.2.0" sources."bn.js-5.2.0" sources."bolt09-0.2.0" - sources."lightning-4.10.1" + sources."lightning-4.10.7" sources."ws-8.2.3" ]; }) - (sources."ln-sync-2.0.2" // { + (sources."ln-sync-2.0.3" // { dependencies = [ sources."@grpc/proto-loader-0.6.5" - sources."@types/node-16.9.6" + sources."@types/node-16.10.4" + sources."@types/ws-8.2.0" + sources."bn.js-5.2.0" + sources."bolt09-0.2.0" + sources."lightning-4.10.7" + ]; + }) + (sources."ln-telegram-3.3.1" // { + dependencies = [ + sources."@grpc/proto-loader-0.6.5" + sources."@types/node-16.10.3" + sources."@types/ws-8.2.0" sources."bn.js-5.2.0" sources."bolt09-0.2.0" sources."cbor-8.0.0" sources."colorette-2.0.7" - sources."lightning-4.7.1" - ]; - }) - (sources."ln-telegram-3.3.0" // { - dependencies = [ - sources."@grpc/proto-loader-0.6.5" - sources."@types/node-16.6.1" - sources."ansi-regex-5.0.1" - sources."bn.js-5.2.0" - sources."cbor-8.0.0" - sources."colorette-1.4.0" - sources."is-fullwidth-code-point-3.0.0" - sources."lightning-4.1.0" - sources."ln-service-52.0.1" - (sources."ln-sync-2.0.0" // { + sources."lightning-4.10.3" + sources."ln-service-52.11.0" + (sources."ln-sync-2.0.2" // { dependencies = [ - sources."@types/node-16.9.1" - sources."lightning-4.6.0" + sources."@types/node-16.9.6" + sources."@types/ws-7.4.7" + sources."lightning-4.7.1" ]; }) - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."table-6.7.1" - sources."ws-8.1.0" + sources."ws-8.2.3" ]; }) sources."lodash-4.17.21" @@ -72773,7 +74840,7 @@ in sources."node-addon-api-2.0.2" sources."node-fetch-2.6.1" sources."node-gyp-build-4.3.0" - sources."nofilter-3.0.3" + sources."nofilter-3.1.0" sources."normalize-url-4.5.1" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" @@ -72842,7 +74909,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" ]; }) sources."proxy-addr-2.0.7" @@ -72875,7 +74942,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-7.3.1" + sources."rxjs-7.4.0" sources."safe-buffer-5.2.1" sources."safe-compare-1.1.4" sources."safer-buffer-2.1.2" @@ -73138,7 +75205,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."w3c-hr-time-1.0.2" sources."web-tree-sitter-0.19.4" @@ -73199,7 +75266,7 @@ in sources."deep-extend-0.6.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."doctoc-2.0.1" + sources."doctoc-2.1.0" (sources."dom-serializer-1.3.2" // { dependencies = [ sources."domhandler-4.2.2" @@ -73304,12 +75371,12 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."web-tree-sitter-0.17.1" sources."which-pm-runs-1.0.0" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."wrappy-1.0.2" sources."x-is-string-0.1.0" sources."xtend-4.0.2" @@ -73388,7 +75455,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -73593,7 +75660,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-date-object-1.0.5" sources."is-generator-function-1.0.10" sources."is-negative-zero-2.0.1" @@ -73969,10 +76036,10 @@ in sha512 = "Va/hSa8+LRP4o6neRo+us8XttwcmLfwgNykeXhtY3xMu3/Y7I2e4EXb6Zd9jElMVI3teWH7eiyLff0KDjnYJdg=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/types-7.15.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -74175,7 +76242,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-expression-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" @@ -74434,7 +76501,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -74576,7 +76643,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -75081,7 +77148,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -75437,15 +77504,15 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.66"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.66.tgz"; - sha512 = "R0jcuhminjhGxzGUFrhEI6qdYxK6qR2ihqmNtj4f6tgwzyqC2objDsaSSGXvptXwndcAEpRfYwwzmdSEx7f8jQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.3.tgz"; + sha512 = "dje6/93p/gKJgsRvj2Jvtnz2VFlr8O24hyHjFEk/eJq126CVLdvsUyHP9XPhE5CWCznmhfoMVwLGmmR4e1shwg=="; }; dependencies = [ - sources."@jsii/check-node-1.36.0" - sources."@jsii/spec-1.36.0" - sources."@types/node-12.20.27" + sources."@jsii/check-node-1.39.0" + sources."@jsii/spec-1.39.0" + sources."@types/node-12.20.33" sources."@xmldom/xmldom-0.7.5" sources."ajv-8.6.3" sources."ansi-regex-5.0.1" @@ -75455,12 +77522,12 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.57" - sources."cdk8s-plus-22-1.0.0-beta.9" + sources."cdk8s-1.1.3" + sources."cdk8s-plus-22-1.0.0-beta.21" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.36.0" // { + (sources."codemaker-1.39.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -75469,7 +77536,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.156" + sources."constructs-3.3.161" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.1" @@ -75525,38 +77592,38 @@ in sources."is-weakref-1.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.36.0" // { + (sources."jsii-1.39.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.36.0" // { + (sources."jsii-pacmak-1.39.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.36.0" // { + (sources."jsii-reflect-1.39.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.36.0" // { + (sources."jsii-rosetta-1.39.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.357" // { + (sources."jsii-srcmak-0.1.369" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.33" + sources."json2jsii-0.2.40" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -75572,7 +77639,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.36.0" + sources."oo-ascii-tree-1.39.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -75594,7 +77661,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.85" + sources."sscaff-1.2.96" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -75663,15 +77730,15 @@ in sources."tslib-2.0.3" ]; }) - sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.15.4" + sources."@babel/code-frame-7.15.8" + sources."@babel/generator-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/template-7.15.4" sources."@babel/types-7.15.6" sources."@cdktf/hcl2cdk-0.6.4" @@ -75681,7 +77748,11 @@ in sources."tslib-2.1.0" ]; }) - sources."@graphql-tools/import-6.5.0" + (sources."@graphql-tools/import-6.5.4" // { + dependencies = [ + sources."@graphql-tools/utils-8.3.0" + ]; + }) (sources."@graphql-tools/load-6.2.8" // { dependencies = [ sources."tslib-2.2.0" @@ -75694,13 +77765,13 @@ in }) (sources."@graphql-tools/mock-8.4.0" // { dependencies = [ - sources."@graphql-tools/utils-8.2.4" + sources."@graphql-tools/utils-8.3.0" ]; }) (sources."@graphql-tools/schema-8.2.0" // { dependencies = [ sources."@graphql-tools/merge-8.1.2" - sources."@graphql-tools/utils-8.2.4" + sources."@graphql-tools/utils-8.3.0" ]; }) (sources."@graphql-tools/utils-7.10.0" // { @@ -75710,12 +77781,12 @@ in }) sources."@graphql-typed-document-node/core-3.1.0" sources."@josephg/resolvable-1.0.1" - sources."@jsii/check-node-1.36.0" - sources."@jsii/spec-1.36.0" + sources."@jsii/check-node-1.39.0" + sources."@jsii/spec-1.39.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/ci-detect-1.3.0" + sources."@npmcli/ci-detect-1.4.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -75736,7 +77807,7 @@ in sources."@types/express-serve-static-core-4.17.24" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-14.17.20" + sources."@types/node-14.17.27" sources."@types/node-fetch-2.5.12" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -75762,20 +77833,20 @@ in sources."normalize-path-3.0.0" ]; }) - sources."apollo-datasource-3.1.0" + sources."apollo-datasource-3.2.0" sources."apollo-graphql-0.9.3" - sources."apollo-reporting-protobuf-3.0.0" - sources."apollo-server-caching-3.1.0" - (sources."apollo-server-core-3.3.0" // { + sources."apollo-reporting-protobuf-3.1.0" + sources."apollo-server-caching-3.2.0" + (sources."apollo-server-core-3.4.0" // { dependencies = [ - sources."@graphql-tools/utils-8.2.4" + sources."@graphql-tools/utils-8.3.0" ]; }) - sources."apollo-server-env-4.0.3" - sources."apollo-server-errors-3.1.0" - sources."apollo-server-express-3.3.0" - sources."apollo-server-plugin-base-3.2.0" - sources."apollo-server-types-3.2.0" + sources."apollo-server-env-4.1.0" + sources."apollo-server-errors-3.2.0" + sources."apollo-server-express-3.4.0" + sources."apollo-server-plugin-base-3.3.0" + sources."apollo-server-types-3.3.0" sources."archiver-5.3.0" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -75856,7 +77927,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-10.0.5" + sources."constructs-10.0.9" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -75866,7 +77937,7 @@ in sources."convert-to-spaces-1.0.2" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-pure-3.18.1" + sources."core-js-pure-3.18.3" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."crc-32-1.2.0" @@ -75964,7 +78035,7 @@ in sources."graceful-fs-4.2.8" sources."graphology-0.20.0" sources."graphology-types-0.19.5" - sources."graphql-15.6.0" + sources."graphql-15.6.1" sources."graphql-subscriptions-1.2.1" sources."graphql-tag-2.12.5" sources."has-1.0.3" @@ -75986,7 +78057,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.9" // { + (sources."ink-3.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -75995,10 +78066,10 @@ in sources."wrap-ansi-6.2.0" ]; }) - sources."ink-spinner-4.0.2" + sources."ink-spinner-4.0.3" sources."ink-text-input-4.0.1" sources."ink-use-stdout-dimensions-1.0.5" - sources."inquirer-8.1.5" + sources."inquirer-8.2.0" sources."internal-slot-1.0.3" sources."ipaddr.js-1.9.1" sources."is-arguments-1.1.1" @@ -76035,35 +78106,35 @@ in sources."iterall-1.3.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.36.0" // { + (sources."jsii-1.39.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.36.0" // { + (sources."jsii-pacmak-1.39.0" // { dependencies = [ sources."clone-2.1.2" - sources."codemaker-1.36.0" + sources."codemaker-1.39.0" sources."decamelize-5.0.1" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.36.0" // { + (sources."jsii-reflect-1.39.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.36.0" // { + (sources."jsii-rosetta-1.39.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.357" // { + (sources."jsii-srcmak-0.1.369" // { dependencies = [ sources."ansi-styles-4.3.0" sources."camelcase-5.3.1" @@ -76137,7 +78208,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.36.0" + sources."oo-ascii-tree-1.39.0" sources."open-7.4.2" sources."optimism-0.16.1" sources."ora-5.4.1" @@ -76173,9 +78244,9 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."react-16.14.0" - sources."react-devtools-core-4.19.1" + sources."react-devtools-core-4.20.0" sources."react-is-16.13.1" - sources."react-reconciler-0.24.0" + sources."react-reconciler-0.26.2" sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" @@ -76191,14 +78262,14 @@ in sources."rfdc-1.3.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - (sources."rxjs-7.3.1" // { + (sources."rxjs-7.4.0" // { dependencies = [ sources."tslib-2.1.0" ]; }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."scheduler-0.18.0" + sources."scheduler-0.20.2" sources."semver-7.3.5" (sources."semver-intersect-1.4.0" // { dependencies = [ @@ -76230,7 +78301,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.85" + sources."sscaff-1.2.96" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -76305,7 +78376,7 @@ in sources."wrappy-1.0.2" sources."ws-7.5.5" sources."xmlbuilder-15.1.1" - sources."xss-1.0.9" + sources."xss-1.0.10" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.2.1" @@ -76366,87 +78437,96 @@ in clipboard-cli = nodeEnv.buildNodePackage { name = "clipboard-cli"; packageName = "clipboard-cli"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/clipboard-cli/-/clipboard-cli-2.0.1.tgz"; - sha512 = "ze7ASsXpF2J27QMq5or4VZZcX9X+E8XtsvFXaRwdLBON0UjnXfIWykgIzffSmrdfHOw/8rAufyOE58+/OU1eGw=="; + url = "https://registry.npmjs.org/clipboard-cli/-/clipboard-cli-3.0.0.tgz"; + sha512 = "DbwDqv+O4AIbUqLmT3w7J/Fo8uT9bNmy7oRzykTUEIcrEL0DozGNOjxjiwwcKSLLf1fXKmjdLolui+OB3j1vYg=="; }; dependencies = [ + sources."@babel/code-frame-7.15.8" + sources."@babel/helper-validator-identifier-7.15.7" + sources."@babel/highlight-7.14.5" + sources."@types/minimist-1.2.2" + sources."@types/normalize-package-data-2.4.1" + sources."ansi-styles-3.2.1" sources."arch-2.2.0" - sources."array-find-index-1.0.2" sources."arrify-1.0.1" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."clipboardy-2.3.0" - sources."cross-spawn-6.0.5" - sources."currently-unhandled-0.4.1" - sources."decamelize-1.2.0" + sources."camelcase-6.2.0" + sources."camelcase-keys-7.0.1" + sources."chalk-2.4.2" + sources."clipboardy-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."cross-spawn-7.0.3" + sources."decamelize-5.0.1" (sources."decamelize-keys-1.1.0" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) - sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."execa-1.0.0" - sources."find-up-2.1.0" + sources."escape-string-regexp-1.0.5" + sources."execa-5.1.1" + sources."find-up-5.0.0" sources."function-bind-1.1.1" - sources."get-stdin-7.0.0" - sources."get-stream-4.1.0" - sources."graceful-fs-4.2.8" + sources."get-stdin-9.0.0" + sources."get-stream-6.0.1" + sources."hard-rejection-2.1.0" sources."has-1.0.3" - sources."hosted-git-info-2.8.9" - sources."indent-string-3.2.0" + sources."has-flag-3.0.0" + sources."hosted-git-info-4.0.2" + sources."human-signals-2.1.0" + sources."indent-string-5.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-docker-2.2.1" sources."is-plain-obj-1.1.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."json-parse-better-errors-1.0.2" - sources."load-json-file-4.0.0" - sources."locate-path-2.0.0" - sources."loud-rejection-1.6.0" - sources."map-obj-2.0.0" - sources."meow-5.0.0" - sources."minimist-options-3.0.2" - sources."nice-try-1.0.5" - sources."normalize-package-data-2.5.0" - sources."npm-run-path-2.0.2" - sources."once-1.4.0" - sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parse-json-4.0.0" - sources."path-exists-3.0.0" - sources."path-key-2.0.1" - sources."path-parse-1.0.7" - sources."path-type-3.0.0" - sources."pify-3.0.0" - sources."pump-3.0.0" - sources."quick-lru-1.1.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" - sources."redent-2.0.0" - sources."resolve-1.20.0" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" + sources."locate-path-6.0.0" + sources."lru-cache-6.0.0" + sources."map-obj-4.3.0" + sources."meow-10.1.1" + sources."merge-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."min-indent-1.0.1" + sources."minimist-options-4.1.0" + sources."normalize-package-data-3.0.3" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + sources."path-key-3.1.1" + sources."quick-lru-5.1.1" + sources."read-pkg-6.0.0" + sources."read-pkg-up-8.0.0" + sources."redent-4.0.0" + sources."semver-7.3.5" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.5" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" - sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" - sources."strip-indent-2.0.0" - sources."trim-newlines-2.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-4.0.0" + sources."supports-color-5.5.0" + sources."trim-newlines-4.0.2" + sources."type-fest-1.4.0" sources."validate-npm-package-license-3.0.4" - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."yargs-parser-10.1.0" + sources."which-2.0.2" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -76528,10 +78608,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.16.0.tgz"; - sha512 = "3NTHssw+ZxZiq1XZVbyfSKxgD0vZ96yBjzYh5l/kyr4413KibNTMgF2gTBMQsOnrfFmrfDz6RF5Yy2ie2EkZXw=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.17.0.tgz"; + sha512 = "TTuzPUw9R1UqszC9uPmijXmCtMhTI5QVc0L8rqKDnIhhaqy99XyOK7zTr4Uw7qmAs4dZSTHonzjbAEkR4zcqFg=="; }; buildInputs = globalBuildInputs; meta = { @@ -76687,7 +78767,7 @@ in sources."npm-run-path-3.1.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.2.1" + sources."open-8.3.0" sources."os-homedir-1.0.2" sources."p-finally-2.0.1" sources."p-map-4.0.0" @@ -76754,7 +78834,7 @@ in sources."node-fetch-2.6.5" sources."tr46-0.0.3" sources."tslib-2.3.1" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-uri-3.0.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -76795,7 +78875,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.4.3" + sources."typescript-4.4.4" ]; buildInputs = globalBuildInputs; meta = { @@ -76887,7 +78967,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" sources."vscode-uri-3.0.2" @@ -76953,7 +79033,7 @@ in sources."async-2.6.3" sources."await-semaphore-0.1.3" sources."balanced-match-1.0.2" - sources."big-integer-1.6.49" + sources."big-integer-1.6.50" sources."binary-0.3.0" sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" @@ -76990,7 +79070,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.14.4" - sources."fp-ts-2.11.4" + sources."fp-ts-2.11.5" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -77115,7 +79195,7 @@ in sources."vscode-languageserver-types-3.15.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."webidl-conversions-3.0.1" @@ -77241,7 +79321,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -77303,7 +79383,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.18.1" + sources."core-js-3.18.3" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -77339,7 +79419,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -77537,7 +79617,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -78138,13 +80218,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.172"; + version = "1.1.177"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.172.tgz"; - sha512 = "Wu+aAcy/8OR8Q7tE3039iSCe+Kc0BV36hssXinCbzLQoTpgWXjbPQpdkZFUgtzYOb9Xbx1kNGSd/XFHp2VM/dg=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.177.tgz"; + sha512 = "TtSU3bWibZqq1LrUa5iLR1TF69x83dzmVNKpXaawYJZoejN81Gnv6DRaLybBjLjOSodjzw9S0D7j6tbeJeLCdg=="; }; dependencies = [ - sources."pyright-1.1.175" + sources."pyright-1.1.178" ]; buildInputs = globalBuildInputs; meta = { @@ -78185,7 +80265,7 @@ in dependencies = [ sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" ]; buildInputs = globalBuildInputs; @@ -78218,10 +80298,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.52.0"; + version = "0.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.52.0.tgz"; - sha512 = "mT9Y7bzuhvHDj+Cv2+EbEUTGwdkulKpiGwyJ0Hm0/8+i3fM8zsoAuLM8l/A3TSIYlbt10Ru3dV5ilHwdt0MZkg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.53.0.tgz"; + sha512 = "B8QCO3v0oH4olnhYJqgLN3ItSJuQ8tqoTvZIWMhlK8lYGZ4AIHwHl8s3jxQITosLg9OaD9ulTNuiShuGEvUmHQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -78294,17 +80374,17 @@ in sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.5" - sources."@babel/generator-7.15.4" + sources."@babel/core-7.15.8" + sources."@babel/generator-7.15.8" sources."@babel/helper-compilation-targets-7.15.4" sources."@babel/helper-function-name-7.15.4" sources."@babel/helper-get-function-arity-7.15.4" sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" @@ -78317,7 +80397,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" sources."@babel/types-7.15.6" @@ -78337,7 +80417,11 @@ in sources."array-union-2.1.0" sources."arrify-1.0.1" sources."astral-regex-2.0.0" - sources."autoprefixer-9.8.8" + (sources."autoprefixer-9.8.8" // { + dependencies = [ + sources."picocolors-0.2.1" + ]; + }) sources."bail-1.0.5" sources."balanced-match-2.0.0" (sources."brace-expansion-1.1.11" // { @@ -78346,11 +80430,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -78387,7 +80471,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -78439,7 +80523,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -78484,7 +80568,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" @@ -78505,10 +80589,11 @@ in sources."path-is-inside-1.0.2" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" (sources."postcss-7.0.39" // { dependencies = [ + sources."picocolors-0.2.1" sources."source-map-0.6.1" ]; }) @@ -78604,7 +80689,7 @@ in sources."vscode-languageserver-types-3.16.0-next.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."which-1.3.1" @@ -78668,7 +80753,7 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" @@ -78691,7 +80776,7 @@ in sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.0.4" @@ -78762,7 +80847,7 @@ in sha512 = "RTet29nZNYrOWEuquBOAv3yFtWyHPE7xGbsHjRdNbTP6g9PF+2nV2TnDO+c/T5HAk/1J0lKKZBu6hZTnEJ2f4w=="; }; dependencies = [ - sources."typescript-4.4.3" + sources."typescript-4.4.4" ]; buildInputs = globalBuildInputs; meta = { @@ -78828,7 +80913,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.19.0" // { + (sources."eslint-plugin-vue-7.19.1" // { dependencies = [ sources."semver-6.3.0" ]; @@ -78877,7 +80962,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -78945,7 +81030,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.4.3" + sources."typescript-4.4.4" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" @@ -79056,7 +81141,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.2" @@ -79408,7 +81493,7 @@ in sha512 = "xMGQdKJ+4XFDDgfX5aK7UNFduvJMbvF5BB+g0OdVhA3rYdYyhctrIE2Al+WYdZeKTdg9YzMWF2iFPT8MupIwng=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."@hutson/parse-repository-url-3.0.2" @@ -79487,7 +81572,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" @@ -79672,7 +81757,7 @@ in sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.49" + sources."big-integer-1.6.50" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" @@ -79749,7 +81834,7 @@ in sources."pify-5.0.0" ]; }) - (sources."cordova-lib-10.0.0" // { + (sources."cordova-lib-10.1.0" // { dependencies = [ sources."pify-5.0.0" ]; @@ -79919,7 +82004,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -80184,7 +82269,7 @@ in ]; }) sources."which-2.0.2" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" (sources."widest-line-3.1.0" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -80233,7 +82318,7 @@ in sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -80241,7 +82326,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -80381,7 +82466,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -80612,7 +82697,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -81589,14 +83674,14 @@ in version = "1.22.2"; src = ../../applications/networking/instant-messengers/deltachat-desktop; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.5" // { + (sources."@babel/core-7.15.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.15.4" // { + (sources."@babel/generator-7.15.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -81613,7 +83698,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -81626,9 +83711,9 @@ in sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" - sources."@babel/plugin-proposal-async-generator-functions-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.8" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -81688,13 +83773,13 @@ in sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" sources."@babel/plugin-transform-shorthand-properties-7.14.5" - sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-spread-7.15.8" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.15.6" + sources."@babel/preset-env-7.15.8" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-react-7.14.5" sources."@babel/runtime-7.15.4" @@ -81702,7 +83787,7 @@ in sources."@babel/traverse-7.15.4" sources."@babel/types-7.15.6" sources."@blueprintjs/colors-4.0.0-beta.0" - sources."@blueprintjs/core-3.50.4" + sources."@blueprintjs/core-3.51.1" sources."@blueprintjs/icons-3.30.2" sources."@electron/get-1.13.0" sources."@hypnosphi/create-react-context-0.3.1" @@ -81727,11 +83812,11 @@ in sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" - sources."@types/node-14.17.20" + sources."@types/node-14.17.27" sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.2.0" - sources."@types/react-16.14.16" + sources."@types/react-16.14.17" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" sources."@types/react-window-infinite-loader-1.0.5" @@ -81773,7 +83858,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -81784,7 +83869,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -81825,8 +83910,8 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.18.1" - (sources."core-js-compat-3.18.1" // { + sources."core-js-3.18.3" + (sources."core-js-compat-3.18.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -81851,8 +83936,8 @@ in sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.5.1" - sources."electron-to-chromium-1.3.859" + sources."electron-13.5.2" + sources."electron-to-chromium-1.3.870" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -81923,7 +84008,7 @@ in sources."get-stdin-7.0.0" sources."get-stream-6.0.1" sources."get-value-2.0.6" - sources."gl-matrix-3.4.0" + sources."gl-matrix-3.4.3" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -81964,7 +84049,7 @@ in sources."is-arguments-1.1.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -82001,7 +84086,7 @@ in sources."lru-cache-6.0.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - (sources."mapbox-gl-1.13.1" // { + (sources."mapbox-gl-1.13.2" // { dependencies = [ sources."rw-1.3.3" ]; @@ -82031,7 +84116,7 @@ in sources."napi-macros-2.0.0" sources."node-fetch-2.6.5" sources."node-gyp-build-4.3.0" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."normalize.css-8.0.1" @@ -82065,7 +84150,7 @@ in sources."path-parse-1.0.7" sources."pbf-3.2.1" sources."pend-1.2.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" sources."pify-3.0.0" sources."popper.js-1.16.1" @@ -82131,7 +84216,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.42.1" // { + (sources."sass-1.43.2" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -82222,7 +84307,7 @@ in sources."string_decoder-1.3.0" sources."strip-json-comments-2.0.1" sources."sumchecker-3.0.1" - sources."supercluster-7.1.3" + sources."supercluster-7.1.4" sources."supports-color-5.5.0" sources."temp-dir-1.0.0" sources."tempy-0.3.0" @@ -82377,7 +84462,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."wrappy-1.0.2" @@ -82404,10 +84489,14 @@ in sources."dockerfile-ast-0.3.4" sources."dockerfile-language-service-0.7.2" sources."dockerfile-utils-0.9.2" - sources."vscode-jsonrpc-8.0.0-next.2" - sources."vscode-languageserver-8.0.0-next.2" - sources."vscode-languageserver-protocol-3.17.0-next.8" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-jsonrpc-8.0.0-next.3" + sources."vscode-languageserver-8.0.0-next.3" + (sources."vscode-languageserver-protocol-3.17.0-next.9" // { + dependencies = [ + sources."vscode-languageserver-types-3.17.0-next.4" + ]; + }) + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.17.0-next.3" ]; buildInputs = globalBuildInputs; @@ -82431,7 +84520,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.20" + sources."@types/node-14.17.27" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -82634,7 +84723,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -82716,7 +84805,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.18.1" + sources."core-js-3.18.3" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { @@ -82887,7 +84976,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.1.5" // { + (sources."inquirer-8.2.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.3" @@ -82895,7 +84984,7 @@ in }) sources."ip-1.1.5" sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" @@ -83010,7 +85099,7 @@ in sources."object-keys-0.4.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.2.1" + sources."open-8.3.0" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" @@ -83090,7 +85179,7 @@ in sources."roarr-2.15.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.3.1" + sources."rxjs-7.4.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -83169,7 +85258,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" @@ -83238,14 +85327,14 @@ in sha512 = "ceJSyC2s1VCIqyzGkHeJkWBq/85QXaHM+0rZ1lRRtmcK9CsfRDyLSIZ7KJDZhPdIRUXBgBkdcOAW3AIu/yO/ew=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.5" // { + (sources."@babel/core-7.15.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.15.4" + sources."@babel/generator-7.15.8" sources."@babel/helper-annotate-as-pure-7.15.4" (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ @@ -83257,7 +85346,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" @@ -83267,7 +85356,7 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -83295,13 +85384,13 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -83330,7 +85419,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -83357,7 +85446,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.9" // { + (sources."ink-3.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -83380,7 +85469,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -83420,7 +85509,7 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -83441,7 +85530,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.7" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" (sources."pkg-dir-4.2.0" // { dependencies = [ sources."find-up-4.1.0" @@ -83456,9 +85545,9 @@ in sources."punycode-2.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.19.1" + sources."react-devtools-core-4.20.0" sources."react-is-16.13.1" - sources."react-reconciler-0.24.0" + sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ sources."type-fest-0.6.0" @@ -83479,7 +85568,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" - sources."scheduler-0.18.0" + sources."scheduler-0.20.2" sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -83562,7 +85651,7 @@ in version = "1.7.5"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -83589,7 +85678,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.217" + sources."@microsoft/load-themed-styles-1.10.225" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -84320,7 +86409,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -84844,7 +86933,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.42.1" // { + (sources."sass-1.43.2" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -85021,7 +87110,7 @@ in sources."sver-compat-1.5.0" sources."swagger-schema-official-2.0.0-bab6bed" sources."swagger-ui-dist-3.34.0" - sources."tail-2.2.3" + sources."tail-2.2.4" sources."tapable-1.1.3" (sources."tar-4.4.19" // { dependencies = [ @@ -85210,7 +87299,7 @@ in }) sources."which-1.3.1" sources."which-module-1.0.0" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."worker-farm-1.7.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -85265,77 +87354,51 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.32.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"; - sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.0.1.tgz"; + sha512 = "LsgcwZgQ72vZ+SMp4K6pAnk2yFDWL7Ti4pJaRvsZ0Hsw2h8ZjUIW38a9AFn2cZXdBMlScMFYYgsSp4ttFI/0bA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.15.7" - (sources."@babel/highlight-7.14.5" // { + (sources."@eslint/eslintrc-1.0.3" // { dependencies = [ - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" + sources."js-yaml-3.14.1" ]; }) - sources."@eslint/eslintrc-0.4.3" - sources."@humanwhocodes/config-array-0.5.0" + sources."@humanwhocodes/config-array-0.6.0" sources."@humanwhocodes/object-schema-1.2.0" - sources."acorn-7.4.1" + sources."acorn-8.5.0" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."argparse-1.0.10" - sources."astral-regex-2.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.2" sources."deep-is-0.1.4" sources."doctrine-3.0.0" - sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-scope-5.1.1" - (sources."eslint-utils-2.1.0" // { + sources."eslint-scope-6.0.0" + (sources."eslint-utils-3.0.0" // { dependencies = [ - sources."eslint-visitor-keys-1.3.0" - ]; - }) - sources."eslint-visitor-keys-2.1.0" - (sources."espree-7.3.1" // { - dependencies = [ - sources."eslint-visitor-keys-1.3.0" + sources."eslint-visitor-keys-2.1.0" ]; }) + sources."eslint-visitor-keys-3.0.0" + sources."espree-9.0.0" sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { - dependencies = [ - sources."estraverse-5.2.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.2.0" - ]; - }) - sources."estraverse-4.3.0" + sources."esquery-1.4.0" + sources."esrecurse-4.3.0" + sources."estraverse-5.2.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -85346,26 +87409,26 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.2.0" - sources."glob-parent-5.1.2" + sources."glob-parent-6.0.2" sources."globals-13.11.0" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" + (sources."js-yaml-4.1.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash.clonedeep-4.5.0" sources."lodash.merge-4.6.2" - sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" sources."minimatch-3.0.4" sources."ms-2.1.2" @@ -85379,30 +87442,15 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.2.0" - sources."require-from-string-2.0.2" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" - sources."supports-color-5.5.0" - (sources."table-6.7.2" // { - dependencies = [ - sources."ajv-8.6.3" - sources."json-schema-traverse-1.0.0" - ]; - }) + sources."supports-color-7.2.0" sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" @@ -85616,19 +87664,20 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.5" // { + (sources."@babel/core-7.15.8" // { dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."json5-2.2.0" sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.15.4" + sources."@babel/generator-7.15.8" sources."@babel/helper-annotate-as-pure-7.15.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" + sources."node-releases-2.0.0" sources."semver-6.3.0" ]; }) @@ -85645,7 +87694,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" @@ -85660,7 +87709,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" 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" @@ -85699,26 +87748,26 @@ in sources."@babel/plugin-transform-react-jsx-self-7.14.9" sources."@babel/plugin-transform-react-jsx-source-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" - (sources."@babel/plugin-transform-runtime-7.15.0" // { + (sources."@babel/plugin-transform-runtime-7.15.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/plugin-transform-shorthand-properties-7.14.5" - sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-spread-7.15.8" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" - sources."@babel/plugin-transform-typescript-7.15.4" + sources."@babel/plugin-transform-typescript-7.15.8" sources."@babel/plugin-transform-unicode-regex-7.14.5" sources."@babel/runtime-7.9.0" (sources."@babel/template-7.15.4" // { dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" ]; }) (sources."@babel/traverse-7.15.4" // { dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" ]; }) sources."@babel/types-7.15.6" @@ -85740,7 +87789,7 @@ in sources."iconv-lite-0.4.24" sources."inherits-2.0.3" sources."ms-2.0.0" - sources."open-8.2.1" + sources."open-8.3.0" sources."qs-6.7.0" sources."raw-body-2.4.0" sources."setprototypeof-1.1.1" @@ -86008,7 +88057,7 @@ in sources."base64url-3.0.1" sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.49" + sources."big-integer-1.6.50" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" @@ -86077,7 +88126,7 @@ in }) sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -86209,9 +88258,10 @@ in sources."semver-6.3.0" ]; }) - (sources."core-js-compat-3.18.1" // { + (sources."core-js-compat-3.18.3" // { dependencies = [ - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" + sources."node-releases-2.0.0" sources."semver-7.0.0" ]; }) @@ -86253,7 +88303,7 @@ in sources."source-map-0.6.1" ]; }) - sources."css-what-5.0.1" + sources."css-what-5.1.0" sources."cssesc-3.0.0" sources."cssnano-4.1.11" sources."cssnano-preset-default-4.0.8" @@ -86343,7 +88393,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.859" + sources."electron-to-chromium-1.3.870" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -86659,7 +88709,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -87108,7 +89158,7 @@ in sources."path-type-4.0.0" sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" @@ -87144,6 +89194,7 @@ in sources."posix-character-classes-0.1.1" (sources."postcss-7.0.39" // { dependencies = [ + sources."picocolors-0.2.1" sources."source-map-0.6.1" ]; }) @@ -87274,7 +89325,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."prompts-2.4.1" + sources."prompts-2.4.2" sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.8.0" @@ -87571,7 +89622,7 @@ in ]; }) sources."subscriptions-transport-ws-0.9.8" - (sources."sucrase-3.20.1" // { + (sources."sucrase-3.20.2" // { dependencies = [ sources."commander-4.1.1" ]; @@ -87888,14 +89939,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."wide-align-1.1.5" sources."widest-line-3.1.0" sources."with-open-file-0.1.7" sources."worker-farm-1.7.0" @@ -87978,10 +90022,10 @@ in sha512 = "QT3uBdxjHiXEz8iSAUJezETjKgTEP0PicHk36ga2veZHmIpqU5k+M0z1bmZ5G+EJHCN84o4w++fngJIgcj1Nqw=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.5" - sources."@babel/generator-7.15.4" + sources."@babel/core-7.15.8" + sources."@babel/generator-7.15.8" sources."@babel/helper-annotate-as-pure-7.15.4" sources."@babel/helper-compilation-targets-7.15.4" sources."@babel/helper-function-name-7.15.4" @@ -87989,7 +90033,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" @@ -87999,7 +90043,7 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -88010,7 +90054,7 @@ in sources."@babel/traverse-7.15.4" sources."@babel/types-7.15.6" sources."@types/minimist-1.2.2" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -88029,7 +90073,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -88037,7 +90081,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -88061,7 +90105,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -88088,7 +90132,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.9" // { + (sources."ink-3.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -88098,10 +90142,10 @@ in sources."supports-color-7.2.0" ]; }) - sources."ink-spinner-4.0.2" + sources."ink-spinner-4.0.3" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -88129,7 +90173,7 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."node-fetch-2.6.5" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" @@ -88147,7 +90191,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."pend-1.2.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."pkg-dir-4.2.0" sources."progress-2.0.3" sources."prop-types-15.7.2" @@ -88156,9 +90200,9 @@ in sources."puppeteer-9.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.19.1" + sources."react-devtools-core-4.20.0" sources."react-is-16.13.1" - sources."react-reconciler-0.24.0" + sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ sources."hosted-git-info-2.8.9" @@ -88179,7 +90223,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" - sources."scheduler-0.18.0" + sources."scheduler-0.20.2" sources."semver-6.3.0" sources."shell-quote-1.7.2" sources."signal-exit-3.0.5" @@ -88613,7 +90657,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.1.5" // { + (sources."inquirer-8.2.0" // { dependencies = [ sources."chalk-4.1.2" sources."has-flag-4.0.0" @@ -88774,7 +90818,7 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - (sources."rxjs-7.3.1" // { + (sources."rxjs-7.4.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -88929,10 +90973,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.19.0"; + version = "9.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.19.0.tgz"; - sha512 = "jo9IhtddYBXEwO5m99oPZ53H4KInfhyYWD5+j6LD1bCsT9M95u+hNx+oXnRBVNTJjbwvlv/stF+zDy1WrpU1FA=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.20.0.tgz"; + sha512 = "/5LzkZtW8aC57syHf34FXY1w6g9unb7qdvtlYROdJA33sk2xsWsJmuvtJylhYhTNX8zrwFsmiTHRlaBxA9YWtg=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -88948,10 +90992,10 @@ in sources."@google-cloud/promisify-2.0.4" (sources."@google-cloud/pubsub-2.18.1" // { dependencies = [ - sources."google-auth-library-7.10.0" + sources."google-auth-library-7.10.1" ]; }) - sources."@grpc/grpc-js-1.3.7" + sources."@grpc/grpc-js-1.3.8" sources."@grpc/proto-loader-0.6.5" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/fs-1.0.0" // { @@ -88985,7 +91029,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.10.2" + sources."@types/node-16.11.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -89036,7 +91080,7 @@ in }) sources."basic-auth-connect-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.49" + sources."big-integer-1.6.50" sources."bignumber.js-9.0.1" sources."binary-0.3.0" sources."binary-extensions-2.2.0" @@ -89325,9 +91369,9 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.27.0" // { + (sources."google-gax-2.27.1" // { dependencies = [ - sources."google-auth-library-7.10.0" + sources."google-auth-library-7.10.1" ]; }) sources."google-p12-pem-3.1.2" @@ -89805,19 +91849,12 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.3" + sources."vm2-3.9.4" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."wide-align-1.1.5" sources."widest-line-3.1.0" sources."winston-3.3.3" (sources."winston-transport-4.4.0" // { @@ -89904,13 +91941,13 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "6.2.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.2.0.tgz"; - sha512 = "HFv/ywCzDAVCxq1IL++lB96zxnUwspScZjqcWown87KPfWng3eJi+BDgXMie9PboXikxOcFoqfd+jJQHDgV3EQ=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-7.0.0.tgz"; + sha512 = "iLv/+0qHQjqnj9Pa9gA0TQ6vhV9eRn4fKxbiOPKL7uGs2Zth7iIGvNnpHmJfQ7OV7TTgR53yolY2DS1vWE/FjQ=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -89918,45 +91955,59 @@ 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."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" - sources."aggregate-error-3.1.0" + sources."aggregate-error-4.0.0" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" + sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" - sources."arrify-2.0.1" - sources."astral-regex-2.0.0" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" + sources."arrify-3.0.0" + sources."base64-js-1.5.1" + sources."bl-4.1.0" + sources."buffer-5.7.1" + sources."camelcase-6.2.0" + (sources."camelcase-keys-7.0.1" // { + dependencies = [ + sources."type-fest-1.4.0" + ]; + }) sources."chalk-4.1.2" sources."chardet-0.7.0" - sources."clean-stack-2.2.0" + sources."clean-stack-4.1.0" sources."cli-cursor-3.1.0" - sources."cli-truncate-2.1.0" + sources."cli-spinners-2.6.1" + sources."cli-truncate-3.1.0" sources."cli-width-3.0.0" + sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."decamelize-1.2.0" + sources."decamelize-5.0.1" (sources."decamelize-keys-1.1.0" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" + sources."defaults-1.0.3" + sources."emoji-regex-9.2.2" sources."error-ex-1.3.2" - sources."esc-exit-2.0.2" - sources."escape-string-regexp-1.0.5" + sources."esc-exit-3.0.0" + sources."escape-string-regexp-5.0.0" sources."execa-5.1.1" sources."external-editor-3.1.0" - sources."figures-3.2.0" - sources."find-up-4.1.0" - sources."fkill-7.2.1" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."find-up-5.0.0" + sources."fkill-8.0.0" sources."function-bind-1.1.1" sources."get-stream-6.0.1" sources."hard-rejection-2.1.0" @@ -89965,26 +92016,44 @@ in sources."hosted-git-info-4.0.2" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" - sources."indent-string-4.0.0" - sources."inquirer-7.3.3" - sources."inquirer-autocomplete-prompt-1.4.0" + sources."ieee754-1.2.1" + sources."indent-string-5.0.0" + sources."inherits-2.0.4" + (sources."inquirer-8.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) + (sources."inquirer-autocomplete-prompt-1.4.0" // { + dependencies = [ + sources."rxjs-6.6.7" + sources."tslib-1.14.1" + ]; + }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" - sources."is-fullwidth-code-point-3.0.0" + sources."is-core-module-2.8.0" + sources."is-fullwidth-code-point-4.0.0" + sources."is-interactive-1.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.1" + sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" + sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."map-obj-4.3.0" - (sources."meow-8.1.2" // { + (sources."meow-10.1.1" // { dependencies = [ - sources."type-fest-0.18.1" + sources."type-fest-1.4.0" ]; }) sources."merge-stream-2.0.0" @@ -89998,77 +92067,77 @@ in sources."mute-stream-0.0.8" sources."normalize-package-data-3.0.3" sources."npm-run-path-4.0.1" - sources."num-sort-2.1.0" - sources."once-1.4.0" + sources."num-sort-3.0.0" sources."onetime-5.1.2" + (sources."ora-5.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) sources."os-tmpdir-1.0.2" - sources."p-finally-2.0.1" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."parse-json-5.2.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."pid-port-0.1.1" + sources."pid-port-0.2.0" (sources."process-exists-4.1.0" // { dependencies = [ sources."ps-list-6.3.0" ]; }) sources."ps-list-7.2.0" - sources."pump-3.0.0" - sources."quick-lru-4.0.1" - (sources."read-pkg-5.2.0" // { + sources."quick-lru-5.1.1" + (sources."read-pkg-6.0.0" // { dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" - sources."type-fest-0.6.0" + sources."type-fest-1.4.0" ]; }) - (sources."read-pkg-up-7.0.1" // { + (sources."read-pkg-up-8.0.0" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-1.4.0" ]; }) - sources."redent-3.0.0" - sources."resolve-1.20.0" + sources."readable-stream-3.6.0" + sources."redent-4.0.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.7" + sources."rxjs-7.4.0" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.5" - sources."slice-ansi-3.0.0" + (sources."slice-ansi-5.0.0" // { + dependencies = [ + sources."ansi-styles-6.1.0" + ]; + }) sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" + sources."string-width-5.0.1" + sources."string_decoder-1.3.0" + sources."strip-ansi-7.0.1" sources."strip-final-newline-2.0.0" - sources."strip-indent-3.0.0" + sources."strip-indent-4.0.0" sources."supports-color-7.2.0" - (sources."taskkill-3.1.0" // { - dependencies = [ - sources."execa-3.4.0" - sources."get-stream-5.2.0" - sources."human-signals-1.1.1" - ]; - }) + sources."taskkill-4.0.0" sources."through-2.3.8" sources."tmp-0.0.33" - sources."trim-newlines-3.0.1" - sources."tslib-1.14.1" + sources."trim-newlines-4.0.2" + sources."tslib-2.1.0" sources."type-fest-0.21.3" + sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" + sources."wcwidth-1.0.1" sources."which-2.0.2" - sources."wrappy-1.0.2" sources."yallist-4.0.0" sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -90092,7 +92161,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -90147,7 +92216,7 @@ in sources."esprima-4.0.1" sources."ethereum-bloom-filters-1.0.10" sources."ethereum-cryptography-0.1.3" - (sources."ethereumjs-util-7.1.2" // { + (sources."ethereumjs-util-7.1.3" // { dependencies = [ sources."bn.js-5.2.0" ]; @@ -90157,7 +92226,6 @@ in sources."bn.js-4.11.6" ]; }) - sources."ethjs-util-0.1.6" sources."evp_bytestokey-1.0.3" sources."extend-3.0.2" sources."external-editor-3.1.0" @@ -90246,7 +92314,11 @@ in sources."require-main-filename-2.0.0" sources."restore-cursor-3.1.0" sources."ripemd160-2.0.2" - sources."rlp-2.2.6" + (sources."rlp-2.2.7" // { + dependencies = [ + sources."bn.js-5.2.0" + ]; + }) sources."run-async-2.4.1" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" @@ -90303,10 +92375,10 @@ in flood = nodeEnv.buildNodePackage { name = "flood"; packageName = "flood"; - version = "4.6.1"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/flood/-/flood-4.6.1.tgz"; - sha512 = "OB5AykNCnRUU8KEvuMQhOArRldfCYfmboZWpV9B++7jUsq7cwo7p2W15+SEBQbTyPjD3mmwNH6hNw+geoy/+LA=="; + url = "https://registry.npmjs.org/flood/-/flood-4.7.0.tgz"; + sha512 = "MAm4Yok64VPa49DM+0TxBBP0mScW5ILGCsY/HJLbATjHEkJFnwD1mkPndruZxO1vXBaFdPzoLl+gYThAUxWQjA=="; }; buildInputs = globalBuildInputs; meta = { @@ -90793,10 +92865,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.14.0"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.14.0.tgz"; - sha512 = "1Az1EEQu0txRE8eZmOo9GOxRSjhJtFseinraiIEtSeHkYuM0/gjuoKVSrtmbBFNWdOZll6QYCO3sRl6sOrwb+g=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.14.2.tgz"; + sha512 = "p3E6XyzwVPGpHd0AYVkvnPkZoEElWLWjAG10173k5aGtpoM6dIuJuSlgBPrjeev9PQ7y3oCoCO3zBjnGdB1/WQ=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -90804,15 +92876,15 @@ in sources."tslib-2.0.3" ]; }) - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.5" // { + (sources."@babel/core-7.15.8" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.15.4" // { + (sources."@babel/generator-7.15.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -90828,7 +92900,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" @@ -90843,7 +92915,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -90852,7 +92924,7 @@ in sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/runtime-7.15.4" - sources."@babel/standalone-7.15.7" + sources."@babel/standalone-7.15.8" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" sources."@babel/types-7.15.6" @@ -90894,7 +92966,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" sources."@types/keyv-3.1.3" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/node-fetch-2.5.12" sources."@types/responselike-1.0.0" sources."@types/unist-2.0.6" @@ -90942,7 +93014,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { @@ -90953,7 +93025,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -91002,8 +93074,8 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.42.0" - sources."contentful-sdk-core-6.10.1" + sources."contentful-management-7.44.1" + sources."contentful-sdk-core-6.10.3" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { dependencies = [ @@ -91021,7 +93093,7 @@ in }) sources."crypto-random-string-2.0.0" sources."css-select-4.1.3" - sources."css-what-5.0.1" + sources."css-what-5.1.0" sources."debug-4.3.2" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -91052,7 +93124,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -91142,7 +93214,7 @@ in sources."globals-11.12.0" sources."got-11.8.2" sources."graceful-fs-4.2.8" - sources."graphql-15.6.0" + sources."graphql-15.6.1" sources."graphql-compose-7.25.1" sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" @@ -91182,7 +93254,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-decimal-1.0.4" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -91241,6 +93313,7 @@ in sources."lock-1.1.0" sources."lodash-4.17.21" sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" sources."longest-streak-2.0.4" sources."loose-envify-1.4.0" sources."lower-case-2.0.2" @@ -91290,7 +93363,7 @@ in sources."node-eta-0.9.0" sources."node-fetch-2.6.5" sources."node-object-hash-2.3.10" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" @@ -91343,7 +93416,7 @@ in sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."peek-readable-4.0.1" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -91357,7 +93430,7 @@ in ]; }) sources."progress-2.0.3" - sources."prompts-2.4.1" + sources."prompts-2.4.2" sources."prop-types-15.7.2" sources."proper-lockfile-4.1.2" sources."protocols-1.4.8" @@ -91579,7 +93652,7 @@ in sha512 = "1U3GkAgbxKpV5WFwbpePThlChVdF4IpaBQBpFGPKzCwknugWPhz8s3ytBkp+YmAj1zSdnfBR43CV04tyM02m2w=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -91595,14 +93668,14 @@ in sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.6.4" - sources."@octokit/plugin-paginate-rest-2.16.7" + sources."@octokit/openapi-types-11.2.0" + sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.11.4" + sources."@octokit/plugin-rest-endpoint-methods-5.13.0" sources."@octokit/request-5.6.2" sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.11.4" - sources."@octokit/types-6.31.3" + sources."@octokit/rest-18.12.0" + sources."@octokit/types-6.34.0" sources."@types/normalize-package-data-2.4.1" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" @@ -91640,7 +93713,7 @@ in sources."inherits-2.0.4" sources."interpret-1.4.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-2.0.0" sources."is-plain-object-5.0.0" sources."is-stream-2.0.1" @@ -91945,7 +94018,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-3.2.1" + sources."sodium-native-3.3.0" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-caps-1.1.0" @@ -92023,7 +94096,7 @@ in sha512 = "8PVebGkXGXlNE2T7You4gzX4SFiULZja38LInfmnJQFfMgmeOT8br/WpirCkqhBVA28tTMYflQj5QGoeGLfTUQ=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -92158,7 +94231,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.1.5" + sources."inquirer-8.2.0" (sources."inquirer-autocomplete-prompt-1.4.0" // { dependencies = [ sources."rxjs-6.6.7" @@ -92168,7 +94241,7 @@ in sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" @@ -92295,7 +94368,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.3.1" + sources."rxjs-7.4.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -92342,7 +94415,7 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vm2-3.9.3" + sources."vm2-3.9.4" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -92407,7 +94480,7 @@ in }; dependencies = [ sources."@ardatan/aggregate-error-0.0.6" - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -92450,8 +94523,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.5.0" // { + (sources."@graphql-tools/import-6.5.4" // { dependencies = [ + sources."@graphql-tools/utils-8.3.0" sources."tslib-2.3.1" ]; }) @@ -92479,7 +94553,7 @@ in (sources."@graphql-tools/schema-8.2.0" // { dependencies = [ sources."@graphql-tools/merge-8.1.2" - sources."@graphql-tools/utils-8.2.4" + sources."@graphql-tools/utils-8.3.0" sources."tslib-2.3.1" ]; }) @@ -92510,7 +94584,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.10.2" + sources."@types/node-16.11.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -93002,7 +95076,7 @@ in sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" @@ -93069,10 +95143,10 @@ in meshcommander = nodeEnv.buildNodePackage { name = "meshcommander"; packageName = "meshcommander"; - version = "0.9.0-d"; + version = "0.9.1-a"; src = fetchurl { - url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.0-d.tgz"; - sha512 = "sA4XtYUB8PZXozUr5G+OLnGyWOXm60nIH7EQUMYQAPHJQuhi52nMHKi6XYOQtByGR+hpeLK0vmi/dKQCj/7oFg=="; + url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.1-a.tgz"; + sha512 = "y6T69luPREY/22vvm0MKauIN85BXoSy1zSEAmZc0lKkqc37JY12M16kGm5wF55uXs8LAlreOVY+4lrfrPnQtxw=="; }; dependencies = [ sources."accepts-1.3.7" @@ -93268,7 +95342,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.9.4" + sources."systeminformation-5.9.7" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -93506,7 +95580,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -93908,7 +95982,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -94186,7 +96260,7 @@ in sha512 = "ciCpeMEGZ7CbfK+MgK8ykV+wzUHz5he06mAiq8OQLuYN6pxFxZDAhwPwByirOYwdF3GV2M4s7spq2A/g/XMncQ=="; }; dependencies = [ - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."async-3.2.0" @@ -94287,13 +96361,13 @@ in hsd = nodeEnv.buildNodePackage { name = "hsd"; packageName = "hsd"; - version = "2.4.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hsd/-/hsd-2.4.0.tgz"; - sha512 = "DoHhX+opX1RVMCtGgBedvbNqTde4otlrc6HZ+Jhd8sJyokJ2BB8EUl2OZYXrsznGytuZ51D+zGvLv4T9g3GXPw=="; + url = "https://registry.npmjs.org/hsd/-/hsd-3.0.0.tgz"; + sha512 = "FjdNbLW3VXv36o7axOQXbPFBCqgO6tbKd8dCj7b/7p3yA4Vm0RnPS9XTEw1zrZcY0Sp03aj7BK8WjfunOccZyw=="; }; dependencies = [ - sources."bcfg-0.1.6" + sources."bcfg-0.1.7" sources."bcrypto-5.4.0" sources."bcurl-0.1.9" sources."bdb-1.3.0" @@ -94303,11 +96377,11 @@ in sources."bfilter-1.0.5" sources."bheep-0.1.5" sources."binet-0.3.6" - sources."blgr-0.1.9" + sources."blgr-0.2.0" sources."blru-0.1.6" sources."blst-0.1.5" sources."bmutex-0.1.6" - sources."bns-0.14.0" + sources."bns-0.15.0" sources."brq-0.1.8" sources."bs32-0.1.6" sources."bsert-0.0.10" @@ -94321,7 +96395,7 @@ in sources."bval-0.1.6" sources."bweb-0.1.10" sources."goosig-0.10.0" - sources."hs-client-0.0.9" + sources."hs-client-0.0.10" sources."loady-0.0.5" sources."mrmr-0.1.10" sources."n64-0.2.10" @@ -94368,13 +96442,13 @@ in hs-client = nodeEnv.buildNodePackage { name = "hs-client"; packageName = "hs-client"; - version = "0.0.9"; + version = "0.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.9.tgz"; - sha512 = "TAsexmpPhSVdCQ1iiX4bBnuqlThTSdGz/YKq+vjLSS1TZ2TwKxERJ8vZh1Wd6GGaMGLZl99uQR+2wUyk4HLSbg=="; + url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.10.tgz"; + sha512 = "15tfeQEMRS1FZA0q9gFbQ1jYs8v4z9oKw9xFwVEyRuckn72hoVAglN4IrFxkOCDMYV7TWCY/nO/yNZp5njYFBw=="; }; dependencies = [ - sources."bcfg-0.1.6" + sources."bcfg-0.1.7" sources."bcurl-0.1.9" sources."brq-0.1.8" sources."bsert-0.0.10" @@ -94457,7 +96531,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.20" + sources."@types/node-14.17.27" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -94466,7 +96540,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1000.0" + sources."aws-sdk-2.1009.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -95003,8 +97077,8 @@ in sha512 = "56gjTrj9SMfPkbGANfqtGYeY3G5KmCkpgEYlKkmiDNG+SpQtLT9/53gt/9CbYd5iT9GgP+IvGXwDWplgCz3NnA=="; }; dependencies = [ - sources."@jcubic/lily-0.2.0" - sources."@types/jquery-3.5.6" + sources."@jcubic/lily-0.3.0" + sources."@types/jquery-3.5.7" sources."@types/sizzle-2.3.3" sources."ansidec-0.3.4" sources."arch-2.2.0" @@ -95020,6 +97094,7 @@ in sources."execa-1.0.0" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" sources."get-stream-4.1.0" sources."glob-7.2.0" sources."graceful-fs-4.2.8" @@ -95032,7 +97107,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.29.2" + sources."jquery.terminal-2.29.4" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -95389,9 +97464,9 @@ in dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.1" - sources."@ot-builder/bin-composite-types-1.1.2" - sources."@ot-builder/bin-util-1.1.2" - (sources."@ot-builder/cli-help-shower-1.1.2" // { + sources."@ot-builder/bin-composite-types-1.2.0" + sources."@ot-builder/bin-util-1.2.0" + (sources."@ot-builder/cli-help-shower-1.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -95401,37 +97476,39 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/cli-proc-1.1.2" - sources."@ot-builder/cli-shared-1.1.2" - sources."@ot-builder/common-impl-1.1.2" - sources."@ot-builder/errors-1.1.2" - sources."@ot-builder/io-bin-cff-1.1.2" - sources."@ot-builder/io-bin-encoding-1.1.2" - sources."@ot-builder/io-bin-ext-private-1.1.2" - sources."@ot-builder/io-bin-font-1.1.2" - sources."@ot-builder/io-bin-glyph-store-1.1.2" - sources."@ot-builder/io-bin-layout-1.1.2" - sources."@ot-builder/io-bin-metadata-1.1.2" - sources."@ot-builder/io-bin-metric-1.1.2" - sources."@ot-builder/io-bin-name-1.1.2" - sources."@ot-builder/io-bin-sfnt-1.1.2" - sources."@ot-builder/io-bin-ttf-1.1.2" - sources."@ot-builder/ot-1.1.2" - sources."@ot-builder/ot-encoding-1.1.2" - sources."@ot-builder/ot-ext-private-1.1.2" - sources."@ot-builder/ot-glyphs-1.1.2" - sources."@ot-builder/ot-layout-1.1.2" - sources."@ot-builder/ot-metadata-1.1.2" - sources."@ot-builder/ot-name-1.1.2" - sources."@ot-builder/ot-sfnt-1.1.2" - sources."@ot-builder/ot-standard-glyph-namer-1.1.2" - sources."@ot-builder/prelude-1.1.2" - sources."@ot-builder/primitive-1.1.2" - sources."@ot-builder/rectify-1.1.2" - sources."@ot-builder/stat-glyphs-1.1.2" - sources."@ot-builder/trace-1.1.2" - sources."@ot-builder/var-store-1.1.2" - sources."@ot-builder/variance-1.1.2" + sources."@ot-builder/cli-proc-1.2.0" + sources."@ot-builder/cli-shared-1.2.0" + sources."@ot-builder/common-impl-1.2.0" + sources."@ot-builder/errors-1.2.0" + sources."@ot-builder/io-bin-cff-1.2.0" + sources."@ot-builder/io-bin-encoding-1.2.0" + sources."@ot-builder/io-bin-ext-private-1.2.0" + sources."@ot-builder/io-bin-font-1.2.0" + sources."@ot-builder/io-bin-glyph-store-1.2.0" + sources."@ot-builder/io-bin-layout-1.2.0" + sources."@ot-builder/io-bin-metadata-1.2.0" + sources."@ot-builder/io-bin-metric-1.2.0" + sources."@ot-builder/io-bin-name-1.2.0" + sources."@ot-builder/io-bin-sfnt-1.2.0" + sources."@ot-builder/io-bin-ttf-1.2.0" + sources."@ot-builder/io-bin-vtt-private-1.2.0" + sources."@ot-builder/ot-1.2.0" + sources."@ot-builder/ot-encoding-1.2.0" + sources."@ot-builder/ot-ext-private-1.2.0" + sources."@ot-builder/ot-glyphs-1.2.0" + sources."@ot-builder/ot-layout-1.2.0" + sources."@ot-builder/ot-metadata-1.2.0" + sources."@ot-builder/ot-name-1.2.0" + sources."@ot-builder/ot-sfnt-1.2.0" + sources."@ot-builder/ot-standard-glyph-namer-1.2.0" + sources."@ot-builder/ot-vtt-private-1.2.0" + sources."@ot-builder/prelude-1.2.0" + sources."@ot-builder/primitive-1.2.0" + sources."@ot-builder/rectify-1.2.0" + sources."@ot-builder/stat-glyphs-1.2.0" + sources."@ot-builder/trace-1.2.0" + sources."@ot-builder/var-store-1.2.0" + sources."@ot-builder/variance-1.2.0" sources."@unicode/unicode-13.0.0-1.2.1" sources."@xmldom/xmldom-0.7.5" sources."aglfn-1.0.2" @@ -95513,8 +97590,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.1.2" - sources."otb-ttc-bundle-1.1.2" + sources."ot-builder-1.2.0" + sources."otb-ttc-bundle-1.2.0" sources."passerror-1.1.1" sources."patel-0.35.1" sources."path-is-absolute-1.0.1" @@ -95776,7 +97853,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1000.0" // { + (sources."aws-sdk-2.1009.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -95937,7 +98014,7 @@ in sources."domelementtype-2.2.0" sources."domexception-1.0.1" sources."domhandler-3.3.0" - sources."dompurify-2.3.1" + sources."dompurify-2.3.3" (sources."domutils-2.8.0" // { dependencies = [ sources."domhandler-4.2.2" @@ -96151,7 +98228,7 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.13.2" + sources."mermaid-8.13.3" sources."mime-db-1.50.0" sources."mime-types-2.1.33" sources."mimic-response-2.1.0" @@ -96170,7 +98247,7 @@ in sources."ms-2.1.3" sources."multiparty-4.2.2" sources."mustache-4.2.0" - sources."nanoid-3.1.28" + sources."nanoid-3.1.30" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" @@ -96390,7 +98467,7 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" sources."tr46-1.0.1" - sources."tree-kit-0.7.3" + sources."tree-kit-0.7.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -96429,7 +98506,7 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" sources."which-2.0.2" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."word-wrap-1.2.3" sources."wordwrapjs-3.0.0" (sources."wrap-ansi-3.0.1" // { @@ -96530,7 +98607,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -96725,10 +98802,10 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.16.3"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.16.3.tgz"; - sha512 = "tbsBONiefH7SR5EhSmK4EzwP3kCHuOduUq5hWAQjCwXTva4OBeKVcPrciHNWOK/+12ygtUnjuWcAxuHgqTuBLA=="; + url = "https://registry.npmjs.org/json-server/-/json-server-0.17.0.tgz"; + sha512 = "+e/nW0mf666j1yTK+5dRx7hgxq5wJTkc5QhTYa/cBfD6vLlQWHfB4l8XKPgzeO55A8Hqm38g44OtZ5SooXi6MQ=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -96855,7 +98932,7 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.28" + sources."nanoid-3.1.30" sources."negotiator-0.6.2" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" @@ -96931,7 +99008,7 @@ in sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-16.2.0" + sources."yargs-17.2.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -97161,7 +99238,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -97819,10 +99896,10 @@ in sha512 = "hbhRogUYIulfkBTZT7xoPrCYhRBnBoqbbL4fszWD0ReFGUxU+LYBr3dwKdAluaDQ/ynT9/7C+Lf7pPNW4gSx4Q=="; }; dependencies = [ - sources."@types/component-emitter-1.2.10" + sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -97983,14 +100060,14 @@ in }; dependencies = [ sources."@babel/cli-7.15.7" - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.5" // { + (sources."@babel/core-7.15.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.15.4" + sources."@babel/generator-7.15.8" sources."@babel/helper-annotate-as-pure-7.15.4" (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ @@ -98002,7 +100079,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" @@ -98012,8 +100089,8 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/node-7.15.4" - sources."@babel/parser-7.15.7" + sources."@babel/node-7.15.8" + sources."@babel/parser-7.15.8" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/register-7.15.3" @@ -98080,12 +100157,12 @@ in sources."brace-expansion-1.1.11" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."bytesish-0.4.4" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-1.3.0" @@ -98103,7 +100180,7 @@ in sources."convert-source-map-1.8.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.18.1" + sources."core-js-3.18.3" sources."cors-2.8.5" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" @@ -98136,7 +100213,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -98161,7 +100238,7 @@ in sources."ms-2.0.0" ]; }) - sources."express-validator-6.12.2" + sources."express-validator-6.13.0" sources."fast-levenshtein-2.0.6" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -98268,7 +100345,7 @@ in sources."node-fetch-2.6.5" sources."node-localstorage-1.3.1" sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."nwsapi-2.2.0" sources."object-assign-4.1.1" sources."object-inspect-1.11.0" @@ -98288,7 +100365,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."pify-4.0.1" sources."pirates-4.0.1" sources."pkg-dir-3.0.0" @@ -99007,7 +101084,7 @@ in sha512 = "DD/i1znurfOmNJb0OBw66NmNqiM8kF6uIrzrJ0wGE3VNdzeOhz9ziWLYiRaZDGGwgbcjOo6eIfcx9O5Qynz+kg=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -99118,7 +101195,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/ci-detect-1.3.0" + sources."@npmcli/ci-detect-1.4.0" sources."@npmcli/fs-1.0.0" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" @@ -99134,19 +101211,19 @@ in ]; }) sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.6.4" + sources."@octokit/openapi-types-11.2.0" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.16.7" + sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.11.4" + sources."@octokit/plugin-rest-endpoint-methods-5.13.0" (sources."@octokit/request-5.6.2" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.11.4" - sources."@octokit/types-6.31.3" + sources."@octokit/rest-18.12.0" + sources."@octokit/types-6.34.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -99396,7 +101473,7 @@ in sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -99726,14 +101803,7 @@ in sources."whatwg-url-8.7.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."wide-align-1.1.5" sources."wordwrap-1.0.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -100693,10 +102763,10 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.5" - sources."@babel/generator-7.15.4" + sources."@babel/core-7.15.8" + sources."@babel/generator-7.15.8" sources."@babel/helper-annotate-as-pure-7.15.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" sources."@babel/helper-compilation-targets-7.15.4" @@ -100709,7 +102779,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -100726,10 +102796,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.8" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -100785,15 +102855,15 @@ in sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" - sources."@babel/plugin-transform-runtime-7.15.0" + sources."@babel/plugin-transform-runtime-7.15.8" sources."@babel/plugin-transform-shorthand-properties-7.14.5" - sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-spread-7.15.8" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.15.6" + sources."@babel/preset-env-7.15.8" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.15.4" @@ -100820,7 +102890,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.10.2" + sources."@types/node-16.11.0" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -100977,7 +103047,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -100993,7 +103063,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.30001264" + sources."caniuse-lite-1.0.30001267" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -101064,7 +103134,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.18.1" // { + (sources."core-js-compat-3.18.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -101116,7 +103186,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -101291,7 +103361,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -101316,7 +103386,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."istanbul-lib-coverage-3.0.1" + sources."istanbul-lib-coverage-3.0.2" sources."istanbul-lib-instrument-4.0.3" sources."jest-haste-map-25.5.1" sources."jest-regex-util-25.2.6" @@ -101419,7 +103489,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -101470,7 +103540,7 @@ in sources."pbkdf2-3.1.2" sources."peek-stream-1.1.3" sources."performance-now-2.1.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-1.0.0" @@ -102276,7 +104346,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -102491,7 +104561,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -102584,7 +104654,7 @@ in sources."debug-4.3.1" sources."delaunator-5.0.0" sources."devtools-protocol-0.0.901419" - sources."dompurify-2.3.1" + sources."dompurify-2.3.3" sources."end-of-stream-1.4.4" sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" @@ -102604,7 +104674,7 @@ in sources."khroma-1.4.1" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mermaid-8.13.2" + sources."mermaid-8.13.3" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -102654,10 +104724,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.1.2"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.2.tgz"; - sha512 = "ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz"; + sha512 = "Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -102965,20 +105035,20 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.9.30"; + version = "6.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.9.30.tgz"; - sha512 = "CM3k7tUgfcaTjO+9xP+/C+cOF/Ke6464GV3EeJow3H1IEzoIufCBB6s6a0wUsVVD6+cKOs3OwQvLCQv03pftYw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.13.2.tgz"; + sha512 = "GKisG/cEDcnB4Okmu+jZJqlrzHRD3s4slvhxT1tJ8QhMRVTSz4oefcdfRdc8YOagfVHKQ0OY8i2MgUIVmuRh9A=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.5" // { + (sources."@babel/core-7.15.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.15.4" + sources."@babel/generator-7.15.8" sources."@babel/helper-annotate-as-pure-7.15.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" (sources."@babel/helper-compilation-targets-7.15.4" // { @@ -102999,7 +105069,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -103018,12 +105088,13 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" - sources."@babel/plugin-proposal-async-generator-functions-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.8" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -103078,13 +105149,13 @@ in sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" sources."@babel/plugin-transform-shorthand-properties-7.14.5" - sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-spread-7.15.8" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.6" // { + (sources."@babel/preset-env-7.15.8" // { dependencies = [ sources."semver-6.3.0" ]; @@ -103094,16 +105165,17 @@ in sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" sources."@babel/types-7.15.6" - sources."@bugsnag/browser-7.11.0" - sources."@bugsnag/core-7.11.0" + sources."@bugsnag/browser-7.13.2" + sources."@bugsnag/core-7.13.2" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.11.0" - sources."@bugsnag/node-7.11.0" + sources."@bugsnag/js-7.13.2" + sources."@bugsnag/node-7.13.2" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-26.6.2" + sources."@mapbox/node-pre-gyp-1.0.5" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.13.7" // { + (sources."@netlify/build-18.17.2" // { dependencies = [ sources."resolve-2.0.0-next.3" ]; @@ -103130,13 +105202,13 @@ in sources."to-regex-range-5.0.1" ]; }) - (sources."@netlify/config-15.6.4" // { + (sources."@netlify/config-15.7.2" // { dependencies = [ sources."dot-prop-5.3.0" ]; }) sources."@netlify/esbuild-0.13.6" - sources."@netlify/framework-info-5.9.2" + sources."@netlify/framework-info-5.11.0" sources."@netlify/functions-utils-2.0.2" (sources."@netlify/git-utils-2.0.2" // { dependencies = [ @@ -103160,16 +105232,16 @@ in 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/open-api-2.5.1" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ - sources."@types/node-14.17.20" + sources."@types/node-14.17.27" ]; }) - sources."@netlify/plugins-list-4.0.0" - sources."@netlify/routing-local-proxy-0.33.2" + sources."@netlify/plugins-list-4.0.1" + sources."@netlify/routing-local-proxy-0.34.1" sources."@netlify/run-utils-2.0.1" - (sources."@netlify/zip-it-and-ship-it-4.23.3" // { + (sources."@netlify/zip-it-and-ship-it-4.25.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -103202,13 +105274,9 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."strip-ansi-5.2.0" - (sources."supports-color-5.5.0" // { - dependencies = [ - sources."has-flag-3.0.0" - ]; - }) + sources."supports-color-5.5.0" ]; }) sources."@oclif/command-1.8.0" @@ -103241,6 +105309,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) @@ -103257,6 +105326,7 @@ in sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" sources."fs-extra-7.0.1" + sources."has-flag-3.0.0" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" sources."semver-5.7.1" @@ -103281,18 +105351,18 @@ in ]; }) sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.6.4" - sources."@octokit/plugin-paginate-rest-2.16.7" + sources."@octokit/openapi-types-11.2.0" + sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.11.4" + sources."@octokit/plugin-rest-endpoint-methods-5.13.0" (sources."@octokit/request-5.6.2" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.11.4" - sources."@octokit/types-6.31.3" + sources."@octokit/rest-18.12.0" + sources."@octokit/types-6.34.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -103325,7 +105395,7 @@ in sources."@types/istanbul-reports-3.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -103337,7 +105407,22 @@ in sources."@typescript-eslint/typescript-estree-4.33.0" sources."@typescript-eslint/visitor-keys-4.33.0" sources."@ungap/from-entries-0.2.1" + (sources."@vercel/nft-0.15.1" // { + dependencies = [ + sources."braces-3.0.2" + sources."estree-walker-2.0.2" + 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."abbrev-1.1.1" sources."accepts-1.3.7" + sources."acorn-8.5.0" + sources."acorn-class-fields-1.0.0" + sources."acorn-private-class-elements-1.0.0" + sources."acorn-static-class-features-1.0.0" sources."agent-base-6.0.2" (sources."aggregate-error-3.1.0" // { dependencies = [ @@ -103353,7 +105438,6 @@ in sources."camelcase-5.3.1" sources."chalk-3.0.0" sources."get-stream-5.2.0" - sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" @@ -103368,17 +105452,19 @@ in sources."ansicolors-0.3.2" sources."any-observable-0.3.0" sources."anymatch-3.1.2" + sources."aproba-1.2.0" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" ]; }) - sources."archiver-5.3.0" - (sources."archiver-utils-2.1.0" // { + (sources."archiver-5.3.0" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-3.6.0" ]; }) + sources."archiver-utils-2.1.0" + sources."are-we-there-yet-1.1.7" sources."argparse-2.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -103415,7 +105501,12 @@ in sources."before-after-hook-2.2.2" sources."better-opn-2.1.1" sources."binary-extensions-2.2.0" - sources."bl-4.1.0" + sources."bindings-1.5.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."blueimp-md5-2.19.0" (sources."body-parser-1.19.0" // { dependencies = [ @@ -103436,7 +105527,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -103460,12 +105551,11 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" 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" ]; }) @@ -103479,6 +105569,7 @@ in sources."to-regex-range-5.0.1" ]; }) + sources."chownr-2.0.0" sources."ci-info-3.2.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -103516,7 +105607,6 @@ in sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."extract-stack-2.0.0" - sources."has-flag-4.0.0" sources."js-yaml-3.14.1" (sources."supports-hyperlinks-2.2.0" // { dependencies = [ @@ -103552,7 +105642,11 @@ in sources."common-path-prefix-3.0.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" - sources."compress-commons-4.1.1" + (sources."compress-commons-4.1.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."concat-map-0.0.1" sources."concordance-5.0.4" (sources."configstore-5.0.1" // { @@ -103560,6 +105654,7 @@ in sources."dot-prop-5.3.0" ]; }) + sources."console-control-strings-1.1.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."convert-source-map-1.8.0" @@ -103569,11 +105664,10 @@ in (sources."copy-template-dir-1.4.0" // { dependencies = [ sources."pump-1.0.3" - sources."readable-stream-2.3.7" sources."readdirp-2.2.1" ]; }) - (sources."core-js-compat-3.18.1" // { + (sources."core-js-compat-3.18.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -103587,7 +105681,11 @@ in ]; }) sources."crc-32-1.2.0" - sources."crc32-stream-4.0.2" + (sources."crc32-stream-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" @@ -103617,7 +105715,6 @@ in sources."bl-1.2.3" sources."file-type-5.2.0" sources."is-stream-1.1.0" - sources."readable-stream-2.3.7" sources."tar-stream-1.6.2" ]; }) @@ -103653,9 +105750,11 @@ in ]; }) sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-1.1.2" sources."deprecation-2.3.1" sources."destroy-1.0.4" + sources."detect-libc-1.0.3" sources."detective-amd-3.1.0" sources."detective-cjs-3.1.1" sources."detective-es6-2.2.0" @@ -103711,7 +105810,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -103722,7 +105821,7 @@ in sources."envinfo-7.8.1" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."es-module-lexer-0.9.2" + sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -103809,7 +105908,6 @@ in sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" sources."camelcase-5.3.1" - sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" (sources."jest-validate-25.5.0" // { dependencies = [ @@ -103828,6 +105926,7 @@ in }) sources."file-size-0.0.5" sources."file-type-11.1.0" + sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-3.0.0" (sources."fill-range-4.0.0" // { @@ -103843,7 +105942,11 @@ in }) sources."find-up-5.0.0" sources."flatten-1.0.3" - sources."flush-write-stream-2.0.0" + (sources."flush-write-stream-2.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."fn.name-1.1.0" sources."folder-walker-3.2.0" sources."follow-redirects-1.14.4" @@ -103852,18 +105955,23 @@ in sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - (sources."from2-2.3.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - ]; - }) + sources."from2-2.3.0" sources."from2-array-0.0.4" sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" + (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" + ]; + }) sources."gensync-1.0.0-beta.2" sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" @@ -103919,7 +106027,7 @@ in sources."ansi-regex-2.1.1" ]; }) - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" (sources."has-glob-1.0.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -103928,6 +106036,7 @@ in sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.2" sources."has-to-string-tag-x-1.4.1" + sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -103947,11 +106056,7 @@ in }) sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.0" - (sources."http-call-5.3.0" // { - dependencies = [ - sources."parse-json-4.0.0" - ]; - }) + sources."http-call-5.3.0" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -103973,6 +106078,7 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-4.0.6" + sources."ignore-walk-3.0.4" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -103990,6 +106096,7 @@ in sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" sources."figures-2.0.0" + sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ @@ -104017,7 +106124,7 @@ in sources."ci-info-2.0.0" ]; }) - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -104061,7 +106168,6 @@ in sources."jest-validate-26.6.2" (sources."jest-worker-26.6.2" // { dependencies = [ - sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; }) @@ -104087,11 +106193,7 @@ in ]; }) sources."latest-version-5.1.0" - (sources."lazystream-1.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - ]; - }) + sources."lazystream-1.0.0" sources."leven-3.1.0" sources."levn-0.3.0" sources."lines-and-columns-1.1.6" @@ -104123,12 +106225,12 @@ in sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" sources."figures-2.0.0" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) (sources."load-json-file-5.3.0" // { dependencies = [ - sources."parse-json-4.0.0" sources."type-fest-0.3.1" ]; }) @@ -104204,6 +106306,8 @@ in sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" + sources."minipass-3.1.5" + sources."minizlib-2.1.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -104222,12 +106326,18 @@ in ]; }) sources."mute-stream-0.0.7" - sources."nanoid-3.1.28" + sources."nanoid-3.1.30" sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" + (sources."needle-2.9.1" // { + dependencies = [ + sources."debug-3.2.7" + sources."ms-2.1.3" + ]; + }) sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-8.0.1" // { + (sources."netlify-8.0.2" // { dependencies = [ sources."qs-6.10.1" ]; @@ -104237,7 +106347,22 @@ in sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.5" - sources."node-releases-1.1.77" + sources."node-gyp-build-4.3.0" + (sources."node-pre-gyp-0.13.0" // { + dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."nopt-4.0.3" + sources."rimraf-2.7.1" + sources."safe-buffer-5.2.1" + sources."semver-5.7.1" + sources."tar-4.4.19" + sources."yallist-3.1.1" + ]; + }) + sources."node-releases-2.0.0" sources."node-source-walk-4.2.0" (sources."node-version-alias-1.0.1" // { dependencies = [ @@ -104246,7 +106371,6 @@ in sources."ansi-styles-4.3.0" sources."camelcase-5.3.1" sources."chalk-3.0.0" - sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" @@ -104255,6 +106379,7 @@ in ]; }) sources."noop2-2.0.0" + sources."nopt-5.0.0" (sources."normalize-node-version-10.0.0" // { dependencies = [ sources."@jest/types-25.5.0" @@ -104262,7 +106387,6 @@ in sources."ansi-styles-4.3.0" sources."camelcase-5.3.1" sources."chalk-3.0.0" - sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" @@ -104277,8 +106401,11 @@ in }) sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.8" sources."npm-run-path-4.0.1" + sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -104328,8 +106455,10 @@ in sources."restore-cursor-3.1.0" ]; }) + sources."os-homedir-1.0.2" sources."os-name-4.0.1" sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" (sources."p-all-2.1.0" // { dependencies = [ sources."p-map-2.1.0" @@ -104389,14 +106518,10 @@ in sources."to-readable-stream-1.0.0" ]; }) - (sources."parallel-transform-1.2.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - ]; - }) + sources."parallel-transform-1.2.0" sources."parse-github-url-1.0.2" sources."parse-gitignore-1.0.1" - sources."parse-json-5.2.0" + sources."parse-json-4.0.0" sources."parse-ms-2.1.0" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" @@ -104419,14 +106544,18 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pend-1.2.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pkg-dir-5.0.0" sources."posix-character-classes-0.1.1" - sources."postcss-8.3.9" + (sources."postcss-8.3.9" // { + dependencies = [ + sources."picocolors-0.2.1" + ]; + }) sources."postcss-values-parser-2.0.1" sources."precinct-8.1.0" sources."precond-0.2.3" @@ -104463,6 +106592,7 @@ in sources."read-package-json-fast-2.0.3" (sources."read-pkg-5.2.0" // { dependencies = [ + sources."parse-json-5.2.0" sources."type-fest-0.6.0" ]; }) @@ -104475,7 +106605,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-2.3.7" sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" sources."redeyed-2.1.1" @@ -104502,6 +106632,7 @@ in sources."require-package-name-2.0.1" sources."requires-port-1.0.0" sources."resolve-1.20.0" + sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-2.0.0" (sources."restore-cursor-2.0.0" // { @@ -104535,6 +106666,7 @@ in sources."safe-regex-1.1.0" sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" + sources."sax-1.2.4" sources."seek-bzip-1.0.6" sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { @@ -104671,11 +106803,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."supports-color-8.1.1" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) + sources."supports-color-8.1.1" (sources."supports-hyperlinks-1.0.1" // { dependencies = [ sources."has-flag-2.0.0" @@ -104687,7 +106815,16 @@ in ]; }) sources."symbol-observable-1.2.0" - sources."tar-stream-2.2.0" + (sources."tar-6.1.11" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { dependencies = [ @@ -104701,11 +106838,7 @@ in }) sources."text-hex-1.0.0" sources."through-2.3.8" - (sources."through2-2.0.5" // { - dependencies = [ - sources."readable-stream-2.3.7" - ]; - }) + sources."through2-2.0.5" sources."through2-filter-3.0.0" sources."through2-map-3.0.0" sources."time-zone-1.0.0" @@ -104740,7 +106873,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.4.3" + sources."typescript-4.4.4" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-2.0.0" @@ -104788,6 +106921,7 @@ in sources."color-name-1.1.3" sources."commander-3.0.2" sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) @@ -104797,6 +106931,7 @@ in sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-module-2.0.0" + sources."wide-align-1.1.5" sources."widest-line-3.1.0" (sources."windows-release-4.0.0" // { dependencies = [ @@ -104804,12 +106939,12 @@ in sources."get-stream-5.2.0" ]; }) - sources."winston-3.3.3" - (sources."winston-transport-4.4.0" // { + (sources."winston-3.3.3" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-3.6.0" ]; }) + sources."winston-transport-4.4.0" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ @@ -104838,7 +106973,11 @@ in sources."yarn-1.22.15" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" - sources."zip-stream-4.1.0" + (sources."zip-stream-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -104970,7 +107109,7 @@ in sources."unique-slug-2.0.2" sources."util-deprecate-1.0.2" sources."which-2.0.2" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; @@ -105030,7 +107169,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.49" + sources."big-integer-1.6.50" sources."block-stream-0.0.9" sources."body-parser-1.19.0" sources."boom-2.10.1" @@ -105114,7 +107253,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -105271,7 +107410,7 @@ in ]; }) sources."which-1.3.1" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" (sources."win-detect-browsers-1.0.2" // { dependencies = [ sources."yargs-1.3.3" @@ -105376,7 +107515,7 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."wrappy-1.0.2" sources."yallist-3.1.1" ]; @@ -105424,7 +107563,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -105454,7 +107593,7 @@ in sources."async-0.1.22" sources."async-mutex-0.3.2" sources."asynckit-0.4.0" - sources."axios-0.21.1" + sources."axios-0.22.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -105517,7 +107656,7 @@ in sources."cors-2.8.5" sources."cronosjs-1.7.1" sources."css-select-4.1.3" - sources."css-what-5.0.1" + sources."css-what-5.1.0" sources."debug-2.6.9" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -105678,7 +107817,7 @@ in sources."negotiator-0.6.2" sources."node-addon-api-3.2.1" sources."node-fetch-2.6.5" - sources."node-red-admin-2.2.0" + sources."node-red-admin-2.2.1" sources."nopt-5.0.0" sources."normalize-url-6.1.0" sources."npmlog-4.1.2" @@ -105776,7 +107915,7 @@ in sources."vary-1.1.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."wrappy-1.0.2" sources."ws-7.5.1" sources."xml2js-0.4.23" @@ -105867,7 +108006,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -105978,7 +108117,7 @@ in ]; }) sources."walk-2.3.15" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; @@ -106163,7 +108302,7 @@ in sha512 = "CdpgqtO6JpDKJjQ2gueY0jnbz6APWA9wFXSwPv5bXg4seSBibHqQ8JyWxYlS8YRfVbpeDtj582wcAWTlfy5qNA=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -106190,7 +108329,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimist-1.2.2" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -106362,7 +108501,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -106681,10 +108820,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.24.2"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.24.2.tgz"; - sha512 = "120p116CE8VMMZ+hk8IAb1inCPk4Dj3VZw29/n2g6UI77urJKVYb7FZUDW8hY+EBnfsjI/2yrobBgFyzo7YpVQ=="; + url = "https://registry.npmjs.org/npm/-/npm-8.1.0.tgz"; + sha512 = "rPiiYY4t8pqK1rCDQy1bE6HRR63B2RwfYsIVc1/BNkeIilvqZMwGeTksSBK8WTozBz8c/tMd7jk0c4Q4f/F+UA=="; }; buildInputs = globalBuildInputs; meta = { @@ -106958,7 +109097,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."prompts-2.4.1" + sources."prompts-2.4.2" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -107026,7 +109165,7 @@ in ]; }) sources."which-2.0.2" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" (sources."widest-line-3.1.0" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -107227,7 +109366,7 @@ in sources."uuid-3.4.0" sources."verror-1.10.0" sources."walk-2.3.15" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -107290,16 +109429,16 @@ in sha512 = "hpku8mW67U6PXQIenW6NBbphBOMb8XzW6B9r093DUhYj5GN2FUB/CXCiz5hKoPYUsusZ35BpProH8AUF9bh5IQ=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.5" // { + (sources."@babel/core-7.15.8" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.15.4" // { + (sources."@babel/generator-7.15.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -107324,7 +109463,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -107337,9 +109476,9 @@ in sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" - sources."@babel/plugin-proposal-async-generator-functions-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.8" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -107398,13 +109537,13 @@ in sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" sources."@babel/plugin-transform-shorthand-properties-7.14.5" - sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-spread-7.15.8" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.6" // { + (sources."@babel/preset-env-7.15.8" // { dependencies = [ sources."semver-6.3.0" ]; @@ -107518,7 +109657,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -107535,7 +109674,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -107561,7 +109700,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.18.1" // { + (sources."core-js-compat-3.18.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -107672,7 +109811,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.859" + sources."electron-to-chromium-1.3.870" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -107816,7 +109955,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -107939,7 +110078,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -107975,10 +110114,14 @@ in sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" sources."physical-cpu-count-2.0.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - sources."postcss-7.0.39" + (sources."postcss-7.0.39" // { + dependencies = [ + sources."picocolors-0.2.1" + ]; + }) (sources."postcss-calc-7.0.5" // { dependencies = [ sources."postcss-value-parser-4.1.0" @@ -108684,7 +110827,7 @@ in sources."base64-js-0.0.8" sources."bencode-2.0.2" sources."bep53-range-1.1.1" - sources."big-integer-1.6.49" + sources."big-integer-1.6.50" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -108793,7 +110936,7 @@ in sources."ipaddr.js-2.0.1" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-date-object-1.0.5" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -109428,7 +111571,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."into-stream-6.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -109510,14 +111653,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-pm-runs-1.0.0" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."wide-align-1.1.5" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" @@ -109658,7 +111794,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" @@ -109736,7 +111872,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.9.4" + sources."systeminformation-5.9.7" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.1" @@ -109751,7 +111887,7 @@ in sources."async-2.6.3" ]; }) - sources."vm2-3.9.3" + sources."vm2-3.9.4" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -109772,10 +111908,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.16.1"; + version = "6.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.16.1.tgz"; - sha512 = "oTZtaWJvvQ1V4KzpPya/BYYF90c6ICKmFYof8DAzMi0g2PEGseSVRdw/A2ov6mQJxBjHyRyYp/j42j8QOqRuKw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.17.1.tgz"; + sha512 = "rxl28iv4zYrhv7hKRMfO49hlXMFGQDgDyJrAoLkQPlJuAziCjEdfMV0OTt5BsntxbQMLsGgwpqSfosNVMbCdNQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -109824,7 +111960,7 @@ in sha512 = "f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw=="; }; dependencies = [ - sources."nanoid-3.1.28" + sources."nanoid-3.1.30" sources."picocolors-0.2.1" sources."source-map-js-0.6.2" ]; @@ -109891,13 +112027,14 @@ in sources."lodash.sortby-4.7.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."nanocolors-0.2.12" + sources."nanocolors-0.2.13" sources."normalize-path-3.0.0" sources."path-type-4.0.0" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" sources."pify-2.3.0" sources."postcss-load-config-3.1.0" - sources."postcss-reporter-7.0.3" + sources."postcss-reporter-7.0.4" sources."pretty-hrtime-1.0.3" sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" @@ -109972,13 +112109,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.1.1"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.1.1.tgz"; - sha512 = "+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.2.1.tgz"; + sha512 = "nXhldcFYemNSMqdTAEziggVWBNbCHTrr0amkCJruP3G2AFpzxrKtksPRLYNetxdKMJAt7aRRumusbtmTTDgyzw=="; }; dependencies = [ - sources."@prisma/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f" + sources."@prisma/engines-3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c" ]; buildInputs = globalBuildInputs; meta = { @@ -110164,7 +112301,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -110480,7 +112617,7 @@ in sources."vscode-jsonrpc-6.0.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."which-2.0.2" @@ -110605,7 +112742,7 @@ in sources."package-json-6.5.0" sources."pixiv-api-client-0.25.0" sources."prepend-http-2.0.0" - sources."prompts-2.4.1" + sources."prompts-2.4.2" sources."pump-3.0.0" sources."qs-6.10.1" sources."rc-1.2.8" @@ -110640,10 +112777,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.175"; + version = "1.1.178"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.175.tgz"; - sha512 = "LCYO4t/wvZPSipRgz5wCRNQWqLBhiVx2H05sU7Xr6db6tesS1mPfwyBoa0X7oMCUycwoEmApdPCSQvrggXQ1oQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.178.tgz"; + sha512 = "OhEoC5HfKZqvY5GVCsHeroYDx85xp4CZwevhNsePxNzZyW+W491K4bfLTvuOBnvcnMWip+aMQ7zzFDkw74Gtkg=="; }; buildInputs = globalBuildInputs; meta = { @@ -110723,7 +112860,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."invert-kv-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-url-1.2.4" @@ -110993,21 +113130,21 @@ in react-static = nodeEnv.buildNodePackage { name = "react-static"; packageName = "react-static"; - version = "7.5.3"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-static/-/react-static-7.5.3.tgz"; - sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; + url = "https://registry.npmjs.org/react-static/-/react-static-7.6.2.tgz"; + sha512 = "JQACM+3GgF1vkUH6E6w1k0Qut6IbcfXjU37shGUWM9tIs3F9e/33saXK4G/uSl1kc8qjI+RekAQs/qyjMlUKlg=="; }; dependencies = [ sources."@babel/cli-7.15.7" - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.5" // { + (sources."@babel/core-7.15.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.15.4" + sources."@babel/generator-7.15.8" sources."@babel/helper-annotate-as-pure-7.15.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" (sources."@babel/helper-compilation-targets-7.15.4" // { @@ -111028,7 +113165,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -111041,9 +113178,9 @@ in sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" - sources."@babel/plugin-proposal-async-generator-functions-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.8" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -111104,19 +113241,19 @@ in sources."@babel/plugin-transform-react-pure-annotations-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" - (sources."@babel/plugin-transform-runtime-7.15.0" // { + (sources."@babel/plugin-transform-runtime-7.15.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/plugin-transform-shorthand-properties-7.14.5" - sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-spread-7.15.8" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.6" // { + (sources."@babel/preset-env-7.15.8" // { dependencies = [ sources."semver-6.3.0" ]; @@ -111134,7 +113271,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.10.2" + sources."@types/node-16.11.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -111206,7 +113343,11 @@ in sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."atob-2.1.2" - sources."autoprefixer-9.8.8" + (sources."autoprefixer-9.8.8" // { + dependencies = [ + sources."picocolors-0.2.1" + ]; + }) sources."axios-0.21.4" sources."babel-core-7.0.0-bridge.0" (sources."babel-loader-8.2.2" // { @@ -111288,7 +113429,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -111322,7 +113463,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -111402,7 +113543,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.18.1" // { + (sources."core-js-compat-3.18.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -111546,7 +113687,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -111846,7 +113987,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-deflate-1.0.0" @@ -111991,7 +114132,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -112073,7 +114214,7 @@ in sources."peek-stream-1.1.3" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" @@ -112088,6 +114229,7 @@ in sources."posix-character-classes-0.1.1" (sources."postcss-7.0.39" // { dependencies = [ + sources."picocolors-0.2.1" sources."source-map-0.6.1" ]; }) @@ -112284,7 +114426,7 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."css-select-4.1.3" - sources."css-what-5.0.1" + sources."css-what-5.1.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domutils-2.8.0" @@ -112801,14 +114943,14 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "2.3.0"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.3.0.tgz"; - sha512 = "9hiYYcNshOLt4kLXcuE1nIO5nAFyOcnau3nn+rw/WNQC52Vpa77GqeJZCSBIWAUNsALmtsCby76oOiSJlX5dbQ=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.3.4.tgz"; + sha512 = "88OPL2Gj8qWx/GWS0dgxJkArT/kcnfFMgW+duBBSGXbvdWG6CEIUY4602e41OVLtDAmT3xo4cdj3PhmQxgAa6g=="; }; dependencies = [ sources."@mozilla/readability-0.4.1" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."abab-2.0.5" sources."acorn-8.5.0" (sources."acorn-globals-6.0.0" // { @@ -112826,22 +114968,18 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."cssom-0.4.4" + sources."cssom-0.5.0" (sources."cssstyle-2.3.0" // { dependencies = [ sources."cssom-0.3.8" ]; }) - sources."data-urls-2.0.0" + sources."data-urls-3.0.1" sources."debug-4.3.2" sources."decimal.js-10.3.1" sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" - (sources."domexception-2.0.1" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) + sources."domexception-4.0.0" sources."dompurify-2.3.3" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" @@ -112850,17 +114988,16 @@ in sources."estraverse-5.2.0" sources."esutils-2.0.3" sources."fast-levenshtein-2.0.6" - sources."form-data-3.0.1" + sources."form-data-4.0.0" sources."get-caller-file-2.0.5" - sources."html-encoding-sniffer-2.0.1" - sources."http-proxy-agent-4.0.1" + sources."html-encoding-sniffer-3.0.0" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.0" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.1" - sources."jsdom-16.7.0" + sources."jsdom-18.0.0" sources."levn-0.3.0" - sources."lodash-4.17.21" sources."mime-db-1.50.0" sources."mime-types-2.1.33" sources."ms-2.1.2" @@ -112878,19 +115015,19 @@ in sources."strip-ansi-6.0.1" sources."symbol-tree-3.2.4" sources."tough-cookie-4.0.0" - sources."tr46-2.1.0" + sources."tr46-3.0.0" sources."type-check-0.3.2" sources."universalify-0.1.2" sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-2.0.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-encoding-1.0.5" - sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.7.0" + sources."w3c-xmlserializer-3.0.0" + sources."webidl-conversions-7.0.0" + sources."whatwg-encoding-2.0.0" + sources."whatwg-mimetype-3.0.0" + sources."whatwg-url-10.0.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.5.5" - sources."xml-name-validator-3.0.0" + sources."ws-8.2.3" + sources."xml-name-validator-4.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yargs-17.2.1" @@ -112909,14 +115046,14 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.12.3"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.3.tgz"; - sha512 = "qTBaEfwVqCvqLbuloZ9sMBQA49WfMOQrLVBGiVyT7pNMAjosQCpMyFESqQL8WqVxDzV2olPCZ1L2rG9cuDGOsA=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.0.tgz"; + sha512 = "SLGjajbYf2QKByYKBWCDTW1mnX6BWfojV3Y6SFkCXtehNFgy4OGGKmi3Dy4/PqSx5liWeGggxMQ9N/oiSsFhbA=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" - (sources."@babel/generator-7.15.4" // { + sources."@babel/code-frame-7.15.8" + (sources."@babel/generator-7.15.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -112929,7 +115066,7 @@ in sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/runtime-7.15.4" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" @@ -112940,18 +115077,14 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.2" - (sources."@redocly/openapi-core-1.0.0-beta.62" // { - dependencies = [ - sources."@types/node-14.17.20" - ]; - }) + sources."@redocly/openapi-core-1.0.0-beta.63" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" - sources."@types/node-15.14.9" + sources."@types/node-14.17.27" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" - sources."argparse-1.0.10" + sources."argparse-2.0.1" (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -113034,7 +115167,6 @@ in sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" sources."eventemitter3-4.0.7" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" @@ -113073,7 +115205,7 @@ in sources."isarray-2.0.5" sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" + sources."js-yaml-4.1.0" sources."jsesc-2.5.2" sources."json-pointer-0.6.1" sources."json-schema-traverse-1.0.0" @@ -113095,8 +115227,8 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.3.3" - sources."mobx-react-7.2.0" + sources."mobx-6.3.5" + sources."mobx-react-7.2.1" sources."mobx-react-lite-3.2.1" sources."ms-2.1.2" sources."neo-async-2.6.2" @@ -113148,7 +115280,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.56" // { + (sources."redoc-2.0.0-rc.57" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -113172,7 +115304,6 @@ in sources."should-util-1.0.1" sources."slugify-1.4.7" sources."source-map-0.6.1" - sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" @@ -113280,7 +115411,7 @@ in sources."ink-2.7.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -113474,9 +115605,9 @@ in sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" - sources."@types/node-14.17.20" + sources."@types/node-14.17.27" sources."@types/node-fetch-2.5.12" - sources."@types/vscode-1.60.0" + sources."@types/vscode-1.61.0" sources."@typescript-eslint/eslint-plugin-4.33.0" sources."@typescript-eslint/experimental-utils-4.33.0" sources."@typescript-eslint/parser-4.33.0" @@ -113499,7 +115630,7 @@ in sources."asynckit-0.4.0" sources."azure-devops-node-api-11.0.1" sources."balanced-match-1.0.2" - sources."big-integer-1.6.49" + sources."big-integer-1.6.50" sources."binary-0.3.0" sources."binary-extensions-2.2.0" sources."bluebird-3.4.7" @@ -113536,7 +115667,7 @@ in sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."css-select-4.1.3" - sources."css-what-5.0.1" + sources."css-what-5.1.0" sources."d3-7.1.1" sources."d3-array-3.1.1" sources."d3-axis-3.0.0" @@ -113724,7 +115855,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-9.1.2" // { + (sources."mocha-9.1.3" // { dependencies = [ sources."argparse-2.0.1" sources."glob-7.1.7" @@ -113836,7 +115967,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.6" - sources."typescript-4.4.3" + sources."typescript-4.4.4" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.1" @@ -113988,10 +116119,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.42.1"; + version = "1.43.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.42.1.tgz"; - sha512 = "/zvGoN8B7dspKc5mC6HlaygyCBRvnyzzgD5khiaCfglWztY99cYoiTUksVx11NlnemrcfH5CEaCpsUKoW0cQqg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.43.2.tgz"; + sha512 = "DncYhjl3wBaPMMJR0kIUaH3sF536rVrOcqqVGmTZHQRRzj7LQlyGV7Mb8aCKFyILMr5VsPHwRYtyKpnKYlmQSQ=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -114161,10 +116292,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.61.0"; + version = "2.63.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.61.0.tgz"; - sha512 = "a0Kha0IJ7dekoXgecoo1jsoH7c1d5tOdYaalZt0ZjrFBJq/hURpqJurPzuDlx4MwecbrGTe2aMjGUYFBFcDlRw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.63.0.tgz"; + sha512 = "8R3WceUjjFBZRcL0YXT6+3hEWIxlzyCIWiIVy9x2Rf2TDBBJTTv82T1JHvLr9dRVBSOcQBu6cHlzSqwk1ozbLA=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -114223,7 +116354,7 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/dashboard-plugin-5.4.5" + sources."@serverless/dashboard-plugin-5.4.8" sources."@serverless/event-mocks-1.1.1" (sources."@serverless/platform-client-4.3.0" // { dependencies = [ @@ -114238,7 +116369,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.17.0" // { + (sources."@serverless/utils-5.18.0" // { dependencies = [ sources."get-stream-6.0.1" sources."has-flag-4.0.0" @@ -114257,12 +116388,12 @@ in sources."@types/keyv-3.1.3" sources."@types/lodash-4.14.175" sources."@types/long-4.0.1" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" sources."@types/tough-cookie-4.0.1" - sources."adm-zip-0.5.7" + sources."adm-zip-0.5.9" sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ @@ -114317,7 +116448,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1000.0" // { + (sources."aws-sdk-2.1009.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -114399,11 +116530,7 @@ in sources."chownr-1.1.4" sources."ci-info-3.2.0" sources."cli-boxes-2.2.1" - (sources."cli-color-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."cli-color-2.0.1" sources."cli-cursor-3.1.0" sources."cli-progress-footer-2.1.1" (sources."cli-sprintf-format-1.1.0" // { @@ -114700,7 +116827,7 @@ in sources."lodash.flatten-4.4.0" sources."lodash.isplainobject-4.0.6" sources."lodash.union-4.6.0" - sources."log-6.2.0" + sources."log-6.3.1" (sources."log-node-8.0.1" // { dependencies = [ sources."has-flag-4.0.0" @@ -114989,6 +117116,7 @@ in sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."unbzip2-stream-1.4.3" + sources."uni-global-1.0.0" sources."universalify-0.1.2" sources."untildify-4.0.0" sources."uri-js-4.4.1" @@ -115007,7 +117135,7 @@ in sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-pm-runs-1.0.0" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" (sources."widest-line-3.1.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" @@ -115686,10 +117814,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.731.0"; + version = "1.737.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.731.0.tgz"; - sha512 = "1bRMFH7ZrjmaUkBnbOtCmLSSpAlj9vPKndBiP4hjCLysN8peVZ9SMdxGWhhJsmvqmRZYCdmPQyL+sKev8dsRkw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.737.0.tgz"; + sha512 = "74RuQLRB2lIDoS3dFY/XXRsPJvL1qr5t7LisJ10q5O2wLi4ISEyNU39XPICVOj+kg1eT30CjKUecMzF+9P2xfQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -115704,25 +117832,25 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.2.0.tgz"; - sha512 = "sjlGfMmnaWvTRVxGRGWyhd9ctpg4APxWAxu85O/SxekkxHhfxmePWZbaYCkeX5QQX0z1YEnKOlNt6w82E4Nzug=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.3.0.tgz"; + sha512 = "15eJ4fLho1uQTgdvAKlkMPvhvurky8KAc0F+wAdrSoIk+rKEYor8vPKiV5grp4J0sQpPms/AW7w9BV6b/HB0oA=="; }; dependencies = [ - sources."@types/component-emitter-1.2.10" + sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."accepts-1.3.7" - sources."base64-arraybuffer-0.1.4" + sources."base64-arraybuffer-1.0.1" sources."base64id-2.0.0" sources."component-emitter-1.3.0" sources."cookie-0.4.1" sources."cors-2.8.5" sources."debug-4.3.2" - sources."engine.io-5.2.0" - sources."engine.io-parser-4.0.3" + sources."engine.io-6.0.0" + sources."engine.io-parser-5.0.0" sources."mime-db-1.50.0" sources."mime-types-2.1.33" sources."ms-2.1.2" @@ -115731,7 +117859,7 @@ in sources."socket.io-adapter-2.3.2" sources."socket.io-parser-4.0.4" sources."vary-1.1.2" - sources."ws-7.4.6" + sources."ws-8.2.3" ]; buildInputs = globalBuildInputs; meta = { @@ -115810,7 +117938,7 @@ in sources."ini-1.3.8" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -115969,7 +118097,7 @@ in sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" - (sources."async-append-only-log-3.1.0" // { + (sources."async-append-only-log-3.1.1" // { dependencies = [ sources."push-stream-11.0.1" ]; @@ -116231,7 +118359,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-canonical-base64-1.1.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -116278,7 +118406,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.4.0" // { + (sources."jitdb-3.4.2" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -116669,13 +118797,13 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-3.2.1" + sources."sodium-native-3.3.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - (sources."ssb-bendy-butt-0.12.3" // { + (sources."ssb-bendy-butt-0.12.4" // { dependencies = [ sources."ssb-keys-8.2.0" ]; @@ -116687,7 +118815,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.6.0" // { + (sources."ssb-db2-2.6.5" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -116749,8 +118877,8 @@ in sources."ssb-keys-8.2.0" ]; }) - sources."ssb-validate2-0.1.1" - sources."ssb-validate2-rsjs-node-1.0.0" + sources."ssb-validate2-0.1.2" + sources."ssb-validate2-rsjs-node-1.0.1" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -116955,7 +119083,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1000.0" // { + (sources."aws-sdk-2.1009.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -117209,7 +119337,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -117738,17 +119866,17 @@ in sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.5" - sources."@babel/generator-7.15.4" + sources."@babel/core-7.15.8" + sources."@babel/generator-7.15.8" sources."@babel/helper-compilation-targets-7.15.4" sources."@babel/helper-function-name-7.15.4" sources."@babel/helper-get-function-arity-7.15.4" sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-module-transforms-7.15.8" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" @@ -117761,7 +119889,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.7" + sources."@babel/parser-7.15.8" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" sources."@babel/types-7.15.6" @@ -117781,7 +119909,11 @@ in sources."array-union-2.1.0" sources."arrify-1.0.1" sources."astral-regex-2.0.0" - sources."autoprefixer-9.8.8" + (sources."autoprefixer-9.8.8" // { + dependencies = [ + sources."picocolors-0.2.1" + ]; + }) sources."bail-1.0.5" sources."balanced-match-2.0.0" (sources."brace-expansion-1.1.11" // { @@ -117790,11 +119922,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -117831,7 +119963,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -117882,7 +120014,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -117927,7 +120059,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" @@ -117947,10 +120079,11 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" (sources."postcss-7.0.39" // { dependencies = [ + sources."picocolors-0.2.1" sources."source-map-0.6.1" ]; }) @@ -118059,16 +120192,16 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.6.tgz"; - sha512 = "oJux/afbmcZO+N+ADXB88h6XANLie8Y2rh2qBlhgfkpr2c3t/q/T0w2JWrHqagaDL8zeNwO8a8RVFBkrRox8gg=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.7.tgz"; + sha512 = "lH8ArmwVC+D314cToZkXBBfj7NlpvgQGP7nXCAMnNHo6hTEcbKcf/cAZgzbnAOTftjIJrmLHp+EDW887VJFSOQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -118130,7 +120263,7 @@ in sources."supports-color-7.2.0" sources."svelte-preprocess-4.9.8" sources."to-regex-range-5.0.1" - sources."typescript-4.4.3" + sources."typescript-4.4.4" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -118146,10 +120279,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.9"; + version = "0.14.10"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.9.tgz"; - sha512 = "mkMsAnGEO/wMsYfRdEKWKY9Hv/FwuCtB5RiJPcUcngHrVq8V+6zYGiZsmDTS4CArpfzhEuPcUNo1UM+E94Pslw=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.10.tgz"; + sha512 = "hRVDcaYNs1T3VUnxPYMlpCfUJYAXzzKHRfpATEyw480meS6gJx7tZCLRirajs1Qh8dUINaoVnCDyI+OqncOXFw=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" @@ -118158,7 +120291,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -118201,7 +120334,7 @@ in sources."svelte2tsx-0.4.7" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" - sources."typescript-4.4.3" + sources."typescript-4.4.4" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" sources."vscode-html-languageservice-4.0.0" @@ -118212,7 +120345,7 @@ in sources."vscode-languageserver-types-3.17.0-next.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-2.1.2" @@ -118241,7 +120374,7 @@ in sources."commander-7.2.0" sources."css-select-4.1.3" sources."css-tree-1.1.3" - sources."css-what-5.0.1" + sources."css-what-5.1.0" sources."csso-4.2.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" @@ -119040,76 +121173,10 @@ in sha1 = "bd2b3b1e3b88ad3c7471bdc8a5244255564b69e1"; }; dependencies = [ - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."base64-js-1.5.1" - sources."bindings-1.5.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."buffer-5.7.1" - sources."chownr-1.1.4" - sources."code-point-at-1.1.0" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" - sources."decompress-response-4.2.1" - sources."deep-extend-0.6.0" - sources."delegates-1.0.0" - sources."detect-libc-1.0.3" - sources."end-of-stream-1.4.4" - sources."expand-template-2.0.3" - sources."file-uri-to-path-1.0.0" - sources."fs-constants-1.0.0" - sources."gauge-2.7.4" - sources."github-from-package-0.0.0" - sources."has-unicode-2.0.1" - sources."ieee754-1.2.1" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-fullwidth-code-point-1.0.0" - sources."isarray-1.0.0" - sources."mimic-response-2.1.0" - sources."minimist-1.2.5" - sources."mkdirp-classic-0.5.3" - sources."napi-build-utils-1.0.2" - sources."node-abi-2.30.1" - sources."node-addon-api-3.0.2" - sources."noop-logger-0.1.1" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."prebuild-install-5.3.6" - sources."process-nextick-args-2.0.1" - sources."pump-3.0.0" + sources."node-addon-api-4.2.0" + sources."node-gyp-build-4.3.0" sources."q-1.5.1" - sources."rc-1.2.8" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."semver-5.7.1" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.5" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - sources."tar-fs-2.1.1" - (sources."tar-stream-2.2.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."usb-1.7.2" - sources."util-deprecate-1.0.2" - sources."which-pm-runs-1.0.0" - sources."wide-align-1.1.3" - sources."wrappy-1.0.2" + sources."usb-1.8.0" ]; buildInputs = globalBuildInputs; meta = { @@ -119287,7 +121354,7 @@ in sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -119505,7 +121572,7 @@ in sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" @@ -119650,7 +121717,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-3.0.0" @@ -120317,7 +122384,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -120393,7 +122460,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.18.1" + sources."core-js-3.18.3" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -120734,7 +122801,7 @@ in sources."verror-1.10.0" sources."web-push-3.4.4" sources."which-1.3.1" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" sources."ws-7.5.5" @@ -121184,10 +123251,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; - sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"; + sha512 = "DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="; }; buildInputs = globalBuildInputs; meta = { @@ -121202,10 +123269,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.6.3.tgz"; - sha512 = "AJux8qVVoXcu1pSG7CwpxzTWGUy92pXFIG1iSsbC4YPajYmP/CNERPL1jHW+8cHHKgpHWKAxJmYpEB0twqw/2Q=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.6.4.tgz"; + sha512 = "tcN3Kyq/tHF79rNdueFNOyY3fTFTj9t0oneoLzkAhV35QBghxwX1eDi6oOnzIglZjSbJWosdnedHHfyjqQ62ig=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -121266,7 +123333,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-1.0.8" sources."wrappy-1.0.2" @@ -121329,10 +123396,10 @@ in sources."@primer/octicons-14.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/component-emitter-1.2.10" + sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.17.20" + sources."@types/node-14.17.27" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.1" @@ -121613,7 +123680,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -121829,7 +123896,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."internmap-1.0.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."lru-cache-6.0.0" @@ -121905,7 +123972,7 @@ in sources."vega-wordcloud-4.1.3" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -121994,7 +124061,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -122173,7 +124240,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.19.0" // { + (sources."eslint-plugin-vue-7.19.1" // { dependencies = [ sources."semver-6.3.0" ]; @@ -122222,7 +124289,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -122290,7 +124357,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.4.3" + sources."typescript-4.4.4" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" (sources."vue-eslint-parser-7.11.0" // { @@ -122407,7 +124474,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" sources."vscode-uri-3.0.2" @@ -122457,7 +124524,7 @@ in sources."vscode-languageserver-types-3.5.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-2.0.2" sources."vscode-uri-1.0.8" @@ -122483,18 +124550,18 @@ in dependencies = [ sources."jsonc-parser-3.0.0" sources."request-light-0.5.4" - sources."typescript-4.4.3" + sources."typescript-4.4.4" sources."vscode-css-languageservice-5.1.7" sources."vscode-html-languageservice-4.1.0" sources."vscode-json-languageservice-4.1.8" - sources."vscode-jsonrpc-8.0.0-next.2" - sources."vscode-languageserver-8.0.0-next.2" - (sources."vscode-languageserver-protocol-3.17.0-next.8" // { + sources."vscode-jsonrpc-8.0.0-next.3" + sources."vscode-languageserver-8.0.0-next.3" + (sources."vscode-languageserver-protocol-3.17.0-next.9" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.3" + sources."vscode-languageserver-types-3.17.0-next.4" ]; }) - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.2" @@ -122512,17 +124579,17 @@ in "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; - version = "1.6.7"; + version = "1.6.8"; src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.5" - sources."@types/eslint-7.28.0" + sources."@types/eslint-7.28.1" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.60.0" + sources."@types/vscode-1.61.0" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -122540,9 +124607,9 @@ in sources."@webassemblyjs/wasm-opt-1.11.1" sources."@webassemblyjs/wasm-parser-1.11.1" 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.2" + sources."@webpack-cli/configtest-1.1.0" + sources."@webpack-cli/info-1.4.0" + sources."@webpack-cli/serve-1.6.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.5.0" @@ -122562,12 +124629,12 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -122588,13 +124655,13 @@ in sources."clone-deep-4.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.4.0" + sources."colorette-2.0.16" sources."commander-6.2.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."css-select-4.1.3" - sources."css-what-5.0.1" + sources."css-what-5.1.0" (sources."debug-4.3.1" // { dependencies = [ sources."ms-2.1.2" @@ -122607,14 +124674,14 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.2" sources."domutils-2.8.0" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."errno-0.1.8" - sources."es-module-lexer-0.9.2" + sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" sources."eslint-scope-5.1.1" @@ -122656,7 +124723,7 @@ in sources."inherits-2.0.4" sources."interpret-2.2.0" sources."is-binary-path-2.1.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.3" @@ -122667,7 +124734,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.2.4" + sources."jest-worker-27.2.5" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -122710,7 +124777,7 @@ in sources."mute-stream-0.0.8" sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.1" @@ -122731,7 +124798,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."pend-1.2.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.0" (sources."pkg-dir-4.2.0" // { dependencies = [ @@ -122799,7 +124866,7 @@ in sources."tslib-2.3.1" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.6" - sources."typescript-4.4.3" + sources."typescript-4.4.4" sources."uc.micro-1.0.6" sources."underscore-1.13.1" sources."uri-js-4.4.1" @@ -122820,8 +124887,8 @@ in sources."vscode-debugadapter-testsupport-1.49.0" sources."vscode-debugprotocol-1.49.0" sources."watchpack-2.2.0" - sources."webpack-5.56.1" - (sources."webpack-cli-4.8.0" // { + sources."webpack-5.58.2" + (sources."webpack-cli-4.9.0" // { dependencies = [ sources."commander-7.2.0" ]; @@ -123165,7 +125232,7 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" + sources."@babel/code-frame-7.15.8" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" @@ -123183,7 +125250,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.10.2" + sources."@types/node-16.11.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -123540,7 +125607,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -124047,7 +126114,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-5.3.0-next.10" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-textbuffer-1.0.0" @@ -124102,13 +126169,13 @@ in wavedrom-cli = nodeEnv.buildNodePackage { name = "wavedrom-cli"; packageName = "wavedrom-cli"; - version = "2.6.8"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-2.6.8.tgz"; - sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; + url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-2.8.1.tgz"; + sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg=="; }; dependencies = [ - sources."@babel/runtime-7.15.4" + sources."@babel/runtime-corejs3-7.15.4" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -124127,24 +126194,14 @@ in sources."aproba-1.2.0" sources."are-we-there-yet-1.1.7" sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" - (sources."bit-field-1.5.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."fs-extra-10.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."yargs-17.2.1" - ]; - }) + sources."bit-field-1.5.3" sources."brace-expansion-1.1.11" sources."browser-process-hrtime-1.0.0" sources."btoa-1.2.1" sources."canvas-2.8.0" - sources."canvg-3.0.9" + sources."canvg-3.0.7" sources."chownr-2.0.0" (sources."cliui-7.0.4" // { dependencies = [ @@ -124160,7 +126217,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-3.18.1" + sources."core-js-pure-3.18.3" sources."core-util-is-1.0.3" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -124195,7 +126252,7 @@ in sources."esutils-2.0.3" sources."fast-levenshtein-2.0.6" sources."form-data-3.0.1" - sources."fs-extra-9.1.0" + sources."fs-extra-10.0.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" @@ -124276,8 +126333,8 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."svg-pathdata-6.0.3" - sources."svg2img-0.9.3" + sources."svg-pathdata-5.0.5" + sources."svg2img-0.9.4" sources."symbol-tree-3.2.4" sources."tar-6.1.11" (sources."tough-cookie-4.0.0" // { @@ -124292,12 +126349,12 @@ in sources."util-deprecate-1.0.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" - sources."wavedrom-2.8.1" + sources."wavedrom-2.8.3" sources."webidl-conversions-3.0.1" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-5.0.0" - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -124313,7 +126370,7 @@ in sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-16.2.0" // { + (sources."yargs-17.2.1" // { dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" @@ -124336,10 +126393,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-6.4.0.tgz"; - sha512 = "M8NLCvgpPbJ9spQPlBjNmSEg674lC1SPI/X5UK0tJoz8mqvL70mFTEWrFcmgjDewzh+/DFNKiIOQFPg1UXjYDw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-6.5.0.tgz"; + sha512 = "71DE73YkxKEyiy1O5Ei5Uy1ZCT0tOPriPWIkH3g+mpnd52Gr1u2buexpq2upATekhc1Mu87d9EmRqXg2Kqhszw=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -124374,21 +126431,22 @@ in ]; }) sources."@humanwhocodes/object-schema-1.2.0" - sources."@mdn/browser-compat-data-4.0.2" + sources."@mdn/browser-compat-data-4.0.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/yauzl-2.9.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" - (sources."addons-linter-3.14.0" // { + (sources."addons-linter-3.20.0" // { dependencies = [ - sources."yargs-17.1.1" + sources."yargs-17.2.1" ]; }) - sources."addons-scanner-utils-4.10.0" - sources."adm-zip-0.5.7" + sources."addons-moz-compare-1.2.0" + sources."addons-scanner-utils-5.0.0" + sources."adm-zip-0.5.9" sources."ajv-6.12.6" sources."ajv-merge-patch-4.1.0" sources."ansi-align-3.0.1" @@ -124447,7 +126505,6 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.4.0" sources."columnify-1.5.4" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -124455,12 +126512,12 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-5.0.1" - sources."core-js-3.17.2" + sources."core-js-3.18.0" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."css-select-4.1.3" - sources."css-what-5.0.1" + sources."css-what-5.1.0" sources."dashdash-1.14.1" sources."debounce-1.2.0" sources."debug-2.6.9" @@ -124523,7 +126580,7 @@ in ]; }) sources."eslint-visitor-keys-3.0.0" - (sources."espree-8.0.0" // { + (sources."espree-9.0.0" // { dependencies = [ sources."acorn-8.5.0" ]; @@ -124558,7 +126615,7 @@ in sources."fastify-warning-0.2.0" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" - (sources."firefox-profile-4.2.0" // { + (sources."firefox-profile-4.2.1" // { dependencies = [ sources."fs-extra-9.0.1" ]; @@ -124589,7 +126646,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" @@ -124721,7 +126778,7 @@ in }) sources."mz-2.7.0" sources."nan-2.15.0" - sources."nanoid-3.1.28" + sources."nanoid-3.1.30" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" @@ -124761,9 +126818,10 @@ in sources."path-key-3.1.1" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-6.13.2" + sources."picocolors-0.2.1" + sources."pino-6.13.3" sources."pino-std-serializers-3.2.0" - sources."postcss-8.3.6" + sources."postcss-8.3.9" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" @@ -124824,13 +126882,13 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."shellwords-0.1.1" - sources."sign-addon-3.8.0" + sources."sign-addon-3.9.0" sources."signal-exit-3.0.5" sources."slice-ansi-4.0.0" sources."sonic-boom-1.4.1" sources."source-map-0.6.1" sources."source-map-js-0.6.2" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" sources."spawn-sync-1.0.15" sources."split-0.3.3" sources."sprintf-js-1.0.3" @@ -124932,17 +126990,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.56.1"; + version = "5.58.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.56.1.tgz"; - sha512 = "MRbTPooHJuSAfbx7Lh/qEMRUe/d0p4cRj2GPo/fq+4JUeR/+Q1EfLvS1lexslbMcJZyPXxxz/k/NzVepkA5upA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.58.2.tgz"; + sha512 = "3S6e9Vo1W2ijk4F4PPWRIu6D/uGgqaPmqw+av3W3jLDujuNkdxX5h5c+RQ6GkjVR+WwIPOfgY8av+j5j4tMqJw=="; }; dependencies = [ - sources."@types/eslint-7.28.0" + sources."@types/eslint-7.28.1" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -124964,14 +127022,14 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.17.3" + sources."browserslist-4.17.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001264" + sources."caniuse-lite-1.0.30001267" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.859" + sources."electron-to-chromium-1.3.870" sources."enhanced-resolve-5.8.3" - sources."es-module-lexer-0.9.2" + sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -124986,7 +127044,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" - sources."jest-worker-27.2.4" + sources."jest-worker-27.2.5" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" @@ -124994,9 +127052,9 @@ in sources."mime-db-1.50.0" sources."mime-types-2.1.33" sources."neo-async-2.6.2" - sources."node-releases-1.1.77" + sources."node-releases-2.0.0" sources."p-limit-3.1.0" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" @@ -125030,18 +127088,18 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz"; - sha512 = "+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.0.tgz"; + sha512 = "n/jZZBMzVEl4PYIBs+auy2WI0WTQ74EnJDiyD98O2JZY6IVIHJNitkYp/uTXOviIOMfgzrNvC9foKv/8o8KSZw=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.5" - sources."@webpack-cli/configtest-1.0.4" - sources."@webpack-cli/info-1.3.0" - sources."@webpack-cli/serve-1.5.2" + sources."@webpack-cli/configtest-1.1.0" + sources."@webpack-cli/info-1.4.0" + sources."@webpack-cli/serve-1.6.0" sources."clone-deep-4.0.1" - sources."colorette-1.4.0" + sources."colorette-2.0.16" sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."envinfo-7.8.1" @@ -125054,7 +127112,7 @@ in sources."human-signals-2.1.0" sources."import-local-3.0.3" sources."interpret-2.2.0" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-plain-object-2.0.4" sources."is-stream-2.0.1" sources."isexe-2.0.0" @@ -125110,7 +127168,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/http-proxy-1.17.7" sources."@types/json-schema-7.0.9" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/retry-0.12.1" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -125138,7 +127196,7 @@ in sources."call-bind-1.0.2" sources."chokidar-3.5.2" sources."clean-stack-2.2.0" - sources."colorette-2.0.14" + sources."colorette-2.0.16" sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ @@ -125283,7 +127341,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.2.1" + sources."open-8.3.0" sources."p-event-4.2.0" sources."p-finally-1.0.0" sources."p-map-4.0.0" @@ -125486,7 +127544,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.1" @@ -125536,7 +127594,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" - sources."bufferutil-4.0.4" + sources."bufferutil-4.0.5" sources."cache-chunk-store-3.2.2" (sources."castv2-0.1.10" // { dependencies = [ @@ -125606,7 +127664,7 @@ in sources."glob-7.2.0" sources."has-flag-4.0.0" sources."he-1.2.0" - sources."http-node-git://github.com/feross/http-node#webtorrent" + sources."http-node-git://github.com/webtorrent/http-node#webtorrent" sources."http-parser-js-0.4.13" sources."ieee754-1.2.1" sources."immediate-chunk-store-2.2.0" @@ -125672,7 +127730,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-8.2.1" + sources."open-8.3.0" sources."package-json-versionify-1.0.4" (sources."parse-torrent-9.1.4" // { dependencies = [ @@ -125742,7 +127800,7 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.11.2" + sources."streamx-2.11.3" sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.3.0" @@ -125775,12 +127833,12 @@ in ]; }) sources."ut_pex-3.0.2" - sources."utf-8-validate-5.0.6" + sources."utf-8-validate-5.0.7" sources."util-deprecate-1.0.2" sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.5.5" // { + (sources."webtorrent-1.5.6" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -125858,10 +127916,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.23.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.23.0.tgz"; - sha512 = "0x3T9GknnROfA8RErRX5djn+3P7PixVonWubhalJTqc5+ZrWVSRimm7XFzZx3owstpxgtH0QYmP68B8grNkXMw=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.0.0.tgz"; + sha512 = "Sp3+CRfH3eiL+wWiUrchTQ+SJWKDlyCGpPxqyxzH9J+KeQ29HeRXY43x8W3lB1mlN0uUp2vlErYlgu2cUpJ6uA=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -125881,12 +127939,11 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.2" - sources."yaml-2.0.0-7" - sources."yaml-language-server-parser-0.1.3" + sources."yaml-2.0.0-8" ]; buildInputs = globalBuildInputs; meta = { @@ -126074,9 +128131,8 @@ in sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - (sources."bin-links-2.2.1" // { + (sources."bin-links-2.3.0" // { dependencies = [ - sources."mkdirp-1.0.4" sources."write-file-atomic-3.0.3" ]; }) @@ -126146,7 +128202,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.18.1" + sources."core-js-3.18.3" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -126292,7 +128348,7 @@ in sources."ip-regex-2.1.0" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.7.0" + sources."is-core-module-2.8.0" sources."is-docker-1.1.0" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" @@ -126806,7 +128862,7 @@ in sources."path-exists-4.0.0" ]; }) - sources."wide-align-1.1.3" + sources."wide-align-1.1.5" sources."widest-line-2.0.1" sources."windows-release-3.3.3" (sources."wrap-ansi-2.1.0" // { @@ -126857,7 +128913,7 @@ in }) sources."get-stream-6.0.1" sources."has-flag-4.0.0" - sources."inquirer-8.1.5" + sources."inquirer-8.2.0" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.1" sources."locate-path-6.0.0" @@ -126872,7 +128928,7 @@ in sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" - sources."rxjs-7.3.1" + sources."rxjs-7.4.0" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -126926,7 +128982,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-16.10.2" + sources."@types/node-16.11.0" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index 197a3eaf69dd..c63f3f796ae7 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -28,9 +28,15 @@ buildDunePackage rec { }) ]; + # Fix build with ppxlib 0.23 + postPatch = '' + substituteInPlace ppx/ppx_bistro.ml \ + --replace 'Parser.parse_expression' 'Ocaml_common.Parser.parse_expression' + ''; + propagatedBuildInputs = [ base64 bos core lwt_react ocamlgraph rresult tyxml ]; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index 08bb426d8abc..e7426cf10e9d 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -1,34 +1,22 @@ -{ lib, fetchFromGitLab, buildDunePackage, ff, zarith, ctypes, tezos-rust-libs, alcotest }: +{ lib, buildDunePackage, bls12-381-gen, ff-sig, zarith, ctypes, alcotest }: buildDunePackage rec { pname = "bls12-381"; - version = "0.3.15"; - src = fetchFromGitLab { - owner = "dannywillems"; - repo = "ocaml-bls12-381"; - rev = version; - sha256 = "1s8n657fsl2gs01p7v2ffpcfzymavifhhpriyx1gq5qh4zvvw4vr"; - }; - useDune2 = true; + inherit (bls12-381-gen) version src useDune2 doCheck; minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ - ff + ff-sig zarith ctypes - tezos-rust-libs + bls12-381-gen ]; checkInputs = [ alcotest ]; - # This is a hack to work around the hack used in the dune files - OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; - - doCheck = true; - meta = { homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381"; description = "OCaml binding for bls12-381 from librustzcash"; diff --git a/pkgs/development/ocaml-modules/bls12-381/gen.nix b/pkgs/development/ocaml-modules/bls12-381/gen.nix new file mode 100644 index 000000000000..d7daba263c65 --- /dev/null +++ b/pkgs/development/ocaml-modules/bls12-381/gen.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitLab, buildDunePackage, ff-sig, zarith }: + +buildDunePackage rec { + pname = "bls12-381-gen"; + version = "0.4.2"; + + src = fetchFromGitLab { + owner = "dannywillems"; + repo = "ocaml-bls12-381"; + rev = version; + sha256 = "0jxc8qrdn74brmzjns1xycv3cb257kx5pa3ripgl9ci4njkv87n2"; + }; + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + ff-sig + zarith + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381"; + description = "Functors to generate BLS12-381 primitives based on stubs"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/bls12-381/unix.nix b/pkgs/development/ocaml-modules/bls12-381/unix.nix new file mode 100644 index 000000000000..4da1a489e2c8 --- /dev/null +++ b/pkgs/development/ocaml-modules/bls12-381/unix.nix @@ -0,0 +1,48 @@ +{ lib +, buildDunePackage +, rustc +, cargo +, dune-configurator +, bls12-381 +, bls12-381-gen +, ff-pbt +, ff-sig +, zarith +, ctypes +, tezos-rust-libs +, alcotest +}: + +buildDunePackage { + pname = "bls12-381-unix"; + + inherit (bls12-381-gen) version src useDune2 doCheck; + + checkInputs = [ + alcotest + ff-pbt + ]; + + buildInputs = [ + rustc + cargo + dune-configurator + ]; + + propagatedBuildInputs = [ + ff-sig + zarith + ctypes + bls12-381-gen + bls12-381 + tezos-rust-libs + ]; + + # This is a hack to work around the hack used in the dune files + OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; + + meta = { + description = "UNIX version of BLS12-381 primitives implementing the virtual package bls12-381"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/color/default.nix b/pkgs/development/ocaml-modules/color/default.nix new file mode 100644 index 000000000000..84d2f11d8629 --- /dev/null +++ b/pkgs/development/ocaml-modules/color/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchurl +, buildDunePackage +, gg +}: + +buildDunePackage rec { + pname = "color"; + version = "0.2.0"; + + useDune2 = true; + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/anuragsoni/color/releases/download/${version}/color-${version}.tbz"; + sha256 = "0wg3a36i1a7fnz5pf57qzbdghwr6dzp7nnxyrz9m9765lxsn65ph"; + }; + + propagatedBuildInputs = [ + gg + ]; + + meta = with lib; { + description = "Converts between different color formats"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://github.com/anuragsoni/color"; + }; +} diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix index 2e4e0518a522..f7036d38d388 100644 --- a/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -12,13 +12,13 @@ buildDunePackage { pname = "data-encoding"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "data-encoding"; - rev = "0.2"; - sha256 = "0d9c2ix2imqk4r0jfhnwak9laarlbsq9kmswvbnjzdm2g0hwin1d"; + rev = "v0.4"; + sha256 = "1f88l9azpfk730hps5v6zlg4yyyyhj1gl27qy3cbbkzjc82d2rhx"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/ff/pbt.nix b/pkgs/development/ocaml-modules/ff/pbt.nix new file mode 100644 index 000000000000..e0363160dd79 --- /dev/null +++ b/pkgs/development/ocaml-modules/ff/pbt.nix @@ -0,0 +1,21 @@ +{ lib, fetchFromGitLab, buildDunePackage, zarith, ff-sig, alcotest }: + +buildDunePackage { + pname = "ff-pbt"; + inherit (ff-sig) version src doCheck useDune2; + + minimalOCamlVersion = "4.08"; + + checkInputs = [ + alcotest + ]; + + propagatedBuildInputs = [ + zarith + ff-sig + ]; + + meta = ff-sig.meta // { + description = "Property based testing library for finite fields over the package ff-sig"; + }; +} diff --git a/pkgs/development/ocaml-modules/ff/sig.nix b/pkgs/development/ocaml-modules/ff/sig.nix new file mode 100644 index 000000000000..a2c7ca0d0c69 --- /dev/null +++ b/pkgs/development/ocaml-modules/ff/sig.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitLab, buildDunePackage, zarith }: + +buildDunePackage rec { + pname = "ff-sig"; + version = "0.6.1"; + src = fetchFromGitLab { + owner = "dannywillems"; + repo = "ocaml-ff"; + rev = version; + sha256 = "0p42ivyfbn1pwm18773y4ga9cm64ysha0rplzvrnhszg01anarc0"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + zarith + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/dannywillems/ocaml-ff"; + description = "Minimal finite field signatures"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/getopt/default.nix b/pkgs/development/ocaml-modules/getopt/default.nix new file mode 100644 index 000000000000..3400774d4c07 --- /dev/null +++ b/pkgs/development/ocaml-modules/getopt/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchzip, stdenv, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-getopt"; + version = "20120615"; + + src = fetchzip { + url = "https://download.ocamlcore.org/ocaml-getopt/ocaml-getopt/${version}/ocaml-getopt-${version}.tar.gz"; + sha256 = "0bng2mmdixpmj23xn8krlnaq66k22iclwz46r8zjrsrq3wcn1xgn"; + }; + + buildInputs = [ + ocaml + findlib + ocamlbuild + ]; + + doCheck = true; + createFindlibDestdir = true; + + meta = { + inherit (ocaml.meta) platforms; + homepage = "https://github.com/gildor478/ocaml-getopt"; + description = "Parsing of command line arguments (similar to GNU GetOpt) for OCaml"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/hashcons/default.nix b/pkgs/development/ocaml-modules/hashcons/default.nix new file mode 100644 index 000000000000..2bfaced11551 --- /dev/null +++ b/pkgs/development/ocaml-modules/hashcons/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildDunePackage }: + +buildDunePackage rec { + pname = "hashcons"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "backtracking"; + repo = "ocaml-${pname}"; + rev = "d733325eeb55878bed285120c2c088daf78f0e2b"; + sha256 = "0h4pvwj34pndaw3pajkhl710ywwinhc9pqimgllfmkl37wz2d8zq"; + }; + + useDune2 = true; + + doCheck = true; + + meta = { + description = "OCaml hash-consing library"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 8f7262b47760..116349746bf3 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -41,7 +41,7 @@ with self; version = "0.14.1"; hash = "1cdkv34m6czhacivpbb2sasj83fgcid6gnqk30ig9i84z8nh2gw2"; meta.description = "Accessors for Core types, for use with the Accessor library"; - meta.broken = lib.versionAtLeast ocaml.version "4.12"; + meta.broken = true; # Not compatible with ppxlib ≥ 0.23 propagatedBuildInputs = [ accessor_base core_kernel ]; }; @@ -375,9 +375,9 @@ with self; ppx_accessor = janePackage { pname = "ppx_accessor"; - version = "0.14.2"; + version = "0.14.3"; minimumOCamlVersion = "4.09"; - hash = "01nifsh7gap28cpvff6i569lqr1gmyhrklkisgri538cp4pf1wq1"; + hash = "sha256:1c8blzh2f34vbm1z3mnvh670c6vda70chw805n2hmkd9j46l0cll"; meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries"; propagatedBuildInputs = [ accessor ]; }; @@ -633,9 +633,9 @@ with self; ppx_variants_conv = janePackage { pname = "ppx_variants_conv"; - version = "0.14.1"; + version = "0.14.2"; minimumOCamlVersion = "4.04.2"; - hash = "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84"; + hash = "1p11fiz4m160hs0xzg4g9rxchp053sz3s3d1lyciqixad1xi47a4"; meta.description = "Generation of accessor and iteration functions for ocaml variant types"; propagatedBuildInputs = [ variantslib ppxlib ]; }; diff --git a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix index 5048a8fd06a7..d131acf4b487 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, json-data-encoding, ocplib-endian, crowbar }: +{ lib, buildDunePackage, json-data-encoding, ocplib-endian, crowbar, alcotest }: buildDunePackage { pname = "json-data-encoding-bson"; @@ -12,6 +12,7 @@ buildDunePackage { checkInputs = [ crowbar + alcotest ]; meta = json-data-encoding.meta // { diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix index 6dfea612b10a..69fbdb6ed1c8 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitLab, buildDunePackage, uri, crowbar }: +{ lib, fetchFromGitLab, buildDunePackage, uri, crowbar, alcotest }: buildDunePackage rec { pname = "json-data-encoding"; - version = "0.8"; - + version = "0.10"; + minimalOCamlVersion = "4.10"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "json-data-encoding"; - rev = "v${version}"; - sha256 = "1c6m2qvi9bm6qjxc38p6cia1f66r0rb9xf6b8svlj3jjymvqw889"; + rev = "${version}"; + sha256 = "0m0xx382wr44wz7gxf7mpfjx2w287pvqhg2lfvzmclfq3y5iy6mx"; }; useDune2 = true; @@ -18,6 +18,7 @@ buildDunePackage rec { checkInputs = [ crowbar + alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/lwt-canceler/default.nix b/pkgs/development/ocaml-modules/lwt-canceler/default.nix index 2e4d12082b75..97b27157265e 100644 --- a/pkgs/development/ocaml-modules/lwt-canceler/default.nix +++ b/pkgs/development/ocaml-modules/lwt-canceler/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "lwt-canceler"; - version = "0.2"; + version = "0.3"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "lwt-canceler"; rev = "v${version}"; - sha256 = "07931486vg83sl1c268i0vyw61l8n8xs2krjsj43070zljqi8rf1"; + sha256 = "1xbb7012hp901b755kxmfgg293rz34rkhwzg2z9i6sakwd7i0h9p"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/lwt-exit/default.nix b/pkgs/development/ocaml-modules/lwt-exit/default.nix new file mode 100644 index 000000000000..34aadc8761fb --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt-exit/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, lwt +, ptime +}: + +buildDunePackage rec { + pname = "lwt-exit"; + version = "1.0"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = pname; + rev = "${version}"; + sha256 = "1k763bmj1asj9ijar39rh3h1d59rckmsf21h2y8966lgglsf42bd"; + }; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + lwt + ptime + ]; + + doCheck = true; + + meta = { + description = "An opinionated clean-exit and signal-handling library for Lwt programs"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index cf72397057db..942d69e59194 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -22,13 +22,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; inherit pname; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "mirage"; repo = pname; rev = "v${version}"; - sha256 = "0w3x2wfd04qr6mci4cp1gfqw33yysp8gamgkpgbgwslr0skryiq5"; + sha256 = "sha256:1mbyjzwcs64n7i3xkkyaxgl3r46drbl0gkqf3fqgm2kh3q03638l"; }; postUnpack = '' @@ -55,15 +55,6 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - preBuild = '' - # perform substitutions, so opam isn't needed - for flags in flags/cflags.tmp flags/libs.tmp; do - substitute "$flags.in" "$flags" \ - --replace "%{prefix}%" "$out" \ - --replace "%{ocaml-freestanding:lib}%" "$out/lib" - done - ''; - installPhase = '' runHook preInstall ./install.sh "$out" diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch b/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch index 43141b1472a9..45f271ec0f25 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch @@ -22,43 +22,6 @@ Date: Thu Mar 18 01:07:49 2021 +0100 nice bonus). The Makefile needs no fix since the target ocaml/Makefile won't be built if it's already present. -diff --git a/Makefile b/Makefile -index b07b8c6..a68b31d 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,6 +2,12 @@ - - include Makeconf - -+ifneq ($(shell command -v opam),) -+ # only set if opam is available and PKG_CONFIG_PATH isn't -+ # already set in the environment or on the command line -+ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig -+endif -+ - FREESTANDING_LIBS=openlibm/libopenlibm.a \ - ocaml/runtime/libasmrun.a \ - nolibc/libnolibc.a -@@ -73,8 +79,7 @@ flags/libs.tmp: flags/libs.tmp.in - opam config subst $@ - - flags/libs: flags/libs.tmp Makeconf -- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \ -- pkg-config $(PKG_CONFIG_DEPS) --libs >> $< -+ pkg-config $(PKG_CONFIG_DEPS) --libs >> $< - awk -v RS= -- '{ \ - sub("@@PKG_CONFIG_EXTRA_LIBS@@", "$(PKG_CONFIG_EXTRA_LIBS)", $$0); \ - print "(", $$0, ")" \ -@@ -84,8 +89,7 @@ flags/cflags.tmp: flags/cflags.tmp.in - opam config subst $@ - - flags/cflags: flags/cflags.tmp Makeconf -- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \ -- pkg-config $(PKG_CONFIG_DEPS) --cflags >> $< -+ pkg-config $(PKG_CONFIG_DEPS) --cflags >> $< - awk -v RS= -- '{ \ - print "(", $$0, ")" \ - }' $< >$@ diff --git a/configure.sh b/configure.sh index 4d154ed..c254f7b 100755 --- a/configure.sh diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix new file mode 100644 index 000000000000..0dfd8edd5736 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -0,0 +1,29 @@ +{ lib, buildDunePackage, fetchurl, ppxlib, alcotest +, ppx_deriving, yaml +}: + +buildDunePackage rec { + pname = "ppx_deriving_yaml"; + version = "0.1.0"; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-v${version}.tbz"; + sha256 = "kdonUD4Y8QhVSAFAafIpXBFPkS4pSScYwJbaWMn/6pA="; + }; + + propagatedBuildInputs = [ ppxlib ppx_deriving yaml ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "A YAML codec generator for OCaml"; + homepage = "https://github.com/patricoferris/ppx_deriving_yaml"; + license = lib.licenses.isc; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index c4591927e075..faae96764bc5 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -2,7 +2,7 @@ , version ? if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" - then "0.22.2" else "0.15.0" else "0.13.0" + then "0.23.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio , stdlib-shims, ocaml-migrate-parsetree-2 }: @@ -38,6 +38,10 @@ let param = { sha256 = "0fysjqcpv281n52wl3h0dy2lzf9d61wdzk90ldv3p63a4i3mr1j2"; min_version = "4.07"; }; + "0.23.0" = { + sha256 = "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1"; + min_version = "4.07"; + }; }."${version}"; in if param ? max_version && lib.versionAtLeast ocaml.version param.max_version diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix new file mode 100644 index 000000000000..7bc794fa2487 --- /dev/null +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, utop, python3, stdcompat, ncurses }: + +stdenv.mkDerivation rec { + pname = "pyml"; + version = "20210226"; + + src = fetchFromGitHub { + owner = "thierry-martinez"; + repo = pname; + rev = version; + sha256 = "15xk6bgdzsf04d6wdjpr3s1ci2g7d7qnbq3102avkz179d5n62h7"; + }; + + buildInputs = [ + ocaml + findlib + utop + ncurses + ]; + + propagatedBuildInputs = [ + python3 + stdcompat + ]; + + buildPhase = '' + make all pymltop pymlutop PREFIX=$out + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $OCAMLFIND_DESTDIR/stublibs + make install PREFIX=$out + runHook postInstall + ''; + + doCheck = true; + + meta = { + description = "OCaml bindings for Python"; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/ocaml-modules/tar/default.nix b/pkgs/development/ocaml-modules/tar/default.nix new file mode 100644 index 000000000000..abc28e2d879f --- /dev/null +++ b/pkgs/development/ocaml-modules/tar/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, ppx_cstruct +, cstruct +, re +, ppx_tools +}: + +buildDunePackage rec { + pname = "tar"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-tar"; + rev = "v${version}"; + sha256 = "14k24vn3q5jl0iyrynb5vwg80670qsv12fsmc6cdgh4zwdpjh7zs"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + ppx_cstruct + cstruct + re + ]; + + buildInputs = [ + ppx_tools + ]; + + doCheck = true; + + meta = { + description = "Decode and encode tar format files from Unix"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tar/unix.nix b/pkgs/development/ocaml-modules/tar/unix.nix new file mode 100644 index 000000000000..4ac1f625a02a --- /dev/null +++ b/pkgs/development/ocaml-modules/tar/unix.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, tar +, cstruct +, cstruct-lwt +, re +, lwt +}: + +buildDunePackage rec { + pname = "tar-unix"; + inherit (tar) version src useDune2 doCheck; + + propagatedBuildInputs = [ + tar + cstruct + cstruct-lwt + re + lwt + ]; + + meta = { + description = "Decode and encode tar format files from Unix"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix b/pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix new file mode 100644 index 000000000000..fe2664333e33 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix @@ -0,0 +1,39 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-stdlib-unix +, tezos-base +, tezos-shell-services +, tezos-protocol-environment +, tezos-protocol-010-PtGRANAD +, tezos-protocol-010-PtGRANAD-parameters +, tezos-client-010-PtGRANAD +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-010-PtGRANAD-test-helpers"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol/test/helpers"; + + propagatedBuildInputs = [ + tezos-base + tezos-stdlib-unix + tezos-shell-services + tezos-protocol-environment + tezos-protocol-010-PtGRANAD + tezos-protocol-010-PtGRANAD-parameters + tezos-client-010-PtGRANAD + alcotest-lwt + ]; + + checkInputs = [ + alcotest-lwt + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol testing framework"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/base.nix b/pkgs/development/ocaml-modules/tezos/base.nix index 2f5d76581318..544daa297acc 100644 --- a/pkgs/development/ocaml-modules/tezos/base.nix +++ b/pkgs/development/ocaml-modules/tezos/base.nix @@ -2,31 +2,35 @@ , buildDunePackage , tezos-stdlib , tezos-crypto +, tezos-hacl-glue-unix , tezos-micheline +, tezos-test-helpers , ptime -, ezjsonm , ipaddr -, qcheck-alcotest -, crowbar +, bls12-381-unix }: buildDunePackage { pname = "tezos-base"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_base"; propagatedBuildInputs = [ tezos-crypto tezos-micheline + tezos-hacl-glue-unix + bls12-381-unix ptime - ezjsonm ipaddr ]; checkInputs = [ - qcheck-alcotest - crowbar + # tezos-test-helpers ]; + # circular dependency if we add this + doCheck = false; + meta = tezos-stdlib.meta // { description = "Tezos: meta-package and pervasive type definitions for Tezos"; }; diff --git a/pkgs/development/ocaml-modules/tezos/clic.nix b/pkgs/development/ocaml-modules/tezos/clic.nix index d69174e5f298..863ecb8df45b 100644 --- a/pkgs/development/ocaml-modules/tezos/clic.nix +++ b/pkgs/development/ocaml-modules/tezos/clic.nix @@ -8,7 +8,8 @@ buildDunePackage { pname = "tezos-clic"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_clic"; propagatedBuildInputs = [ tezos-stdlib-unix @@ -19,6 +20,8 @@ buildDunePackage { alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: library of auto-documented command-line-parsing combinators"; }; diff --git a/pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nix b/pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nix new file mode 100644 index 000000000000..55a984545088 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nix @@ -0,0 +1,38 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-mockup-registration +, tezos-proxy +, tezos-signer-backends +, tezos-protocol-010-PtGRANAD-parameters +, tezos-protocol-plugin-010-PtGRANAD +, alcotest-lwt +, ppx_inline_test +, cacert +}: + +buildDunePackage { + pname = "tezos-client-010-PtGRANAD"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_client"; + + propagatedBuildInputs = [ + tezos-mockup-registration + tezos-proxy + tezos-signer-backends + tezos-protocol-010-PtGRANAD-parameters + tezos-protocol-plugin-010-PtGRANAD + ppx_inline_test + ]; + + checkInputs = [ + alcotest-lwt + cacert + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol specific library for `tezos-client`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/client-base.nix b/pkgs/development/ocaml-modules/tezos/client-base.nix new file mode 100644 index 000000000000..f2503481720a --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/client-base.nix @@ -0,0 +1,28 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-shell-services +, tezos-sapling +, alcotest +}: + +buildDunePackage { + pname = "tezos-client-base"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_client_base"; + + propagatedBuildInputs = [ + tezos-shell-services + tezos-sapling + ]; + + checkInputs = [ + alcotest + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: protocol registration for the mockup mode"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/context.nix b/pkgs/development/ocaml-modules/tezos/context.nix new file mode 100644 index 000000000000..e118c3e1ebe4 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/context.nix @@ -0,0 +1,34 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +, tezos-shell-services +, irmin +, irmin-pack +, digestif +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-context"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_context"; + + propagatedBuildInputs = [ + tezos-base + tezos-shell-services + irmin + irmin-pack + digestif + ]; + + checkInputs = [ + alcotest-lwt + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/crypto.nix b/pkgs/development/ocaml-modules/tezos/crypto.nix index 9c5bd45f94f1..532e8fc12b2c 100644 --- a/pkgs/development/ocaml-modules/tezos/crypto.nix +++ b/pkgs/development/ocaml-modules/tezos/crypto.nix @@ -1,37 +1,41 @@ { lib , buildDunePackage , tezos-stdlib -, tezos-clic , tezos-rpc -, bls12-381 -, hacl-star +, tezos-clic +, tezos-hacl-glue +, tezos-hacl-glue-unix , secp256k1-internal -, uecc , ringo -, ff -, alcotest +, bls12-381 +, bls12-381-unix +, tezos-test-helpers , alcotest-lwt }: buildDunePackage { pname = "tezos-crypto"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_crypto"; propagatedBuildInputs = [ - tezos-clic tezos-rpc - bls12-381 - hacl-star + tezos-clic + tezos-hacl-glue + tezos-hacl-glue-unix secp256k1-internal - uecc ringo + bls12-381 + bls12-381-unix ]; checkInputs = [ - alcotest + tezos-test-helpers alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: library with all the cryptographic primitives used by Tezos"; }; diff --git a/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix b/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix new file mode 100644 index 000000000000..f0f9c2be7706 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-010-PtGRANAD +, tezos-protocol-updater +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-embedded-protocol-010-PtGRANAD"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol"; + + preBuild = tezos-protocol-010-PtGRANAD.preBuild; + + propagatedBuildInputs = [ + tezos-protocol-010-PtGRANAD + tezos-protocol-updater + ]; + + buildInputs = [ + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: economic-protocol definition, embedded in `tezos-node`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/error-monad.nix b/pkgs/development/ocaml-modules/tezos/error-monad.nix index 70cdff0c0aca..cbebf1e51c63 100644 --- a/pkgs/development/ocaml-modules/tezos/error-monad.nix +++ b/pkgs/development/ocaml-modules/tezos/error-monad.nix @@ -4,19 +4,22 @@ , data-encoding , lwt , lwt-canceler +, tezos-lwt-result-stdlib , alcotest , alcotest-lwt }: buildDunePackage { pname = "tezos-error-monad"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_error_monad"; propagatedBuildInputs = [ tezos-stdlib data-encoding lwt lwt-canceler + tezos-lwt-result-stdlib ]; checkInputs = [ @@ -24,6 +27,8 @@ buildDunePackage { alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: error monad"; }; diff --git a/pkgs/development/ocaml-modules/tezos/event-logging.nix b/pkgs/development/ocaml-modules/tezos/event-logging.nix index 30d6c12087ee..75b4a5d06439 100644 --- a/pkgs/development/ocaml-modules/tezos/event-logging.nix +++ b/pkgs/development/ocaml-modules/tezos/event-logging.nix @@ -1,21 +1,27 @@ { lib , buildDunePackage , tezos-stdlib -, tezos-lwt-result-stdlib +, tezos-error-monad +, data-encoding , lwt_log -, alcotest -, alcotest-lwt +, lwt }: buildDunePackage { pname = "tezos-event-logging"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_event_logging"; propagatedBuildInputs = [ - tezos-lwt-result-stdlib + tezos-stdlib + tezos-error-monad + data-encoding lwt_log + lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: event logging library"; }; diff --git a/pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nix b/pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nix new file mode 100644 index 000000000000..5c8afad0f2ad --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nix @@ -0,0 +1,26 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-hacl-glue +, ctypes +, hacl-star +}: + +buildDunePackage { + pname = "tezos-hacl-glue-unix"; + + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_hacl_glue/unix"; + + propagatedBuildInputs = [ + ctypes + hacl-star + tezos-hacl-glue + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: thin layer of glue around hacl-star (unix implementation)"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/hacl-glue.nix b/pkgs/development/ocaml-modules/tezos/hacl-glue.nix new file mode 100644 index 000000000000..409d04bb2660 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/hacl-glue.nix @@ -0,0 +1,17 @@ +{ lib +, buildDunePackage +, tezos-stdlib +}: + +buildDunePackage { + pname = "tezos-hacl-glue"; + + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_hacl_glue/virtual"; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: thin layer of glue around hacl-star (virtual package)"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/legacy-store.nix b/pkgs/development/ocaml-modules/tezos/legacy-store.nix new file mode 100644 index 000000000000..6029401e3618 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/legacy-store.nix @@ -0,0 +1,40 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-context +, tezos-lmdb +, tezos-validation +, tezos-shell-services +, tezos-protocol-compiler +, lwt-watcher +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-legacy-store"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_store/legacy_store"; + + propagatedBuildInputs = [ + tezos-context + tezos-lmdb + tezos-validation + tezos-shell-services + lwt-watcher + ]; + + buildInputs = [ + tezos-protocol-compiler + ]; + + checkInputs = [ + alcotest-lwt + ]; + + # A lot of extra deps with wide dependency cones needed + doCheck = false; + + meta = tezos-stdlib.meta // { + description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/lmdb.nix b/pkgs/development/ocaml-modules/tezos/lmdb.nix index 960b2532c378..6eaed942317f 100644 --- a/pkgs/development/ocaml-modules/tezos/lmdb.nix +++ b/pkgs/development/ocaml-modules/tezos/lmdb.nix @@ -8,25 +8,23 @@ , alcotest }: -buildDunePackage rec { - pname = "tezos-lmdb"; +let version = "7.4"; src = fetchFromGitLab { owner = "tezos"; repo = "tezos"; rev = "v${version}"; - sha256 = "18q02j74aa8mxv233kvyb62xbhjngzpgppp6kgr4m53d7a78wgsm"; + sha256 = "0sghc60xzr02pmmkr626pnhzrnczf7mki7qyxzzfn7rbbdbrf4wp"; }; +in + +buildDunePackage { + pname = "tezos-lmdb"; + version = version; + src = "${src}/vendors/ocaml-lmdb"; useDune2 = true; - preBuild = '' - rm dune - rm -rf src - rm -rf docs - ls vendors | grep -v ocaml-lmdb |xargs rm -rf - ''; - buildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix b/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix index fe32b7aba74e..89c15b0f6345 100644 --- a/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix +++ b/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix @@ -2,10 +2,10 @@ , buildDunePackage , ocaml , tezos-stdlib -, tezos-error-monad +, lwt , alcotest , alcotest-lwt -, crowbar +, tezos-test-helpers }: if lib.versionAtLeast ocaml.version "4.12" then @@ -14,18 +14,21 @@ else buildDunePackage { pname = "tezos-lwt-result-stdlib"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_lwt_result_stdlib"; propagatedBuildInputs = [ - tezos-error-monad + lwt ]; checkInputs = [ alcotest alcotest-lwt - crowbar + tezos-test-helpers ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: error-aware stdlib replacement"; }; diff --git a/pkgs/development/ocaml-modules/tezos/micheline.nix b/pkgs/development/ocaml-modules/tezos/micheline.nix index a729cdef155a..c28e8f897450 100644 --- a/pkgs/development/ocaml-modules/tezos/micheline.nix +++ b/pkgs/development/ocaml-modules/tezos/micheline.nix @@ -10,11 +10,13 @@ buildDunePackage { pname = "tezos-micheline"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_micheline"; propagatedBuildInputs = [ tezos-error-monad uutf + ppx_inline_test ]; checkInputs = [ @@ -22,6 +24,8 @@ buildDunePackage { alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: internal AST and parser for the Michelson language"; }; diff --git a/pkgs/development/ocaml-modules/tezos/mockup-proxy.nix b/pkgs/development/ocaml-modules/tezos/mockup-proxy.nix new file mode 100644 index 000000000000..d949439fcee7 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/mockup-proxy.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-client-base +, tezos-protocol-environment +, tezos-rpc-http-client +, resto-cohttp-self-serving-client +}: + +buildDunePackage { + pname = "tezos-mockup-proxy"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_mockup_proxy"; + + propagatedBuildInputs = [ + tezos-client-base + tezos-protocol-environment + tezos-rpc-http-client + resto-cohttp-self-serving-client + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: local RPCs"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/mockup-registration.nix b/pkgs/development/ocaml-modules/tezos/mockup-registration.nix new file mode 100644 index 000000000000..651c89a59864 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/mockup-registration.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-client-base +, tezos-protocol-environment +}: + +buildDunePackage { + pname = "tezos-mockup-registration"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_mockup"; + + propagatedBuildInputs = [ + tezos-client-base + tezos-protocol-environment + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: protocol registration for the mockup mode"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/p2p-services.nix b/pkgs/development/ocaml-modules/tezos/p2p-services.nix index b4243f589f0b..da15852aa975 100644 --- a/pkgs/development/ocaml-modules/tezos/p2p-services.nix +++ b/pkgs/development/ocaml-modules/tezos/p2p-services.nix @@ -6,7 +6,8 @@ buildDunePackage { pname = "tezos-p2p-services"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_p2p_services"; propagatedBuildInputs = [ tezos-base diff --git a/pkgs/development/ocaml-modules/tezos/p2p.nix b/pkgs/development/ocaml-modules/tezos/p2p.nix index b75c03debfa2..cec1f1ef7b6e 100644 --- a/pkgs/development/ocaml-modules/tezos/p2p.nix +++ b/pkgs/development/ocaml-modules/tezos/p2p.nix @@ -2,13 +2,16 @@ , buildDunePackage , tezos-stdlib , tezos-p2p-services +, tezos-test-services , alcotest-lwt +, astring , lwt-watcher }: buildDunePackage { pname = "tezos-p2p"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_p2p"; propagatedBuildInputs = [ tezos-p2p-services @@ -16,9 +19,13 @@ buildDunePackage { ]; checkInputs = [ + astring alcotest-lwt + tezos-test-services ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: library for a pool of P2P connections"; }; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix b/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix deleted file mode 100644 index 5b043eede93d..000000000000 --- a/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib -, buildDunePackage -, tezos-stdlib -, tezos-protocol-008-PtEdo2Zk -, qcheck-alcotest -}: - -buildDunePackage { - pname = "tezos-protocol-008-PtEdo2Zk-parameters"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; - - propagatedBuildInputs = [ - tezos-protocol-008-PtEdo2Zk - ]; - - meta = tezos-stdlib.meta // { - description = "Tezos/Protocol: parameters"; - }; -} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix b/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix deleted file mode 100644 index 49a7f0e63801..000000000000 --- a/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildDunePackage -, tezos-stdlib -, tezos-protocol-compiler -}: - -buildDunePackage { - pname = "tezos-protocol-008-PtEdo2Zk"; - inherit (tezos-stdlib) version src useDune2 doCheck; - - preBuild = '' - rm -rf vendors - substituteInPlace src/proto_008_PtEdo2Zk/lib_protocol/dune.inc --replace "-nostdlib" "" - ''; - - propagatedBuildInputs = [ - tezos-protocol-compiler - ]; - - meta = tezos-stdlib.meta // { - description = "Tezos/Protocol: economic-protocol definition"; - }; -} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix new file mode 100644 index 000000000000..832ca9df30ce --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-010-PtGRANAD +, tezos-protocol-environment +}: + +buildDunePackage { + pname = "tezos-protocol-010-PtGRANAD-parameters"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_parameters"; + + propagatedBuildInputs = [ + tezos-protocol-010-PtGRANAD + tezos-protocol-environment + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: parameters"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix new file mode 100644 index 000000000000..80809cafbab2 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-protocol-010-PtGRANAD"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol"; + + preBuild = '' + rm dune + cp -f ${tezos-protocol-compiler.src}/dune_protocol dune + sed -i.back -e s/-nostdlib//g dune.inc + ''; + + buildInputs = [ + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: economic-protocol definition"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix b/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix index a43356d9cbe3..6178fb6c0811 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix @@ -4,6 +4,7 @@ , tezos-stdlib , tezos-protocol-environment , ocp-ocamlres +, re , pprint }: @@ -13,16 +14,20 @@ else buildDunePackage { pname = "tezos-protocol-compiler"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_compiler"; - minimalOCamlVersion = "4.09"; + minimalOCamlVersion = "4.10"; propagatedBuildInputs = [ tezos-protocol-environment ocp-ocamlres + re pprint ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: economic-protocol compiler"; }; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix b/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix deleted file mode 100644 index 51efe6941840..000000000000 --- a/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, buildDunePackage -, tezos-stdlib -, tezos-protocol-compiler -}: - -buildDunePackage { - pname = "tezos-protocol-demo-noops"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; - - propagatedBuildInputs = [ - tezos-protocol-compiler - ]; - - meta = tezos-stdlib.meta // { - description = "Tezos/Protocol: demo_noops economic-protocol definition"; - }; -} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix index 42662105b95f..3aa5e0f6fca8 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix @@ -5,10 +5,13 @@ buildDunePackage { pname = "tezos-protocol-environment-packer"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; minimalOCamlVersion = "4.03"; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: sigs/structs packer for economic protocol environment"; }; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix index 79b84360a9d1..3008de624319 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix @@ -8,7 +8,21 @@ buildDunePackage { pname = "tezos-protocol-environment-sigs"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; + + postPatch = '' + ls ./sigs/v0 + cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v1/z.mli + cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v2/z.mli + cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v3/z.mli + sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v1/z.mli + sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v1/z.mli + sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v2/z.mli + sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v2/z.mli + sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v3/z.mli + sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v3/z.mli + ''; propagatedBuildInputs = [ tezos-protocol-environment-packer @@ -18,11 +32,7 @@ buildDunePackage { tezos-stdlib ]; - postPatch = '' - cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./src/lib_protocol_environment/sigs/v1/z.mli - sed -i 's/out_channel/Stdlib.out_channel/g' ./src/lib_protocol_environment/sigs/v1/z.mli - sed -i 's/Buffer/Stdlib.Buffer/g' ./src/lib_protocol_environment/sigs/v1/z.mli - ''; + doCheck = true; meta = tezos-stdlib.meta // { description = "Tezos: restricted typing environment for the economic protocols"; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix index feddca046f8c..f7b61b22b235 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix @@ -7,13 +7,16 @@ buildDunePackage { pname = "tezos-protocol-environment-structs"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; propagatedBuildInputs = [ tezos-crypto tezos-protocol-environment-packer ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: restricted typing environment for the economic protocols"; }; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment.nix index 60d9ae29222e..292e4ce41ee6 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-environment.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment.nix @@ -1,22 +1,26 @@ { lib +, ocaml , buildDunePackage , tezos-stdlib , tezos-base , tezos-sapling +, tezos-context , tezos-protocol-environment-sigs , tezos-protocol-environment-structs +, tezos-test-helpers , zarith , alcotest-lwt -, crowbar }: buildDunePackage { pname = "tezos-protocol-environment"; - inherit (tezos-stdlib) version src useDune2 doCheck preBuild; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; propagatedBuildInputs = [ tezos-sapling tezos-base + tezos-context tezos-protocol-environment-sigs tezos-protocol-environment-structs zarith # this might break, since they actually want 1.11 @@ -24,9 +28,11 @@ buildDunePackage { checkInputs = [ alcotest-lwt - crowbar + tezos-test-helpers ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing"; }; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix b/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix new file mode 100644 index 000000000000..2ce231577426 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-embedded-protocol-010-PtGRANAD +, tezos-protocol-010-PtGRANAD +, tezos-shell +}: + +buildDunePackage { + pname = "tezos-protocol-plugin-010-PtGRANAD"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_plugin"; + + buildInputs = [ + tezos-embedded-protocol-010-PtGRANAD + tezos-protocol-010-PtGRANAD + tezos-shell + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol plugin registerer"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-updater.nix b/pkgs/development/ocaml-modules/tezos/protocol-updater.nix new file mode 100644 index 000000000000..29aaa8be7349 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-updater.nix @@ -0,0 +1,26 @@ +{ lib +, ocaml +, buildDunePackage +, tezos-stdlib +, tezos-protocol-compiler +, tezos-shell-context +, lwt-exit +}: + +buildDunePackage { + pname = "tezos-protocol-updater"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_updater"; + + propagatedBuildInputs = [ + tezos-shell-context + lwt-exit + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: economic-protocol dynamic loading for `tezos-node`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/proxy.nix b/pkgs/development/ocaml-modules/tezos/proxy.nix new file mode 100644 index 000000000000..4e46027de0db --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/proxy.nix @@ -0,0 +1,36 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-mockup-proxy +, tezos-context +, ringo-lwt +, alcotest-lwt +, crowbar +, tezos-test-services +, tezos-test-helpers +}: + +buildDunePackage { + pname = "tezos-proxy"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_proxy"; + + propagatedBuildInputs = [ + ringo-lwt + tezos-mockup-proxy + tezos-context + ]; + + checkInputs = [ + alcotest-lwt + crowbar + tezos-test-services + tezos-test-helpers + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: protocol registration for the mockup mode"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/requester.nix b/pkgs/development/ocaml-modules/tezos/requester.nix index d4a2b69eaa8a..2326f8ec91d5 100644 --- a/pkgs/development/ocaml-modules/tezos/requester.nix +++ b/pkgs/development/ocaml-modules/tezos/requester.nix @@ -9,7 +9,8 @@ buildDunePackage { pname = "tezos-requester"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_requester"; propagatedBuildInputs = [ tezos-base @@ -21,6 +22,8 @@ buildDunePackage { tezos-test-services ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: generic resource fetching service"; }; diff --git a/pkgs/development/ocaml-modules/tezos/rpc-http-client-unix.nix b/pkgs/development/ocaml-modules/tezos/rpc-http-client-unix.nix new file mode 100644 index 000000000000..246618ce0768 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/rpc-http-client-unix.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-rpc-http-client +, cohttp-lwt-unix +}: + +buildDunePackage { + pname = "tezos-rpc-http-client-unix"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_rpc_http"; + + propagatedBuildInputs = [ + tezos-rpc-http-client + cohttp-lwt-unix + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: unix implementation of the RPC client"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/rpc-http-client.nix b/pkgs/development/ocaml-modules/tezos/rpc-http-client.nix new file mode 100644 index 000000000000..54cb71617bbf --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/rpc-http-client.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-rpc-http +, resto-cohttp-client +}: + +buildDunePackage { + pname = "tezos-rpc-http-client"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_rpc_http"; + + propagatedBuildInputs = [ + tezos-rpc-http + resto-cohttp-client + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: library of auto-documented RPCs (http client)"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/rpc-http.nix b/pkgs/development/ocaml-modules/tezos/rpc-http.nix new file mode 100644 index 000000000000..56fda87f93d3 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/rpc-http.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +, resto-directory +, resto-cohttp +}: + +buildDunePackage { + pname = "tezos-rpc-http"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_rpc_http"; + + propagatedBuildInputs = [ + tezos-base + resto-directory + resto-cohttp + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: library of auto-documented RPCs (http server and client)"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/rpc.nix b/pkgs/development/ocaml-modules/tezos/rpc.nix index 33450bdf1675..f8a1336146e3 100644 --- a/pkgs/development/ocaml-modules/tezos/rpc.nix +++ b/pkgs/development/ocaml-modules/tezos/rpc.nix @@ -8,7 +8,8 @@ buildDunePackage { pname = "tezos-rpc"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_rpc"; propagatedBuildInputs = [ tezos-error-monad @@ -16,6 +17,8 @@ buildDunePackage { resto-directory ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)"; }; diff --git a/pkgs/development/ocaml-modules/tezos/sapling.nix b/pkgs/development/ocaml-modules/tezos/sapling.nix index 40665e380548..a51973ed7241 100644 --- a/pkgs/development/ocaml-modules/tezos/sapling.nix +++ b/pkgs/development/ocaml-modules/tezos/sapling.nix @@ -4,12 +4,14 @@ , tezos-stdlib , tezos-crypto , tezos-rust-libs +, tezos-test-services , alcotest-lwt }: buildDunePackage { pname = "tezos-sapling"; - inherit (tezos-stdlib) version src useDune2 preBuild; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_sapling"; propagatedBuildInputs = [ tezos-crypto @@ -18,8 +20,10 @@ buildDunePackage { checkInputs = [ alcotest-lwt + tezos-test-services ]; + # requires the "zcash-params" files doCheck = false; # This is a hack to work around the hack used in the dune files diff --git a/pkgs/development/ocaml-modules/tezos/shell-context.nix b/pkgs/development/ocaml-modules/tezos/shell-context.nix new file mode 100644 index 000000000000..89b50177f2ca --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/shell-context.nix @@ -0,0 +1,21 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-environment +}: + +buildDunePackage { + pname = "tezos-shell-context"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; + + propagatedBuildInputs = [ + tezos-protocol-environment + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: economic-protocols environment implementation for `tezos-node`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/shell-services.nix b/pkgs/development/ocaml-modules/tezos/shell-services.nix index 4e2f40497eb8..d15993e0a919 100644 --- a/pkgs/development/ocaml-modules/tezos/shell-services.nix +++ b/pkgs/development/ocaml-modules/tezos/shell-services.nix @@ -8,7 +8,8 @@ buildDunePackage { pname = "tezos-shell-services"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_shell_services"; propagatedBuildInputs = [ tezos-workers @@ -16,6 +17,8 @@ buildDunePackage { tezos-version ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: descriptions of RPCs exported by `tezos-shell`"; }; diff --git a/pkgs/development/ocaml-modules/tezos/shell.nix b/pkgs/development/ocaml-modules/tezos/shell.nix new file mode 100644 index 000000000000..268db42fcdb9 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/shell.nix @@ -0,0 +1,45 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-p2p +, tezos-requester +, tezos-validation +, tezos-store +, tezos-workers +, tezos-test-services +# , tezos-embedded-protocol-demo-noops +, tezos-test-helpers +# , tezos-protocol-plugin-alpha +, alcotest-lwt +, crowbar +}: + +buildDunePackage { + pname = "tezos-shell"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_shell"; + + propagatedBuildInputs = [ + tezos-p2p + tezos-requester + tezos-validation + tezos-store + tezos-workers + ]; + + checkInputs = [ + alcotest-lwt + crowbar + tezos-test-helpers + tezos-test-services + # tezos-embedded-protocol-demo-noops + # tezos-protocol-plugin-alpha + ]; + + # A lot of extra deps with wide dependency cones needed + doCheck = false; + + meta = tezos-stdlib.meta // { + description = "Tezos: descriptions of RPCs exported by `tezos-shell`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/signer-backends.nix b/pkgs/development/ocaml-modules/tezos/signer-backends.nix new file mode 100644 index 000000000000..0b49779c2791 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/signer-backends.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-rpc-http-client-unix +, tezos-signer-services +, alcotest +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-signer-backends"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_signer_backends"; + + propagatedBuildInputs = [ + tezos-rpc-http-client-unix + tezos-signer-services + ]; + + checkInputs = [ + alcotest + alcotest-lwt + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: remote-signature backends for `tezos-client`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/signer-services.nix b/pkgs/development/ocaml-modules/tezos/signer-services.nix new file mode 100644 index 000000000000..2f7333312fa5 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/signer-services.nix @@ -0,0 +1,21 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-client-base +}: + +buildDunePackage { + pname = "tezos-signer-services"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_signer_services"; + + propagatedBuildInputs = [ + tezos-client-base + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: descriptions of RPCs exported by `tezos-signer`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix b/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix index 2b3a01469a71..1b275d03dff9 100644 --- a/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix +++ b/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix @@ -2,28 +2,31 @@ , buildDunePackage , tezos-stdlib , tezos-event-logging -, lwt +, re , ptime , mtime , ipaddr -, re -, alcotest -, alcotest-lwt +, ezjsonm +, fmt }: buildDunePackage { pname = "tezos-stdlib-unix"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_stdlib_unix"; propagatedBuildInputs = [ tezos-event-logging - lwt + re ptime mtime ipaddr - re + ezjsonm + fmt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: yet-another local-extension of the OCaml standard library (unix-specific fragment)"; }; diff --git a/pkgs/development/ocaml-modules/tezos/stdlib.nix b/pkgs/development/ocaml-modules/tezos/stdlib.nix index eff403ba808e..07ec63785bea 100644 --- a/pkgs/development/ocaml-modules/tezos/stdlib.nix +++ b/pkgs/development/ocaml-modules/tezos/stdlib.nix @@ -9,19 +9,24 @@ , crowbar , bigstring , lwt_log +, ppx_inline_test +, qcheck-alcotest +, tezos-test-helpers }: buildDunePackage rec { pname = "tezos-stdlib"; - version = "8.3"; - src = fetchFromGitLab { + version = "10.2"; + base_src = fetchFromGitLab { owner = "tezos"; repo = "tezos"; rev = "v${version}"; - sha256 = "1ykhz5m5sb2hq04nspbsbq8wspkhimagb5g6yi65hpdbn8f4zr6h"; + sha256 = "1sqwbdclsvzz0781r0830ncy1j048h12jp3hsdy7hz4dpqp80jsq"; }; - minimalOCamlVersion = "4.0.8"; + src = "${base_src}/src/lib_stdlib"; + + minimalOCamlVersion = "4.10.0"; useDune2 = true; @@ -33,17 +38,23 @@ buildDunePackage rec { hex lwt zarith + ppx_inline_test ]; checkInputs = [ + bigstring + lwt_log alcotest alcotest-lwt crowbar bigstring lwt_log + qcheck-alcotest + # tezos-test-helpers ]; - doCheck = true; + # circular dependency if we add this + doCheck = false; meta = { description = "Tezos: yet-another local-extension of the OCaml standard library"; diff --git a/pkgs/development/ocaml-modules/tezos/store.nix b/pkgs/development/ocaml-modules/tezos/store.nix new file mode 100644 index 000000000000..69dad7512707 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/store.nix @@ -0,0 +1,48 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-updater +, tezos-validation +, tezos-legacy-store +, tezos-protocol-compiler +, index +, camlzip +, tar-unix +, ringo-lwt +, digestif +, alcotest-lwt +, lwt-watcher +}: + +buildDunePackage { + pname = "tezos-store"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_store"; + + propagatedBuildInputs = [ + index + camlzip + tar-unix + ringo-lwt + digestif + lwt-watcher + tezos-protocol-updater + tezos-validation + tezos-legacy-store + ]; + + buildInputs = [ + tezos-protocol-compiler + ]; + + checkInputs = [ + alcotest-lwt + ]; + + # A lot of extra deps with wide dependency cones needed + doCheck = false; + + meta = tezos-stdlib.meta // { + description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/test-helpers.nix b/pkgs/development/ocaml-modules/tezos/test-helpers.nix new file mode 100644 index 000000000000..68a0d841ccf5 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/test-helpers.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, qcheck-alcotest +, alcotest +, alcotest-lwt +, hashcons +, pyml +, uri +, tezos-test-services +, tezos-stdlib +}: + +buildDunePackage rec { + pname = "tezos-test-helpers"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_test"; + + propagatedBuildInputs = [ + qcheck-alcotest + alcotest + alcotest-lwt + hashcons + pyml + uri + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: yet-another local-extension of the OCaml standard library"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/test-services.nix b/pkgs/development/ocaml-modules/tezos/test-services.nix index ba30b922d174..0da38d896ead 100644 --- a/pkgs/development/ocaml-modules/tezos/test-services.nix +++ b/pkgs/development/ocaml-modules/tezos/test-services.nix @@ -1,4 +1,5 @@ { lib +, fetchFromGitLab , buildDunePackage , tezos-stdlib , tezos-base @@ -7,13 +8,16 @@ buildDunePackage { pname = "tezos-test-services"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_test_services"; propagatedBuildInputs = [ tezos-base alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: Alcotest-based test services"; }; diff --git a/pkgs/development/ocaml-modules/tezos/validation.nix b/pkgs/development/ocaml-modules/tezos/validation.nix new file mode 100644 index 000000000000..b26b81f4a779 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/validation.nix @@ -0,0 +1,26 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-updater +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-validation"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_validation"; + + propagatedBuildInputs = [ + tezos-protocol-updater + ]; + + buildInputs = [ + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: library for blocks validation"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/version.nix b/pkgs/development/ocaml-modules/tezos/version.nix index 3b4bdd4bf6f3..a0928d15f46b 100644 --- a/pkgs/development/ocaml-modules/tezos/version.nix +++ b/pkgs/development/ocaml-modules/tezos/version.nix @@ -6,12 +6,15 @@ buildDunePackage { pname = "tezos-version"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_version"; propagatedBuildInputs = [ tezos-base ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: version information generated from Git"; }; diff --git a/pkgs/development/ocaml-modules/tezos/workers.nix b/pkgs/development/ocaml-modules/tezos/workers.nix index ca659f8adfb3..65a60a216cd4 100644 --- a/pkgs/development/ocaml-modules/tezos/workers.nix +++ b/pkgs/development/ocaml-modules/tezos/workers.nix @@ -6,12 +6,15 @@ buildDunePackage { pname = "tezos-workers"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_workers"; propagatedBuildInputs = [ tezos-base ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: worker library"; }; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 898bbbba91b7..b71442a6a8b3 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,50 +1,24 @@ -{ lib, stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }: let pname = "uunf"; webpage = "https://erratique.ch/software/${pname}"; - version = "13.0.0"; - ucdxml = fetchurl { - url = "http://www.unicode.org/Public/${version}/ucdxml/ucd.all.grouped.zip"; - sha256 = "04gpl09ggb6fb0kmk6298rd8184dv6vcscn28l1gpdv1yjlw1a8q"; - }; - gen = fetchurl { - url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen.ml"; - sha256 = "08j2mpi7j6q3rqc6bcdwspqn1s7pkkphznxfdycqjv4h9yaqsymj"; - }; - gen_norm = fetchurl { - url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_norm.ml"; - sha256 = "11vx5l5bag6bja7qj8jv4s2x9fknj3557n0mj87k2apq5gs5f4m5"; - }; - gen_props = fetchurl { - url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_props.ml"; - sha256 = "0a6lhja498kp9lxql0pbfvkgvajs10wx88wkqc7y5m3lrvw46268"; - }; + version = "14.0.0"; in -assert lib.versionAtLeast ocaml.version "4.03"; +if !lib.versionAtLeast ocaml.version "4.03" +then throw "${pname} is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${version}"; inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm"; + sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2"; }; - postConfigure = '' - rm -f src/uunf_data.ml - mkdir -p support/ - cp ${gen} support/gen.ml - cp ${gen_norm} support/gen_norm.ml - cp ${gen_props} support/gen_props.ml - funzip ${ucdxml} > support/ucd.xml - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/build_support.ml - ''; - - nativeBuildInputs = [ unzip ]; - - buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner uucd ]; + buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; propagatedBuildInputs = [ uchar ]; @@ -53,11 +27,8 @@ stdenv.mkDerivation { meta = with lib; { description = "An OCaml module for normalizing Unicode text"; homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - # See https://github.com/dbuenzli/uunf/issues/15#issuecomment-903151264 - broken = lib.versions.majorMinor ocaml.version == "4.08" - && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix index c8b2b614e860..2b8714ed1034 100644 --- a/pkgs/development/ocaml-modules/yaml/default.nix +++ b/pkgs/development/ocaml-modules/yaml/default.nix @@ -1,22 +1,23 @@ { lib, fetchurl, buildDunePackage , dune-configurator -, ppx_sexp_conv -, bos, ctypes, fmt, logs, rresult, sexplib +, bos, ctypes, fmt, logs, rresult +, mdx, alcotest, crowbar, junit_alcotest, ezjsonm }: buildDunePackage rec { pname = "yaml"; - version = "2.1.0"; + version = "3.0.0"; useDune2 = true; src = fetchurl { url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-v${version}.tbz"; - sha256 = "03g8vsh5jgi1cm5q78v15slgnzifp91fp7n4v1i7pa8yk0bkh585"; + sha256 = "1iws6lbnrrd5hhmm7lczfvqp0aidx5xn7jlqk2s5rjfmj9qf4j2c"; }; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ bos ctypes fmt logs ppx_sexp_conv rresult sexplib ]; + propagatedBuildInputs = [ bos ctypes rresult ]; + checkInputs = [ fmt logs mdx alcotest crowbar junit_alcotest ezjsonm ]; meta = { description = "Parse and generate YAML 1.1 files"; diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix new file mode 100644 index 000000000000..960361458440 --- /dev/null +++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix @@ -0,0 +1,13 @@ +{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }: + +buildDunePackage rec { + pname = "yaml-sexp"; + + inherit (yaml) version src useDune2; + + propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ]; + + meta = yaml.meta // { + description = "ocaml-yaml with sexp support"; + }; +} diff --git a/pkgs/development/php-packages/amqp/default.nix b/pkgs/development/php-packages/amqp/default.nix new file mode 100644 index 000000000000..0c4f170901d1 --- /dev/null +++ b/pkgs/development/php-packages/amqp/default.nix @@ -0,0 +1,19 @@ +{ buildPecl, lib, rabbitmq-c }: + +buildPecl { + pname = "amqp"; + + version = "1.11.0beta"; + sha256 = "sha256-HbVLN6fg2htYZgAFw+IhYHP+XN8j7cTLG6S0YHHOC14="; + + buildInputs = [ rabbitmq-c ]; + + AMQP_DIR = rabbitmq-c; + + meta = with lib; { + description = "PHP extension to communicate with any AMQP compliant server"; + license = licenses.php301; + homepage = "https://github.com/php-amqp/php-amqp"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 1afa8f2ae330..2ae6ec055476 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.8"; + version = "2.1.9"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "141myfivdjnkx8myvkgl2sclhvx9z1c6a1my4xzscx0injhsrf3p"; + sha256 = "1fj8sq21qdsdidj5zh8s3c12pmf9nkmj36igmmixc5vc2h7bf02d"; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 90486c8c3992..029d9f467763 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "0.12.90"; + version = "0.12.99"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0f8858w9b421s3dfz8a56g0mik4zyi1lp88lijw4zs2d94dcdl9s"; + sha256 = "0rv8xf5yx88wh95myysqmv29n5rr15zgwsvh8a4xb1pmw3h9kb6q"; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index ccacef6df575..618510363683 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "accuweather"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-Swe8vegRcyaeG4n/8aeGFLrXkwcLM/Al53yD6oD/0GA="; + sha256 = "sha256-Kn2hP0mdnC4+Lk8wsTznC23CsYLYKhya+HlHox1Fo2o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 6f1f9b0337ea..1d25bcae10ef 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.15.3"; + version = "3.16.0"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-cmeCh54dwYwbL1AwGrPwTDp4F6VONclV7iu2Sm1g33Q="; + sha256 = "sha256-/60f++CemVbeUwRSzQ5dZpoQE4btRiRhnVHHDPIn3Xc="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 47a70940e927..9094b1c780cf 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.4.0"; + version = "0.4.1"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "1dzpgpvjvss4mk2kp1s9g1gg0d008pbmfdsi9b98q9fax9syk725"; + sha256 = "sha256-E7sX+N6d5Otwp1AbdPCnQJ2YT/k89+6kMJDLt8U2Dsg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index f98cf112eb17..8d719f4c3357 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10072"; + version = "9.0.10159"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sUyR9X/+JedJGsiQQuwgJQB5e1+S1I516P5jDCQRzAw="; + sha256 = "sha256-45wdHlAkuzLqwy3B7bEm2fhHD8iT5xSVmeRGOa2SNnI="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 1ad7c0bfd9d9..268654ea9baa 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.4"; + version = "1.4.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DobTx6oUr25J8bolo84V4yTT0b0jBsOIzPn93uAmDl0="; + sha256 = "sha256-QfeAEFB5WikuriBTcfFIgnJw5H4vEcGIVX47fyDb1Dk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 3d40e7ff52b8..5b69a3326155 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "9.1.5"; + version = "10.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PPag65ZMz9KZEe9FmiB42/DgeM0vJw5L0haAG/jBjqg="; + sha256 = "sha256-ZVexJt1CE7Q0j9QzrPFLYYSXzoWYtfw1BWwL/hnAkD0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index 3f2ee2fee3ea..fea1956e3311 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -3,18 +3,19 @@ , async-timeout , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , slixmpp }: buildPythonPackage rec { pname = "aioharmony"; - version = "0.2.7"; - disabled = !isPy3k; + version = "0.2.8"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aej8xC0Bsy6ip7IwO6onp55p6afkz8yZnz14cCExSPA="; + sha256 = "0adf08955810a227db489556dc3ca808e4f825a00183f613797856114c2a2a47"; }; propagatedBuildInputs = [ @@ -26,7 +27,10 @@ buildPythonPackage rec { # aioharmony does not seem to include tests doCheck = false; - pythonImportsCheck = [ "aioharmony.harmonyapi" "aioharmony.harmonyclient" ]; + pythonImportsCheck = [ + "aioharmony.harmonyapi" + "aioharmony.harmonyclient" + ]; meta = with lib; { homepage = "https://github.com/ehendrix23/aioharmony"; diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 5e8e9327c4f5..55b5d4215135 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.9.2"; + version = "0.11.0"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "sha256-xZPNEynj0kbeika15ZDEIRUe519V6Asaw+CEiBu7VL4="; + sha256 = "sha256-58l9bmGmSRFHqiKwHtGcAu2H+JnKjsZZg+fxbLW5xBg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix index 60b5647f5eb9..07e265f8fc0b 100644 --- a/pkgs/development/python-modules/aiopg/default.nix +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiopg"; - version = "1.3.1"; + version = "1.3.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kAkxulAMtLeL3IAuIVvZtsN5RxHWV/qHyFIYu9Odn34="; + sha256 = "sha256-e7USw3Bx6cpLu9PKDC+eEdPTSjriuSX2Sg+9BeRa9Ko="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix new file mode 100644 index 000000000000..2b3bc08d1d9f --- /dev/null +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -0,0 +1,73 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, freezegun +, poetry-core +, pyjwt +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pytz +, titlecase +, types-pytz +}: + +buildPythonPackage rec { + pname = "aioridwell"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "0kzxh1igncql1rwh12n42qahlc94z0fsd344d1vgni50jg7i34v7"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pyjwt + pytz + titlecase + ]; + + checkInputs = [ + aresponses + freezegun + pytest-aiohttp + pytest-asyncio + pytestCheckHook + types-pytz + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'titlecase = "^2.3"' 'titlecase = "*"' \ + --replace 'pytz = "^2021.3"' 'pytz = "*"' + ''; + + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_ + "examples/" + ]; + + pythonImportsCheck = [ + "aioridwell" + ]; + + meta = with lib; { + description = "Python library for interacting with Ridwell waste recycling"; + homepage = "https://github.com/bachya/aioridwell"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index 9d919becd439..acf106ab3c6d 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.1.2"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "1gyvisccx25py85wwwlljai5qa20jvwyvacgrgkk1h18dkc262fw"; + sha256 = "1pamfc2l95s1q86jvmbp17chjy129gk01kwy8xm88d2ijy8s1caq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/airthings/default.nix b/pkgs/development/python-modules/airthings-cloud/default.nix similarity index 96% rename from pkgs/development/python-modules/airthings/default.nix rename to pkgs/development/python-modules/airthings-cloud/default.nix index 21525941cb26..ca80f38c899d 100644 --- a/pkgs/development/python-modules/airthings/default.nix +++ b/pkgs/development/python-modules/airthings-cloud/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - pname = "airthings"; + pname = "airthings-cloud"; version = "0.0.1"; format = "setuptools"; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 342ff82c3afb..21539a93f4b7 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10072"; + version = "9.0.10159"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-mdGcEeuWXo0Qyi8+mU8RSpUoTbUkVBmduTz3B4TW2zg="; + sha256 = "sha256-j3SbKBoREeB4IJmXVm27K4C1FLcZwqFMFXQwWnMtE0g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index a71c6e3c7ef0..71690bf31b2d 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10072"; + version = "9.0.10159"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FTKvGhONDUifwZhoKBXTZQFNbC/vTcHdLIge3j6U8uo="; + sha256 = "sha256-gVYriEt0/DPB0lDK9hGSnipGLCZtSOf27gtF8KwCMDA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index a508e7b27111..9ea365079451 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "annexremote"; - version = "1.4.5"; + version = "1.6.0"; # use fetchFromGitHub instead of fetchPypi because the test suite of # the package is not included into the PyPI tarball @@ -17,7 +17,7 @@ buildPythonPackage rec { rev = "v${version}"; owner = "Lykos153"; repo = "AnnexRemote"; - sha256 = "0r5chdk2aiqcz7z8r8m1j657cz79f6bbv96xdmhj4m5fiqn672if"; + sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 3156ba18e106..e6113b93dcbc 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.14"; + version = "2.10.15"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gAxGRsWKWJf3HyIwFn21YmoZbeuiCPDvRWChg//Z39o="; + sha256 = "sha256-RHiBi6gh26FD4SNWjsXTF9yPpKxuFRP3pQFzTlKXa/8="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index b64942b10780..dc87dcfeda83 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.5"; + version = "2.11.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fTzkcBQSKQdFRwQ2NIXkhRP4rQ8AE4uIhw622IlT0SE="; + sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 3957e109c7c0..50662b43f32c 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.26"; + version = "2.9.27"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OuAqrSu+3PtBnOdevSpkjp3rc+ni2N6GyC1gR7G962M="; + sha256 = "sha256-R5FZ5Qs72Qkg0GvFlBDDpR0/m+m04QKeEdHkotBwVzY="; }; prePatch = '' diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 2d80b6a3984a..2ffe0b137528 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -64,13 +64,13 @@ }: let - version = "2.1.2"; + version = "2.1.4"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "sha256-Q0l2c1tuxcoE65zgdxnv/j1TIoQzaNoEFCYHvqN+Bzk="; + sha256 = "12nxjaz4afkq30s42x3rbsci8jiw2k5zjngsc8i190fasbacbnbs"; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. @@ -193,7 +193,9 @@ buildPythonPackage rec { --replace "sqlalchemy>=1.3.18, <1.4" "sqlalchemy" \ --replace "sqlalchemy_jsonfield~=1.0" "sqlalchemy-jsonfield" \ --replace "werkzeug~=1.0, >=1.0.1" "werkzeug" \ - --replace "itsdangerous>=1.1.0, <2.0" "itsdangerous" + --replace "itsdangerous>=1.1.0, <2.0" "itsdangerous" \ + --replace "python-slugify>=3.0.0,<5.0" "python-slugify" \ + --replace "colorlog>=4.0.2, <6.0" "colorlog" substituteInPlace tests/core/test_core.py \ --replace "/bin/bash" "${stdenv.shell}" diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index c2e581832fe4..0f86c103c27d 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.0.1a9"; + version = "0.0.1a11"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Apycula"; - sha256 = "01shkaxakisgg253jdwjkd81vnjgfws3gi2wyrdxmkcg95wphk5y"; + sha256 = "0fwk1pgphpgj0lazjy40ii08xq2qi6bvrfc30rwfj52yff1s9akn"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index e20cb09326f7..88bb434a2cc6 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10072"; + version = "9.0.10159"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nwt2QD+A67Lbgzg/HSR+yaNWk9+EsUWA5nxm4JTikS8="; + sha256 = "sha256-WkA4vSXzndd7ldNBVagEEodj+2GuYg9OURnMLhRq8W8="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 2f5bb183795f..a921948bcfe6 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.22.5"; + version = "0.22.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-/GELV94m75jSIFR4Ua3Sr+L9iGmzRQxPMIK2yfDiX9E="; + sha256 = "sha256-0McLH5iNiA6aIyk6OaN57JAs97R+/4M7xaUDmh+xV6c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 5afd91f52f3e..4c2fd7e6c64b 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -59,6 +59,11 @@ buildPythonPackage rec { "tests/sspi_stub.py" ]; + disabledTests = [ + # No PIN set + "TestSKAuthCTAP2" + ]; + pythonImportsCheck = [ "asyncssh" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index a2434a9cb626..031c696f020f 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.10.1"; + version = "3.10.2"; disabled = pythonOlder "3.7"; format = "flit"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D8XaBny/m6dXMz6k/FhVX/5t8guNdJsfiX4cVQV4VIY="; + sha256 = "sha256-vjOhfEsAldTjROFUer1SgEX1KxnNM/WwtLsCB9ZV1WM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index c19dcda24522..4bb201b251e9 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "0.4.0"; + version = "0.4.1"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yJ+AHUyzAl8lRcKcLfMJ8InhV0LVUK+Neb5ngQOwFTM="; + sha256 = "sha256-mKKN2IuveOE+3mZGS5LFa15lJPA9y7KgLd0FoRuEMH0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index cf1d4544e4ad..6b70f3675268 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # TODO: not very nice! postPatch = - let libname = if stdenv.isDarwin then "libaugeas.dylib" else "libaugeas.so"; + let libname = "libaugeas${stdenv.hostPlatform.extensions.sharedLibrary}"; in '' substituteInPlace augeas/ffi.py \ diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 41e0ede31c5d..224b8bec4015 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.18.0"; + version = "3.19.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jitJF+puXaLv3qyJOjLFetzxRpnlbi4BKS0TzDmCRe8="; + sha256 = "ed33557f252cf8b022b788ebd2b851c681979f200171498acde2b92d760db026"; }; propagatedBuildInputs = [ @@ -23,7 +23,6 @@ buildPythonPackage rec { checkInputs = [ mock - pyjwt pytestCheckHook ]; diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 1ac9954730dd..c55a6e412730 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.15.4"; + version = "0.15.5"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "v${version}"; - sha256 = "1jc7rssi1y6brkwjplj8qmi4q5w9h9wz03fbhg01c0y5bmy0g1nj"; + sha256 = "1893mkzrlfxpxrgv10y134y8c3ni5hb0qvb0wsc76d2k4mci5j3n"; }; propagatedBuildInputs = [ cryptography requests ]; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 62f383c56785..c60122ff1802 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3cb1b0e28f420232d894d89665d5c0c8241b99e56d806171f4faf5cdfec08ae1"; + sha256 = "c0357c62223fefcfc7a7565389dbd4db900623bf10eccf2bc8e87586ec59b38d"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index bad63d287be3..9136ed0a4eb8 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "69035c81f280fac5fa9c55f87be3a359b264853727486e3568818bb43988080e"; + sha256 = "3faaecb645e3b2300648a4a452458ec0e31e13d9dc928e710992e43ef4694205"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index d8e8f45d7cc8..a89e803220d7 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "23.0.0"; + version = "23.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1eb26b965ba4049ddcf10d4f25818725fc03c491c3be76537d0d74ceb1146b04"; + sha256 = "49dbb0f51006d557cbd0b22999cb9ecf3eabc2be46d96efcc6d651c6b33754b3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 1f4c78ed1bed..69ca3c63391b 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "16.2.0"; + version = "16.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ee40fa76d84b82e37e1d8a364649de25bb1e0c6c07f182f145a3ade44ec43711"; + sha256 = "87f06525c6cc47de86d7886ed35f04140ddaf1b0c59482ba578fdb3f5d143b1c"; }; propagatedBuildInputs = [ @@ -31,6 +31,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.containerservice" ]; + meta = with lib; { description = "This is the Microsoft Azure Container Service Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 8454d4463f4b..c2c4e6328d5b 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "1.1.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "433ad8e83bd8df4abc5af47a0e3a7a4515f79931db4036f2bccd65b5a9e88bfb"; + sha256 = "df14272a1835f743d1889f901e972ed6ec9ea9d6f8966ba2865bf10306a621cc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 02d2c6a013c1..a6920815f0fa 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "8.0.0"; + version = "9.0.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000"; + sha256 = "41ebdc69c0d1f81d25dd30438c14fff4331f66639f55805b918b9649eaffe78a"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 792501b24e71..20d3db5669a3 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { - version = "19.0.0"; + version = "19.1.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8"; + sha256 = "62ef7fe8ba98e56412b434c9c35dc755b3c5e469f2c01bbed2ce0d12973a044b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 59f3e7189f95..626a60d7c998 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "9.1.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f738d9e6db8f6da6bb4e84e59dd0548c8adef948357a447337e78d1035ac960a"; + sha256 = "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index be011a1ed002..ea6f47183abb 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.6.2"; + version = "0.7.0"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc"; + sha256 = "cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index f189572f12e3..c5ccff1dad24 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.8.3"; + version = "1.8.4"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "a2940b447fdbea084311de55d415a1538299ad40ee1cc6ae711319c0734dc401"; + sha256 = "63e7a02c9ddb5505a345e178f4e436b82c35ec0a177d7047b67ea10ea3029a68"; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 9f4966ffe897..f7e6e86a0a16 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -4,7 +4,6 @@ , stdenv , zlib , xz -, ncompress , gzip , bzip2 , gnutar @@ -31,7 +30,7 @@ buildPythonPackage rec { sha256 = "sha256-lfHXutAp06Xr/TSBpDwBUBC/mWI9XuyImoKwA3inqgU="; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ] + propagatedBuildInputs = [ zlib xz gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ] ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ] ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ]; diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix index 9651d7289a9b..35634b1e2417 100644 --- a/pkgs/development/python-modules/bond-api/default.nix +++ b/pkgs/development/python-modules/bond-api/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "bond-api"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "prystupa"; repo = "bond-api"; rev = "v${version}"; - sha256 = "0v3bwbpn98fjm8gza2k7fb7w5ps3982kfvbck5x0fh2xq2825b80"; + sha256 = "0s7an6kbib1immrbwrh4pzj812zwf8kj3kgky5k3qwxzrj0iv6ak"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braceexpand/default.nix b/pkgs/development/python-modules/braceexpand/default.nix new file mode 100644 index 000000000000..c5e711bb8043 --- /dev/null +++ b/pkgs/development/python-modules/braceexpand/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "braceexpand"; + version = "0.1.7"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version pname; + sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "braceexpand" ]; + + meta = with lib; { + description = "Bash-style brace expansion for Python"; + homepage = "https://github.com/trendels/braceexpand"; + changelog = "https://github.com/trendels/braceexpand/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/bracex/default.nix b/pkgs/development/python-modules/bracex/default.nix index 0f8282ae7b6e..b9441ae49706 100644 --- a/pkgs/development/python-modules/bracex/default.nix +++ b/pkgs/development/python-modules/bracex/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bracex"; - version = "2.1.1"; + version = "2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AfcVzQ7XpiLsizIyLnFYE/dXTeUx8Jtw9vOywQ9oJCU="; + sha256 = "8230f3a03f1f76c192a7844377124300fbaec83870a728b629dfabd9be9e83d0"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index 2418d282ce0a..dc1e4f37f3c4 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "broadlink"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "bfd1ff007d0d1187c17ae52be938afc8137fbd1ed6a794426e975df10d167571"; + sha256 = "c66b3e4a097d6549f0fcc9ccdf289bd88f73f647ad9449e1c4e2958301ad1b04"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 2f4552ca3f6c..17d46940e254 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "brother"; - version = "1.0.2"; + version = "1.1.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-xs/GIsJUuKKbDotV1BeT/ng86UVkNsH48uHR4i3vqow="; + sha256 = "sha256-ZDQIpzdr3XkYrSUgrBDZsUwUZRQCdJdvmniMezvJxzU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index d4d52b9b03b1..d15f28e475c2 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,25 +1,44 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, lz4, keyring, pbkdf2, pycryptodome, pyaes}: +{ lib +, fetchPypi +, buildPythonPackage +, isPy3k +, lz4 +, keyring +, pbkdf2 +, pycryptodome +, pyaes +}: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.12.1"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "72c1e6aa6a98adab3a6797b889664bdbfddc287474dd8e774da37a854ec32185"; + sha256 = "9f8e5ddf5a6641a1fdca12d82b0923777ba59a988b68c9bcf358bfb7c42ef25b"; }; disabled = !isPy3k; - propagatedBuildInputs = [ lz4 keyring pbkdf2 pyaes pycryptodome ]; + propagatedBuildInputs = [ + lz4 + keyring + pbkdf2 + pyaes + pycryptodome + ]; # No tests implemented doCheck = false; + pythonImportsCheck = [ + "browser_cookie3" + ]; + meta = with lib; { description = "Loads cookies from your browser into a cookiejar object"; - maintainers = with maintainers; [ borisbabic ]; homepage = "https://github.com/borisbabic/browser_cookie3"; - license = licenses.gpl3; + license = licenses.gpl3Only; + maintainers = with maintainers; [ borisbabic ]; }; } diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index 365f36542985..03a1610ac7e4 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Bugzilla XMLRPC access module"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ pierron peti ]; + maintainers = with maintainers; [ pierron ]; }; } diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index 75d4f38b2c3d..648ec29520bf 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bytecode"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vstinner"; repo = pname; rev = version; - sha256 = "sha256-CEfDoJ+JlnxLLVnSxv7bEN891tmwG9zAvtT8GNvp8JU="; + sha256 = "sha256-aY19qMYW7KziiXVY3lxdnHk7OCAJaNh+aTvlQyJWmDw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index fe7ad48274ea..21529174eb2d 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage -, isPy27 , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "cachetools"; - version = "4.2.2"; + version = "4.2.3"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tkem"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JTm8ht2Ubn34uQLR0yjUjXSdDQggWfYUlS0T628OUoI="; + sha256 = "sha256-9CHXvb+Nn3N2oWHwNbqKguzDO/q+4EnMZ50+E+MWS/A="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "cachetools" ]; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index ef7b79989c45..cf4813a9d908 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -3,33 +3,43 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytest-cov +, pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "cbor2"; - version = "5.4.1"; + version = "5.4.2"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1jga5wj3kalf6zj5gyrmy6kwmxxkld52mvcgxc5gb5dmdhpl7gx8"; + sha256 = "sha256-4oPnC1WgSf82TMXmSP3lh+TZsOh+SyZkxp5jkTXms7g="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; checkInputs = [ - pytest-cov pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov" "" + ''; + # https://github.com/agronholm/cbor2/issues/99 disabledTests = lib.optionals stdenv.is32bit [ "test_huge_truncated_bytes" "test_huge_truncated_string" ]; - pythonImportsCheck = [ "cbor2" ]; + pythonImportsCheck = [ + "cbor2" + ]; meta = with lib; { description = "Python CBOR (de)serializer with extensive tag support"; diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix index baef04eab5b5..94eea88efe8b 100644 --- a/pkgs/development/python-modules/chess/default.nix +++ b/pkgs/development/python-modules/chess/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "chess"; - version = "1.6.1"; + version = "1.7.0"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "niklasf"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-2pyABmr6q1Y2/ivtvMYqRHE2Zjlyz2QO0us0w4l2HQM="; + sha256 = "0f2q9sif1rqjlgzkf7dnxrclmw8v84hzyrnq21g8k1cwqj5fx9j2"; }; pythonImportsCheck = [ "chess" ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 584067e10242..8a1da0241c94 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10072"; + version = "9.0.10159"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bsFfp1ocgHhe0/1wWwgnXDQm37gmWQylZvy6HiyQGSw="; + sha256 = "sha256-0I3ITMCOuYm5fmmnQN+zy9lunvfsLb1qlUzSOnPGwlQ="; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index c5dea6ece1cf..7cdfec13c877 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10072"; + version = "9.0.10159"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uY0Pp+BssnkQvF8fsVlRW2Wj/JmMBSBudDf9AHekBtw="; + sha256 = "sha256-DkddaVmSIQToF5b7uj+96vCSZU0cJdfqIDSwDIFEEyI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index d99f66943d96..6dbb3f91d1e8 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,14 +17,15 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.5"; + version = "0.4.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = pname; rev = version; - sha256 = "0s446jji3c9x1gw0lsb03giir91cnv6dgh4nzxg9mc1rm9wy7gzw"; + sha256 = "sha256-TFUOsfQ1QxdpmRUJPoHMCuCpmYpQodLkP5EVXKm+qsw="; }; propagatedBuildInputs = [ @@ -44,7 +45,19 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "cloudsplaining" ]; + postPatch = '' + # Ignore pinned versions + sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" requirements.txt + ''; + + disabledTests = [ + "test_policy_expansion" + "test_statement_details_for_allow_not_action" + ]; + + pythonImportsCheck = [ + "cloudsplaining" + ]; meta = with lib; { description = "Python module for AWS IAM security assessment"; diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 6abb6ff023ad..d8a800f70ce0 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "6.4.1"; + version = "6.5.0"; src = fetchPypi { inherit pname version; - sha256 = "af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8"; + sha256 = "cf62a8e389d5660d0d22be17937b25b9abef9497ddc940197d1773aa1f604339"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 136a638c352c..04921a618c25 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -1,24 +1,29 @@ { lib -, fetchPypi -, buildPythonPackage -, setuptools-scm -, click -, requests , attrs -, intbitset -, saneyaml -, text-unidecode , beautifulsoup4 -, pytestCheckHook +, buildPythonPackage +, click +, fetchPypi +, intbitset , pytest-xdist +, pytestCheckHook +, pythonOlder +, requests +, saneyaml +, setuptools-scm +, text-unidecode +, typing }: + buildPythonPackage rec { pname = "commoncode"; - version = "21.8.31"; + version = "30.0.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0e74c61226834393801e921ab125eae3b52361340278fb9a468c5c691d286c32"; + sha256 = "sha256-6SeU4u6pfDuGCgCYAO5fdbWBxW9XN3WvM8j6DwUlFwM="; }; dontConfigure = true; @@ -28,13 +33,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - click - requests attrs + beautifulsoup4 + click intbitset + requests saneyaml text-unidecode - beautifulsoup4 + ] ++ lib.optionals (pythonOlder "3.7") [ + typing ]; checkInputs = [ diff --git a/pkgs/development/python-modules/cramjam/Cargo.lock b/pkgs/development/python-modules/cramjam/Cargo.lock deleted file mode 100644 index 0eb5882cc36b..000000000000 --- a/pkgs/development/python-modules/cramjam/Cargo.lock +++ /dev/null @@ -1,520 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "brotli-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "brotli2" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -dependencies = [ - "brotli-sys", - "libc", -] - -[[package]] -name = "cc" -version = "1.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cramjam" -version = "2.3.2" -dependencies = [ - "brotli2", - "flate2", - "lz4", - "mimalloc", - "numpy", - "pyo3", - "snap", - "zstd", -] - -[[package]] -name = "crc32fast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "ctor" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "flate2" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" -dependencies = [ - "cfg-if 1.0.0", - "crc32fast", - "libc", - "miniz_oxide", -] - -[[package]] -name = "ghost" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "inventory" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" -dependencies = [ - "ctor", - "ghost", - "inventory-impl", -] - -[[package]] -name = "inventory-impl" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "jobserver" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" -dependencies = [ - "libc", -] - -[[package]] -name = "libc" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2396cf99d2f58611cd69f0efeee4af3d2e2c7b61bed433515029163aa567e65c" -dependencies = [ - "cc", -] - -[[package]] -name = "lock_api" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "lz4" -version = "1.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "matrixmultiply" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" -dependencies = [ - "rawpointer", -] - -[[package]] -name = "mimalloc" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7c6b11afd1e5e689ac96b6d18b1fc763398fe3d7eed99e8773426bc2033dfb" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "ndarray" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0d5c9540a691d153064dc47a4db2504587a75eae07bf1d73f7a596ebc73c04" -dependencies = [ - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", -] - -[[package]] -name = "num-complex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "numpy" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7073fae1e0b82409533a29c6f804b79783d7b2d3c07728fdc4d884eda8cd4f0" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "ndarray", - "num-complex", - "num-traits", - "pyo3", -] - -[[package]] -name = "parking_lot" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro2" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "pyo3" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4837b8e8e18a102c23f79d1e9a110b597ea3b684c95e874eb1ad88f8683109c3" -dependencies = [ - "cfg-if 1.0.0", - "ctor", - "indoc", - "inventory", - "libc", - "parking_lot", - "paste", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-macros" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47f2c300ceec3e58064fd5f8f5b61230f2ffd64bde4970c81fdd0563a2db1bb" -dependencies = [ - "pyo3-macros-backend", - "quote", - "syn", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b097e5d84fcbe3e167f400fbedd657820a375b034c78bd852050749a575d66" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[package]] -name = "redox_syscall" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" -dependencies = [ - "bitflags", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "snap" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" - -[[package]] -name = "syn" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "unindent" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "zstd" -version = "0.6.1+zstd.1.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "3.0.1+zstd.1.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "1.4.20+zstd.1.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" -dependencies = [ - "cc", - "libc", -] diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index 4d1227dcbc59..a88cc233ad56 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -1,35 +1,34 @@ { lib -, stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , rustPlatform +, stdenv , libiconv -, pytestCheckHook , brotli , lz4 , memory_profiler , numpy , pytest-benchmark +, pytestCheckHook , python-snappy , zstd }: buildPythonPackage rec { pname = "cramjam"; - version = "2.3.2"; + version = "2.4.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "577955f1510d99df0e4d61379c3f05568f594f91e12bc6a7e147d0abfa643a3b"; + src = fetchFromGitHub { + owner = "milesgranger"; + repo = "pyrus-cramjam"; + rev = "v${version}"; + sha256 = "sha256-00KvbiTf8PxYWljLKTRZmPIAbb+PnBleDM4p0AzZhHw="; }; - postPatch = '' - cp ${./Cargo.lock} ./Cargo.lock - ''; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sha256 = "sha256-4y/jeEZjVUbaXtBx5l3Hrbnj3iNYX089K4xexRP+5v0="; }; nativeBuildInputs = with rustPlatform; [ @@ -39,12 +38,12 @@ buildPythonPackage rec { buildInputs = lib.optional stdenv.isDarwin libiconv; checkInputs = [ - pytestCheckHook brotli lz4 memory_profiler numpy pytest-benchmark + pytestCheckHook python-snappy zstd ]; @@ -53,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Thin Python bindings to de/compression algorithms in Rust"; - homepage = "https://crates.io/crates/cramjam"; + homepage = "https://github.com/milesgranger/pyrus-cramjam"; license = with licenses; [ mit ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix new file mode 100644 index 000000000000..94e6219264c0 --- /dev/null +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, asynctest +, buildPythonPackage +, fetchFromGitHub +, certifi +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "crownstone-cloud"; + version = "1.4.5"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "crownstone"; + repo = "crownstone-lib-python-cloud"; + rev = "v${version}"; + sha256 = "1a8bkqkrc7iyggr5rr20qdqg67sycdx2d94dd1ylkmr7627r34ys"; + }; + + propagatedBuildInputs = [ + aiohttp + asynctest + certifi + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "codecov>=2.1.10" "" + ''; + + pythonImportsCheck = [ + "crownstone_cloud" + ]; + + meta = with lib; { + description = "Python module for communicating with Crownstone Cloud and devices"; + homepage = "https://github.com/crownstone/crownstone-lib-python-cloud"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/crownstone-core/default.nix b/pkgs/development/python-modules/crownstone-core/default.nix new file mode 100644 index 000000000000..35289cf1956c --- /dev/null +++ b/pkgs/development/python-modules/crownstone-core/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyaes +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "crownstone-core"; + version = "3.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "crownstone"; + repo = "crownstone-lib-python-core"; + rev = version; + sha256 = "138lignv7c8kkqbqfkdcfpg39gm9x44h7r2j403m4ib7gq420hsn"; + }; + + propagatedBuildInputs = [ + pyaes + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "crownstone_core" + ]; + + meta = with lib; { + description = "Python module with shared classes, util functions and definition of Crownstone"; + homepage = "https://github.com/crownstone/crownstone-lib-python-core"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix new file mode 100644 index 000000000000..ef2e2cbc240c --- /dev/null +++ b/pkgs/development/python-modules/crownstone-sse/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, asynctest +, buildPythonPackage +, certifi +, fetchFromGitHub +, pythonOlder +, coverage +}: + +buildPythonPackage rec { + pname = "crownstone-sse"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "crownstone"; + repo = "crownstone-lib-python-sse"; + rev = version; + sha256 = "0rrr92j8pi5annrfa22k1hggsyyacl9asi9i8yrj4jqdjvwjn2gc"; + }; + + propagatedBuildInputs = [ + aiohttp + asynctest + certifi + ]; + + # Tests are only providing coverage + doCheck = false; + + pythonImportsCheck = [ + "crownstone_sse" + ]; + + meta = with lib; { + description = "Python module for listening to Crownstone SSE events"; + homepage = "https://github.com/crownstone/crownstone-lib-python-sse"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix new file mode 100644 index 000000000000..fd1c2094335c --- /dev/null +++ b/pkgs/development/python-modules/crownstone-uart/default.nix @@ -0,0 +1,41 @@ +{ lib +, crownstone-core +, buildPythonPackage +, pyserial +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "crownstone-uart"; + version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "crownstone"; + repo = "crownstone-lib-python-uart"; + rev = version; + sha256 = "0sdz131vmrfp6hrm9iwqw8mj9qazsxg7b85yadib1122w9f3b1zc"; + }; + + propagatedBuildInputs = [ + crownstone-core + pyserial + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "crownstone_uart" + ]; + + meta = with lib; { + description = "Python module for communicating with Crownstone USB dongles"; + homepage = "https://github.com/crownstone/crownstone-lib-python-uart"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index 09987ddb3bf2..f286cd4a7f02 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cucumber-tag-expressions"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "4ef4e0513d4c26d42299ffed010ed5e24125b87fc64de2e74b979d4a84c8f522"; + sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"; }; checkInputs = [ pytest pytest-html ]; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 6f5373b56bc8..2facff6c840b 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub , sqlalchemy , aiocontextvars -, isPy27 +, aiopg +, pythonOlder , pytestCheckHook , pymysql , asyncpg @@ -13,42 +14,48 @@ buildPythonPackage rec { pname = "databases"; - version = "0.5.0"; - disabled = isPy27; + version = "0.5.3"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-HNSPLmZTXZL1e5E9VJiXnQuO2WiXLYOveNTlFqdlTG8="; + sha256 = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; }; propagatedBuildInputs = [ - aiocontextvars - sqlalchemy - ]; - - checkInputs = [ + aiopg aiomysql aiosqlite asyncpg pymysql + sqlalchemy + ] ++ lib.optionals (pythonOlder "3.7") [ + aiocontextvars + ]; + + checkInputs = [ pytestCheckHook ]; disabledTestPaths = [ - # ModuleNotFoundError: No module named 'aiopg' - "tests/test_connection_options.py" # circular dependency on starlette "tests/test_integration.py" # TEST_DATABASE_URLS is not set. "tests/test_databases.py" + "tests/test_connection_options.py" + ]; + + pythonImportsCheck = [ + "databases" ]; meta = with lib; { description = "Async database support for Python"; homepage = "https://github.com/encode/databases"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 38095ea009df..a719658a509b 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "8.1.13"; + version = "8.1.14"; src = fetchPypi { inherit pname version; - sha256 = "2833679bccd507e3eac9ec931cfae85c8070a78ad1286159475b7d3b79a40dc2"; + sha256 = "8f110955a1a50e46dc03dbd969a8765b9493268153de16704767b226e4fe186e"; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index e19694bcf9c8..b91e26f71467 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "debian-inspector"; - version = "21.5.25"; + version = "30.0.0"; src = fetchPypi { pname = "debian_inspector"; inherit version; - sha256 = "1d3xaqw00kav85nk29qm2yqb73bkyqf185fs1q0vgd7bnap9wqaw"; + sha256 = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 48b5b015b11a..569e2b29631e 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.40"; + version = "0.1.42"; src = fetchPypi { inherit pname version; - sha256 = "385dfb965eca75164d256486c7cf9bae772d24144249fd18b9d15d3cffb70eea"; + sha256 = "a794f4c4ee2318ae7260c2e32dac252b833bdaf6686efc2a1afbc6ecf3f0931f"; }; propagatedBuildInputs = [ chardet six ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 4392a3c2ecf4..183548f5f944 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -4,26 +4,26 @@ , fetchFromGitHub , substituteAll , gdb +, django , flask +, gevent , psutil , pytest-timeout , pytest-xdist , pytestCheckHook , requests -, isPy27 -, django -, gevent +, isPy3k }: buildPythonPackage rec { pname = "debugpy"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - hash = "sha256-ULxVoZuMNDL0Win/+55RnbkCPZ8OI8nhSKshvJOMFQ4="; + sha256 = "sha256-xgxKyqtSqKITwze7DKDdkxZlq1mWM+x4C/eJlUJmYuk="; }; patches = [ @@ -65,30 +65,21 @@ buildPythonPackage rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; + doCheck = isPy3k; checkInputs = [ + django flask + gevent psutil pytest-timeout pytest-xdist pytestCheckHook requests - ] ++ lib.optionals (!isPy27) [ - django - gevent ]; # Override default arguments in pytest.ini pytestFlagsArray = [ "--timeout=0" "-n=$NIX_BUILD_CORES" ]; - disabledTests = lib.optionals isPy27 [ - # django 1.11 is the last version to support Python 2.7 - # and is no longer built in nixpkgs - "django" - - # gevent fails to import zope.interface with Python 2.7 - "gevent" - ]; - pythonImportsCheck = [ "debugpy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index e414d8633502..199894f13201 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "5.5.0"; + version = "5.6.0"; format = "setuptools"; # pypi source does not contain all fixtures required for tests @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = version; - sha256 = "sha256-PQijGub0sAW0aBYI+Ir89SraXaWx7OcQ+txZSqodJ6w="; + sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 332707504a94..bbbf813557b5 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, environs , fetchFromGitHub , poetry-core , pytest-mock @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "2.4.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4Jjkhlv3wK4j2uU8dT11WYuBttlFtg+/ZBrc57UVeao="; + sha256 = "sha256-eza0bu4CcKvDMEq/8y6fW5qXtEFbeB5zk0w75+3Hx4Q="; }; nativeBuildInputs = [ @@ -29,9 +30,10 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook - pytest-vcr + environs pytest-mock + pytest-vcr + pytestCheckHook ]; propagatedBuildInputs = [ @@ -47,7 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "deezer" ]; meta = with lib; { - description = "A friendly Python wrapper around the Deezer API"; + description = "Python wrapper around the Deezer API"; homepage = "https://github.com/browniebroke/deezer-python"; license = licenses.mit; maintainers = with maintainers; [ synthetica ]; diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 7e5105807cfb..9f04f25f4648 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.10.1"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "e4b2bb7b2563c5064ba56dd76441c77e06b850ff1466a386a1cd308909a6c7de"; + sha256 = "f214c938b5872a17647e2b2ccfd9ad00a90a3c6c4aa83fa65d3c5c446e7a66c7"; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 4f4304fd1d6c..00eea271b493 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin peti qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index cc5a1ba01b8f..afb9a8fc46cf 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.12"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "b3fdb4337b1e54b8a23fe41c62d91648e26249f9fc00e882d1d09e16207aa204"; + sha256 = "0013ebe4904521e2fa28f33591a03a7210304d73363e7eadd7cdcf81c12ba003"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index fdd4bd03b705..fc0d0e0921b4 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.1"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08"; + sha256 = "e541a46a0a899ef4778a4708be22e71cac3efacc09a6ff44bc065c5c9194c054"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index ad9afabadf2c..6c54f3ded292 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -1,23 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, django, djangorestframework, pyjwt }: +{ lib +, buildPythonPackage +, django +, djangorestframework +, fetchPypi +, pyjwt +, python-jose +, setuptools-scm +}: buildPythonPackage rec { - pname = "djangorestframework_simplejwt"; + pname = "djangorestframework-simplejwt"; version = "4.8.0"; src = fetchPypi { - inherit pname version; + pname = "djangorestframework_simplejwt"; + inherit version; sha256 = "153c973c5c154baf566be431de8527c2bd62557fde7373ebcb0f02b73b28e07a"; }; - propagatedBuildInputs = [ django djangorestframework pyjwt ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + djangorestframework + pyjwt + python-jose + ]; # Test raises django.core.exceptions.ImproperlyConfigured doCheck = false; + pythonImportsCheck = [ + "rest_framework_simplejwt" + ]; + meta = with lib; { - description = "A minimal JSON Web Token authentication plugin for Django REST Framework"; + description = "JSON Web Token authentication plugin for Django REST Framework"; homepage = "https://github.com/davesque/django-rest-framework-simplejwt"; license = licenses.mit; - maintainers = [ maintainers.arnoldfarkas ]; + maintainers = with maintainers; [ arnoldfarkas ]; }; } diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 808c2916ddd9..fb513a20c654 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -19,6 +19,8 @@ buildPythonPackage { pname = "dogtail"; version = "0.9.11"; + outputs = [ "out" "dev" ]; + # https://gitlab.com/dogtail/dogtail/issues/1 # src = fetchPypi { # inherit pname version; diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix new file mode 100644 index 000000000000..fb3feaae63ee --- /dev/null +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, decorator +, packaging +, pynput +, regex +, lark-parser +, enum34 +, pyperclip +, six +, requests +, psutil +, json-rpc +, werkzeug +, kaldi-active-grammar +, sounddevice +, webrtcvad +, setuptools +, xdotool +, wmctrl +, xorg +}: + +buildPythonPackage rec { + pname = "dragonfly"; + version = "0.32.0"; + + src = fetchFromGitHub { + owner = "dictation-toolbox"; + repo = pname; + rev = version; + sha256 = "BUbIhc8as/DVx8/4VeQS9emOLGcWFujNCxesSEEBqKQ="; + }; + + postPatch = '' + substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark-parser' + substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \ + --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' + substituteInPlace dragonfly/windows/x11_window.py \ + --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \ + --replace 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \ + --replace 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"' + ''; + + propagatedBuildInputs = [ + decorator + packaging + pynput + regex + lark-parser + enum34 + pyperclip + six + requests + psutil + json-rpc + werkzeug + kaldi-active-grammar # for the Kaldi engine + sounddevice + webrtcvad + setuptools # needs pkg_resources at runtime + ]; + + # Too many tests fail because of the unusual environment or + # because of the missing dependencies for some of the engines. + doCheck = false; + + pythonImportsCheck = [ "dragonfly" ]; + + meta = with lib; { + description = "Speech recognition framework allowing powerful Python-based scripting"; + homepage = "https://github.com/dictation-toolbox/dragonfly"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/pkgs/development/python-modules/ecoaliface/default.nix b/pkgs/development/python-modules/ecoaliface/default.nix index e3001d7fa46c..f37a85da7d01 100644 --- a/pkgs/development/python-modules/ecoaliface/default.nix +++ b/pkgs/development/python-modules/ecoaliface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ecoaliface"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1hzx0r3311f952jik3pgmrg74xp5m6w9c5v6snfrb8w2m19vs6qy"; + sha256 = "f17b3452cfd31bb8c3509d59b846889c81db5fb85082c061c32703162cbe9083"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 883ff8bcb61f..f7cdca223078 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "0sxqw1y070cpg7102a6a1bha8s25vwdgfcjp9nzlrzgd2p6pav41"; + sha256 = "0x18l8jgbki9yqx994w97dagfaqrbxi3sy2l2101is1dfjr0kib6"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 5e9492f90412..ee815e53f010 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.13"; + version = "0.5.14"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-Z/5YRvHcZgRuSQnaMbNIT93uSYvRzMWpdMy0M7tD2QI="; + sha256 = "06v9ifpgdfx5v8k8jwqd4y985p27s1wxl7908v3aqxv7203acn7w"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix new file mode 100644 index 000000000000..bc63d577a7ef --- /dev/null +++ b/pkgs/development/python-modules/environs/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, dj-database-url +, dj-email-url +, django-cache-url +, fetchFromGitHub +, marshmallow +, pytestCheckHook +, python-dotenv +, pythonOlder +}: + +buildPythonPackage rec { + pname = "environs"; + version = "9.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "sloria"; + repo = pname; + rev = version; + sha256 = "0n0l9jici2d1pck5pf1c96jj3lhw91jki9nsgxzpikvpyvsw7wga"; + }; + + propagatedBuildInputs = [ + marshmallow + python-dotenv + ]; + + checkInputs = [ + dj-database-url + dj-email-url + django-cache-url + pytestCheckHook + ]; + + pythonImportsCheck = [ + "environs" + ]; + + meta = with lib; { + description = "Python modle for environment variable parsing"; + homepage = "https://github.com/sloria/environs"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index a39205f5aeea..c4f6ecc537bc 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -9,6 +9,7 @@ , pytestCheckHook , pytest-xdist }: + buildPythonPackage rec { pname = "extractcode"; version = "21.7.23"; @@ -36,7 +37,7 @@ buildPythonPackage rec { pytest-xdist ]; - # cli test tests the cli which we can't do until after install + # CLI test tests the cli which we can't do until after install disabledTestPaths = [ "tests/test_extractcode_cli.py" ]; @@ -45,6 +46,7 @@ buildPythonPackage rec { disabledTests = [ "test_uncompress_lz4_basic" "test_extract_tarlz4_basic" + "test_extract_rar_with_trailing_data" # tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox "test_can_extract_qcow2_vm_image_as_tarball" "test_can_extract_qcow2_vm_image_not_as_tarball" @@ -56,7 +58,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A mostly universal archive extractor using z7zip, libarchve, other libraries and the Python standard library for reliable archive extraction"; + description = "Universal archive extractor using z7zip, libarchve, other libraries and the Python standard library"; homepage = "https://github.com/nexB/extractcode"; license = licenses.asl20; maintainers = teams.determinatesystems.members; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index f068c4cb735e..85594a2c4c22 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -13,18 +13,19 @@ , peewee , python-jose , sqlalchemy +, trio }: buildPythonPackage rec { pname = "fastapi"; - version = "0.68.1"; + version = "0.70.0"; format = "flit"; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "sha256-zwfopyig4ImMbkx89l8SsLW8PzoVcDN5KSd7a7fOnms="; + sha256 = "sha256-mLI+w9PeewnwUMuUnXj6J2r/3shinjlwXMnhNcQlhrM="; }; postPatch = '' @@ -48,6 +49,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio sqlalchemy + trio ]; # disabled tests require orjson which requires rust nightly diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 984a3743f0b3..f656e260867a 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "8680ee25238e2307596eb3900a0f8c0d9cc91189146ed8039544f1a3a69dfe6e"; + sha256 = "f491c47bb2d74fa157f9d127a1cbb2753a15939a21e78ba8b0bd323d7d101c61"; }; propagatedBuildInputs = [ six cryptography ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 0110db18c4c3..e40e7e37bbbc 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.5") [ typing ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + # Tests fail on Python 3.7 due to importlib using a deprecated interface + doCheck = !(pythonOlder "3.8"); + # fixtures fail to initialize correctly checkPhase = '' py.test tests --ignore=tests/integration/test_checker.py diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 22be871f745f..3b9c9b4a0678 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "4.3.0"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "6e2b40d548b9dfc6051740c4552c097ac38e514e500c16c682d9a533d17ca418"; + sha256 = "ad6977b07c54e51c13b5981afc246868b9901a46715d9b9827898bfd916aae88"; }; propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix index 301b16035396..d44c8841f923 100644 --- a/pkgs/development/python-modules/flufl/bounce.nix +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "flufl.bounce"; - version = "3.0.2"; + version = "4.0"; buildInputs = [ nose2 ]; propagatedBuildInputs = [ atpublic zope_interface ]; src = fetchPypi { inherit pname version; - sha256 = "5014b23248fce72b13143c32da30073e6abc655b963e7739575608280c52c9a7"; + sha256 = "25504aeb976ec0fe5a19cd6c413a3410cb514fdcdbdca9f9b5d8d343a8603831"; }; } diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index b757585e40d7..f9c5c8f1efe8 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "flufl.i18n"; - version = "3.1.5"; + version = "3.2"; propagatedBuildInputs = [ atpublic ]; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b7016000a4d9d366866e776947b777dbe2b1532c990efeef58922b3e7bcab36e"; + sha256 = "c35c8f8eab66adb7fd64a1420860105066d2b36cb655b33ffb14afe8e223ed62"; }; } diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 792af5a6c725..e63af005de31 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "flufl.lock"; - version = "5.1"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "1ylahys50vaj7iw6dhlx3gg7vs8cms9sbyvscd06clnk6lqk78ad"; + sha256 = "fc748ee609ec864b4838ef649dbd1170fa79deb0c213c2fd51151bee6a7fc242"; }; propagatedBuildInputs = [ atpublic psutil ]; diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 64eafed6c198..eb4a226f26c2 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -1,23 +1,44 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, aiohttp, zigpy -, pytest, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, webcolors +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "flux_led"; - version = "0.22"; - disabled = isPy27; + version = "0.24.9"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "1zgajlkhclyrqhkmivna4ha2lyvfpk5929s042gy59p7mzpkvjx7"; + sha256 = "sha256-U2Z7fsXO5Wb4WmcOOXm+6zmk+7pLcUxz/a5/QtWwC2Y="; }; + propagatedBuildInputs = [ + webcolors + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ + "flux_led" + ]; + meta = with lib; { - description = "A Python library to communicate with the flux_led smart bulbs"; + description = "Python library to communicate with the flux_led smart bulbs"; homepage = "https://github.com/Danielhiversen/flux_led"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ colemickens ]; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 5cb1bac87887..1c4145df14e4 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.7.0"; + version = "1.7.1"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = version; - sha256 = "sha256-1HzeNtSqzqr9zyxF1PVWi6QfRupw8huMYmdFI6rzIdY="; + sha256 = "sha256-yrkFtvGXkeHD5hp0Fzz3M1hsuSIt6bQriyUy4NagD0U="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index e3def747f03b..34660645b596 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.1.1"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "07z33vid7s8fjwvybyn8357yvs0f6nlhizv1l3qj1bczi3jbdkbh"; + sha256 = "sha256-rTbekdceC5QK0aiySi/4QUwaEoDfTlLrx2t6Kb9bH7U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index c584ce433287..956c7da93580 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "furo"; - version = "2021.9.22"; + version = "2021.10.9"; format = "flit"; disable = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-749l6cXyGbIarXXJmiCU0DsWQwrvH1dobOGePyT5VK8="; + sha256 = "sha256-K6pCoi7ePm6Vxhgqs2S6wuwVt5vH+cp/sJ/ZrsSzVAw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix new file mode 100644 index 000000000000..ac0ee8038582 --- /dev/null +++ b/pkgs/development/python-modules/git-filter-repo/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "git-filter-repo"; + version = "2.33.0"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nxfd5yv8ri7w5pzxclxs0yd317nsdcwvw87ancmdkh69xvx1f2f"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "git_filter_repo" + ]; + + meta = with lib; { + description = "Quickly rewrite git repository history"; + homepage = "https://github.com/newren/git-filter-repo"; + license = with licenses; [ mit /* or */ gpl2Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index e53346510dec..b434a92923cb 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vZ6wcJ9OEN1v3bMv0HiKGQtDRCbCWL5uAO9A2hNtdo0="; + sha256 = "sha256-XsJ7lCs00EVZy/NnRDC7g/w9dOfTK4u9McRGbnF0C4M="; }; propagatedBuildInputs = [ 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 45d6044b8ea7..b612a58c4f9e 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.18.0"; + version = "2.25.0"; src = fetchPypi { inherit pname version; - sha256 = "a25661ec6cf4c159f41fe9c061c2bee31b2dddaf2ad787e23617048a25b53842"; + sha256 = "sha256-dNgF7xC4sfWL04U53T0D+vEYj2TuPKQorAQtU59fVcc="; }; # No tests included in archive diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 940d04e5a413..1d23af5a3d46 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.5"; + version = "0.4.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SrWObD3GzPES+SH8ztQOVCb7omZ2iYbqUCIoSIJ26ro="; + sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index c10e3807f200..69cd26625093 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.0.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6hrwULPgbrc+RHD3BNIwBzB7wOh8E+AV9rkEYPFAe9M="; + sha256 = "sha256-KAD2360pxs7V+vnKDDjqi6Hr4lWbEMApvQIePeMwFic="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 8f9570530911..0bfd6945b128 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.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9d31647238a8ee05abd0a860bf333ccdda3d6540059fbf3c75c28cf58ee8dc4e"; + sha256 = "f10760c7df7052e63a79547b36fb439ab8a0f72fe28ff8356a0755c45ab75412"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 18c427a75f92..8a48df97f97d 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "4aa14659d1b406d98b7d39f5d7b9399c4eaeb0c0b9f669fe51a5ac45a28b784e"; + sha256 = "48b8081700eeaa92f8921d5aff6a5287c0eb47a3cc483f2032105290ce0454b5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index f7a567357310..98ff29921d0e 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.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c3zlpCejXB/RO8RnyFUpDknefpoMZWXWgaS7ACpqdAw="; + sha256 = "c360f40f4c63e16ae6dfe701892bb74a1055169e58f1ef39136809eecf73264e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index a89c7eba6904..9caa65ae1f93 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.3.4"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "e0beee002f435236bf8026872ce34bd03c9d4f91467c79fc5e7cde591bd15596"; + sha256 = "672a86089093e94ccbb3f95dd315f1152ecd239cfab49e1963d217929bab3bcc"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; 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 9e46a9ecf3c4..60aea98d9b01 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.2.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2dc15be4fdcd574c23124bfc0a678c864581038c96b86275c7b41d9fced06534"; + sha256 = "a85d11c28733792ee55218fce7786f51fdd013c79ff1d92531ffd50a8a51692c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 89d0c1f873dc..b96d61bf6724 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.26.0"; + version = "2.28.1"; src = fetchPypi { inherit pname version; - sha256 = "15ca1f9c8165b584c2d593620354cd3b17c007e87cfd1abd1eebd2c08eb5d109"; + sha256 = "sha256-DiNT2X5SktyM5URHtxL7nolJbnFLXKz8PVNmFNHEYdw="; }; propagatedBuildInputs = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" - "test_query_retry_539" + "test_arrow_extension_types_same_for_storage_and_REST_APIs_894" "test_query_retry_539" "test_list_rows_empty_table" "test_list_rows_page_size" diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 15f496c99182..c388429e56a7 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.8.1"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "dc0302b1fa4a435ffd97c13d669ed5b1a60c5a0a21d5528418466ca54d0cd4d5"; + sha256 = "3804e37865b4d63ac39eac3f8f184225db16bbc69f201b4d54abe6b68f170e60"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index a51ed3840207..657fe314b94e 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 = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kO6ZZIzPnhGhZ4Gn/FjRPlj2YrQ5xzfUjCTvGGYsJwI="; + sha256 = "sha256-NaH18CqG4PouKMZp8NtKdtkoZxoo+7u0k6tZup0cuak="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 6e9bf1aa29e1..74410ea129df 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.4.2"; + version = "3.4.3"; src = fetchPypi { inherit pname version; - sha256 = "f16ff1bb49ff760cdc0ff30bbc352f0c27b8bdd2ba76d8bf22e0fd9af3a2ca16"; + sha256 = "1b0f7bb8aaf8a3e0f4b4509808ee9e1de77b5f076214b0b3e52e0ce86734fd84"; }; propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 718c5998a34e..1ea514ef9ecd 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.5.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wRGIuut2mJ6RJh8fRUAT0JDmnUreQYXhgVgsfRxvyxo="; + sha256 = "sha256-a81HBeNoLXSpJJJ0BBqJz24ls0TFMwiHJgkkNyHZGvo="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; @@ -30,12 +30,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "google.cloud.dataproc" "google.cloud.dataproc_v1" - "google.cloud.dataproc_v1beta2" ]; meta = with lib; { description = "Google Cloud Dataproc API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-dataproc"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index a433ccdc69c9..f4b6301f218a 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -7,19 +7,20 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pytz , mock }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.2.2"; + version = "3.2.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZxGWTsqCIvpTSN+aThVgjPuMJE7hHMVn4zsidpXk7xk="; + sha256 = "sha256-5Z4/jUXyBlC1vpuwS7dPrTRFw1lqf+GGjm2fqFfIOjQ="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 05b2d954c4b8..3ce93893a940 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.33.1"; + version = "0.34.0"; src = fetchPypi { inherit pname version; - sha256 = "e4aa73fc6ca22764fd7294de19b602dff084d924c77366c136fb9c28e70ae739"; + sha256 = "bd75d6e9fd456ce643ee936a113a1ead5405704515caa679db30d7f036e447f3"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index e9bf6f82d021..3e1a1c93bfb4 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.2.3"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5a7d742ab1c94525a68c75c94ccb7af3f19759627ebe7869fe16db158f0eba4e"; + sha256 = "a5482a7b05ac3be13a3d96db32d158cb4cebf0ac35c82c3a27ee2fd9aa0dcc25"; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index f476dcea7a43..50a08e66f360 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.3.3"; + version = "2.3.4"; src = fetchPypi { inherit pname version; - sha256 = "ef7572cbc83412dbc9cadd95962e77bfa9962a5cb030706638a4aafa7cad84aa"; + sha256 = "sha256-cU4bwfxRAp14qmSTO+8u/APa7clWXqeeyRuEOwUgFuw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 9cc1d8252eed..d461392705f2 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.3"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5d1847f44a23a2fba815cbfbe7391a0364fd6a5c088fcd5f5a09d454aad8cc7c"; + sha256 = "3d4fb605d2611586a66d16d02803fcb306331f21351b16497ee8c40753be3a27"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 702deeb6eb61..da0fab4ce96f 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.3.2"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c59ceebe2ff5d45a7367ddbe1a702bbbb010d6d3423d278797835d59e885fa50"; + sha256 = "c5002e29febdd6c63a842e30709fa597742dae82181d8b062fe849d7d638047c"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 2264cb74824e..203102cafb9a 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.6.1"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "ccf90b2a14098258648364dc16a0a58a3d281b8c7c6050fb9c05640c3809e7bb"; + sha256 = "bedd376807ab3dde08f2d92caa0e4e5ad7c2ccfc7069561e80964b998a0d8f51"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 140f5be3cf77..ec3125926def 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.2.2"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X8lh+90HyyktxgJiRaiJF9ExKHmgiVcQiYDotg3AqaQ="; + sha256 = "feb7e04fc1e70ca6faf1b0b517ff1be644125283c54b24dd698f985afde6a2bf"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 938c97689aaa..1ebb1fa6332e 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.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "f8b3842fd11965a3872622988359a21bff62bd1b7b9be3ccf095b7ae2f4c796f"; + sha256 = "47feb2e635ef79af98696eb22a5af1db8a78b3a2919e39bdec65ba45659b59ac"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 95142cc6a5e9..f96ce0a8f91e 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e5489dffc6b6558125e548bc8c5be78f13d11bb9916470992816e6ed66a9d7fb"; + sha256 = "8ad50ce9145c3b477536752785635295c318b2b123bc9d251020cc1cfe98b131"; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 5dc2f5eeadf9..8b9f98a1b3f6 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.5.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "4dc498d6fede223049c415f301ba1129ecaf628f31a77ae87d2678e6d71556f6"; + sha256 = "204ecbe480e5e5abc17752ac2ac17877e0325f31ed7e57f019724c3041ecc1fa"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 6ee8ccc3e963..d7c389bb8640 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.2.3"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "2a95ad2d99cfc480513bfaf6b301829446a0f50503d07f54524873d723e585b7"; + sha256 = "3b53fde67a97718642d29ac26b1b7608e7581b37d1e468f3c2ae38ea6cf7308f"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 91a1e354acca..fb581ee0c604 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.6"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "3f333aa1f6a47cb5a38f3416c4ac9a4bbeaceeb1f3f2381fef9553c9fb665cc7"; + sha256 = "cc85e5de7cdb58a27561885021ee6fcf1d9f89e0f0db7c371bdca9c54788dd15"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 74fb1f1e01b2..404a51529934 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.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "5ac6bad2506d21e9176dcc1afd74cd9c87209c40e85cd2a03bb0421f76b7fa77"; + sha256 = "7321a88191d61ca0cc720b7ad07d9693e07726728492739930562bcd33ec1494"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 90ec3078d24e..849f1ea6ef94 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.9.3"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "52b8a056f26e9ed082576b7b173c9a86f286a12c2883ec7cf5a0e8be68020bac"; + sha256 = "bc85ae6694c9a1e02046364776b9f2401a3826ddc7b532b32c316559ff4f1afa"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index be3abb363711..5ad4c2a31f66 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.42.1"; + version = "1.42.3"; src = fetchPypi { inherit pname version; - sha256 = "b37ec5b0cd69aacb09270674c4c14873898cbc77624d17fef41ec0cb08004866"; + sha256 = "sha256-d1TU3KpFl1UUtATs4NortCkqy8Z8pVmmnhKhnVT82wY="; }; propagatedBuildInputs = [ @@ -56,9 +56,12 @@ buildPythonPackage rec { "tests/system/test_kms_integration.py" ]; - # prevent google directory from shadowing google imports preCheck = '' + # prevent google directory from shadowing google imports rm -r google + + # requires docker and network + rm tests/conformance/test_conformance.py ''; pythonImportsCheck = [ "google.cloud.storage" ]; diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 138637d70a7b..45999fb332bb 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.5.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "af870971187b3d58fc87a81323cabec1628fac910c6af82076dd6270b111f17e"; + sha256 = "fd9fe318063ec0f7e4e1780aca81a798d3e90e8def1c24b6f450ea1a8c131c0a"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 201e0ce821f9..9adb5df95974 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.5.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2672f5caf518105fe9389269efd59a0761ad48b8140e68bac3f6a5062be9d8a4"; + sha256 = "d24dec1ee71bb63a7f6805b2d78923b2325de59407b4688978b7769bbafc3eb8"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 697489602daf..43b35ca1988d 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.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "7da158734db646867deb125c144a7a1692a48a134692c4dc54ba420f89db64ae"; + sha256 = "49c91574e04d52fc7c0fade95dd5e6ccb51190ab8b419352d008a617c7799879"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 942c100a5964..e405c43e90f2 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.3.3"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bb3a98b5b8044be80c5fdbd76e7acd9b9bdd6026729a53eae9692a9a6c6683ef"; + sha256 = "92dd4f1e87b02ab414ad744eefa321e079358527cb8c352e1054ae1dab5f1055"; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index b3952f222fe8..e6b88e727fa5 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.4.3"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "4a7b1c025baedae220abef612dc01b822665e5db83d680d9a31be4e0a8490e3a"; + sha256 = "e56e35fa647d794429c6fc1595b2ebf5f4d627f0b3d6499a000b54be343ea37e"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 5b2e86b5fb58..9e0086f3e202 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "0.11.8"; + version = "0.11.9"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = version; - sha256 = "1n46klbhl0gpd5x995mrcr1qfd77hrfm501qns1zhvv0zk8mdsf4"; + sha256 = "sha256-fyIx/w+jKIscPGbK6LqjMtjy43qJtzzITwtUeNurE+o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 8891b513421a..e781c2127dab 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "2.4.2"; + version = "2.5.0"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "1yv84girmqm155yjhhkiy1gdflf62110m2kgjiv4vcsjpy2i6has"; + sha256 = "0zw3ihbzkldwijz9phwivnzwylj30a2a4lknfbwm6vkx78rdrb1a"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix index b9db312d8716..df409599cd1f 100644 --- a/pkgs/development/python-modules/guppy3/default.nix +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "guppy3"; - version = "3.1.1"; + version = "3.1.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "zhuyifei1999"; repo = pname; rev = "v${version}"; - sha256 = "14iwah1i4dcn74zjj9sq3av1yh9q5nvgqwccnn71blp7gxcnxnvh"; + sha256 = "sha256-f7YpaZ85PU/CSsDwSm2IJ/x2ZxzHoMOVbdbzT1i8y/w="; }; propagatedBuildInputs = [ tkinter ]; diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 6c946b826252..8d3d4f240bd5 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -43,7 +43,14 @@ buildPythonPackage rec { }) ]; - pythonImportsCheck = [ "gvmtools" ]; + disabledTests = [ + # Don't test sending + "SendTargetTestCase" + ]; + + pythonImportsCheck = [ + "gvmtools" + ]; meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 39d7429e8106..c58e50bee868 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.1.0"; + version = "4.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "sha256-vUbcsG6mKPgH+IF5i/BYSIkfIizSZzMWz0Kq0yfuKxE="; + sha256 = "sha256-G4KL6iMeVn/tmvFtFL8vyqHGNfqk6j8iG4tDK9VpCyM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index b3165a7e3c02..e746c4c24850 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "1qdvm1bnn7x2mf4fq997gvq6a5901ndhd2s75h92zsgmlcp7rc77"; + sha256 = "sha256-mtn/r6pvHeGMLkvUP4w6CT+2+viLna4Vvn9RFMEmqts="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 00791ac642f0..70b1a1fe5276 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.3"; + version = "10.4.0"; src = fetchPypi { inherit pname version; - sha256 = "ca3b0ae45a2c3a811c0dc39153b8a1ea8a5c8f786c56370a41dfd83a5bff2502"; + sha256 = "64fd249a7fcabea60953fc3e7f08da6a85960aca367c04d078b999b7f6fd0246"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 1b4996f4cb47..a95d4816c497 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.5"; + version = "1.14.6"; src = fetchPypi { inherit pname version; - sha256 = "268e07c09012d24233d8957f0207b9aec33000b639e661ca50e68458d735e6be"; + sha256 = "3a25c4fe3195fdc4639461abbfa5a8bebce8ab737674b6673da2236a901cfefd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix index 7870247e2fdf..bc4ddc0e0b56 100644 --- a/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/pkgs/development/python-modules/homepluscontrol/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "homepluscontrol"; - version = "0.0.61"; + version = "0.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "chemaaa"; repo = pname; rev = version; - sha256 = "1g61xj417dz1nz5g5ic8rs34fp424zvbgsymry1zldg3gskaqgvk"; + sha256 = "sha256-COOGqfYiR4tueQHXuCvVxShrYS0XNltcW4mclbFWcfA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index cc7572499da1..741fd996ffdc 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.11.3"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; + sha256 = "ff3e8675a982f7754359ec598329ba5635014e2bfd51573b9413605849ef314a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index fdf490e7cb2d..289099dbb0e9 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.7"; + version = "4.0.8"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "0fc18d87f66e0b5da84fa731389496cfe18e4c21304e8f6713556b2e8724a7a4"; + sha256 = "7508a92b4e36049777640b0ae393e7219a16488d852841a0e57b44fe51d9f848"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 2eedaaece690..33816631584e 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { "-DOPENCOLLADA_LIBRARY_DIR=${opencollada}/lib/opencollada" "-DSWIG_EXECUTABLE=${swig}/bin/swig" "-DLIBXML2_INCLUDE_DIR=${libxml2.dev}/include/libxml2" - "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/${if stdenv.isDarwin then "libxml2.dylib" else "libxml2.so"}" + "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 3e36b4dd8e2d..fc1cb34d32c6 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -1,4 +1,10 @@ -{ buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests, fetchpatch, fetchPypi +{ buildPythonPackage +, lib +, fetchFromGitHub +, isPy27 +, nixosTests +, fetchpatch +, fetchPypi , alembic , aniso8601 , Babel @@ -12,7 +18,6 @@ , flask_mail , flask_migrate , flask-restful -, flask_script , flask_sqlalchemy , flask_wtf , debts @@ -25,7 +30,9 @@ , pytz , six , sqlalchemy +, sqlalchemy-utils , sqlalchemy-continuum +, sqlalchemy-i18n , werkzeug , wtforms , psycopg2 # optional, for postgresql support @@ -36,6 +43,7 @@ # ihatemoney is not really a library. It will only ever be imported # by the interpreter of uwsgi. So overrides for its depencies are fine. let + # fixed in next release, but patches don't apply # https://github.com/spiral-project/ihatemoney/issues/567 pinned_wtforms = wtforms.overridePythonAttrs (old: rec { pname = "WTForms"; @@ -45,7 +53,19 @@ let sha256 = "0q9vkcq6jnnn618h27lx9sas6s9qlg2mv8ja6dn0hy38gwzarnqc"; }; }); - pinned_flask_wtf = flask_wtf.override { wtforms = pinned_wtforms; }; + + # sqlalchemy-continuum requires sqlalchemy < 1.4 + pinned_sqlalchemy = sqlalchemy.overridePythonAttrs ( + old: rec { + pname = "SQLAlchemy"; + version = "1.3.24"; + + src = fetchPypi { + inherit pname version; + sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb"; + }; + } + ); in buildPythonPackage rec { @@ -73,6 +93,9 @@ buildPythonPackage rec { url = "https://github.com/spiral-project/ihatemoney/commit/8d77cf5d5646e1d2d8ded13f0660638f57e98471.patch"; sha256 = "0y855sk3qsbpq7slj876k2ifa1lccc2dccag98pkyaadpz5gbabv"; }) + # backported from current master + # remove dependency on flask-script, which removed support on some features ihm used to need + ./remove_flask_script.patch ]; postPatch = '' @@ -81,7 +104,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - alembic aniso8601 Babel blinker @@ -92,11 +114,18 @@ buildPythonPackage rec { flask-babel flask-cors flask_mail - flask_migrate + ( + flask_migrate.override { + flask_sqlalchemy = flask_sqlalchemy.override { + sqlalchemy = pinned_sqlalchemy; + }; + alembic = alembic.override { + sqlalchemy = pinned_sqlalchemy; + }; + } + ) flask-restful - flask_script - flask_sqlalchemy - pinned_flask_wtf + (flask_wtf.override { wtforms = pinned_wtforms; }) idna itsdangerous jinja2 @@ -105,8 +134,29 @@ buildPythonPackage rec { python-dateutil pytz six - sqlalchemy - sqlalchemy-continuum + ( + ( + sqlalchemy-continuum.override { + sqlalchemy = pinned_sqlalchemy; + sqlalchemy-utils = sqlalchemy-utils.override { + sqlalchemy = pinned_sqlalchemy; + }; + sqlalchemy-i18n = sqlalchemy-i18n.override { + sqlalchemy = pinned_sqlalchemy; + sqlalchemy-utils = sqlalchemy-utils.override { + sqlalchemy = pinned_sqlalchemy; + }; + }; + flask_sqlalchemy = flask_sqlalchemy.override { + sqlalchemy = pinned_sqlalchemy; + }; + } + ).overridePythonAttrs ( + old: { + doCheck = false; + } + ) + ) werkzeug pinned_wtforms psycopg2 @@ -114,7 +164,8 @@ buildPythonPackage rec { ]; checkInputs = [ - flask_testing pytestCheckHook + flask_testing + pytestCheckHook ]; pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ]; @@ -134,5 +185,3 @@ buildPythonPackage rec { maintainers = [ maintainers.symphorien ]; }; } - - diff --git a/pkgs/development/python-modules/ihatemoney/remove_flask_script.patch b/pkgs/development/python-modules/ihatemoney/remove_flask_script.patch new file mode 100644 index 000000000000..dac59680a09c --- /dev/null +++ b/pkgs/development/python-modules/ihatemoney/remove_flask_script.patch @@ -0,0 +1,284 @@ +commit 4d831ba2316d54f4916fb9d1160ec7a3856b47d4 +Author: Glandos +Date: Sun Jun 6 14:30:52 2021 +0200 + + remove usage of Flask-Script + + Use flask.cli instead with compatibility layer for existing commands, + such as "runserver". + + cherry-pick from 74e222f1a1cbfc2fac102fefc1115e9d0a6586dc + +diff --git a/Makefile b/Makefile +index a681709..90ab1bb 100644 +--- a/Makefile ++++ b/Makefile +@@ -38,7 +38,7 @@ update: remove-install-stamp install ## Update the dependencies + .PHONY: serve + serve: install ## Run the ihatemoney server + @echo 'Running ihatemoney on http://localhost:5000' +- $(PYTHON) -m ihatemoney.manage runserver ++ $(PYTHON) -m ihatemoney.manage run + + .PHONY: test + test: install-dev ## Run the tests +diff --git a/docs/installation.rst b/docs/installation.rst +index 4994499..4df70a2 100644 +--- a/docs/installation.rst ++++ b/docs/installation.rst +@@ -59,7 +59,7 @@ Test it + + Once installed, you can start a test server:: + +- ihatemoney runserver ++ ihatemoney run + + And point your browser at `http://localhost:5000 `_. + +diff --git a/ihatemoney/manage.py b/ihatemoney/manage.py +index a192844..805a07f 100755 +--- a/ihatemoney/manage.py ++++ b/ihatemoney/manage.py +@@ -5,8 +5,8 @@ import os + import random + import sys + +-from flask_migrate import Migrate, MigrateCommand +-from flask_script import Command, Manager, Option ++import click ++from flask.cli import FlaskGroup + from werkzeug.security import generate_password_hash + + from ihatemoney.models import Project, db +@@ -14,31 +14,48 @@ from ihatemoney.run import create_app + from ihatemoney.utils import create_jinja_env + + +-class GeneratePasswordHash(Command): ++@click.group(cls=FlaskGroup, create_app=create_app) ++def cli(): ++ """IHateMoney Management script""" + +- """Get password from user and hash it without printing it in clear text.""" + +- def run(self): +- password = getpass.getpass(prompt="Password: ") +- print(generate_password_hash(password)) +- +- +-class GenerateConfig(Command): +- def get_options(self): +- return [ +- Option( +- "config_file", +- choices=[ +- "ihatemoney.cfg", +- "apache-vhost.conf", +- "gunicorn.conf.py", +- "supervisord.conf", +- "nginx.conf", +- ], +- ) ++@cli.command( ++ context_settings={"ignore_unknown_options": True, "allow_extra_args": True} ++) ++@click.pass_context ++def runserver(ctx): ++ """Deprecated, use the "run" command instead""" ++ click.secho( ++ '"runserver" is deprecated, please use the standard "run" flask command', ++ fg="red", ++ ) ++ run = cli.get_command(ctx, "run") ++ ctx.forward(run) ++ ++ ++@click.command(name="generate_password_hash") ++def password_hash(): ++ """Get password from user and hash it without printing it in clear text.""" ++ password = getpass.getpass(prompt="Password: ") ++ print(generate_password_hash(password)) ++ ++ ++@click.command() ++@click.argument( ++ "config_file", ++ type=click.Choice( ++ [ ++ "ihatemoney.cfg", ++ "apache-vhost.conf", ++ "gunicorn.conf.py", ++ "supervisord.conf", ++ "nginx.conf", + ] ++ ), ++) ++def generate_config(config_file): ++ """Generate front-end server configuration""" + +- @staticmethod + def gen_secret_key(): + return "".join( + [ +@@ -49,59 +66,33 @@ class GenerateConfig(Command): + ] + ) + +- def run(self, config_file): +- env = create_jinja_env("conf-templates", strict_rendering=True) +- template = env.get_template("%s.j2" % config_file) ++ env = create_jinja_env("conf-templates", strict_rendering=True) ++ template = env.get_template(f"{config_file}.j2") + +- bin_path = os.path.dirname(sys.executable) +- pkg_path = os.path.abspath(os.path.dirname(__file__)) ++ bin_path = os.path.dirname(sys.executable) ++ pkg_path = os.path.abspath(os.path.dirname(__file__)) + +- print( +- template.render( +- pkg_path=pkg_path, +- bin_path=bin_path, +- sys_prefix=sys.prefix, +- secret_key=self.gen_secret_key(), +- ) ++ print( ++ template.render( ++ pkg_path=pkg_path, ++ bin_path=bin_path, ++ sys_prefix=sys.prefix, ++ secret_key=gen_secret_key(), + ) +- +- +-class DeleteProject(Command): +- def run(self, project_name): +- demo_project = Project.query.get(project_name) +- db.session.delete(demo_project) ++ ) ++ ++ ++@cli.command() ++@click.argument("project_name") ++def delete_project(project_name): ++ """Delete a project""" ++ project = Project.query.get(project_name) ++ if project is None: ++ click.secho(f'Project "{project_name}" not found', fg="red") ++ else: ++ db.session.delete(project) + db.session.commit() + + +-def main(): +- QUIET_COMMANDS = ("generate_password_hash", "generate-config") +- +- exception = None +- backup_stderr = sys.stderr +- # Hack to divert stderr for commands generating content to stdout +- # to avoid confusing the user +- if len(sys.argv) > 1 and sys.argv[1] in QUIET_COMMANDS: +- sys.stderr = open(os.devnull, "w") +- +- try: +- app = create_app() +- Migrate(app, db) +- except Exception as e: +- exception = e +- +- # Restore stderr +- sys.stderr = backup_stderr +- +- if exception: +- raise exception +- +- manager = Manager(app) +- manager.add_command("db", MigrateCommand) +- manager.add_command("generate_password_hash", GeneratePasswordHash) +- manager.add_command("generate-config", GenerateConfig) +- manager.add_command("delete-project", DeleteProject) +- manager.run() +- +- + if __name__ == "__main__": +- main() ++ cli() +diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py +index b27fafc..23f19a6 100644 +--- a/ihatemoney/tests/tests.py ++++ b/ihatemoney/tests/tests.py +@@ -15,7 +15,7 @@ from sqlalchemy import orm + from werkzeug.security import check_password_hash, generate_password_hash + + from ihatemoney import history, models, utils +-from ihatemoney.manage import DeleteProject, GenerateConfig, GeneratePasswordHash ++from ihatemoney.manage import delete_project, generate_config, password_hash + from ihatemoney.run import create_app, db, load_configuration + from ihatemoney.versioning import LoggingMode + +@@ -2157,28 +2157,24 @@ class CommandTestCase(BaseTestCase): + - raise no exception + - produce something non-empty + """ +- cmd = GenerateConfig() +- for config_file in cmd.get_options()[0].kwargs["choices"]: +- with patch("sys.stdout", new=io.StringIO()) as stdout: +- cmd.run(config_file) +- print(stdout.getvalue()) +- self.assertNotEqual(len(stdout.getvalue().strip()), 0) ++ runner = self.app.test_cli_runner() ++ for config_file in generate_config.params[0].type.choices: ++ result = runner.invoke(generate_config, config_file) ++ self.assertNotEqual(len(result.output.strip()), 0) + + def test_generate_password_hash(self): +- cmd = GeneratePasswordHash() +- with patch("sys.stdout", new=io.StringIO()) as stdout, patch( +- "getpass.getpass", new=lambda prompt: "secret" +- ): # NOQA +- cmd.run() +- print(stdout.getvalue()) +- self.assertEqual(len(stdout.getvalue().strip()), 189) ++ runner = self.app.test_cli_runner() ++ with patch("getpass.getpass", new=lambda prompt: "secret"): ++ result = runner.invoke(password_hash) ++ print(result.output.strip()) ++ self.assertEqual(len(result.output.strip()), 102) + + def test_demo_project_deletion(self): + self.create_project("demo") + self.assertEquals(models.Project.query.get("demo").name, "demo") + +- cmd = DeleteProject() +- cmd.run("demo") ++ runner = self.app.test_cli_runner() ++ runner.invoke(delete_project, "demo") + + self.assertEqual(len(models.Project.query.all()), 0) + +diff --git a/setup.cfg b/setup.cfg +index d493717..48e447c 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -31,7 +31,6 @@ install_requires = + Flask-Mail==0.9.1 + Flask-Migrate==2.5.3 + Flask-RESTful==0.3.8 +- Flask-Script==2.0.6 + Flask-SQLAlchemy==2.4.1 + Flask-WTF==0.14.3 + WTForms==2.2.1 +@@ -51,8 +50,12 @@ dev = + zest.releaser==6.20.1 + + [options.entry_points] ++flask.commands = ++ generate_password_hash = ihatemoney.manage:password_hash ++ generate-config = ihatemoney.manage:generate_config ++ + console_scripts = +- ihatemoney = ihatemoney.manage:main ++ ihatemoney = ihatemoney.manage:cli + + paste.app_factory = + main = ihatemoney.run:main diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 204e3e93b8d3..48557d34bc86 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-OKEinKhLIR13gtHWWtclGpeBvyT29kl8c4x1X8/tVVI="; + sha256 = "sha256-qs9YZQPWET5Tv7A8hcheVGw4RBOlbBXd0I7lHIZEeaI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 306d242d68a3..3faf61d169be 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.8.3"; + version = "2.8.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8e22d81a53ce3316f0253bf0b7831bd72ac1122ca78896c2ee2e585178c5c9ae"; + sha256 = "4b09189f3094896cfc68596adc95b7f1d92772e1de1424e5dc4dd81def56e8b0"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index b45b852f85fc..6979f848055b 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.2.0"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - sha256 = "sha256-Jf7ad3ImPfEvCBrUZ1NVXMCBqwLmd0hwpKfe9rVsehc="; + sha256 = "sha256-z04xxoCw0eBtkt++y/1yUsAPaLlAGUtWBdRBM74ul1c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix index 1aac6dad0126..0e9cb91ded9e 100644 --- a/pkgs/development/python-modules/inifile/default.nix +++ b/pkgs/development/python-modules/inifile/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "inifile"; - version = "0.3"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0zgd53czc1irwx6b5zip8xlmyfr40hz2pd498d8yv61znj6lm16h"; + sha256 = "d9e5eb4708ebf13353c4cfce798ad47890a8bcc5fbae04630223d15d79f55e96"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index d884e7ff45cc..a3d603a13d42 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.0.2"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f963e90671fec51d1b248862a9bcc4639c1d6d3b1dbc1ee34d042cb765d8730a"; + sha256 = "0d6eab99067e935336289c564caab541209ddd5e951a111f604b1ec92c710b84"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 9b34a4c441d4..80b0349ed58d 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "6.0.1"; + version = "6.0.3"; src = fetchPypi { inherit pname version; - sha256 = "6939e47806a39330a9f9772bf9ea910da39abc159ff2579d454a763358553439"; + sha256 = "1775bfcad5de275a540a36720c5ab34594ea1dbe7ffefa32099b0129c5604608"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch b/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch new file mode 100644 index 000000000000..4ebe5472b44a --- /dev/null +++ b/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch @@ -0,0 +1,156 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 66e6d49..78f7b42 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,23 +1,6 @@ + cmake_minimum_required(VERSION 3.13.0) + project(kaldi_binaries) + +-include(ExternalProject) +-include(ProcessorCount) +- +-ProcessorCount(NCPU) +-if(NOT NCPU EQUAL 0) +- set(MAKE_FLAGS -j${NCPU}) +-endif() +- +-set(DST ${PROJECT_SOURCE_DIR}/kaldi_active_grammar/exec) +-if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") +- set(DST ${DST}/macos/) +-elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") +- set(DST ${DST}/linux/) +-else() +- set(DST ${DST}/windows/) +-endif() +- + set(BINARIES + tools/openfst/bin/fstarcsort${CMAKE_EXECUTABLE_SUFFIX} + tools/openfst/bin/fstcompile${CMAKE_EXECUTABLE_SUFFIX} +@@ -29,63 +12,6 @@ set(LIBRARIES + src/lib/libkaldi-dragonfly${CMAKE_SHARED_LIBRARY_SUFFIX} + ) + +-# For MacOS, we handle all the "indirect" shared libraries manually. +-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") +- list(APPEND LIBRARIES +- tools/openfst/lib/libfst${CMAKE_SHARED_LIBRARY_SUFFIX} +- tools/openfst/lib/libfstscript${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-base${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-chain${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-cudamatrix${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-decoder${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-feat${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-fstext${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-gmm${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-hmm${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-ivector${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-lat${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-lm${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-matrix${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-nnet2${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-nnet3${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-online2${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-rnnlm${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-transform${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-tree${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-util${CMAKE_SHARED_LIBRARY_SUFFIX} +- ) +-endif() +- +-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") +- message(FATAL_ERROR "CMake build not supported on Windows") +- # FIXME: copy files? +- # https://cmake.org/cmake/help/latest/command/foreach.html +- # https://stackoverflow.com/questions/34799916/copy-file-from-source-directory-to-binary-directory-using-cmake +-endif() +- +-find_program(MAKE_EXE NAMES make gmake nmake) +- +-if(DEFINED ENV{INTEL_MKL_DIR}) +- # Default: INTEL_MKL_DIR=/opt/intel/mkl/ +- message("Compiling with MKL in: $ENV{INTEL_MKL_DIR}") +- set(KALDI_CONFIG_FLAGS --shared --static-math --use-cuda=no --mathlib=MKL --mkl-root=$ENV{INTEL_MKL_DIR}) +- set(MATHLIB_BUILD_COMMAND true) +-else() +- message("Compiling with OpenBLAS") +- set(KALDI_CONFIG_FLAGS --shared --static-math --use-cuda=no --mathlib=OPENBLAS) +- set(MATHLIB_BUILD_COMMAND cd tools +- && git clone -b v0.3.13 --single-branch https://github.com/xianyi/OpenBLAS +- && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS DYNAMIC_ARCH=1 TARGET=GENERIC USE_LOCKING=1 USE_THREAD=0 all +- && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS PREFIX=install install +- && cd ..) +-endif() +- +-if(DEFINED ENV{KALDI_BRANCH}) +- set(KALDI_BRANCH $ENV{KALDI_BRANCH}) +-else() +- message(FATAL_ERROR "KALDI_BRANCH not set! Use 'origin/master'?") +- # set(KALDI_BRANCH "origin/master") +-endif() + + message("MAKE_EXE = ${MAKE_EXE}") + message("PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}") +@@ -99,63 +25,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") + + # CXXFLAGS are set and exported in kaldi-configure-wrapper.sh + +-if(NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") +- set(STRIP_LIBS_COMMAND find src/lib tools/openfst/lib -name *${CMAKE_SHARED_LIBRARY_SUFFIX} | xargs strip) +- set(STRIP_DST_COMMAND find ${DST} | xargs strip) +- if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") +- list(APPEND STRIP_LIBS_COMMAND -x) +- list(APPEND STRIP_DST_COMMAND -x) +- endif() +- ExternalProject_Add(kaldi +- GIT_CONFIG advice.detachedHead=false +- GIT_REPOSITORY https://github.com/daanzu/kaldi-fork-active-grammar.git +- GIT_TAG ${KALDI_BRANCH} +- GIT_SHALLOW TRUE +- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ +- BUILD_IN_SOURCE TRUE +- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly dragonflybin bin fstbin lmbin +- LIST_SEPARATOR " " +- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} +- ) +-endif() +- +-# Fix dynamic libraries loading paths on macOS. The libraries and +-# executables are built with RPATH settings embedded in them, pointing +-# to the locations in temporary directories used to build the +-# binaries. After package installation is done, these directories are +-# deleted and the dynamic libraries cannot be loaded. The following +-# commands generate a shell script that fixes the paths to the dynamic +-# libraries in the built executables and the libraries themselves. +-# Also the commands add a custom target to invoke the generated script +-# after the external project (kaldi) has been built. An alternative +-# would be to change the kaldi engine build system to accept a path to +-# where the binaries would be placed and point RPATH to that location. +-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") +- string (REPLACE ";" " " BINARIES_STR "${BINARIES}") +- string (REPLACE ";" " " LIBRARIES_STR "${LIBRARIES}") +- file(GENERATE OUTPUT name_fixer +- CONTENT +- "for a in ${BINARIES_STR} ; do +- a_bare=$\{a##*/\} +- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfst.10.dylib \"@loader_path/libfst.dylib\" ${DST}$a_bare +- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfstscript.10.dylib \"@loader_path/libfstscript.dylib\" ${DST}$a_bare +- for b in ${LIBRARIES_STR} ; do +- b_bare=$\{b##*/\} +- install_name_tool -change \"@rpath/$b_bare\" \"@loader_path/$b_bare\" ${DST}$a_bare +- done +- done +- for a in ${LIBRARIES_STR} ; do +- a_bare=$\{a##*/\} +- install_name_tool -id \"@loader_path/$a_bare\" ${DST}$a_bare +- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfst.10.dylib \"@loader_path/libfst.dylib\" ${DST}$a_bare +- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfstscript.10.dylib \"@loader_path/libfstscript.dylib\" ${DST}$a_bare +- for b in ${LIBRARIES_STR} ; do +- b_bare=$\{b##*/\} +- install_name_tool -change \"@rpath/$b_bare\" \"@loader_path/$b_bare\" ${DST}$a_bare +- done +- done") +- add_custom_target(fixer ALL COMMAND /bin/sh name_fixer) +- add_dependencies(fixer kaldi) +-endif() +- + install(CODE "MESSAGE(\"Installed kaldi engine binaries.\")") diff --git a/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch b/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch new file mode 100644 index 000000000000..60f50d707db0 --- /dev/null +++ b/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch @@ -0,0 +1,34 @@ +diff --git a/kaldi_active_grammar/utils.py b/kaldi_active_grammar/utils.py +index 0b70c7f..21e1d62 100644 +--- a/kaldi_active_grammar/utils.py ++++ b/kaldi_active_grammar/utils.py +@@ -79,7 +79,7 @@ elif sys.platform.startswith('linux'): platform = 'linux' + elif sys.platform.startswith('darwin'): platform = 'macos' + else: raise KaldiError("unknown sys.platform") + +-exec_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'exec', platform) ++exec_dir = '/' + library_extension = dict(windows='.dll', linux='.so', macos='.dylib')[platform] + subprocess_seperator = '^&' if platform == 'windows' else ';' + +@@ -89,13 +89,13 @@ class ExternalProcess(object): + + shell = ush.Shell(raise_on_error=True) + +- fstcompile = shell(os.path.join(exec_dir, 'fstcompile')) +- fstarcsort = shell(os.path.join(exec_dir, 'fstarcsort')) +- fstaddselfloops = shell(os.path.join(exec_dir, 'fstaddselfloops')) +- fstinfo = shell(os.path.join(exec_dir, 'fstinfo')) +- # compile_graph = shell(os.path.join(exec_dir, 'compile-graph')) +- compile_graph_agf = shell(os.path.join(exec_dir, 'compile-graph-agf')) +- # compile_graph_agf_debug = shell(os.path.join(exec_dir, 'compile-graph-agf-debug')) ++ fstcompile = shell('fstcompile') ++ fstarcsort = shell('fstarcsort') ++ fstaddselfloops = shell('fstaddselfloops') ++ fstinfo = shell('fstinfo') ++ # compile_graph = shell('compile-graph') ++ compile_graph_agf = shell('compile-graph-agf') ++ # compile_graph_agf_debug = shell('compile-graph-agf-debug') + + make_lexicon_fst = shell([sys.executable, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'kaldi', 'make_lexicon_fst%s.py' % ('_py2' if PY2 else ''))]) + diff --git a/pkgs/development/python-modules/kaldi-active-grammar/0003-ffi-path.patch b/pkgs/development/python-modules/kaldi-active-grammar/0003-ffi-path.patch new file mode 100644 index 000000000000..19fd8692e57a --- /dev/null +++ b/pkgs/development/python-modules/kaldi-active-grammar/0003-ffi-path.patch @@ -0,0 +1,13 @@ +diff --git a/kaldi_active_grammar/ffi.py b/kaldi_active_grammar/ffi.py +index 936ed35..1eb2f3d 100644 +--- a/kaldi_active_grammar/ffi.py ++++ b/kaldi_active_grammar/ffi.py +@@ -15,7 +15,7 @@ from cffi import FFI + from .utils import exec_dir, platform + + _ffi = FFI() +-_library_binary_path = os.path.join(exec_dir, dict(windows='kaldi-dragonfly.dll', linux='libkaldi-dragonfly.so', macos='libkaldi-dragonfly.dylib')[platform]) ++_library_binary_path = os.path.join('@kaldiFork@', dict(windows='kaldi-dragonfly.dll', linux='libkaldi-dragonfly.so', macos='libkaldi-dragonfly.dylib')[platform]) + _c_source_ignore_regex = re.compile(r'(\b(extern|DRAGONFLY_API)\b)|("C")|(//.*$)', re.MULTILINE) # Pattern for extraneous stuff to be removed + + def encode(text): diff --git a/pkgs/development/python-modules/kaldi-active-grammar/0004-fork-cmake.patch b/pkgs/development/python-modules/kaldi-active-grammar/0004-fork-cmake.patch new file mode 100644 index 000000000000..b5ae7bc607f3 --- /dev/null +++ b/pkgs/development/python-modules/kaldi-active-grammar/0004-fork-cmake.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ededc78b8..7ee1879a5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,6 +188,7 @@ add_subdirectory(src/ivector) + add_subdirectory(src/online) + add_subdirectory(src/online2) + add_subdirectory(src/kws) ++add_subdirectory(src/dragonfly) + + add_subdirectory(src/itf) + +@@ -219,6 +220,7 @@ add_subdirectory(src/ivectorbin) + add_subdirectory(src/onlinebin) + add_subdirectory(src/online2bin) + add_subdirectory(src/kwsbin) ++add_subdirectory(src/dragonflybin) + + # add all cuda executables + if(CUDA_FOUND) diff --git a/pkgs/development/python-modules/kaldi-active-grammar/0006-fork-configure.patch b/pkgs/development/python-modules/kaldi-active-grammar/0006-fork-configure.patch new file mode 100644 index 000000000000..8467b83f00c7 --- /dev/null +++ b/pkgs/development/python-modules/kaldi-active-grammar/0006-fork-configure.patch @@ -0,0 +1,26 @@ +diff --git a/src/configure b/src/configure +index 1186c6d12..4ad355e64 100755 +--- a/src/configure ++++ b/src/configure +@@ -1045,9 +1045,6 @@ echo "AS = $AS" >> kaldi.mk + echo "RANLIB = $RANLIB" >> kaldi.mk + echo >> kaldi.mk + +-echo "Checking compiler $CXX ..." +-check_compiler $CXX +- + echo "# Base configuration" >> kaldi.mk + echo >> kaldi.mk + if $dynamic_kaldi ; then +@@ -1066,11 +1063,6 @@ if [ ! -f $FSTROOT/include/fst/fst.h ]; then + failure "Could not find file $FSTROOT/include/fst/fst.h: + you may not have installed OpenFst. See ../tools/INSTALL" + fi +-OPENFST_VER=${OPENFST_VER:-$(grep 'PACKAGE_VERSION' $FSTROOT/Makefile | sed -e 's:.*= ::')} +-OPENFST_VER_NUM=$(echo $OPENFST_VER | sed 's/\./ /g' | xargs printf "%d%02d%02d") +-if [ $OPENFST_VER_NUM -lt 10600 ]; then +- failure "OpenFst-$OPENFST_VER is not supported. You need OpenFst >= 1.6.0.)" +-fi + echo "OPENFSTINC = $FSTROOT/include" >> kaldi.mk + if $static_fst ; then + OPENFSTLIBS="$FSTROOT/lib/libfst.a" diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix new file mode 100644 index 000000000000..f7d4738ebcab --- /dev/null +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, scikit-build +, cmake +, ush +, requests +, numpy +, cffi +, openfst +, substituteAll +, callPackage +}: + +let + kaldi = callPackage ./fork.nix { }; +in +buildPythonPackage rec { + pname = "kaldi-active-grammar"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "daanzu"; + repo = pname; + rev = "v${version}"; + sha256 = "ArbwduoH7mMmIjlFfYAFvcpR39rrkVUJhYEyQzZqsbY="; + }; + + KALDI_BRANCH = "foo"; + KALDIAG_SETUP_RAW = "1"; + + patches = [ + # Makes sure scikit-build doesn't try to build the dependencies for us + ./0001-stub.patch + # Uses the dependencies' binaries from $PATH instead of a specific directory + ./0002-exec-path.patch + # Makes it dynamically link to the correct Kaldi library + (substituteAll { + src = ./0003-ffi-path.patch; + kaldiFork = "${kaldi}/lib"; + }) + ]; + + # scikit-build puts us in the wrong folder. That is bad. + preBuild = '' + cd .. + ''; + + buildInputs = [ openfst kaldi ]; + nativeBuildInputs = [ scikit-build cmake ]; + propagatedBuildInputs = [ ush requests numpy cffi ]; + + meta = with lib; { + description = "Python Kaldi speech recognition"; + homepage = "https://github.com/daanzu/kaldi-active-grammar"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ ckie ]; + # Other platforms are supported upstream. + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix new file mode 100644 index 000000000000..ba14aec768cb --- /dev/null +++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix @@ -0,0 +1,94 @@ +{ lib +, stdenv +, blas +, lapack +, openfst +, icu +, pkg-config +, fetchFromGitHub +, git +, python3 +, openblas +, zlib +, gfortran +}: + +let + old-openfst = openfst.overrideAttrs (self: { + src = fetchFromGitHub { + owner = "kkm000"; + repo = "openfst"; + rev = "0bca6e76d24647427356dc242b0adbf3b5f1a8d9"; + sha256 = "1802rr14a03zl1wa5a0x1fa412kcvbgprgkadfj5s6s3agnn11rx"; + }; + buildInputs = [ zlib ]; + }); in + +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + +stdenv.mkDerivation rec { + pname = "kaldi"; + version = "kag-v2.1.0"; + + src = fetchFromGitHub { + owner = "daanzu"; + repo = "kaldi-fork-active-grammar"; + rev = version; + sha256 = "+kT2xJRwDj/ECv/v/J1FpsINWOK8XkP9ZvZ9moFRl70="; + }; + + patches = [ + ./0004-fork-cmake.patch + ./0006-fork-configure.patch + ]; + + enableParallelBuilding = true; + + buildInputs = [ + openblas + old-openfst + icu + ]; + + nativeBuildInputs = [ + pkg-config + python3 + gfortran + ]; + + buildFlags = [ + "dragonfly" + "dragonflybin" + "bin" + "fstbin" + "lmbin" + ]; + + postPatch = '' + # Replace the shebangs for the various build scripts + patchShebangs src + ''; + + configurePhase = '' + cd src + ./configure --shared --fst-root="${old-openfst}" --use-cuda=no --openblas-root="${openblas}" --mathlib=OPENBLAS + ''; + + installPhase = '' + # Fixes "patchelf: wrong ELF type" + find . -type f -name "*.o" -print0 | xargs -0 rm -f + mkdir -p $out/{bin,lib} + cp lib/* $out/lib/ + patchelf \ + --set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \ + $out/lib/* + ''; + + meta = with lib; { + description = "Speech Recognition Toolkit"; + homepage = "https://kaldi-asr.org"; + license = licenses.mit; + maintainers = with maintainers; [ ckie ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index cd51661bde05..95981992fea3 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "6.7.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "0yi27wzb4q371y4bywi4hz37h4x63wjsyaa2mbx0rgc8xl2wm6yz"; + sha256 = "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 7aedf44d0676..238ba0571e4d 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -65,11 +65,6 @@ buildPythonPackage rec { pytest-dependency ]; - disabledTests = [ - "docker" - "sshmanager" - ]; - meta = with lib; { description = "Embedded control & testing library"; homepage = "https://labgrid.org"; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 0d8142645e1b..ce39ec117ee0 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.9.3"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "60e6ce37be064f6e51d02b25da44230ecc9c0b1fdb6f14568c71457d963c1749"; + sha256 = "d3ba82ecf7ab6a48d21dac6697e26504670cc3522b8e5941bd28fb56cf3f6c46"; }; postPatch = '' - substituteInPlace usb1/libusb1.py --replace \ + substituteInPlace usb1/_libusb1.py --replace \ "ctypes.util.find_library(base_name)" \ "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 59b7f451c61a..4572aee08b33 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "7.7.0"; + version = "7.8.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-KIeo4CvJS8ZPlEHmrt7BPXdgA2RplHpb0j2ha4gyUxU="; + sha256 = "sha256-GuV++CFkywW0LGconyahfBGY+jjFA27Qu9JGIFt4bus="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index e934c5194285..5ed61931a7d8 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -1,25 +1,45 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib , boolean-py +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "license-expression"; - version = "1.2"; + version = "21.6.14"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nexB"; repo = "license-expression"; rev = "v${version}"; - sha256 = "0bbd7d90z58p9sd01b00g0vfd9bmwzksjb7pc8833s2jpja9mxz1"; + sha256 = "sha256-hwfYKKalo8WYFwPCsRRXNz+/F8/42PXA8jxbIQjJH/g="; }; - postPatch = "patchShebangs ./configure"; - propagatedBuildInputs = [ boolean-py ]; + dontConfigure = true; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + boolean-py + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "license_expression" ]; meta = with lib; { + description = "Utility library to parse, normalize and compare License expressions for Python"; homepage = "https://github.com/nexB/license-expression"; - description = "Utility library to parse, normalize and compare License expressions for Python using a boolean logic engine"; license = licenses.asl20; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 46306feb9367..0bfa586a8ba5 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "bd98e3b501b4c24dc127f4ad93e467f42923fe3eefa99e143b5b93158f024395"; + sha256 = "107ae7babbbda2c2f0e07484f0c53cdeb455e9219235f79dc4e1685d7541e505"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/limiter/default.nix b/pkgs/development/python-modules/limiter/default.nix new file mode 100644 index 000000000000..21217f34673f --- /dev/null +++ b/pkgs/development/python-modules/limiter/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, token-bucket +}: + +buildPythonPackage rec { + pname = "limiter"; + version = "0.1.2"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "alexdelorenzo"; + repo = pname; + rev = "v${version}"; + sha256 = "0cdqw08qw3cid1yjknlh4hqfl46xh4madkjrl7sxk2c1pbwils8r"; + }; + + propagatedBuildInputs = [ + token-bucket + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "token-bucket==0.2.0" "token-bucket>=0.2.0" + ''; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "limiter" + ]; + + meta = with lib; { + description = "Python rate-limiting, thread-safe and asynchronous decorators and context managers"; + homepage = "https://github.com/alexdelorenzo/limiter"; + license = with licenses; [ agpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 0afd8902d956..1753b0dce8c1 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.07.21"; + version = "2021.10.9"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "80ca1db9648e7678f81b373dab04d06025ec6532e68a9be773ddbd159de54e4c"; + sha256 = "907a4a0765ab29ccd1c2247efa0eda7a9bd82d3be3a2ecfdeb9b9e6fbb9aa56e"; }; postPatch = '' diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 19d9141a0d31..7b550b2430e6 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -4,28 +4,33 @@ , impacket , netaddr , pypykatz +, rich }: buildPythonPackage rec { pname = "lsassy"; - version = "2.1.5"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Hackndo"; repo = pname; rev = "v${version}"; - sha256 = "15w12asy797dxsz57avbxy6dbi7va9p5jx6i3gm9df9mbj0j3lcc"; + sha256 = "sha256-75gs08QGjN5iUT4HQZZTSKi3vzNNKQvZR2JTObYNb7w="; }; propagatedBuildInputs = [ impacket netaddr pypykatz + rich ]; # Tests require an active domain controller doCheck = false; - pythonImportsCheck = [ "lsassy" ]; + + pythonImportsCheck = [ + "lsassy" + ]; meta = with lib; { description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)"; diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index d5bf64573363..3bf996fa714a 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Mailman archiver plugin for HyperKitty"; homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; license = licenses.gpl3; - maintainers = with maintainers; [ globin peti qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 55b3b7bc14fe..7aafe6e61e81 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "REST client for driving Mailman 3"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ peti globin qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index d16260dd57eb..96f333fcf8a6 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -1,41 +1,41 @@ { lib , buildPythonPackage , fetchFromGitHub -, git -, poetry-core -, attrs -, future +, Logbook +, aiofiles , aiohttp , aiohttp-socks -, aiofiles +, aioresponses +, atomicwrites +, attrs +, cachetools +, faker +, future +, git , h11 , h2 -, Logbook -, jsonschema -, unpaddedbase64 -, pycryptodome -, python-olm -, peewee -, cachetools -, atomicwrites -, pytestCheckHook -, faker -, aioresponses , hypothesis +, jsonschema +, peewee +, poetry-core +, pycryptodome , pytest-aiohttp , pytest-benchmark +, pytestCheckHook +, python-olm +, unpaddedbase64 }: buildPythonPackage rec { pname = "matrix-nio"; - version = "0.18.3"; + version = "0.18.7"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "1sjdqzlk8vgv0748ayhnadw1bip3i4bfga4knb94cfkd3s4rgb39"; + hash = "sha256-eti9kvfv3y7m+mJzcxftyn8OyVSd2Ehqd3eU2ezMV5Q="; }; postPatch = '' @@ -50,26 +50,26 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - attrs - future + Logbook + aiofiles aiohttp aiohttp-socks - aiofiles + atomicwrites + attrs + cachetools + future h11 h2 - Logbook jsonschema - unpaddedbase64 + peewee pycryptodome python-olm - peewee - cachetools - atomicwrites + unpaddedbase64 ]; checkInputs = [ - faker aioresponses + faker hypothesis pytest-aiohttp pytest-benchmark @@ -83,8 +83,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A Python Matrix client library, designed according to sans I/O principles"; homepage = "https://github.com/poljar/matrix-nio"; + description = "A Python Matrix client library, designed according to sans I/O principles"; license = licenses.isc; maintainers = with maintainers; [ tilpner emily symphorien ]; }; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 2ef611a0acf5..c74d2f547c5b 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.10.9"; + version = "0.10.10"; src = fetchPypi { inherit pname version; - sha256 = "b774a2e1178a2f9812ce02119c6ee374b1ea08d34bad4c09a1ecc92d08d98f28"; + sha256 = "78309702392fe1ced000a23cfacb9bae0511ba533963b82d1d040f4a39924c09"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 4ede1e9ecaa9..7926b157118c 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "sha256-cDj6lrGPeSWwuvVd00z12+EWaqDZOHpoRZSloalhni8="; + sha256 = "sha256-CG0hQN4m8EE+j5yUqODJX8/DLTVWS9tSPADSDHl6K9o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 61b7c68d53f6..2056bbb0b946 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.44"; + version = "1.45"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "v${version}"; - sha256 = "1na3vx10lc41gkk14h6s3fm4bnrd2bwf4qbf1l6bfvhs92b9k111"; + sha256 = "1yx4n4zax103fmjzdiqzw37zibsh68b2p2l5qvgcnx2zrrjd31yl"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mockupdb/default.nix b/pkgs/development/python-modules/mockupdb/default.nix index 341660e1af0b..47107f0617be 100644 --- a/pkgs/development/python-modules/mockupdb/default.nix +++ b/pkgs/development/python-modules/mockupdb/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mockupdb"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "130z5g96r52h362qc5jbf1g3gw3irb2wr946xlhgcv9ww9z64cl8"; + sha256 = "d36d0e5b6445ff9141e34d012fa2b5dfe589847aa1e3ecb8d774074962af944e"; }; propagatedBuildInputs = [ pymongo ]; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index cadf07f21173..5bbdb332f87a 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.56"; + version = "1.18.64"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "61c74253cb77a0734970703d58a49e29624cec76d97da31fa912faf6f6d3347b"; + sha256 = "c1640be24881b174b318888d6a0bfc7fc25d51ec9b263c60c6c5bac1e3295b70"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 914fd4fa2568..6142972c0c94 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-YfRPfOJ0uEBounRMSUHcjNASLBqEwS2nVJKbsfrSpGQ="; + sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 0bc184d138f3..eb715c91e50d 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.6.4"; + version = "3.6.5"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dd7e8012af25737e6aa7bc26568a319508dca789f13e62afa09798dccc7798b5"; + sha256 = "834d1a8e38496369390be699be9bca4f2a0f2175b50327272b2ec7a98ffda2a0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nulltype/default.nix b/pkgs/development/python-modules/nulltype/default.nix new file mode 100644 index 000000000000..1f354e422488 --- /dev/null +++ b/pkgs/development/python-modules/nulltype/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "nulltype"; + version = "2.3.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0wpjbsmm0c9ifg9y6cnfz49qq9pa5f99nnqp6wdlv42ymfr3rak4"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nulltype" + ]; + + meta = with lib; { + description = "Python library to handle Null values and sentinels like (but not) None, False and True"; + homepage = "https://pypi.org/project/nulltype/"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 10ac5ae722ca..75eb114ac581 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.4.2"; + version = "1.5.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7238780e42a8d6b7fd3296273c76d35dbebb4520d6778472d556b68b77e2aade"; + sha256 = "2c57a9ffe6d462b0ad1ea49ac3ce9ebb3e8d43b2adf653dbe47eaf1b13be3c3b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onetimepass/default.nix b/pkgs/development/python-modules/onetimepass/default.nix new file mode 100644 index 000000000000..220265fbc01d --- /dev/null +++ b/pkgs/development/python-modules/onetimepass/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, six, timecop }: + +buildPythonPackage rec { + pname = "onetimepass"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tadeck"; + repo = pname; + rev = "v${version}"; + sha256 = "0wmv62l3r8r4428gdzyj80lhgadfqvj220khz1wnm9alyzg60wkh"; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + timecop + ]; + + pythonImportsCheck = [ "onetimepass" ]; + + meta = with lib; { + description = "One-time password library for HMAC-based (HOTP) and time-based (TOTP) passwords"; + homepage = "https://github.com/tadeck/onetimepass"; + license = licenses.mit; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/development/python-modules/open-garage/default.nix b/pkgs/development/python-modules/open-garage/default.nix index cbf9ee308713..87d524845751 100644 --- a/pkgs/development/python-modules/open-garage/default.nix +++ b/pkgs/development/python-modules/open-garage/default.nix @@ -8,14 +8,15 @@ buildPythonPackage rec { pname = "open-garage"; - version = "0.1.5"; + version = "0.1.6"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyOpenGarage"; rev = version; - sha256 = "1iqcqkbb1ik5lmsvwgy6i780x6y3wlm1gx257anxyvp1b21gm24p"; + sha256 = "sha256-vm51Fjej0OQ7LftisS/tsnxZxa5c/j7eGIROMsEcXNE="; }; propagatedBuildInputs = [ @@ -26,7 +27,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "opengarage" ]; + pythonImportsCheck = [ + "opengarage" + ]; meta = with lib; { description = "Python module to communicate with opengarage.io"; diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 55fbb2df8e25..4a579d8766bf 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -15,20 +15,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.6.3"; + version = "3.6.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - sha256 = "10clf13bp3fqd9b7n1isrfwz7sngcl1j6birqc1xyg9wzfw1kslj"; + sha256 = "0xpna70s5v7d4lwsb6ijc0f2rm6p7jqmac9yayx9qb1dasbki6zd"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "163rf8k7qb1whjf78i8v5dlyif1sgvd9xkj8li81j45abgzkq86w"; + sha256 = "0m4f8lc0zwxh4lmxkpxvdd2lc2g3lkq0ymllqbyr31sbxvwnxk56"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix index 2c90a0e066d7..c4fe8be0b7ac 100644 --- a/pkgs/development/python-modules/ospd/default.nix +++ b/pkgs/development/python-modules/ospd/default.nix @@ -6,7 +6,6 @@ , fetchFromGitHub , lxml , paramiko -, poetry , psutil , pytestCheckHook , pythonOlder @@ -14,8 +13,8 @@ buildPythonPackage rec { pname = "ospd"; - version = "21.4.3"; - format = "pyproject"; + version = "21.4.4"; + format = "setuptools"; disabled = pythonOlder "3.7" || stdenv.isDarwin; @@ -23,13 +22,9 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "1i4nfvxgxibqmqb6jwih951960sm2zy00i1wnjfnwb6za1xkpbkp"; + sha256 = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; }; - nativeBuildInputs = [ - poetry - ]; - propagatedBuildInputs = [ defusedxml deprecated @@ -42,7 +37,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "ospd" ]; + pythonImportsCheck = [ + "ospd" + ]; meta = with lib; { description = "Framework for vulnerability scanners which support OSP"; diff --git a/pkgs/development/python-modules/parameter-expansion-patched/default.nix b/pkgs/development/python-modules/parameter-expansion-patched/default.nix new file mode 100644 index 000000000000..18511e1c70fd --- /dev/null +++ b/pkgs/development/python-modules/parameter-expansion-patched/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "parameter-expansion-patched"; + version = "0.2.1b4"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vhshscjifi78qapzwn29gln6p8jhyc7cccszl8ai2jamhcph5zs"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "parameter_expansion" + ]; + + meta = with lib; { + description = "POSIX parameter expansion in Python"; + homepage = "https://github.com/nexB/commoncode"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 291ceb90e323..82831acca030 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.51"; + version = "2.1.52"; src = fetchPypi { inherit pname version; - sha256 = "32c5bf3926c1ac001d57f6b7569fc1fdd7ccfe747190f2e61d6baf610811beb8"; + sha256 = "6ab60a316892e6e7c6a39cdcbd324d2c3d763b2fe60f381a6fe34b671f24b6e0"; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index aadcec698ae2..8b8d2ed488b9 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.21.2"; + version = "1.22.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "36a3b517408334967c1fa0d29656da03608d63122a372ec92c85f49aed2d24e3"; + sha256 = "c5172252fc92142ec104cd5e7231be4580a1a0a814403707bafbf7bb8383a29a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 38acf736b74f..c3b34b1fc199 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -3,27 +3,32 @@ , fetchPypi , isPy3k , setuptools -, pytest-cov , pytest }: buildPythonPackage rec { pname = "pglast"; - version = "3.5"; + version = "3.7"; src = fetchPypi { inherit pname version; - sha256 = "3bb74df084b149e8bf969380d88b1980fbd1aeda7f7057f4dee6751d854d6ae6"; + sha256 = "3f0f36cebdb68d5b3aaacb11cbf09db44250194845fbf3b49b0aef93c30991bf"; }; disabled = !isPy3k; + # ModuleNotFoundError: No module named 'pkg_resources' propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest pytest-cov ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=pglast --cov-report term-missing" "" + ''; - pythonImportsCheck = [ "pglast" ]; + checkInputs = [ pytest ]; + # pytestCheckHook doesn't work + # ImportError: cannot import name 'parse_sql' from 'pglast' checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index 09a240f4c4a6..e4e427dfe7c2 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, cmake , fetchPypi , isPy3k , pytest @@ -11,19 +12,19 @@ , scipy , pandas , matplotlib +, ninja , numba +, pybind11 }: buildPythonPackage rec { pname = "phik"; version = "0.12.0"; - format = "wheel"; disabled = !isPy3k; src = fetchPypi { - inherit pname version format; - python = "py3"; - sha256 = "57db39d1c74c84a24d0270b63d1c629a5cb975462919895b96a8522ae0678408"; + inherit pname version; + sha256 = "959fd40482246e3f643cdac5ea04135b2c11a487e917af7d4e75843f47183549"; }; checkInputs = [ @@ -40,6 +41,15 @@ buildPythonPackage rec { pandas matplotlib numba + pybind11 + ]; + + # uses setuptools to drive build process + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + cmake + ninja ]; postInstall = '' diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 39c7e077a628..4235f6eeb934 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.34"; + version = "8.12.35"; src = fetchPypi { inherit pname version; - sha256 = "2d0f3db2944130f4a842f37a3b252f4a32cc0454a1a2e992c6480c7c17f1b121"; + sha256 = "f426d419aabf6366c27ef1193918cc55217ef0e8be8f09cbf0667131037ca229"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 7b380627d75a..2b0b9bc4999a 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "3.1.1"; + version = "3.2.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-klSUszWsIIz7o0/Ql8K4CWYujBH0mAbqyUcabpn1SkQ="; + sha256 = "a0582f00440668c07edb8403e82724961c7812c8e6c30655e34825b2645f15cd"; }; patches = [ diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index b864dedecfe7..f60b2a289246 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,26 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, nulltype +, python-dateutil +, urllib3 +}: buildPythonPackage rec { - version = "8.1.0"; pname = "plaid-python"; + version = "8.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b1f7b5b58ba3c171bb795352119d54797c8c50877bc376d26cd756de2453e9fd"; + sha256 = "13gj4xb0lx2dgdkcdp7fvvql3vjr572qpa1m993z3p7n5c27j5xi"; }; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + nulltype + python-dateutil + urllib3 + ]; - # Integration tests require API keys and internet access - checkPhase = "py.test -rxs ./tests/unit"; + # Tests require a Client IP + doCheck = false; - propagatedBuildInputs = [ requests ]; + pythonImportsCheck = [ + "plaid" + ]; - meta = { + meta = with lib; { description = "Python client library for the Plaid API and Link"; homepage = "https://github.com/plaid/plaid-python"; changelog = "https://github.com/plaid/plaid-python/blob/master/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bhipple ]; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index eba416fd3562..66e16d7e8762 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,15 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.7.1"; - disabled = pythonOlder "3.5"; + version = "4.7.2"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-kZREcjLBSWXGULEKfWiherRCl5UXLOw4f3JFaqs8dXw="; + sha256 = "sha256-v12CL2VR9QAoj44F8V1qw/qflzQ1WRi1cvWn/U/wW/E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 8240e86af2b3..a9e3930f67f4 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.11.16"; + version = "0.11.18"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = version; - sha256 = "0m3sr1mhnmm22xgd3h9dgkrq20pdghwx505xld4pahj686z4bva2"; + sha256 = "sha256-1wpy4WofqrPusOI2BHRqSHfXlRpbuLOx97egzSAbB8E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index d9c8dda1354f..3b7ddaf28019 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.5.1"; + version = "1.5.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "57ab0c43e9c5bd81227b08b9931435d71c118cd53339cc5925123a740f40b312"; + sha256 = "5969b2f1defbdc405df932767e05e0b536e2771c27f1f95d7f260bc99bf13581"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix similarity index 57% rename from pkgs/development/python-modules/privacyidea/ldap-proxy.nix rename to pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix index 25a81510c7dc..aa44e1396a00 100644 --- a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix +++ b/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix @@ -1,30 +1,24 @@ -{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }: +{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }: buildPythonPackage rec { pname = "privacyidea-ldap-proxy"; - version = "0.6.1"; - - # https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50 - disabled = isPy3k; + version = "0.6.2"; src = fetchFromGitHub { owner = "privacyidea"; repo = pname; rev = "v${version}"; - sha256 = "1kc1n9wr1a66xd5zvl6dq78xnkqkn5574jpzashc99pvm62dr24j"; + sha256 = "sha256-U2lg4zDQKn9FQ7O0zSLaijIkXKVjg8wi2ItueF4ACDU="; }; propagatedBuildInputs = [ twisted ldaptor configobj ]; - # python 2 zope.interface test import path issues - doCheck = false; - pythonImportsCheck = [ "pi_ldapproxy" ]; meta = with lib; { description = "LDAP Proxy to intercept LDAP binds and authenticate against privacyIDEA"; homepage = "https://github.com/privacyidea/privacyidea-ldap-proxy"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = [ maintainers.globin ]; }; } diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 972c0f0bb754..766b7090f90f 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.53.3"; + version = "3.55.0"; src = fetchPypi { inherit pname version; - sha256 = "f4e1c2d48e608850c59f793d6e74ccdebbcbaac7ffe917d45e9646ec0d664d6d"; + sha256 = "86835d1f1a9317ab41aeb1da5e4184975e2306586839d66daf63067c102f8f04"; }; propagatedBuildInputs = [ python-utils ]; diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index cdbec22bc1fe..125984554a0c 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "1.1.1"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "09fz8zbxjaly9zqksvq6cqp66plbsyjsmndy4g25ryys45siz1ny"; + sha256 = "sha256-ElHocXrazwK+b5vdjYSJAYB4ajs2n+V8koj4QKkdDMQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 19fa273c0466..6e35cb573586 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.9.1"; + version = "21.10.5"; src = fetchPypi { inherit pname version; - sha256 = "8eef4dbfc97d984e63fd609a3f690d005173ec5342be88d10f67dd507affdf32"; + sha256 = "b347983fb78baab168f4dc4804ab2c59ca5b813bf62f8146dfb5fcb6ab6c8ba2"; }; patches = [ diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index e0ff93697395..6d1dca6b699f 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "c84218af7e08e859e07cfe5645d9586ceaad51c24f0f4529a9ed0adafd5aa0bf"; + sha256 = "cc8011ca05301653f2e5c2d02eadff0e882b611841a76f9e5b911994899df49e"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 3a5d68f37e4a..961ca5badbee 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.1.9"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6fb4d48d5ba9c09cdd1ed732e8a1d48b41bca379e072268af3831774d8391300"; + sha256 = "df02fb0ab74a6e7c4e1d7a3e2ffd7e4760a30cdeccb9fa6dd19f334122ec00f2"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index e01c5e181981..c9a2103ccf7f 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "9.2.1"; + version = "9.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iD1ug2/18QaKi9ADZKFbTJhUKTCGSV6f2crNm01UwL8="; + sha256 = "sha256-VN3TWbfk0Bm+LJ05/Cx1zRbiFYKafqca99GEobAxlhw="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix index 009bb446028a..b960b4b7da6d 100644 --- a/pkgs/development/python-modules/pycontrol4/default.nix +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pycontrol4"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "lawtancool"; repo = "pyControl4"; rev = "v${version}"; - sha256 = "sha256-z7MDz9fGwZY4JcqabeYFGZ9nsRU2qa5LYnNQx/ae/4Y="; + sha256 = "068iiyi17ndv6cv124r5dzvififblbi2zw7jgnzb5xi0q093czkj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index 15014cdafd28..4223ce02caea 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.6.4"; + version = "0.6.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "00f15f4bae2947de49b3206f2600f78780008e044380f7aafe0ce52969cda4ca"; + sha256 = "608d8e80da38070d3bb970d132bc47a55dcfd63b4dc03997d93646c5b2ad185b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix index 180f5902faca..0228c318c604 100644 --- a/pkgs/development/python-modules/pyfuse3/default.nix +++ b/pkgs/development/python-modules/pyfuse3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyfuse3"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "45f0053ad601b03a36e2c283a5271403674245a66a0daf50e3deaab0ea4fa82f"; + sha256 = "22d146dac59a8429115e9a93317975ea54b35e0278044a94d3fac5b4ad5f7e33"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix new file mode 100644 index 000000000000..e0764ecb3a4b --- /dev/null +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, setuptools-scm +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pygmars"; + version = "0.7.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "nexB"; + repo = pname; + rev = "v${version}"; + sha256 = "0wghk4nzplpl26iwrgvm0n9x88nyxlcxz4ywss4nwdr4hfccl28l"; + }; + + dontConfigure = true; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pygmars" + ]; + + meta = with lib; { + description = "Python lexing and parsing library"; + homepage = "https://github.com/nexB/pygmars"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 373577dc4675..fda11ef89e83 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.40.1"; + version = "3.42.0"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0"; + sha256 = "mxJhbjLPx5L53IQdnEcqQaNbhbpn06brQn4wem/kNns="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 1b8ee8067520..36f4f434469e 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "21.07.0"; + version = "21.10.0"; # Only 3.8.0 and beyond are supported disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-LcuMLYekeK9HR+SR8+R+EvuxxaN3RCh7KV969RngZjw="; + sha256 = "sha256-EvVkewFgkfYL6BjmJ/IWeuCyR+0R0ZxI35i9sxKcqxo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix index 6e8b8fef32fc..c6b1a7319f3e 100644 --- a/pkgs/development/python-modules/pyintesishome/default.nix +++ b/pkgs/development/python-modules/pyintesishome/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyintesishome"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jnimmo"; repo = "pyIntesisHome"; rev = version; - sha256 = "1y1agdr32p7m4dbb6kzchh0vb49gy0rqp8hq9zadwrq2vp70k5sn"; + sha256 = "sha256-+bad3VIoP0sVw0blK9YIot2GfK5de4HTXv5/ipV2Nds="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index dfd84fe066d0..95d4597fd57b 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pykka"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; disabled = pythonOlder "3.6.1"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jodal"; repo = pname; rev = "v${version}"; - sha256 = "1h3brgm8y4a9s991y0drkp0vvmxix9f2b49f9w6ibhkhr37gc0lh"; + sha256 = "1cy4pr05xlsny9g573q7njsv7jaaysi1qzafm6f82y57jqnmziks"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 5de1776d8244..50dc87a926f2 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.16"; + version = "2.4.17"; src = fetchPypi { inherit pname version; - sha256 = "99b77fdc1389dea7c9dbbfb70143fed707238e00c961ada73b79bcf15b21ca19"; + sha256 = "84e2af4d8099afd37c5d887261a168e7bde4ec2354f12f65c72dad1a4cd8f21d"; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index b4ff976c8eac..7742a8890455 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "1.3"; + version = "1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-zhuXOZIIzh5p0CDOsiUNTqeXDoHFcf1BPg868fc7CIg="; + sha256 = "48dbe6c4929961021cb61e49bb9e0605b54c4b61b9fb9ade51076705a08ecd54"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 40dae5c6997b..41babc82175e 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.5.3rc1"; + version = "2.5.3"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jynljjTipN/Yx97RSWikcotxCqosNWSDH7GdwcSIiRU="; + sha256 = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4="; }; # Twisted asynchronous version is not supported due to a missing dependency diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 7256749f8dec..4173987a7f6a 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "221124cbad8e3cf3ed421a4089d80ac5a29d3215e76cb49effc1df887533d2a8"; + sha256 = "7a7df8412b19cfb3596060faf5a8c5d0bf5b3bd504f8efd900fc4e3918c6f882"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 4b7f85482a41..a700a7d1fd6d 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynput"; - version = "1.7.3"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "4e50b1a0ab86847e87e58f6d1993688b9a44f9f4c88d4712315ea8eb552ef828"; + sha256 = "16fecc4d1e53a28fb7c669c79e189c3f2cde14a08d6b457c3da07075c82f3b4c"; }; nativeBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index 89c8b86aa6d4..df258cad930b 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pynws"; - version = "1.3.1"; + version = "1.3.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iWg8UsZeVaOxp35rItywTAlQUbCWe4WWDK4VPCRApcM="; + sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 427b65394006..c19e571a9cc8 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -21,7 +21,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2021.2.6"; + version = "2021.2.8"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -30,7 +30,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "df208546d28a3274ba7b554d50643ed1e393b8f3f75a43b24b83d3ee76597587"; + sha256 = "15809b5d2b9a86ad01e31d176c00415436805ac884c4d197d9263bfe98280d76"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 31e01e83dbf6..41cdcad20385 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.16.0.1"; + version = "0.17.0"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "v${version}"; - sha256 = "168bwwm8c2k22m7paip8q0yajyl7xdxgnik0bgjl7rhqg0majz0f"; + sha256 = "sha256-RDeBq6pwBGCBNIn8YOPQr96GuL6FKEYeLAPQD6XN0iE="; }; nativeBuildInputs = [ samtools ]; diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index fd31b15fdc77..caa5e4e24405 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -6,12 +6,12 @@ let in buildPythonPackage rec { - version = "2.0.1"; + version = "2.0.2"; pname = "pyscard"; src = fetchPypi { inherit pname version; - sha256 = "2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8"; + sha256 = "05de0579c42b4eb433903aa2fb327d4821ebac262434b6584da18ed72053fd9e"; }; postPatch = if withApplePCSC then '' diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 9efd55e32429..1392f91b6363 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.6"; + version = "0.6.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ahSc45fIoYvFc0QOt8LV44J3mlJe8uTkwTLJ6cu8gKo="; + sha256 = "sha256-8HADY6+qwfzYyEVLQyMiXiUYinADSA1iKUay3YHhNXI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 625041fd81b2..2e6f41aa2332 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -1,28 +1,39 @@ -{ buildPythonPackage, fetchPypi, lib, py4j }: +{ lib +, buildPythonPackage +, fetchPypi +, py4j +}: buildPythonPackage rec { pname = "pyspark"; - version = "3.1.2"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5e25ebb18756e9715f4d26848cc7e558035025da74b4fc325a0ebc05ff538e65"; + sha256 = "bfea06179edbfb4bc76a0f470bd3c38e12f00e1023e3ad0373558d07cff102ab"; }; # pypandoc is broken with pandoc2, so we just lose docs. postPatch = '' sed -i "s/'pypandoc'//" setup.py - substituteInPlace setup.py --replace py4j==0.10.9 'py4j>=0.10.9,<0.11' + substituteInPlace setup.py \ + --replace py4j==0.10.9.2 'py4j>=0.10.9,<0.11' ''; - propagatedBuildInputs = [ py4j ]; + propagatedBuildInputs = [ + py4j + ]; - # Tests assume running spark... + # Tests assume running spark instance doCheck = false; + pythonImportsCheck = [ + "pyspark" + ]; + meta = with lib; { - description = "Apache Spark"; + description = "Python bindings for Apache Spark"; homepage = "https://github.com/apache/spark/tree/master/python"; license = licenses.asl20; maintainers = [ maintainers.shlevy ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index e850349b7a56..1f21d09d9504 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = version; - sha256 = "sha256-YqXR6zL8rM2p6YqK8BX82F9HZHgfpfEU4qBiVSud0hw="; + sha256 = "sha256-8u5KeWVaCOksag2CYE7GBl36crB4k9YdLZ5aHD9hlwU="; }; propagatedBuildInputs = [ bluepy ]; diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix new file mode 100644 index 000000000000..32806004f767 --- /dev/null +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytautulli"; + version = "21.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "1gi1jalwzf1aykvdmdbvr7hvfch9wbbjra87f1vzdmkb5iiirw01"; + }; + + postPatch = '' + # Upstream is releasing with the help of a CI to PyPI, GitHub releases + # are not in their focus + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' + ''; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pytautulli" ]; + + meta = with lib; { + description = "Python module to get information from Tautulli"; + homepage = "https://github.com/ludeeus/pytautulli"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 79d10f8cf743..5a5c3b1449f2 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { pname = "pytest_httpserver"; inherit version; - sha256 = "12b0028vp5rh9bg712klgjzm4vl4biyza1j6iyv3pgg25ircang3"; + sha256 = "sha256-JwH9HZgU1YVR+dEETbM1xrqYcxaTZsWDSVI6WM907UA="; }; propagatedBuildInputs = [ werkzeug ]; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index a643e7dc5a54..9b16760b23b8 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "10.1"; + version = "10.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7617c06de13ee6dd2df9add7e275bfb2bcebbaaf3e450f5937cd0200df824273"; + sha256 = "9e1e1bad51e07642c5bbab809fc1d4ec8eebcb7de86f90f1a26e6ef9de446697"; }; buildInputs = [ pytest ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "pytest plugin to re-run tests to eliminate flaky failures"; + description = "Pytest plugin to re-run tests to eliminate flaky failures"; homepage = "https://github.com/pytest-dev/pytest-rerunfailures"; license = licenses.mpl20; maintainers = with maintainers; [ das-g ]; diff --git a/pkgs/development/python-modules/python-didl-lite/default.nix b/pkgs/development/python-modules/python-didl-lite/default.nix index 64fcd189c749..cab8bc0c0b0c 100644 --- a/pkgs/development/python-modules/python-didl-lite/default.nix +++ b/pkgs/development/python-modules/python-didl-lite/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-didl-lite"; - version = "1.2.6"; + version = "1.3.0"; disabled = pythonOlder "3.5.3"; src = fetchFromGitHub { owner = "StevenLooman"; repo = pname; rev = version; - sha256 = "sha256-1rr26dnV5As15HeFLWEDBDYPiRDHkGfYOYFhSJi7iyU="; + sha256 = "sha256-NsZ/VQlKEp4p3JRSNQKTGvzLrKgDCkkT81NzgS3UHos="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 27b85215e655..5f3ff50d1a8d 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -1,19 +1,18 @@ { lib , stdenv , buildPythonPackage +, defusedxml , fetchFromGitHub -, fetchpatch +, lxml +, paramiko , poetry-core , pytestCheckHook , pythonOlder -, paramiko -, lxml -, defusedxml }: buildPythonPackage rec { pname = "python-gvm"; - version = "21.6.0"; + version = "21.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "070qpj2y7834i50lhkkbv93s77j91js06zs1bpbmplppiraxqmyz"; + sha256 = "sha256-6cNoeuB9449HB2/41VjazpSAGvaHmBjG/hqmBKX5FEA="; }; nativeBuildInputs = [ @@ -30,24 +29,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - paramiko - lxml defusedxml + lxml + paramiko ]; checkInputs = [ pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/greenbone/python-gvm/pull/552 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/greenbone/python-gvm/commit/e48afa614ba9cf69d9b22ce1a4642c625acbaa06.patch"; - sha256 = "0f5wfdymp5dcjk1xb7ynsf0g6idjg2ifwgggp4agic5nkh1k1inl"; - }) - ]; - disabledTests = [ # No running SSH available "test_connect_error" @@ -55,7 +45,9 @@ buildPythonPackage rec { "test_feed_xml_error" ]; - pythonImportsCheck = [ "gvm" ]; + pythonImportsCheck = [ + "gvm" + ]; meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index a09a65a2b4d0..fb4840753df6 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonApplication rec { pname = "python-ironicclient"; - version = "4.8.0"; + version = "4.9.0"; src = fetchPypi { inherit pname version; - sha256 = "b55516a72b995f92fb434619cbc1e2effa604c7fcaa6ac4afb8f5af1ea8193a4"; + sha256 = "99d45e914b2845731ac44fbfc63ae3e1bd52211396748797b588f2adc4b3f341"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 9e44a6b151d2..39597afa8540 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.2.3"; + version = "1.2.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zoKJ9g7cXcQhickkhRjYwl6SqOar2Kautg5dHf3PqGk="; + sha256 = "0c1g46hpzjhqbjcmv6xm3by3jprcjhzjslqzrp95hdkbykvrgs5x"; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index a939caf49703..0655d29f6af7 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.4"; + version = "1.5"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "018c20d3983cccfdc9cfed64407d4ba861ef3d64fe324a486f7130431afdefa7"; + sha256 = "04323e63cf57f7ed927fd9bcb1861ef5ecb0d4d7213f2755969d4a1ac3c2de6f"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 581813fac4d9..bb809674e830 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.16"; + version = "1.17"; pname = "python-stdnum"; src = fetchPypi { inherit pname version; - sha256 = "4248d898042a801fc4eff96fbfe4bf63a43324854efe3b5534718c1c195c6f43"; + sha256 = "374e2b5e13912ccdbf50b0b23fca2c3e0531174805c32d74e145f37756328340"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 6ddc4543d3d0..e188a3ef8686 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -36,13 +36,15 @@ buildPythonPackage rec { rm -r telegram/vendor substituteInPlace requirements.txt \ - --replace 'APScheduler==3.6.3' 'APScheduler' + --replace "APScheduler==3.6.3" "APScheduler" \ + --replace "cachetools==4.2.2" "cachetools" ''; setupPyGlobalFlags = "--with-upstream-urllib3"; # tests not included with release doCheck = false; + pythonImportsCheck = [ "telegram" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 779703723eeb..93197e1c2bad 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "5.2.3"; + version = "5.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "01gxq6dbqjmsqndjcbqv79wd2wgs7krm0rn47k883gh2xg9sn606"; + sha256 = "sha256-9FbcGhRmXULJgfJOmy6mhiZwQUDNmvxZI/WxjJIbnc8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index e06a7e681351..597702e6d34b 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "7.0.6"; + version = "7.1.0"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - sha256 = "0ckh2waz3xpz51pmigg1q336igqvvkl2pzncszvblkwv38a0rj3a"; + sha256 = "sha256-r/qt06YPia8PYhwOeDXk0oK3YvEZ/1kN//+LXj34fmE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix index 943642bfd64c..423f87c1f7d3 100644 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ b/pkgs/development/python-modules/pytwitchapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytwitchapi"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "v${version}"; - sha256 = "0fq1ky6nbrb47mlznl3vq8m86lqb6p78fvbcy8x3rm3m5zngxnz7"; + sha256 = "0sbzl9a4zxnvnvkmmmfc9c157dgq7y6qfb2cid5nym6jhxkixnqk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index dc7c0c84b781..e8babafdf9a1 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10072"; + version = "9.0.10159"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F6NUvcGYshPbfcfhkfbnzIxkXmfpAc/kfHFk5fuaICA="; + sha256 = "sha256-9I9gAPbazuPdZDyoXpjw0IrTu+97dwznoOnyBzkNNCw="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 6db3eaae2bd2..7f3b3f5da8f0 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.9.1"; + version = "2.13.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-Uzz2mWBT5BaMxYeR6YFIP1BqTWye1Hz9CTTg/bg4kSU="; + sha256 = "sha256-v1twWyxd0nhXxvbRCbnH5TP736eeDYE5Nz62sf6HIcA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 3c7082d0e67b..a2f475f3b314 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "vmware"; repo = pname; rev = "v${version}"; - sha256 = "0li6g72ps1vxjzqhz10n02fl6cs069173jd9y4ih5am7vwhrwgpa"; + sha256 = "07jwlbi3k5kvpmgygvpkhsnbdp9m2ndwqxk9k6kyzfszwcbdx4bk"; }; # requires old version of vcrpy diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index c3c8401bc476..81813de356af 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.20.0"; + version = "0.20.1"; checkInputs = [ pytest-runner @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "5b405efb4b6ebe81e7f991b360126a4f61c2768ceed6027346e2b8ef3f57ef39"; + sha256 = "hZxE7b0bOx/B8Kz4cgBC7wV23OikRxwrdZ4UQ8G/yhg="; }; doCheck = true; diff --git a/pkgs/development/python-modules/qualysclient/default.nix b/pkgs/development/python-modules/qualysclient/default.nix new file mode 100644 index 000000000000..6556187c44bf --- /dev/null +++ b/pkgs/development/python-modules/qualysclient/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, certifi +, charset-normalizer +, fetchFromGitHub +, idna +, lxml +, pytest-mock +, pytestCheckHook +, pythonOlder +, requests +, responses +, urllib3 +}: + +buildPythonPackage rec { + pname = "qualysclient"; + version = "0.0.4.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "woodtechie1428"; + repo = pname; + rev = "v${version}"; + sha256 = "0hrbp5ci1l06j709k5y3z3ad9dryvrkvmc2wyb4a01gw7qzry7ys"; + }; + + propagatedBuildInputs = [ + certifi + charset-normalizer + idna + lxml + requests + urllib3 + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "qualysclient" + ]; + + meta = with lib; { + description = "Python SDK for interacting with the Qualys API"; + homepage = "https://qualysclient.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index fb767e5c4685..1d7b4e95e854 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.6.2"; + version = "1.6.4"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "088e1a0778f8021af90b9458c9b706ae3d303a3e6a5064e1ca25d4fd737dc3c7"; + sha256 = "a79877781b8e8e9bd5612faebd3991d75d7189f2941021d2adea9b4b4c5b9b7b"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/rangehttpserver/default.nix b/pkgs/development/python-modules/rangehttpserver/default.nix new file mode 100644 index 000000000000..217bffb174b8 --- /dev/null +++ b/pkgs/development/python-modules/rangehttpserver/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, requests +}: + +buildPythonPackage rec { + pname = "rangehttpserver"; + version = "1.2.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "danvk"; + repo = "RangeHTTPServer"; + rev = version; + sha256 = "1sy9j6y8kp5jiwv2vd652v94kspp1yd4dwxrfqfn6zwnfyv2mzv5"; + }; + + checkInputs = [ + nose + requests + ]; + + checkPhase = '' + runHook preCheck + nosetests + runHook postCheck + ''; + + pythonImportsCheck = [ + "RangeHTTPServer" + ]; + + meta = with lib; { + description = "SimpleHTTPServer with support for Range requests"; + homepage = "https://github.com/danvk/RangeHTTPServer"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 8ad1e6f7dfa8..48d92d43ec6e 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -10,14 +10,13 @@ buildPythonPackage rec { pname = "recommonmark"; - version = "0.6.0"; + version = "0.7.1"; - # PyPI tarball is missing some test files: https://github.com/rtfd/recommonmark/pull/128 src = fetchFromGitHub { owner = "rtfd"; repo = pname; rev = version; - sha256 = "0m6qk17irka448vcz5b39yck1qsq90k98dmkx80mni0w00yq9ggd"; + sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 3cc833b561ef..3acb55377f9f 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "19pmjd9z3g9xpbri363lzd0gi1xa06aiyw2wjnxwqmd73x6pw695"; + sha256 = "0s6lakbd8h1pa4lfdj18sm13gpywszgpcns4hz026a4kam787kby"; }; checkInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 5f0653236acf..728d56527bbe 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -1,40 +1,51 @@ { lib , buildPythonPackage -, fetchFromGitHub , defusedxml -, requests -, pytest -, requests-mock +, fetchFromGitHub , mock -, pytest-cov +, pytest-asyncio , pytest-timeout -, testtools +, pytest-vcr +, pytestCheckHook +, pythonOlder +, requests +, requests-mock }: buildPythonPackage rec { pname = "rxv"; - version = "0.6.0"; + version = "0.7.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wuub"; repo = pname; - # Releases are not tagged - rev = "9b586203665031f93960543a272bb1a8f541ed37"; - sha256 = "1dw3ayrzknai2279bhkgzcapzw06rhijlny33rymlbp7irp0gvnj"; + rev = "v${version}"; + sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8"; }; - propagatedBuildInputs = [ defusedxml requests ]; + propagatedBuildInputs = [ + defusedxml + requests + ]; - checkInputs = [ pytest requests-mock mock pytest-cov pytest-timeout testtools ]; - checkPhase = '' - pytest - ''; + checkInputs = [ + mock + pytest-asyncio + pytest-timeout + pytest-vcr + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "rxv" ]; meta = with lib; { - description = "Automation Library for Yamaha RX-V473, RX-V573, RX-V673, RX-V773 receivers"; + description = "Python library for communicate with Yamaha RX-Vxxx receivers"; homepage = "https://github.com/wuub/rxv"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; } - diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index f8a2c8f0209e..015ba22781a8 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.59.7"; + version = "2.63.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6tNUI08Fp2zITH1ILfVVEU0VhgvLogWfXPr9dkAKQEk="; + sha256 = "b4d793217181f4ff1d269aa22e44f82e21a060ec9723301e1ae5e7d9082c76c8"; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 177032aea7f3..afde27967dbb 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -1,105 +1,141 @@ { lib -, fetchPypi -, buildPythonPackage -, isPy3k -, markupsafe -, click -, typecode -, gemfileparser -, pefile -, fingerprints -, spdx-tools -, fasteners -, pycryptodome -, urlpy -, dparse -, jaraco_functools -, pkginfo -, debian-inspector -, extractcode -, ftfy -, pyahocorasick -, colorama -, jsonstreams -, packageurl-python -, pymaven-patch -, nltk -, pygments +, attrs +, beautifulsoup4 , bitarray -, jinja2 -, javaproperties , boolean-py -, license-expression +, buildPythonPackage +, chardet +, click +, colorama +, commoncode +, debian-inspector +, dparse +, extractcode , extractcode-7z , extractcode-libarchive -, typecode-libmagic +, fasteners +, fetchPypi +, fingerprints +, ftfy +, gemfileparser +, html5lib +, importlib-metadata +, intbitset +, jaraco_functools +, javaproperties +, jinja2 +, jsonstreams +, license-expression +, lxml +, markupsafe +, packageurl-python +, packaging +, parameter-expansion-patched +, pefile +, pkginfo +, pluggy +, plugincode +, publicsuffix2 +, pyahocorasick +, pycryptodome +, pygmars +, pygments +, pymaven-patch , pytestCheckHook +, pythonOlder +, requests +, saneyaml +, spdx-tools +, text-unidecode +, toml +, typecode +, typecode-libmagic +, typing +, urlpy +, xmltodict +, zipp }: + buildPythonPackage rec { pname = "scancode-toolkit"; - version = "21.8.4"; - disabled = !isPy3k; + version = "30.1.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c18340067244274c67e166f701c60e747e1d0bccb17efc99f277a4bc0a5a13c6"; + sha256 = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0="; }; dontConfigure = true; - # https://github.com/nexB/scancode-toolkit/issues/2501 - # * dparse2 is a "Temp fork for Python 2 support", but pdfminer requires - # Python 3, so it's "fine" to leave dparse2 unpackaged and use the "normal" - # version - # * ftfy was pinned for similar reasons (to support Python 2), but rather than - # packaging an older version, I figured it would be better to remove the - # erroneous (at least for our usage) version bound - # * bitarray's version bound appears to be unnecessary for similar reasons - postPatch = '' - substituteInPlace setup.cfg \ - --replace "dparse2" "dparse" \ - --replace "ftfy < 5.0.0" "ftfy" \ - --replace "bitarray >= 0.8.1, < 1.0.0" "bitarray" - ''; - propagatedBuildInputs = [ - markupsafe - click - typecode - gemfileparser - pefile - fingerprints - spdx-tools - fasteners - pycryptodome - urlpy - dparse - jaraco_functools - pkginfo - debian-inspector - extractcode - ftfy - pyahocorasick - colorama - jsonstreams - packageurl-python - pymaven-patch - nltk - pygments + attrs + beautifulsoup4 bitarray - jinja2 - javaproperties boolean-py - license-expression + chardet + click + colorama + commoncode + debian-inspector + dparse + extractcode extractcode-7z extractcode-libarchive + fasteners + fingerprints + ftfy + gemfileparser + html5lib + intbitset + jaraco_functools + javaproperties + jinja2 + jsonstreams + license-expression + lxml + markupsafe + packageurl-python + packaging + parameter-expansion-patched + pefile + pkginfo + pluggy + plugincode + publicsuffix2 + pyahocorasick + pycryptodome + pygmars + pygments + pymaven-patch + requests + saneyaml + spdx-tools + text-unidecode + toml + typecode typecode-libmagic + urlpy + xmltodict + zipp + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-metadata + ] ++ lib.optionals (pythonOlder "3.7") [ + typing ]; checkInputs = [ pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pluggy >= 0.12.0, < 1.0" "pluggy" \ + --replace "pygmars >= 0.7.0" "pygmars" \ + --replace "license_expression >= 21.6.14" "license_expression" + ''; + # Importing scancode needs a writeable home, and preCheck happens in between # pythonImportsCheckPhase and pytestCheckPhase. postInstall = '' @@ -114,7 +150,7 @@ buildPythonPackage rec { dontStrip = true; meta = with lib; { - description = "A tool to scan code for license, copyright, package and their documented dependencies and other interesting facts"; + description = "Tool to scan code for license, copyright, package and their documented dependencies and other interesting facts"; homepage = "https://github.com/nexB/scancode-toolkit"; license = with licenses; [ asl20 cc-by-40 ]; maintainers = teams.determinatesystems.members; diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index 3b7106ac4f2b..5e87c585116a 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "scikit-optimize"; - version = "0.8.1"; + version = "0.9.0"; disabled = isPy27; src = fetchFromGitHub { owner = "scikit-optimize"; repo = "scikit-optimize"; rev = "v${version}"; - sha256 = "1bz8gxccx8n99abw49j8h5zf3i568g5hcf8nz1yinma8jqhxjkjh"; + sha256 = "0hsq6pmryimxc275yrcy4bv217bx7ma6rz0q6m4138bv4zgq18d1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index e19e502af269..dd06a04e080a 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage , cryptography , cssselect -, fetchFromGitHub +, fetchPypi , fetchpatch , glibcLocales , installShellFiles @@ -31,14 +31,13 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.5.0"; + version = "2.5.1"; disabled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "09lxnjz1cw37i9bgk8sci2xxknj20gi2lq8l7i0b3xw7q8bxzp7h"; + src = fetchPypi { + inherit version; + pname = "Scrapy"; + sha256 = "13af6032476ab4256158220e530411290b3b934dd602bb6dacacbf6d16141f49"; }; nativeBuildInputs = [ @@ -82,7 +81,8 @@ buildPythonPackage rec { (fetchpatch { name = "remove-h2.patch"; url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch"; - sha256 = "1gw28wg8qcb0al59rz214hm17smspi6j5kg62nr1r850pykyrsqk"; + sha256 = "0sa39yx9my4nqww8a12bk9zagx7b56vwy7xpxm4xgjapjl6mcc0k"; + excludes = [ "tox.ini" ]; }) ]; @@ -140,6 +140,7 @@ buildPythonPackage rec { range of purposes, from data mining to monitoring and automated testing. ''; homepage = "https://scrapy.org/"; + changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst"; license = licenses.bsd3; maintainers = with maintainers; [ drewkett marsam ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index a9492c3e8fdf..c77bcfee3384 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.8.2"; + version = "6.8.3"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-TaewVBWQ6D5TH1TGXlXVBnW7K4HS/cFxJ6bcMv2DB+c="; + sha256 = "sha256-kJbpYLM+GpyAHEnO2mqULOYyxIpOrmGeSMd4wJccz/8="; }; propagatedBuildInputs = [ @@ -45,5 +45,7 @@ buildPythonPackage rec { homepage = "https://github.com/sendgrid/sendgrid-python"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + # No support for new starkbank-ecdsa releases + broken = true; }; } diff --git a/pkgs/development/python-modules/simple-rest-client/default.nix b/pkgs/development/python-modules/simple-rest-client/default.nix index b9b1cbe7b058..757acf32e516 100644 --- a/pkgs/development/python-modules/simple-rest-client/default.nix +++ b/pkgs/development/python-modules/simple-rest-client/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , buildPythonPackage , fetchFromGitHub , httpx @@ -13,15 +12,15 @@ buildPythonPackage rec { pname = "simple-rest-client"; - version = "1.0.8"; + version = "1.1.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "allisson"; repo = "python-simple-rest-client"; rev = version; - sha256 = "12qxhrjhlbyyr1pkvwfkcxbsmyns5b0mfdn42vz310za5x76ldj3"; + sha256 = "sha256-oJXP2/lChlzzKyNiTgJMHkcNkFyy92kTPxgDkon54g8="; }; propagatedBuildInputs = [ @@ -31,7 +30,6 @@ buildPythonPackage rec { ]; checkInputs = [ - asynctest pytest-asyncio pytest-httpserver pytestCheckHook @@ -42,9 +40,17 @@ buildPythonPackage rec { --replace "pytest-runner" "" substituteInPlace pytest.ini \ --replace " --cov=simple_rest_client --cov-report=term-missing" "" + substituteInPlace requirements-dev.txt \ + --replace "asyncmock" "" ''; - pythonImportsCheck = [ "simple_rest_client" ]; + disabledTestPaths = [ + "tests/test_decorators.py" + ]; + + pythonImportsCheck = [ + "simple_rest_client" + ]; meta = with lib; { description = "Simple REST client for Python"; diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix new file mode 100644 index 000000000000..b3116bd3182e --- /dev/null +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pythonOlder +}: + +buildPythonPackage rec { + pname = "smbus2"; + version = "0.4.1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "kplindegaard"; + repo = pname; + rev = version; + sha256 = "0xgqs7bzhr8y3irc9gq3dnw1l3f5gc1yv4r2v4qxj95i3vvzpg5s"; + }; + + checkInputs = [ + nose + ]; + + checkPhase = '' + runHook preCheck + nosetests + runHook postCheck + ''; + + pythonImportsCheck = [ + "smbus2" + ]; + + meta = with lib; { + description = "Drop-in replacement for smbus-cffi/smbus-python"; + homepage = "https://smbus2.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 624ef4e30fc9..c5a06ee8f202 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.24.0"; + version = "0.24.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-3VL2JFlukfQdjTP65X40OOsuCUVsY9kuvRKUZ3qEd+s="; + sha256 = "sha256-78JYetA6msGiLMHNTdTN2b5lOiXaY+TQA9ID8qtPmM0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index ec4947ebfc45..09becb972360 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.4"; + version = "7.1.5"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "d778ec2b92866eddf97d0809968bc5f9887cb5a000a518a4b67d8eb999cb775c"; + sha256 = "9511dce6d23abdaa47d39d8e222c6b49206bf92e19f4acaf4966b2d402bb6541"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 94e7410d6c79..3e92dc97f96d 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.0.6"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zkpSaiqb0wUTugmbeREVJyZzv5qxXXw4YFBpXzdSUXE="; + sha256 = "17c5d821834726d3cad010d07bc9951cdf57b0a703e3727520f817286809591e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index 53d6d51d2d28..d35846a11017 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -1,39 +1,31 @@ { lib , buildPythonPackage +, click , fetchPypi -, fetchpatch -, six , pyyaml , rdflib , ply , xmltodict , pytestCheckHook -, pythonAtLeast +, pythonOlder }: + buildPythonPackage rec { pname = "spdx-tools"; - version = "0.6.1"; + version = "0.7.0a3"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9a1aaae051771e865705dd2fd374c3f73d0ad595c1056548466997551cbd7a81"; + sha256 = "sha256-afV1W1n5ubHhqfLFpPO5fxaIy5TaZdw9eDy3JYOJ1oE="; }; - patches = lib.optionals (pythonAtLeast "3.9") [ - # https://github.com/spdx/tools-python/pull/159 - # fixes tests on Python 3.9 - (fetchpatch { - name = "drop-encoding-argument.patch"; - url = "https://github.com/spdx/tools-python/commit/6c8b9a852f8a787122c0e2492126ee8aa52acff0.patch"; - sha256 = "RhvLhexsQRjqYqJg10SAM53RsOW+R93G+mns8C9g5E8="; - }) - ]; - propagatedBuildInputs = [ - six + click + ply pyyaml rdflib - ply xmltodict ]; diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index f5ec90755c1d..1d890de94f70 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinx_rtd_theme"; - version = "0.5.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "32bd3b5d13dc8186d7a42fc816a23d32e83a4827d7d9882948e7b837c232da5a"; + sha256 = "0p3abj91c3l72ajj5jwblscsdf1jflrnn0djx2h5y6f2wjbx9ipf"; }; postPatch = '' diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix new file mode 100644 index 000000000000..65e382ce30d1 --- /dev/null +++ b/pkgs/development/python-modules/spyse-python/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, dataclasses-json +, fetchFromGitHub +, limiter +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "spyse-python"; + version = "2.2.3"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "spyse-com"; + repo = pname; + rev = "v${version}"; + sha256 = "041k0037anwaxp2mh7mdk8rdsw9hdr3arigyyqfxfn35x8j41c3k"; + }; + + propagatedBuildInputs = [ + requests + dataclasses-json + responses + limiter + ]; + + # Tests requires an API token + doCheck = false; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'dataclasses~=0.6'," "" \ + --replace "responses~=0.13.3" "responses>=0.13.3" + ''; + + pythonImportsCheck = [ + "spyse" + ]; + + meta = with lib; { + description = "Python module for spyse.com API"; + homepage = "https://github.com/spyse-com/spyse-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 33b408240fc6..944a2cf08e09 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -41,5 +41,7 @@ buildPythonPackage rec { homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; description = "Versioning and auditing extension for SQLAlchemy"; license = licenses.bsd3; + # https://github.com/kvesteri/sqlalchemy-continuum/issues/255 + broken = lib.versionAtLeast sqlalchemy.version "1.4"; }; } diff --git a/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/pkgs/development/python-modules/starkbank-ecdsa/default.nix index 9d935444339a..df45883b9b05 100644 --- a/pkgs/development/python-modules/starkbank-ecdsa/default.nix +++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix @@ -6,18 +6,31 @@ buildPythonPackage rec { pname = "starkbank-ecdsa"; - version = "1.1.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "starkbank"; repo = "ecdsa-python"; rev = "v${version}"; - sha256 = "1x86ia0385c76nzqa00qyrvnn4j174n6piq85m7ar5i0ij7qky9a"; + sha256 = "sha256-MTd9aeX6UavRua0hnuy5qY5kltzSoyvv+LcL5EvU5Sc="; }; - checkInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "-v tests/*.py" ]; - pythonImportsCheck = [ "ellipticcurve" ]; + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + cd tests + ''; + + pytestFlagsArray = [ + "-v" + "*.py" + ]; + + pythonImportsCheck = [ + "ellipticcurve" + ]; meta = with lib; { description = "Python ECDSA library"; diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index cbd08934115c..d85113b50d2e 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.4.4"; + version = "1.5.0"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "044ae3bec56f31e18dff8cfa62a2c9c028f4c7fe4c0f761e50761184d3b68eef"; + sha256 = "273a6382cc98a404d20779351cd5bb12e746397fbe18a8e9ccec4ae3c0ffa0e2"; }; postPatch = '' diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index e02da9a07ca5..384d7e3902ed 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.60.0"; + version = "2.61.0"; src = fetchPypi { inherit pname version; - sha256 = "8966b7793014380f60c6f121ba333d6f333a55818edaf79c8d70464ce0a7a808"; + sha256 = "8131addd3512a22c4c539dda2d869a8f488e06f1b02d1f3a5f0f4848fc56184e"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index dc7aea0c3bf9..3d1a8f8af674 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "21.1.0"; + version = "21.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d9d2d890532e8db83c6977a2a676fb1889922ff0c26ad4dc0ecac26f9fafbc57"; + sha256 = "7ac42b565e1295712313f91edbcb64e0840a9037d888c8954f11fa6c43270e99"; }; checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 9b834fe5c5ba..943bbd22c7fb 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.0.1"; + version = "3.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WpqkCAwDYb6L+W4VTC/1auGVbblnNYwBxbk+tZbAiBw="; + sha256 = "5dcd2c5cbf2f419da00abde00798d067b515c2f082ce63f4fbe1de47682c1c41"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/svdtools/default.nix b/pkgs/development/python-modules/svdtools/default.nix new file mode 100644 index 000000000000..b02058b8d301 --- /dev/null +++ b/pkgs/development/python-modules/svdtools/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, braceexpand +, click +, pyyaml +, lxml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "svdtools"; + version = "0.1.20"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version pname; + sha256 = "028s1bn50mfpaygf1wc2mvf06s50wqfplqrkhrjz6kx8vzrmwj72"; + }; + + propagatedBuildInputs = [ + braceexpand + click + pyyaml + lxml + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "svdtools" ]; + + meta = with lib; { + description = "Python package to handle vendor-supplied, often buggy SVD files"; + homepage = "https://github.com/stm32-rs/svdtools"; + changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix index 3b6869fbf9ac..8f6d86abdd9b 100644 --- a/pkgs/development/python-modules/systembridge/default.nix +++ b/pkgs/development/python-modules/systembridge/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "systembridge"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "1p0w1phmlifkag7inx8395g8li13r4b7dvgkpj6fysdi42glvvxp"; + sha256 = "sha256-VR5juaZdZaEo7S0XXJkspcKmH1alitNIWmI0g/dFBbM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 8cb2a2f0278d..ebc2d46fd989 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true"; in buildPythonPackage rec { pname = "tasklib"; - version = "2.4.0"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "3645594147107c92780e19ac437f09eb8b8eac950209fb92d3f71869a721234e"; + sha256 = "b523bc12893d26c8173a6b8d84b16259c9a9c5acaaf8932bc018117f907b3bc5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index d66ce20d697e..96017e364b3e 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -6,22 +6,26 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, httpx , poetry-core , pytest-asyncio , pytestCheckHook +, pythonOlder , wrapt }: buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.21.0"; + version = "1.1.2"; format = "pyproject"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "1rwp3aag21hdkis2wx680ckja0203grm7naldaj8d2kpy4697m54"; + sha256 = "sha256-i1p36qy3UF9dKzFBHaW5w0s75z/mgQ8tlYWe6qLxAKk="; }; nativeBuildInputs = [ @@ -33,6 +37,7 @@ buildPythonPackage rec { aiohttp backoff beautifulsoup4 + httpx wrapt ]; diff --git a/pkgs/development/python-modules/timecop/default.nix b/pkgs/development/python-modules/timecop/default.nix new file mode 100644 index 000000000000..272657dfaafd --- /dev/null +++ b/pkgs/development/python-modules/timecop/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "timecop"; + version = "0.5.0dev"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zbi58sw2yp1qchzfhyi7bsrwxajiypphg65fir98kvj03g011wd"; + }; + + # test_epoch fails, see https://github.com/bluekelp/pytimecop/issues/4 + preCheck = '' + sed -i 's/test_epoch/_test_epoch/' timecop/tests/test_freeze.py + ''; + + meta = with lib; { + description = "A port of the most excellent TimeCop Ruby Gem for Python"; + homepage = "https://github.com/bluekelp/pytimecop"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 48fbf84e93a9..0b9e6547dee6 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -1,24 +1,44 @@ -{ buildPythonPackage, lib, fetchPypi, regex }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, regex +}: buildPythonPackage rec { pname = "titlecase"; version = "2.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9a1595ed9b88f3ce4362a7602ee63cf074e10ac80d1256b32ea1ec5ffa265fa0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ppannuto"; + repo = "python-titlecase"; + rev = "v${version}"; + sha256 = "169ywzn5wfzwyknqavspkdpwbx31nycxsxkl7iywwk71gs1lskkw"; }; - propagatedBuildInputs = [ regex ]; + propagatedBuildInputs = [ + regex + ]; - # no tests run - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "titlecase" ]; + pytestFlagsArray = [ + "titlecase/tests.py" + ]; + + pythonImportsCheck = [ + "titlecase" + ]; meta = with lib; { + description = "Python library to capitalize strings as specified by the New York Times"; homepage = "https://github.com/ppannuto/python-titlecase"; - description = "Python Port of John Gruber's titlecase.pl"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index b0f857196d39..631d4836d7f3 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "0.1.7"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0pmcc8xpsmij4174ky81vp811yxgic2lj1dfj2fa0ii87nlcfwhp"; + sha256 = "sha256-mavQDGFOVOde4I2IeZiGrMKRjMiJBeymR0upF7Mncps="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-futures/default.nix b/pkgs/development/python-modules/types-futures/default.nix index 5e9ebe7fa7fd..845dab08d330 100644 --- a/pkgs/development/python-modules/types-futures/default.nix +++ b/pkgs/development/python-modules/types-futures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-futures"; - version = "3.3.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1p00wb93af01b6fw9wxk9qm4kbhqwb48nszmm16slsrc1nx4px25"; + sha256 = "bbdad92cec642693bac10fbbecf834776009db7782d91dc293bdd123be73186d"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 5d9737c5803e..b3e38c864070 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.17.4"; + version = "3.18.0"; src = fetchPypi { inherit pname version; - sha256 = "0r42kzspqna2b2jiz9bjzagrd4gbh0sd6jp4v7i9nv09y0ifrkrn"; + sha256 = "a391d1a9138fe53fe08aeb6aa15ca7f1a188659b9a6c12af5313c55730eccd6c"; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 4b3f9c1726c8..a6139eb9c9b2 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.1.2"; + version = "2021.3.0"; src = fetchPypi { inherit pname version; - sha256 = "448828a06f2aaa840e57364d866c661645a045e532f817e4f10c8c3ab2b66651"; + sha256 = "sha256-hqYZZ4NNzuqvmLaQLtg1fv3SYruK/K9LyMzs90hZJ3g="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 464b0d58762e..05fb1b2b9f43 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.9"; + version = "2.25.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Tsi3Hac+U0Stub7nJadOyFmOcob5vLF1ANYn8ln+T7k="; + sha256 = "sha256-snkoTlH2aOOO4S2WZeTXiQifUy3CoL5KFQjKDv2Yup4="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix new file mode 100644 index 000000000000..d7a90bcb9e8d --- /dev/null +++ b/pkgs/development/python-modules/ush/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook}: + +buildPythonPackage rec { + pname = "ush"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "tarruda"; + repo = "python-ush"; + rev = version; + sha256 = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo="; + }; + + checkInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # seems to be outdated? + "tests/test_glob.py" + ]; + + meta = with lib; { + description = "Powerful API for invoking with external commands"; + homepage = "https://github.com/tarruda/python-ush"; + license = licenses.mit; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index b9d6b7151665..17ed9f4eb02f 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -1,4 +1,5 @@ { lib +, backoff , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2021.9.4"; + version = "2021.10.2"; disabled = pythonOlder "3.7"; @@ -16,10 +17,11 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-WywJ70tVniUX9RZTh9aswHgCEvWTggzABhSWoSRydUc="; + sha256 = "sha256-zamFDlahHQGo5g0dlGF6uWG53K/IkEjP0dA8cWYrhtI="; }; propagatedBuildInputs = [ + backoff pyserial-asyncio ]; @@ -27,7 +29,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ " velbusaio" ]; + pythonImportsCheck = [ + "velbusaio" + ]; meta = with lib; { description = "Python library to support the Velbus home automation system"; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 5336420c79af..868ad5fed966 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.20"; + version = "0.21"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ljk2AOwnF7efWcmE942TX3bkbEyu+HWoe4tO1gLy/2U="; + sha256 = "64f2dbcbbed15f9a6da2b85f643997db729cf496cafdb97670fb2fa73a7d8e20"; }; # Couldn't get tests to work because, for instance, they used virtualenv and diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix new file mode 100644 index 000000000000..69d77551fcd3 --- /dev/null +++ b/pkgs/development/python-modules/versionfinder/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchFromGitHub, GitPython, pytestCheckHook, backoff, requests }: + +buildPythonPackage rec { + pname = "versionfinder"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jantman"; + repo = pname; + rev = version; + sha256 = "16mvjwyhmw39l8by69dgr9b9jnl7yav36523lkh7w7pwd529pbb9"; + }; + + propagatedBuildInputs = [ + GitPython + backoff + ]; + + checkInputs = [ + pytestCheckHook + requests + ]; + + disabledTestPaths = [ + # acceptance tests use the network + "versionfinder/tests/test_acceptance.py" + ]; + + pythonImportsCheck = [ "versionfinder" ]; + + meta = with lib; { + description = "Find the version of another package, whether installed via pip, setuptools or git"; + homepage = "https://github.com/jantman/versionfinder"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index dc1223419249..cc6655a3b6c4 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "94cff37e03f89fc4c5e4b2d4c913c7d5d7450f5a205d14f709b39e0a4202be95"; + sha256 = "ce0abfc5909d06031dc612ec321d7f75df50bcb47a31e14e882a299cea2ea7a3"; }; propagatedBuildInputs = [ future python-dateutil six ]; diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 0e0d19e4f40a..1542a447a1bc 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.7.5"; + version = "0.7.6"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-vC2teem231Lw7cglVc+0M+QbgMgZ23JzTYy7wvnhFI4="; + sha256 = "sha256-Gf3hNCXioaLiQ0fZWPe9PO2YQeId4ZLmWsSZ5WvjSk0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index c04fcf7f0d83..6c40f266f346 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.7"; + version = "0.7.8"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-unxJf//VJc21uM0njirQIOjMrkFR6KXicNrOXKus3lw="; + sha256 = "sha256-fKtG0D256bK1hIcQiLdzCM+IdD/mmcFpcoE3DEFt7r0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index 805f99c02288..da90c3c2a74d 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "youless-api"; - version = "0.13"; + version = "0.14"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jongsoftdev"; repo = "youless-python-bridge"; rev = version; - sha256 = "sha256-Vywzd8wZG4eI/U69fPYuLpF54zAeuCv3Q81z5UcMGjc="; + sha256 = "sha256-ZHDQ+4Urv0ZxKFASsgDG12mpfRiCN2DwU6Rgc9ye5qY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 46377a238bfe..650f09558cbc 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.36.7"; + version = "0.36.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-jGbYd56JCXYUE4N2He5Ds8vVcgfny1kUYbd1rL7upcM="; + sha256 = "sha256-lsvrttfyUtQneUkQlWFpmQ99BSJp/YiVYUKY7AWh0rs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 70afd412f3e4..6a4a87bc8963 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -119,6 +119,7 @@ let wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; nativeBuildInputs = [ makeWrapper ]; + inherit (ruby) gemPath meta; buildCommand = '' mkdir -p $out/bin for i in ${ruby}/bin/*; do diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 72c5595e2883..0855084b314e 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.4"; + version = "1.6.5"; subPackages = [ "cmd/actionlint" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "1516892wikz3zda0la57s8nbm6459pf4vd123rv09s4nivznbmcx"; + sha256 = "12s9ijfvnmfbcvf5lxi2jm3j7vrn7rfkas2lib5jdih77hf9270k"; }; vendorSha256 = "1i7442n621jmc974b73pfz1gyqw74ilpg1zz16yxqpfh5c958m7n"; @@ -30,5 +30,6 @@ buildGoModule rec { changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.marsam ]; + mainProgram = "actionlint"; }; } diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index c645cd359032..f287d10ff42d 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.32.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0DK6uTbuIVqrfsrTF0tAbx1WnVpc97nE0zuwTcFoBf8="; + sha256 = "1cq84ggp32xx79sgrxyqysqs34lhzyv8jdg7d46d9hdvjcwjb5af"; }; - vendorSha256 = "sha256-ox5Wx/9sJhZq4kFuI/GQlmFzuo5xti8yV+FY0bdR6Ek="; + vendorSha256 = "1ay3vf4dqlbizq98nxz2cgi67ck1c6lw7wi28w56607qzbx0yvmg"; doCheck = false; diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix new file mode 100644 index 000000000000..9e24309d984a --- /dev/null +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, python3 +, rustPlatform +, pkg-config +, glib +, libshumate +, gst_all_1 +, gtk4 +, libadwaita +, llvmPackages +, glibc +, pipewire +, wayland +, wrapGAppsHook4 +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "ashpd-demo"; + version = "0.0.1-alpha"; + + src = + let + share = fetchFromGitHub { + owner = "bilelmoussaoui"; + repo = "ashpd"; + rev = version; + sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; + }; + in + "${share}/ashpd-demo"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc + wrapGAppsHook4 + desktop-file-utils + glib # for glib-compile-schemas + ]; + + buildInputs = [ + glib + gtk4 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libadwaita + pipewire + wayland + libshumate + ]; + + # libspa-sys requires this for bindgen + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + # included by libspa-sys requires + BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + # https://github.com/bilelmoussaoui/ashpd/pull/32 + substituteInPlace build-aux/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Tool for playing with XDG desktop portals"; + homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/build-managers/ekam/default.nix b/pkgs/development/tools/build-managers/ekam/default.nix new file mode 100644 index 000000000000..9247a2b21302 --- /dev/null +++ b/pkgs/development/tools/build-managers/ekam/default.nix @@ -0,0 +1,67 @@ +{ lib, stdenv, fetchFromGitHub, capnproto }: + +stdenv.mkDerivation { + pname = "ekam"; + version = "unstable-2021-09-18"; + + src = fetchFromGitHub { + owner = "capnproto"; + repo = "ekam"; + rev = "77c338f8bd8f4a2ce1e6199b2a52363f1fccf388"; + sha256 = "0q4bizlb1ykzdp4ca0kld6xm5ml9q866xrj3ijffcnyiyqr51qr8"; + }; + + # The capnproto *source* is required to build ekam. + # https://github.com/capnproto/ekam/issues/5 + # + # Specifically, the git version of the source is required, as + # capnproto release tarballs do not include ekam rule files. + postUnpack = '' + mkdir -p $sourceRoot/deps + cp -r ${capnproto.src} $sourceRoot/deps/capnproto + ''; + + postPatch = '' + # A single capnproto test file expects to be able to write to + # /var/tmp. We change it to use /tmp because /var is not available + # under nix-build. + substituteInPlace deps/capnproto/c++/src/kj/filesystem-disk-test.c++ \ + --replace "/var/tmp" "/tmp" + ''; + + # NIX_ENFORCE_PURITY prevents ld from linking against anything outside + # of the nix store -- but ekam builds capnp locally and links against it, + # so that causes the build to fail. So, we turn this off. + # + # See: https://nixos.wiki/wiki/Development_environment_with_nix-shell#Troubleshooting + preBuild = '' + unset NIX_ENFORCE_PURITY + ''; + + makeFlags = [ + "PARALLEL=$(NIX_BUILD_CORES)" + ]; + + installPhase = '' + mkdir $out + cp -r bin $out + + # Remove capnproto tools; there's a separate nix package for that. + rm $out/bin/capnp* + # Don't distribute ekam-bootstrap, which is not needed outside this build. + rm $out/bin/ekam-bootstrap + ''; + + meta = with lib; { + description = ''Build system ("make" in reverse)''; + longDescription = '' + Ekam ("make" spelled backwards) is a build system which automatically + figures out what to build and how to build it purely based on the + source code. No separate "makefile" is needed. + ''; + homepage = "https://github.com/capnproto/ekam"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.garrison ]; + }; +} diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index b214f89eac98..5c3225c683f7 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk, writeText, roslyn }: +{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnetCorePackages, writeText, roslyn }: let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + xplat = fetchurl { url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip"; sha256 = "1wnzbdpk4s9bmawlh359ak2b8zi0sgx1qvcjnvfncr1wsck53v7q"; diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 084225a8f5e8..f810510b5625 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -1,10 +1,11 @@ { lib , fetchFromGitHub -, crystal_1_0 +, crystal }: + let generic = - { version, sha256, crystal }: + { version, sha256 }: crystal.buildCrystalPackage { pname = "shards"; @@ -39,8 +40,12 @@ rec { shards_0_15 = generic { version = "0.15.0"; sha256 = "sha256-/C6whh5RbTBkFWqpn0GqyVe0opbrklm8xPv5MIG99VU="; - crystal = crystal_1_0; }; - shards = shards_0_15; + shards_0_16 = generic { + version = "0.16.0"; + sha256 = "sha256-go8sL4djIDGNwb7FsCcATONnMYahHY8qJUDyUiPLRUY="; + }; + + shards = shards_0_16; } diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/development/tools/bunyan-rs/default.nix index 12ced94c81b7..e5f58810ebf4 100644 --- a/pkgs/development/tools/bunyan-rs/default.nix +++ b/pkgs/development/tools/bunyan-rs/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/LukeMathWalker/bunyan"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ netcrns ]; + mainProgram = "bunyan"; }; } diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index a95f9914fe71..38382ea43474 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -21,6 +21,7 @@ buildGoModule rec { }; meta = with lib; { + mainProgram = "drone"; maintainers = with maintainers; [ ]; license = licenses.asl20; description = "Command line client for the Drone continuous integration server"; diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 5417f2b83a5d..977f05aea5c6 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -8,9 +8,7 @@ , stdenv }: -let - node-api-lib = (if stdenv.isDarwin then "libquery_engine.dylib" else "libquery_engine.so"); -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "prisma-engines"; version = "3.2.0"; @@ -47,7 +45,7 @@ in rustPlatform.buildRustPackage rec { cargoBuildFlags = "-p query-engine -p query-engine-node-api -p migration-engine-cli -p introspection-core -p prisma-fmt"; postInstall = '' - mv $out/lib/${node-api-lib} $out/lib/libquery_engine.node + mv $out/lib/libquery_engine${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libquery_engine.node ''; # Tests are long to compile diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 40c4e459a2ee..095c2e10b573 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.8"; + version = "0.7.0"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Aistr85doKEOD0/uTS/7iRzYggb+hC3njVi4mWt8ndM="; + sha256 = "sha256-Cqbo1L3z3bTDIXZ90GXdAulTpGhWLoTc/kYRNghZ/SE="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -39,10 +39,9 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTestPaths = [ - # dbt is not available yet - "test/core/templaters/dbt_test.py" # Don't run the plugin related tests "test/core/plugin_test.py" + "plugins/sqlfluff-templater-dbt" "plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py" ]; diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index 9d6510c89d8d..b647505fe4bf 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dockle"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H+qJBwKh+jh5ECMPbPgGtXzF+mm73ut0+URqpNBc3SM="; + sha256 = "sha256-0yeHxQW6zX8Mh9JBmp915czEZCmbIom/KYHWLc/O6NY="; }; vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ="; diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 2218b441476e..7e8c61e1c8d2 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2021.5"; + version = "2021.7"; format = "other"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "1fz6r6mkp4fw1mn6gn9745wcdcqg7696bbwvdcnmhinlhrcnaiz6"; + sha256 = "i2s4JXg+D9sYq1QwVcDRLIr9qnRmzHC+cBInHv4SXHI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/development/tools/ec2-metadata-mock/default.nix new file mode 100644 index 000000000000..1a2fd8ec0f70 --- /dev/null +++ b/pkgs/development/tools/ec2-metadata-mock/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ec2-metadata-mock"; + version = "1.9.2"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "amazon-ec2-metadata-mock"; + rev = "v${version}"; + sha256 = "sha256-k4YzG4M+r6BHc4DdAMXoUvVDTJqmzr8vIL1J6kbJBeY="; + }; + + vendorSha256 = "sha256-uq0gcpFzAcz1HMwI1ZjHykWU93bV2U5kxC/G+J4ob7Q="; + + postInstall = '' + mv $out/bin/{cmd,ec2-metadata-mock} + ''; + + meta = with lib; { + description = "Amazon EC2 Metadata Mock"; + homepage = "https://github.com/aws/amazon-ec2-metadata-mock"; + license = licenses.asl20; + maintainers = with maintainers; [ ymatsiuk ]; + }; +} diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index c8c388847ad2..2134c8e033f7 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,43 +105,43 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.2.1" { - armv7l-linux = "7cad4f432655e3ac8b4b2f792648015f820f52abe4f2f489302de6d5a170d62a"; - aarch64-linux = "53f4397bf88f026f1a73919b6d1c74eb15b908283f93935801b76647530acd08"; - x86_64-linux = "a3e736c286f326eced0080f29a56b546c308716f4ce0d4f144adc37b530990ef"; - i686-linux = "be333c8fffb8adbf96b19b33f87e1cbe6ff8a36ecd0a5c48fa8352fed8850510"; - x86_64-darwin = "9a8e4fe8069e164fb2a87736bc9f9a1546a5c4060c499a92a7f9a95bd3c5c19d"; - aarch64-darwin = "e9844eeb0e2a26ba60a8eb1540f0d1c52069806c885842a33b45b4fd2b2bb187"; - headers = "1m1hcdb96rcxcdg812cn2m68bh1s1h6qyy39lmvkjvhbpyzd02pr"; + electron_12 = mkElectron "12.2.2" { + armv7l-linux = "aeee4acf40afa0397c10a4c76bc61ed2967433bab5c6f11de181fa33d0b168ff"; + aarch64-linux = "593a3fef97a7fed8e93b64d659af9c736dff445eedcbfd037f7d226a88d58862"; + x86_64-linux = "a8e88c67f375e41f3a6f8b8a8c3a1e41b8c0a46f1b731e05de21208caa005fb2"; + i686-linux = "5f0bdc9581237f2f87b5d34e232d711617bd8bf5ff5d7ebd66480779c13fba0a"; + x86_64-darwin = "8a33d2bed668e30a6d64856e01d2aa3b1f1d9efe4eb0e808e916694d32d5e8f2"; + aarch64-darwin = "256daa25a8375c565b32c3c2f0e12fbac8d5039a13a9edbb3673a863149b750a"; + headers = "1fvqkw08pync38ixi5cq4f8a108k2ajxpm1w2f8sn2hjph9kpbsd"; }; - electron_13 = mkElectron "13.5.1" { - armv7l-linux = "9cb773eaa9882c313513cb1bb552f8bcac859f35854de477dc2ec6cc24e7d003"; - aarch64-linux = "ae605f169482b1c40e9449073c0f962cceeac4166a00cb304ba22f4f5a7a5d48"; - x86_64-linux = "4d145dbca59541d665435198c9fb697b1ec85c6e525878b7f48ecb8431dc4836"; - i686-linux = "95acabcf7d0a5a3bbfa0634c1956d8aea59565fb695d22ec65edd77c2a09e3a8"; - x86_64-darwin = "ac342741a17034ccc305b83fde18d014f8c6080f8f7143e953545a945542168d"; - aarch64-darwin = "79ad1c22afb2e5338467621fc16a092d16be329c3b60bb753caa311e9933a4b4"; - headers = "0pjj0ra5ksn6cdqiy84ydy45hivksknzbq3szs9r9dlajcczgw9l"; + electron_13 = mkElectron "13.5.2" { + armv7l-linux = "f325d48761ec222a2f9bbf0d0a3b995959266314b8375d4d6bb8e014bddd3a06"; + aarch64-linux = "6d89c41e53d8c14ae4a4b7f2f9d7b477055decad3074675e4cef745967829688"; + x86_64-linux = "6f9b9ad08f74ea8a2c214a7bafbc5b08e316674ff964b91a93f575e499d00464"; + i686-linux = "62d8766c1c921a95b24e2128bcee66e2e832491715df51554d9a12a16087d35c"; + x86_64-darwin = "d5f6262e89a986e3a453f37086ce27e389c9b3fab0f797d169c7a065aac80850"; + aarch64-darwin = "04213cc9303b2114b0db2db0e1a598427788118c125d306b68d1da6ee41a8d2f"; + headers = "1hpcpnkzs834fr5kqaiww4dpq44bpxhgbrrs6a2njkdfv4j3xmrk"; }; - electron_14 = mkElectron "14.1.0" { - armv7l-linux = "25a68645cdd1356d95a8bab9488f5aeeb9a206f9b5ee2df23c2e13f87d775847"; - aarch64-linux = "94047dcf53c54f6a5520a6eb62e400174addf04fc0e3ebe04b548ca962de349a"; - x86_64-linux = "27b60841c85369a0ea8b65a8b71cdd1fb08eba80d70e855e9311f46c595874f3"; - i686-linux = "808795405d6b27221b219c2a0f7a058e3acb2e56195c87dc08828dc882ffb8e9"; - x86_64-darwin = "36d8e900bdcf5b410655e7fcb47800fa1f5a473c46acc1c4ce326822e5e95ee1"; - aarch64-darwin = "5c81f418f3f83dc6fc5893247dd386e1d23e609c83f798dd5aad451febed13c8"; - headers = "0p8lkhy97yq43sl6s4rskhdnzl520968cyh5l4fdhl2fhm5mayd4"; + electron_14 = mkElectron "14.1.1" { + armv7l-linux = "56cbba7f15c8caeef06af50e249e26974f1a01ca7133f7b9baa35338454b4f73"; + aarch64-linux = "b9c1187d6116bd83c402b01215a2af3a6206f11de5609fa5eb5d0e75da6f8d26"; + x86_64-linux = "5bf136691dfdff9ef97f459db489dd5c4c9981e48780fb7a92ebb2e575c8dffb"; + i686-linux = "0a00bbea8a23a3d517fbdf9a8e82bc51a2276af57a1ee10793cffb8a2178a45f"; + x86_64-darwin = "388c88d3b7c7b69d524b143c26d1e13f08e5192aad1197bfa955f56ff38ce9b3"; + aarch64-darwin = "a3b17406a28553a04576199adb68b2c78a1c457e78985f5648231bbf9b367832"; + headers = "1pw67w9l63xgkwp78wmnxfjgyzlrmij27bapd2yjrvj6ag7j9xgy"; }; - electron_15 = mkElectron "15.1.1" { - armv7l-linux = "902711052fdb0e7bfcded9396aa24fd5bcf6fcc5f70548f51396d75a45cd6645"; - aarch64-linux = "05b24c409a6dbf83b5f64f2d8904fa37cf71259c46beaaabd4b9a5ba75d03cd3"; - x86_64-linux = "70de2da51c6a8591b88f08366c82166a51b1719243f67ef1a14eddbb806a115f"; - i686-linux = "30f4be4dcf06c6dda953af94dd14a232767592f69e7f408def1a5b58dab054ea"; - x86_64-darwin = "ddfab707063a79f25a95983abeba6ef4e581d53b6f26e7667fde4fd11c5547b0"; - aarch64-darwin = "8db2ff70446e081311bb1d5cc8a13fd66e7143046747f87cdb07b139d973bb89"; - headers = "1hfgxk1iyzg6jr36s78l3m3g8433gna6l1n2jz33mz9iw66wgy27"; + electron_15 = mkElectron "15.2.0" { + armv7l-linux = "b682f5adca133673c8a7488c0d7e0dab8bddf0028218a2b4b842c85c12393aea"; + aarch64-linux = "dea4ebd0583f149909acb6fe3168e225e4f6cb5470c1d0eb6c86cb58db0fb623"; + x86_64-linux = "35d1c7e02fde920664ca245ad694cae82e3acfdac0175a1d32345497eb455673"; + i686-linux = "52d48fbd6a6d8cae565a0d3f7574305c6313c42cac96bbdde39621b201df0082"; + x86_64-darwin = "32d3d4e5f7dbb8fe035a7b91dc64c042eb930461424784d4c450e06768e7162d"; + aarch64-darwin = "a7982607416ca2d30d7f48fbc3b16ab072c46170b117123a5e9763f85227a5cb"; + headers = "0l9hbvikkw5qd1zp4kwa5w1pj80m466skdlz6j474jzqk1qz2nzm"; }; } diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix new file mode 100644 index 000000000000..efd5b917e9cd --- /dev/null +++ b/pkgs/development/tools/esbuild/netlify.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "esbuild"; + version = "0.13.6"; + + src = fetchFromGitHub { + owner = "netlify"; + repo = "esbuild"; + rev = "v${version}"; + sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; + }; + + vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + + meta = with lib; { + description = "A fork of esbuild maintained by netlify"; + homepage = "https://github.com/netlify/esbuild"; + license = licenses.mit; + maintainers = with maintainers; [ roberth ]; + }; +} diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 856cd44e26c0..2d1cdfc546b2 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/gtk-rs/gir/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ekleog ]; + mainProgram = "gir"; }; } diff --git a/pkgs/development/tools/git-privacy/default.nix b/pkgs/development/tools/git-privacy/default.nix new file mode 100644 index 000000000000..c17654174382 --- /dev/null +++ b/pkgs/development/tools/git-privacy/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, git +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "git-privacy"; + version = "2.1.0"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "EMPRI-DEVOPS"; + repo = pname; + rev = "v${version}"; + sha256 = "0hfy43fip1l81672xfwqrz1jryzkjy7h9f2lyikxgibibil0p444"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + click + git-filter-repo + GitPython + pynacl + setuptools + ]; + + checkInputs = with python3.pkgs; [ + git + pytestCheckHook + ]; + + disabledTests = [ + # Tests want to interact with a git repo + "TestGitPrivacy" + ]; + + pythonImportsCheck = [ + "gitprivacy" + ]; + + meta = with lib; { + description = "Tool to redact Git author and committer dates"; + homepage = "https://github.com/EMPRI-DEVOPS/git-privacy"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 9f9bb882de08..70e127e9000d 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.8.1"; + version = "2.9.1"; subPackages = [ "cmd/gosec" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AlADSEekcUH/pCGggKlkBDiIYMe1zsoe9hh6fVUwQVA="; + sha256 = "0q9834siya19gj5ckymymyzkd1yn34b4xg5bvcgd7ckcpky143yw"; }; - vendorSha256 = "sha256-HBwIZfvkL9HSwkD1sZzBM7IJFAjLbCxyc95vqR5TFAg="; + vendorSha256 = "1h0bbkp9g5nzzjm8qkaag54n9nl711ckkjwibb1gb9ciqwsad33l"; doCheck = false; diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 51c7d3340847..04024dc3acfb 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.6.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3dSWIDPIT4crsJuaB1TDfrUzobn8RfRlFAhqMXzZbKI="; + sha256 = "sha256-ZCEgv+2WC1XLDFdRtigkiWu81zLMHvmB8vvIBWN2UYY="; }; - vendorSha256 = "sha256-+MVViFwaApGZZxCyTwLzIEWTZDbr7WSx7e/yGbJ309Y="; + vendorSha256 = "sha256-LFa0s2FBkw97P0CV+9JBmUAjaKVO+RzCX+iWGPUD9iA="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index a0b9b813f4f0..298c55c47e96 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.6"; + version = "0.10.7"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1f31z5isr34acv3nbsdigk3h426vind2zk5qvy44zmb5qmlb15x9"; + outputHash = "0sk4vwpy06smn0k7035bdz0g2y98l8hxmn4v3gijsqaxvnya36x9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 31c5d0d26e8f..c6c8ff2a8a84 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.46.0"; + version = "1.49.4"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "0cxgc18xpwyb5wp08km7aj8asn5biqnwq9fkgkk6wv1r1ihqlhf2"; + sha256 = "t1S54z3xTMTUBWz0jCFX1A7GJdWWsP/lTa9MMjo8t1A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index c8f1a3e420a2..fc8277625a9d 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -1,88 +1,33 @@ -{ lib, stdenvNoCC, fetchurl, fetchgit, - gnumake, patch, zlib, git, bison, - flex, gnat11, curl, perl +{ callPackage, fetchgit, lib, stdenvNoCC +, bison, curl, git, perl +, flex, gnat11, zlib }: -let - version_coreboot = "4.14"; - - version_gmp = "6.2.0"; - version_mpfr = "4.1.0"; - version_mpc = "1.2.0"; - version_gcc = "8.3.0"; - version_binutils = "2.35.1"; - version_acpica = "20200925"; - version_nasm = "2.15.05"; - - tar_name_gmp = "gmp-${version_gmp}.tar.xz"; - tar_gmp = fetchurl { - url = "https://ftpmirror.gnu.org/gmp/${tar_name_gmp}"; - sha256 = "09hmg8k63mbfrx1x3yy6y1yzbbq85kw5avbibhcgrg9z3ganr3i5"; - }; - - tar_name_mpfr = "mpfr-${version_mpfr}.tar.xz"; - tar_mpfr = fetchurl { - url = "https://ftpmirror.gnu.org/mpfr/${tar_name_mpfr}"; - sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c"; - }; - - tar_name_mpc = "mpc-${version_mpc}.tar.gz"; - tar_mpc = fetchurl { - url = "https://ftpmirror.gnu.org/mpc/${tar_name_mpc}"; - sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9"; - }; - - tar_name_gcc = "gcc-${version_gcc}.tar.xz"; - tar_gcc = fetchurl { - url = "https://ftpmirror.gnu.org/gcc/gcc-${version_gcc}/${tar_name_gcc}"; - sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4"; - }; - - tar_name_binutils = "binutils-${version_binutils}.tar.xz"; - tar_binutils = fetchurl { - url = "https://ftpmirror.gnu.org/binutils/${tar_name_binutils}"; - sha256 = "01w6xvfy7sjpw8j08k111bnkl27j760bdsi0wjvq44ghkgdr3v9w"; - }; - - tar_name_acpica = "acpica-unix2-${version_acpica}.tar.gz"; - tar_acpica = fetchurl { - url = "https://acpica.org/sites/acpica/files/${tar_name_acpica}"; - sha256 = "18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w"; - }; - - tar_name_nasm = "nasm-${version_nasm}.tar.bz2"; - tar_nasm = fetchurl { - url = "https://www.nasm.us/pub/nasm/releasebuilds/${version_nasm}/${tar_name_nasm}"; - sha256 = "1l1gxs5ncdbgz91lsl4y7w5aapask3w02q9inayb2m5bwlwq6jrw"; - }; - - tar_coreboot_name = "coreboot-${version_coreboot}.tar.xz"; - tar_coreboot = fetchurl { - url = "https://coreboot.org/releases/${tar_coreboot_name}"; - sha256 = "0viw2x4ckjwiylb92w85k06b0g9pmamjy2yqs7fxfqbmfadkf1yr"; - }; -in stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "coreboot-toolchain"; - version = version_coreboot; - src = tar_coreboot; + version = "4.14"; - nativeBuildInputs = [ perl curl gnumake git bison ]; + src = fetchgit { + url = "https://review.coreboot.org/coreboot"; + rev = version; + sha256 = "00xr74yc0kj9rrqa1a8b7bih865qlp9i4zs67ysavkfrjrwwssxm"; + }; - buildInputs = [ gnat11 flex zlib ]; + nativeBuildInputs = [ bison curl git perl ]; + buildInputs = [ flex gnat11 zlib ]; enableParallelBuilding = true; dontConfigure = true; dontInstall = true; - patchPhase = '' - mkdir util/crossgcc/tarballs - ln -s ${tar_gmp} util/crossgcc/tarballs/${tar_name_gmp} - ln -s ${tar_mpfr} util/crossgcc/tarballs/${tar_name_mpfr} - ln -s ${tar_mpc} util/crossgcc/tarballs/${tar_name_mpc} - ln -s ${tar_gcc} util/crossgcc/tarballs/${tar_name_gcc} - ln -s ${tar_binutils} util/crossgcc/tarballs/${tar_name_binutils} - ln -s ${tar_acpica} util/crossgcc/tarballs/${tar_name_acpica} - ln -s ${tar_nasm} util/crossgcc/tarballs/${tar_name_nasm} + postPatch = '' + mkdir -p util/crossgcc/tarballs + + ${lib.concatMapStringsSep "\n" ( + file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}" + ) (callPackage ./stable.nix { }) + } + patchShebangs util/genbuild_h/genbuild_h.sh util/crossgcc/buildgcc ''; diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix new file mode 100644 index 000000000000..62c3043cc6cb --- /dev/null +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -0,0 +1,51 @@ +{ fetchurl }: [ + { + name = "gmp-6.2.0.tar.xz"; + archive = fetchurl { + sha256 = "09hmg8k63mbfrx1x3yy6y1yzbbq85kw5avbibhcgrg9z3ganr3i5"; + url = "mirror://gnu/gmp/gmp-6.2.0.tar.xz"; + }; + } + { + name = "mpfr-4.1.0.tar.xz"; + archive = fetchurl { + sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c"; + url = "mirror://gnu/mpfr/mpfr-4.1.0.tar.xz"; + }; + } + { + name = "mpc-1.2.0.tar.gz"; + archive = fetchurl { + sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9"; + url = "mirror://gnu/mpc/mpc-1.2.0.tar.gz"; + }; + } + { + name = "gcc-8.3.0.tar.xz"; + archive = fetchurl { + sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4"; + url = "mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz"; + }; + } + { + name = "binutils-2.35.1.tar.xz"; + archive = fetchurl { + sha256 = "01w6xvfy7sjpw8j08k111bnkl27j760bdsi0wjvq44ghkgdr3v9w"; + url = "mirror://gnu/binutils/binutils-2.35.1.tar.xz"; + }; + } + { + name = "acpica-unix2-20200925.tar.gz"; + archive = fetchurl { + sha256 = "18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w"; + url = "https://acpica.org/sites/acpica/files/acpica-unix2-20200925.tar.gz"; + }; + } + { + name = "nasm-2.15.05.tar.bz2"; + archive = fetchurl { + sha256 = "1l1gxs5ncdbgz91lsl4y7w5aapask3w02q9inayb2m5bwlwq6jrw"; + url = "https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.bz2"; + }; + } +] diff --git a/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/pkgs/development/tools/misc/coreboot-toolchain/update.sh new file mode 100755 index 000000000000..6f248359c69b --- /dev/null +++ b/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i bash -p nix cacert git getopt + +rootdir="../../../../../" + +src="$(nix-build $rootdir --no-out-link -A coreboot-toolchain.src)" +urls=$($src/util/crossgcc/buildgcc -u) + +tmp=$(mktemp) +echo '{ fetchurl }: [' > $tmp + +for url in $urls; do + name="$(basename $url)" + hash="$(nix-prefetch-url "$url")" + + cat << EOF >> $tmp + { + name = "$name"; + archive = fetchurl { + sha256 = "$hash"; + url = "$url"; + }; + } +EOF +done + +echo ']' >> $tmp + +sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' $tmp + +mv $tmp sources.nix diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index d335916bfe6a..45edeb89a9c7 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -2,16 +2,24 @@ stdenv.mkDerivation rec { pname = "dejagnu"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd"; + sha256 = "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ expect ]; + # dejagnu-1.6.3 can't successfully run tests in source tree: + # https://wiki.linuxfromscratch.org/lfs/ticket/4871 + preConfigure = '' + mkdir build + cd build + ''; + configureScript = "../configure"; + doCheck = true; # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 85917a114c0f..2b9d543fb791 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dfu-util"; - version = "0.10"; + version = "0.11"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; src = fetchurl { url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0"; + sha256 = "sha256-tLU7ohqC7349TEffKVKt9fpJT0mbawtXxYxdBK6P8Z4="; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix index 132ddf2eacfd..4d3661b6c201 100644 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ b/pkgs/development/tools/misc/fsatrace/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jacereda/fsatrace"; description = "filesystem access tracer"; license = licenses.isc; - maintainers = [ maintainers.peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/luarocks/3.7.nix b/pkgs/development/tools/misc/luarocks/3.7.nix new file mode 100644 index 000000000000..aa49af753b32 --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/3.7.nix @@ -0,0 +1,82 @@ +{lib, stdenv, fetchFromGitHub +, curl, makeWrapper, which, unzip +, lua +# for 'luarocks pack' +, zip +# some packages need to be compiled with cmake +, cmake +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "luarocks"; + version = "3.7.0"; + + src = fetchFromGitHub { + owner = "luarocks"; + repo = "luarocks"; + rev = "v${version}"; + sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d"; + }; + + patches = [ ./darwin-3.7.0.patch ]; + + postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' + substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' + ''; + + preConfigure = '' + lua -e "" || { + luajit -e "" && { + export LUA_SUFFIX=jit + configureFlags="$configureFlags --lua-suffix=$LUA_SUFFIX" + } + } + lua_inc="$(echo "${lua}/include"/*/)" + if test -n "$lua_inc"; then + configureFlags="$configureFlags --with-lua-include=$lua_inc" + fi + ''; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + buildInputs = [ lua curl which ]; + + postInstall = '' + sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* + for i in "$out"/bin/*; do + test -L "$i" || { + wrapProgram "$i" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ + --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ + --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" + } + done + + installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash) + installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh) + ''; + + propagatedBuildInputs = [ zip unzip cmake ]; + + # unpack hook for src.rock and rockspec files + setupHook = ./setup-hook.sh; + + # cmake is just to compile packages with "cmake" buildType, not luarocks itself + dontUseCmakeConfigure = true; + + shellHook = '' + export PATH="src/bin:''${PATH:-}" + export LUA_PATH="src/?.lua;''${LUA_PATH:-}" + ''; + + meta = with lib; { + description = "A package manager for Lua"; + license = licenses.mit ; + maintainers = with maintainers; [raskin teto]; + platforms = platforms.linux ++ platforms.darwin; + downloadPage = "http://luarocks.org/releases/"; + updateWalker = true; + }; +} diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch b/pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch new file mode 100644 index 000000000000..3252e6ae7b4f --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch @@ -0,0 +1,24 @@ +diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua +index 535bd69..b017161 100644 +--- a/src/luarocks/core/cfg.lua ++++ b/src/luarocks/core/cfg.lua +@@ -436,7 +436,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home) + defaults.external_lib_extension = "dylib" + defaults.arch = "macosx-"..target_cpu + defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" +- local version = util.popen_read("sw_vers -productVersion") ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@" + if not (version:match("^%d+%.%d+%.%d+$") or version:match("^%d+%.%d+$")) then + version = "10.3" + end +@@ -448,8 +448,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home) + else + defaults.gcc_rpath = false + end +- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc" +- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc" ++ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang" ++ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang" + defaults.web_browser = "open" + end + diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 22872bdcbfa8..05770464de7d 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -5,8 +5,8 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "test-speedup"; - sha256 = "sha256-WfzLSpIp0V7Ib4sjYvoJHF+/vHaieccvfVAr5W47QsQ="; + rev = "standalone"; + sha256 = "sha256-53Zi+GTayO9EQTCIVrzPeRRHeIkHLqy0mHyBDzbcQQk="; }; patches = []; diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index f37815081ee4..dbcd49dcfbe4 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, makeWrapper, fetchFromGitHub, cctools }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "macdylibbundler"; - version = "20180825"; + version = "1.0.0"; src = fetchFromGitHub { owner = "auriamg"; repo = "macdylibbundler"; - rev = "ce13cb585ead5237813b85e68fe530f085fc0a9e"; - sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; + rev = version; + sha256 = "02w04qvaf9v8yw8bgncx5qj3jx08xdfa855isvq92q27hsb8m8hv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 42a30cce8eb9..4fe721d9193f 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - hash = "sha256-iXsV7zt190GH0kTMpdmf8xHk4cqtCVwq6LDICmhe5qU="; + sha256 = "sha256-QLrmUlgrys+Bd2hiaPcfDUtn75XdaMhVThsDRq/ijQQ="; }; - cargoHash = "sha256-Yqn6VpAKw93QvkxuwNcYvrQm0C4TfisRDcmFy95/yw8="; + cargoSha256 = "sha256-Xw0/vEL50vc9ktwjTz09160Fo7rXRVgeRo/EnWJ2PH0="; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index da15f47b6a2c..25f7ce4e7aa6 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -3,7 +3,7 @@ , fetchurl , mono6 , msbuild -, dotnet-sdk +, dotnetCorePackages , makeWrapper , unzip , writeText @@ -11,6 +11,8 @@ let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + deps = map (package: stdenv.mkDerivation (with package; { pname = name; inherit version src; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index fa8ee6f49928..aa9329874360 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -24,6 +24,7 @@ tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json)); tree-sitter-latex = (builtins.fromJSON (builtins.readFile ./tree-sitter-latex.json)); tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json)); + tree-sitter-make = (builtins.fromJSON (builtins.readFile ./tree-sitter-make.json)); tree-sitter-markdown = (builtins.fromJSON (builtins.readFile ./tree-sitter-markdown.json)); tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json)); tree-sitter-norg = (builtins.fromJSON (builtins.readFile ./tree-sitter-norg.json)); diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json new file mode 100644 index 000000000000..fcb0b280e243 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/alemuller/tree-sitter-make", + "rev": "716c294283bc3dda263ccbdf55e38ec30aa0edba", + "date": "2021-04-30T16:37:32-03:00", + "path": "/nix/store/v2dvgqs3fxwh83dhc53xivrx8i0g519y-tree-sitter-make", + "sha256": "1fb6rf6pc6mdawphifhlbzbgppxvq6hj48cz6073schvavgjgchc", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 4f1e69a585fe..bb1736b3ce71 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -102,6 +102,10 @@ let orga = "travonted"; repo = "tree-sitter-fennel"; }; + "tree-sitter-make" = { + orga = "alemuller"; + repo = "tree-sitter-make"; + }; "tree-sitter-markdown" = { orga = "ikatyang"; repo = "tree-sitter-markdown"; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 248a137c49f6..1731dabf3704 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -14,6 +14,7 @@ buildRustPackage rec { license = licenses.mit; maintainers = [ maintainers.klntsky ]; platforms = platforms.linux; + mainProgram = "px"; }; src = diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 26d7063c81f2..6c0465c1cf35 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -2,19 +2,22 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "10ml3va6ip501ibaykbhq8282y1j6r8bc8azc1gqxskk5jvfz1jm"; + sha256 = "1a6rmph96s7c8lpmpkizcvdf0x4jlsr5iqi7qjprxqsf6zak2rfg"; }; outputs = [ "out" ]; makeMakerFlags = [ "INSTALLDIRS=vendor" ]; + # Avoid creating perllocal.pod, which contains a timestamp + installTargets = [ "pure_install" ]; + # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS. patchPhase = '' substituteInPlace pg_format \ diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index eab000e8d8e4..03460f7f04c0 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -1,33 +1,42 @@ -# This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { - pname = "pprof-unstable"; - version = "2018-08-15"; - rev = "781f11b1fcf71fae9d185e7189b5e686f575075a"; +buildGoModule rec { + pname = "pprof"; + version = "unstable-2021-09-30"; - goPackagePath = "github.com/google/pprof"; - - src = fetchgit { - inherit rev; - url = "git://github.com/google/pprof"; - sha256 = "1nvzwcj6h4q0lsjlri3bym4axgv848w3xz57iz5p0wz9lcd5jsmf"; + src = fetchFromGitHub { + owner = "google"; + repo = "pprof"; + rev = "7fe48b4c820be13151ae35ce5a5e3f54f1b53eef"; + sha256 = "05nr3igdigs1586qplwfm17hfw0v81jy745g6vayq7cbplljfjb1"; }; - goDeps = ./deps.nix; + vendorSha256 = "0yl8y3m2ia3cwxhmg1km8358a0225khimv6hcvras8r2glm69h3f"; meta = with lib; { description = "A tool for visualization and analysis of profiling data"; homepage = "https://github.com/google/pprof"; license = licenses.asl20; longDescription = '' - pprof reads a collection of profiling samples in profile.proto format and generates reports to visualize and help analyze the data. It can generate both text and graphical reports (through the use of the dot visualization package). + pprof reads a collection of profiling samples in profile.proto format and + generates reports to visualize and help analyze the data. It can generate + both text and graphical reports (through the use of the dot visualization + package). - profile.proto is a protocol buffer that describes a set of callstacks and symbolization information. A common usage is to represent a set of sampled callstacks from statistical profiling. The format is described on the proto/profile.proto file. For details on protocol buffers, see https://developers.google.com/protocol-buffers + profile.proto is a protocol buffer that describes a set of callstacks and + symbolization information. A common usage is to represent a set of sampled + callstacks from statistical profiling. The format is described on the + proto/profile.proto file. For details on protocol buffers, see + https://developers.google.com/protocol-buffers - Profiles can be read from a local file, or over http. Multiple profiles of the same type can be aggregated or compared. + Profiles can be read from a local file, or over http. Multiple profiles of + the same type can be aggregated or compared. - If the profile samples contain machine addresses, pprof can symbolize them through the use of the native binutils tools (addr2line and nm). + If the profile samples contain machine addresses, pprof can symbolize them + through the use of the native binutils tools (addr2line and nm). This is not an official Google product. ''; diff --git a/pkgs/development/tools/profiling/pprof/deps.nix b/pkgs/development/tools/profiling/pprof/deps.nix deleted file mode 100644 index e76f6367996b..000000000000 --- a/pkgs/development/tools/profiling/pprof/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e78746da79ba8e24e8b488c9880de"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/ianlancetaylor/demangle"; - fetch = { - type = "git"; - url = "https://github.com/ianlancetaylor/demangle"; - rev = "fcd258a6f0b45dc345a407ee5568cf9a4d24a0ae"; - sha256 = "10hdzq6n4mb13g8ddqvwjwx14djfyxhh0gjc888vdihzvhyqhvrp"; - }; - } -] diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 6ceda016045b..7bcf387202ef 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -2,6 +2,7 @@ , lib , desktop-file-utils , fetchurl +, fetchpatch , gettext , glib , gtk3 @@ -21,15 +22,23 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.40.1"; + version = "3.42.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dvlzjwi3a4g37cpyhqpf41f5hypf0gim1jw9wqlv30flbb00l62"; + sha256 = "PBbgPv3+XT5xxNI5xndBrTf3LOiXHi9/rxaNvV6T6IY="; }; + patches = [ + # Fix missing unistd.h include. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/sysprof/commit/b113c89af1de2f87589175795a197f6384852a78.patch"; + sha256 = "3Q8d6IZYNJl/vbyzRgoRR2sdl4aRkbcKPeVjSSqxb98="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext diff --git a/pkgs/development/tools/pypi-mirror/default.nix b/pkgs/development/tools/pypi-mirror/default.nix index cc90e41a472a..945fafa7648c 100644 --- a/pkgs/development/tools/pypi-mirror/default.nix +++ b/pkgs/development/tools/pypi-mirror/default.nix @@ -4,13 +4,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "pypi-mirror"; - version = "4.0.6"; + version = "4.0.7"; src = fetchFromGitHub { owner = "montag451"; repo = pname; rev = "v${version}"; - sha256 = "0slh8ahywcgbggfcmzyqpb8bmq9dkk6vvjfkbi0ashnm8c6x19vd"; + sha256 = "0sjzjvq2jnsr5mfyvkww3rfk3k5xcl8wa07q614850m0sn907laz"; }; pythonImportsCheck = [ "pypi_mirror" ]; diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/development/tools/rust/cargo-deadlinks/default.nix index ebd66a9b0093..a7c1b885a6e4 100644 --- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix +++ b/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -2,22 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deadlinks"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "deadlinks"; repo = pname; rev = "${version}"; - sha256 = "1zd5zgq3346xijllr0qdvvmsilpawisrqgdmsqir8v3bk55ybj4g"; + sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh"; }; - cargoSha256 = "1ar3iwpy9mng4j09z4g3ynxra2qwc8454dnc0wjal4h16fk8gxwv"; + cargoSha256 = "00g06zf0m1wry0mhf098pw99kbb99d8a17985pb90yf1w74rdkh6"; checkFlags = [ # uses internet "--skip non_existent_http_link --skip working_http_check" - # expects top-level directory to be named "cargo-deadlinks" - "--skip simple_project::it_checks_okay_project_correctly" ]; buildInputs = lib.optional stdenv.isDarwin Security; @@ -25,6 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo subcommand to check rust documentation for broken links"; homepage = "https://github.com/deadlinks/cargo-deadlinks"; + changelog = "https://github.com/deadlinks/cargo-deadlinks/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ newam ]; }; diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 13339e4dc342..f5de052e0e55 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -3,10 +3,8 @@ , rustPlatform , fetchFromGitHub , libusb1 -, openssl , pkg-config , rustfmt -, Security , AppKit }: @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-f5vUMdyz3vDh2yE0pMKZiknsqTAKkuvTCtlgb6/gaLc="; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index 76f766685ab4..da5f019d660a 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-OHBxQcXhZkJ1F6xLc7/sPpJhJzuJXb91IUjAtyC3XP8="; + sha256 = "sha256-GRitz9LOdZhbakbLZI2BUfZjqXLrsMK2MQJgixiEHaA="; }; - cargoSha256 = "sha256-LxqxRtMKUKZeuvk1caoYy8rv1bkEOQBM8i5SXMF4GXc="; + cargoSha256 = "sha256-uiANH9HOvy41FiABTTx2D9Rz1z/F7eITc5aiofaMSfI="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 836b959f1023..92863d76de9a 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.8.13"; + version = "0.8.14"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "0k88ma00gj8wjdvd7ysbbvqnf5sk1w8d3wqbi6qfxnqrc1k3hlv2"; + sha256 = "11r4gzcsbqlflam2rdixc451qw69c46mkf7g0slq6f127is25fgz"; }; - cargoSha256 = "0mmk0igm2s8sxi65zvikxhz52xhkyd3ljqy61mij7zlx95rf639x"; + cargoSha256 = "1p4iirblk6idvfhn8954v8lbxlzj0gbd8fv4wq03hfrdqisjqcsn"; LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/development/tools/rust/devserver/default.nix b/pkgs/development/tools/rust/devserver/default.nix new file mode 100644 index 000000000000..9e4545e5e87e --- /dev/null +++ b/pkgs/development/tools/rust/devserver/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchCrate +, rustPlatform +, openssl +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "devserver"; + version = "0.4.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-UcrLzsALwl0zqNRMS1kTTXsR6wN8XDd5Iq+yrudh6M4="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js="; + + meta = with lib; { + description = "An extremely tiny tool to serve a static folder locally"; + homepage = "https://github.com/kettle11/devserver"; + license = licenses.zlib; + maintainers = with maintainers; [ nickhu ]; + }; +} diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index b388ec3c5e93..ed51a6fedc6b 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-RhjH/phRVlNO9nPL+TtcrZYpwqNygpXjI/Pdyrxxv/4="; + sha256 = "sha256-qap6TsqaCy+9prWiUow78eBgaWGq5eUkOXBTYFnAZyo="; fetchSubmodules = true; }; @@ -33,13 +33,14 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/extras - cp -r ./{locale,meta,script,*.lua} $out/extras/ - cp ./bin/Linux/{bee.so,lpeglabel.so} $out/extras - cp ./bin/Linux/lua-language-server $out/extras/.lua-language-server-unwrapped - makeWrapper $out/extras/.lua-language-server-unwrapped \ + install -Dt "$out"/share/lua-language-server/bin/Linux bin/Linux/lua-language-server + install -m644 -t "$out"/share/lua-language-server/bin/Linux bin/Linux/*.* + install -m644 -t "$out"/share/lua-language-server {debugger,main}.lua + cp -r locale meta script "$out"/share/lua-language-server + + makeWrapper "$out"/share/lua-language-server/bin/Linux/lua-language-server \ $out/bin/lua-language-server \ - --add-flags "-E $out/extras/main.lua \ + --add-flags "-E $out/share/lua-language-server/main.lua \ --logpath='~/.cache/sumneko_lua/log' \ --metapath='~/.cache/sumneko_lua/meta'" diff --git a/pkgs/development/tools/time-ghc-modules/default.nix b/pkgs/development/tools/time-ghc-modules/default.nix new file mode 100644 index 000000000000..e57495b8fb1c --- /dev/null +++ b/pkgs/development/tools/time-ghc-modules/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, sqlite +, python3 +, coreutils +, findutils +, gnused +}: + +stdenv.mkDerivation rec { + pname = "time-ghc-modules"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "codedownio"; + repo = "time-ghc-modules"; + rev = version; + sha256 = "0s6540gllhjn7366inhwa70rdnngnhbi07jn1h6x8a0pi71wdfm9"; + }; + + nativeBuildInputs = [makeWrapper]; + + buildPhase = '' + runHook preBuild + + mkdir -p $out/bin + cp ./time-ghc-modules $out/bin/time-ghc-modules + wrapProgram $out/bin/time-ghc-modules --prefix PATH : ${lib.makeBinPath [ sqlite python3 coreutils findutils gnused ]} \ + --set PROCESS_SCRIPT $out/lib/process \ + --set HTML_FILE $out/lib/index.html + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + install -m 444 ./dist/index.html $out/lib + install ./scripts/process $out/lib + + runHook postInstall + ''; + + meta = with lib; { + description = "Analyze GHC .dump-timings files"; + homepage = "https://github.com/codedownio/time-ghc-modules"; + license = licenses.mit; + maintainers = [ maintainers.thomasjm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index d48787ea017a..16926b16e981 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -34,6 +34,6 @@ buildGoModule { homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; maintainers = with maintainers; [ adisbladis SuperSandro2000 ]; + mainProgram = "vgo2nix"; }; - } diff --git a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock deleted file mode 100644 index a51aef852d97..000000000000 --- a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ /dev/null @@ -1,2505 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "add" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aho-corasick" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "ascii" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109" - -[[package]] -name = "askama" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" -dependencies = [ - "askama_derive", - "askama_escape", - "askama_shared", -] - -[[package]] -name = "askama_derive" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" -dependencies = [ - "askama_shared", - "proc-macro2", - "syn", -] - -[[package]] -name = "askama_escape" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" - -[[package]] -name = "askama_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" -dependencies = [ - "askama_escape", - "humansize", - "nom 6.2.1", - "num-traits 0.2.14", - "percent-encoding", - "proc-macro2", - "quote", - "serde", - "syn", - "toml", -] - -[[package]] -name = "assert_cmd" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" -dependencies = [ - "bstr", - "doc-comment", - "predicates 2.0.1", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - -[[package]] -name = "base64" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder", - "safemem", -] - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "bitflags" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bitvec" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "bstr" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", -] - -[[package]] -name = "buf_redux" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" -dependencies = [ - "memchr", - "safemem", -] - -[[package]] -name = "bumpalo" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "canvas" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "cc" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "char" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits 0.2.14", - "time 0.1.43", - "winapi", -] - -[[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.2.1", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "closures" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "console_error_panic_hook" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" -dependencies = [ - "cfg-if 0.1.10", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "const_fn" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" - -[[package]] -name = "crossbeam-channel" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" -dependencies = [ - "cfg-if 1.0.0", - "lazy_static", -] - -[[package]] -name = "curl" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.45+curl-7.78.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] -name = "deflate" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "deno" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "diff" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" - -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "docopt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" -dependencies = [ - "lazy_static", - "regex", - "serde", - "strsim 0.10.0", -] - -[[package]] -name = "dom" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "enum_primitive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -dependencies = [ - "num-traits 0.1.43", -] - -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "fetch" -version = "0.1.0" -dependencies = [ - "js-sys", - "serde", - "serde_derive", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "filetime" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "winapi", -] - -[[package]] -name = "float-cmp" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" -dependencies = [ - "num-traits 0.2.14", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - -[[package]] -name = "futures" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-channel-preview" -version = "0.3.0-alpha.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" -dependencies = [ - "futures-core-preview", -] - -[[package]] -name = "futures-core" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" - -[[package]] -name = "futures-core-preview" -version = "0.3.0-alpha.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" - -[[package]] -name = "futures-executor" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" - -[[package]] -name = "futures-lite" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" -dependencies = [ - "autocfg", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" - -[[package]] -name = "futures-task" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" - -[[package]] -name = "futures-util" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" -dependencies = [ - "autocfg", - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "proc-macro-hack", - "proc-macro-nested", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "gif" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f" -dependencies = [ - "color_quant", - "lzw", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "guide-supported-types-examples" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hello_world" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "httparse" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" - -[[package]] -name = "humansize" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "id-arena" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" -dependencies = [ - "rayon", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95816db758249fe16f23a4e23f1a3a817fe11892dbfd1c5836f625324702158" -dependencies = [ - "byteorder", - "enum_primitive", - "gif", - "jpeg-decoder", - "num-iter", - "num-rational", - "num-traits 0.1.43", - "png", - "scoped_threadpool", -] - -[[package]] -name = "import_js" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "inflate" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" - -[[package]] -name = "itertools" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "jpeg-decoder" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.52" -dependencies = [ - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", -] - -[[package]] -name = "julia_set" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "leb128" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" - -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags 1.2.1", - "cfg-if 1.0.0", - "ryu", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" - -[[package]] -name = "libz-sys" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "lzw" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "memchr" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" - -[[package]] -name = "memoffset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "mime_guess" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "multipart" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" -dependencies = [ - "buf_redux", - "httparse", - "log", - "mime", - "mime_guess", - "quick-error", - "rand", - "safemem", - "tempfile", - "twoway", -] - -[[package]] -name = "no-std" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - -[[package]] -name = "nom" -version = "6.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" -dependencies = [ - "bitvec", - "funty", - "lexical-core", - "memchr", - "version_check", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits 0.2.14", -] - -[[package]] -name = "num-iter" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" -dependencies = [ - "autocfg", - "num-integer", - "num-traits 0.2.14", -] - -[[package]] -name = "num-rational" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-integer", - "num-traits 0.2.14", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.14", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" - -[[package]] -name = "openssl" -version = "0.10.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" -dependencies = [ - "bitflags 1.2.1", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - -[[package]] -name = "openssl-src" -version = "111.15.0+1.1.1k" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" -dependencies = [ - "autocfg", - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "performance" -version = "0.1.0" -dependencies = [ - "humantime", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" - -[[package]] -name = "png" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" -dependencies = [ - "bitflags 0.7.0", - "deflate", - "inflate", - "num-iter", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "predicates" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" -dependencies = [ - "difference", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3d91237f5de3bcd9d927e24d03b495adb6135097b001cea7403e2d573d00a9" -dependencies = [ - "difflib", - "itertools", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" - -[[package]] -name = "predicates-tree" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7dd0fd014130206c9352efbdc92be592751b2b9274dff685348341082c6ea3d" -dependencies = [ - "predicates-core", - "treeline", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - -[[package]] -name = "proc-macro2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rayon" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "raytrace-parallel" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "futures-channel-preview", - "js-sys", - "rayon", - "rayon-core", - "raytracer", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "raytracer" -version = "0.1.0" -source = "git+https://github.com/alexcrichton/raytracer?branch=update-deps#42faa13859f7d8d47fd18be785c108003a207786" -dependencies = [ - "image", - "serde", - "serde_derive", -] - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags 1.2.1", -] - -[[package]] -name = "regex" -version = "1.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "request-animation-frame" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "rouille" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263ea8c0988dbdd89e679d408eaa5505bb886677e997562646c2e2ba4d2e6db" -dependencies = [ - "base64 0.13.0", - "chrono", - "filetime", - "multipart", - "num_cpus", - "percent-encoding", - "rand", - "serde", - "serde_derive", - "serde_json", - "sha1", - "threadpool", - "time 0.2.27", - "tiny_http", - "url", -] - -[[package]] -name = "rust-duck-typed-interfaces" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "sample" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi", -] - -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" - -[[package]] -name = "slab" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" - -[[package]] -name = "socket2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "sourcefile" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "structopt" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "syn" -version = "1.0.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "rand", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] - -[[package]] -name = "tiny_http" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce51b50006056f590c9b7c3808c3bd70f0d1101666629713866c227d6e58d39" -dependencies = [ - "ascii", - "chrono", - "chunked_transfer", - "log", - "url", -] - -[[package]] -name = "tinyvec" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "todomvc" -version = "0.1.0" -dependencies = [ - "askama", - "console_error_panic_hook", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "toml" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - -[[package]] -name = "treeline" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" - -[[package]] -name = "trybuild" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02c413315329fc96167f922b46fd0caa3a43f4697b7a7896b183c7142635832" -dependencies = [ - "glob", - "lazy_static", - "serde", - "serde_json", - "termcolor", - "toml", -] - -[[package]] -name = "twoway" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" -dependencies = [ - "memchr", -] - -[[package]] -name = "typescript-tests" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walrus" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" -dependencies = [ - "anyhow", - "id-arena", - "leb128", - "log", - "rayon", - "walrus-macro", - "wasmparser 0.77.0", -] - -[[package]] -name = "walrus-macro" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasm-bindgen" -version = "0.2.75" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "serde", - "serde_derive", - "serde_json", - "wasm-bindgen-futures", - "wasm-bindgen-macro", - "wasm-bindgen-test", - "wasm-bindgen-test-crate-a", - "wasm-bindgen-test-crate-b", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.75" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-benchmark" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-cli" -version = "0.2.75" -dependencies = [ - "anyhow", - "assert_cmd", - "curl", - "diff", - "docopt", - "env_logger", - "log", - "openssl", - "predicates 1.0.8", - "rayon", - "rouille", - "serde", - "serde_derive", - "serde_json", - "tempfile", - "walrus", - "wasm-bindgen-cli-support", - "wasm-bindgen-shared", - "wit-printer", - "wit-text", - "wit-validator", - "wit-walrus", -] - -[[package]] -name = "wasm-bindgen-cli-support" -version = "0.2.75" -dependencies = [ - "anyhow", - "base64 0.9.3", - "log", - "rustc-demangle", - "serde_json", - "tempfile", - "walrus", - "wasm-bindgen-externref-xform", - "wasm-bindgen-multi-value-xform", - "wasm-bindgen-shared", - "wasm-bindgen-threads-xform", - "wasm-bindgen-wasm-conventions", - "wasm-bindgen-wasm-interpreter", - "wit-text", - "wit-validator", - "wit-walrus", -] - -[[package]] -name = "wasm-bindgen-externref-xform" -version = "0.2.75" -dependencies = [ - "anyhow", - "rayon", - "walrus", - "wasmprinter", - "wast 21.0.0", - "wat", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.25" -dependencies = [ - "cfg-if 1.0.0", - "futures-channel-preview", - "futures-core", - "futures-lite", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-test", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.75" -dependencies = [ - "quote", - "trybuild", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.75" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-multi-value-xform" -version = "0.2.75" -dependencies = [ - "anyhow", - "rayon", - "walrus", - "wasmprinter", - "wast 21.0.0", - "wat", -] - -[[package]] -name = "wasm-bindgen-paint" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.75" - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.25" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-crate-a" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "wasm-bindgen-test-crate-b" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.25" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "wasm-bindgen-threads-xform" -version = "0.2.75" -dependencies = [ - "anyhow", - "walrus", - "wasm-bindgen-wasm-conventions", -] - -[[package]] -name = "wasm-bindgen-wasm-conventions" -version = "0.2.75" -dependencies = [ - "anyhow", - "walrus", -] - -[[package]] -name = "wasm-bindgen-wasm-interpreter" -version = "0.2.75" -dependencies = [ - "anyhow", - "log", - "tempfile", - "walrus", - "wasm-bindgen-wasm-conventions", - "wat", -] - -[[package]] -name = "wasm-bindgen-webidl" -version = "0.2.75" -dependencies = [ - "anyhow", - "env_logger", - "heck", - "lazy_static", - "log", - "proc-macro2", - "quote", - "sourcefile", - "structopt", - "syn", - "wasm-bindgen-backend", - "weedle", -] - -[[package]] -name = "wasm-in-wasm" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", -] - -[[package]] -name = "wasm-in-wasm-imports" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", -] - -[[package]] -name = "wasm-in-web-worker" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm2js" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "wasmparser" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" - -[[package]] -name = "wasmparser" -version = "0.77.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" - -[[package]] -name = "wasmparser" -version = "0.80.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f71b80b8193e50910919e7d1bc956d2b4f42b1cb1fad84bacb59332c16f2cf" - -[[package]] -name = "wasmprinter" -version = "0.2.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48e4f2999b9930e9b037e328357d7d2367e0d8ea6e534be90aeff60976c0452" -dependencies = [ - "anyhow", - "wasmparser 0.80.0", -] - -[[package]] -name = "wast" -version = "21.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5" -dependencies = [ - "leb128", -] - -[[package]] -name = "wast" -version = "37.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc7b9a76845047ded00e031754ff410afee0d50fbdf62b55bdeecd245063d68" -dependencies = [ - "leb128", -] - -[[package]] -name = "wat" -version = "1.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2cc8d9a69d1ab28a41d9149bb06bb927aba8fc9d56625f8b597a564c83f50" -dependencies = [ - "wast 37.0.0", -] - -[[package]] -name = "web-sys" -version = "0.3.52" -dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", -] - -[[package]] -name = "webaudio" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "webgl" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "webidl-tests" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "wasm-bindgen-webidl", -] - -[[package]] -name = "webrtc_datachannel" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "websockets" -version = "0.1.0" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "webxr" -version = "0.1.0" -dependencies = [ - "futures", - "js-sys", - "serde", - "serde_derive", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "weedle" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" -dependencies = [ - "nom 5.1.2", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "wit-parser" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5fd97866f4b9c8e1ed57bcf9446f3d0d8ba37e2dd01c3c612c046c053b06f7" -dependencies = [ - "anyhow", - "leb128", - "wit-schema-version", -] - -[[package]] -name = "wit-printer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f19ca44555a3c14d69acee6447a6e4f52771b0c6e5d8db3e42db3b90f6fce9" -dependencies = [ - "anyhow", - "wasmprinter", - "wit-parser", - "wit-schema-version", -] - -[[package]] -name = "wit-schema-version" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfee4a6a4716eefa0682e7a3b836152e894a3e4f34a9d6c2c3e1c94429bfe36a" - -[[package]] -name = "wit-text" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33358e95c77d660f1c7c07f4a93c2bd89768965e844e3c50730bb4b42658df5f" -dependencies = [ - "anyhow", - "wast 21.0.0", - "wit-writer", -] - -[[package]] -name = "wit-validator" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c11d93d925420e7872b226c4161849c32be38385ccab026b88df99d8ddc6ba6" -dependencies = [ - "anyhow", - "wasmparser 0.59.0", - "wit-parser", - "wit-schema-version", -] - -[[package]] -name = "wit-walrus" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad559e3e4c6404b2a6a675d44129d62a3836e3b951b90112fa1c5feb852757cd" -dependencies = [ - "anyhow", - "id-arena", - "walrus", - "wit-parser", - "wit-schema-version", - "wit-writer", -] - -[[package]] -name = "wit-writer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad01ba5e9cbcff799a0689e56a153776ea694cec777f605938cb9880d41a09" -dependencies = [ - "leb128", - "wit-schema-version", -] - -[[package]] -name = "without-a-bundler" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "without-a-bundler-no-modules" -version = "0.1.0" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index fba7c979390a..4416ce1b6cdc 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -1,8 +1,9 @@ -{ rustPlatform -, fetchFromGitHub -, lib -, openssl +{ lib +, rustPlatform +, fetchCrate +, nodejs , pkg-config +, openssl , stdenv , curl , Security @@ -11,34 +12,29 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.75"; + version = "0.2.78"; - src = - let - tarball = fetchFromGitHub { - owner = "rustwasm"; - repo = "wasm-bindgen"; - rev = version; - hash = "sha256-eRAe6/v0Xrtd1d2k6p0WETZ2vkQkiDRZOds7y0DidY0="; - }; - in - runCommand "source" { } '' - cp -R ${tarball} $out - chmod -R +w $out - cp ${./Cargo.lock} $out/Cargo.lock - ''; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-5s+HidnVfDV0AXA+/YcXNGVjv/E9JeK0Ttng4mCVX8M="; + }; + + cargoSha256 = "sha256-CbtjUFwowP/QqyAMCzmUiSib4EpRhQAmO4ekX00xYGE="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-xZrGBRnsBQKvqGkZyU7FQCkx0dHt/hXlrVLSvGKx27k="; - cargoBuildFlags = [ "-p" pname ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; + + checkInputs = [ nodejs ]; + + # other tests require it to be ran in the wasm-bindgen monorepo + cargoTestFlags = [ "--test=interface-types" ]; meta = with lib; { homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; - license = licenses.asl20; + license = with licenses; [ asl20 /* or */ mit ]; description = "Facilitating high-level interactions between wasm modules and JavaScript"; maintainers = with maintainers; [ ma27 nitsky rizary ]; - platforms = platforms.unix; + mainProgram = "wasm-bindgen"; }; } diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index cdcb95b43488..3c16977ae7ba 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2LtjaxDClVYPcsCA7v+5GN3MY5VkTJ8TDxz5l0Oq4sQ="; + sha256 = "sha256-Qe/bl5H+ieHGC2GXdWlXCR+ZI1SNfy4l+VIGMy193lk="; }; - cargoSha256 = "sha256-f/nYBBfxl9JHhdo00smm6rYYH2kfgJKaCw/wflVgABc="; + cargoSha256 = "sha256-KYxqir/wxvyn9sgLF0OjM2Zn42Wt9eUqIX0Xbsvq1c4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js index d6b4dcf358c3..d2152f9c5e49 100755 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js @@ -63,7 +63,7 @@ let pkgs = R.pipe( ;(async () => { if (!options['--no-patch']) { - pkgs = await R.map(fixPkgAddMissingSha1, pkgs) + pkgs = await Promise.all(R.map(fixPkgAddMissingSha1, pkgs)) } const origJson = lockfile.parse(data) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js index 7df4679a1308..1e7b4f341002 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js @@ -45,11 +45,13 @@ function fetchgit(fileName, url, rev, branch, builtinFetchGit) { name = "${fileName}"; path = let${builtinFetchGit ? ` - repo = builtins.fetchGit { + repo = builtins.fetchGit ({ url = "${url}"; ref = "${branch}"; rev = "${rev}"; - }; + } // (if builtins.substring 0 3 builtins.nixVersion == "2.4" then { + allRefs = true; + } else {})); ` : ` repo = fetchgit { url = "${url}"; @@ -87,7 +89,7 @@ function fetchLockedDep(builtinFetchGit) { const [_, branch] = nameWithVersion.split('#') - return fetchgit(fileName, githubUrl, rev, branch || 'master', builtinFetchGit) + return fetchgit(fileName, githubUrl, githubRev, branch || 'master', builtinFetchGit) } if (url.startsWith('git+') || url.startsWith("git:")) { diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 34bcd7992ea9..4cfb2c14354c 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.14.3"; + version = "1.15.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ersfn69vRGKzJ4LV7qLI2orLftHz7tuI8+/zUEPctAE="; + sha256 = "sha256-ABCItd90mtASpyf+HSQeIcn70Wjvloj7L36WM+FUt0g="; }; - cargoSha256 = "sha256-BnJH/jbNiPyRmNjvfE5bNQX58iuAFFaQ93bZsXooTfI="; + cargoSha256 = "sha256-crSx122kE7lvV32YnFsZIGRwHMb8z4bEdg5s+6Qeih8="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 6fb597b81acd..6e63681f66bb 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.31.0"; + version = "0.32.0"; shas = { - x86_64-linux = "sha256-KPoxq6rZnwghcDR5cMexN8EMeCfyuKoBcTZ3bv1mEpw="; - aarch64-linux = "sha256-S+lHGwbnCu2uNCIE+R5MljltOIqXpFAxvx0cglV8ZNI="; - x86_64-darwin = "sha256-o8O+X4SEXP7eY/dfHqe8NT7johtnPJQTBOgApFqOOhY="; - aarch64-darwin = "sha256-OQNQh6byNn9R0a6madgUMdUxbUv/R9psnwtTSr3BfzE="; + x86_64-linux = "sha256-35Rm4j4BJNCfl3MQJIpKw1altzm9fgvZ6WeC2cF4Qzc="; + aarch64-linux = "sha256-w1ljFwao/YMO27QSaEyVl7HEVnfzZyVOXZK4xN0205Y="; + x86_64-darwin = "sha256-oNrF9lFkgMgphDElKQRXMq9uYua75e2HrfflNO+CyPk="; + aarch64-darwin = "sha256-Bz9C1AChvGJYamnIg1XtYyTzmIisL0Oe/yDjB7ZebMw="; }; } diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix new file mode 100644 index 000000000000..f929727d59d6 --- /dev/null +++ b/pkgs/development/web/netlify-cli/composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix new file mode 100644 index 000000000000..f16cce4c1511 --- /dev/null +++ b/pkgs/development/web/netlify-cli/default.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchFromGitHub, lib, pkgs }: +let + nodePackages = import ./composition.nix { inherit pkgs; }; +in + nodePackages.package.override { + preRebuild = '' + export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" + ''; + src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./netlify-cli.json)); + bypassCache = true; + reconstructLock = true; + passthru.tests.test = callPackage ./test.nix { }; + meta.maintainers = with lib.maintainers; [ roberth ]; + } diff --git a/pkgs/development/web/netlify-cli/generate.sh b/pkgs/development/web/netlify-cli/generate.sh new file mode 100755 index 000000000000..41858cd98097 --- /dev/null +++ b/pkgs/development/web/netlify-cli/generate.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +set -eu -o pipefail +cd "$( dirname "${BASH_SOURCE[0]}" )" +rm -f ./node-env.nix +src="$(nix-build --expr '(import ../../../.. {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./netlify-cli.json))')" +echo $src +node2nix \ + --input $src/package.json \ + --lock $src/npm-shrinkwrap.json \ + --output node-packages.nix \ + --composition composition.nix \ + --node-env node-env.nix \ + --nodejs-14 \ + ; diff --git a/pkgs/development/web/netlify-cli/netlify-cli.json b/pkgs/development/web/netlify-cli/netlify-cli.json new file mode 100644 index 000000000000..efd5fb1396bd --- /dev/null +++ b/pkgs/development/web/netlify-cli/netlify-cli.json @@ -0,0 +1,7 @@ +{ + "owner": "netlify", + "repo": "cli", + "rev": "a50e410fddda92d3f3f256321eddefb8cb8ba6e1", + "sha256": "sisX58I5UxxEPGCh5JGtQHw72A4+pLuENpBB9WKRTZc=", + "fetchSubmodules": false +} diff --git a/pkgs/development/web/netlify-cli/node-env.nix b/pkgs/development/web/netlify-cli/node-env.nix new file mode 100644 index 000000000000..21089c4d5459 --- /dev/null +++ b/pkgs/development/web/netlify-cli/node-env.nix @@ -0,0 +1,573 @@ +# This file originates from node2nix + +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: + +let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , meta ? {} + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; + in + stdenv.mkDerivation ({ + name = "${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; + } // extraArgs); + + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + in + stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell <hi' >index.html + echo '/with-redirect /' >_redirects + + # Start a local server and wait for it to respond + netlify dev --offline --port 8888 2>&1 | tee log & + sleep 0.1 || true + for (( i=0; i<300; i++ )); do + if grep --ignore-case 'Server now ready' hi' + + # Success + touch $out +'' diff --git a/pkgs/development/web/netlify-cli/update.sh b/pkgs/development/web/netlify-cli/update.sh new file mode 100755 index 000000000000..616b3757db72 --- /dev/null +++ b/pkgs/development/web/netlify-cli/update.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash +set -euo pipefail +mv netlify-cli.json{,.old} +nix-prefetch-github-latest-release netlify cli >netlify-cli.json + +if ! diff -U3 netlify-cli.json{.old,}; then + echo New version detected\; generating expressions... + ./generate.sh +fi +rm -f netlify-cli.json.old diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 0e52dd5f8040..86332bf7b69c 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -139,6 +139,7 @@ in meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = "https://nodejs.org"; + changelog = "https://github.com/nodejs/node/blob/v${version}/doc/changelogs/CHANGELOG_V${majorVersion}.md#${version}"; license = licenses.mit; maintainers = with maintainers; [ goibhniu gilligan cko marsam ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 7717dfa6c9cf..54f077e71821 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.6"; - sha256 = "0yhgkcp7lx5nglxsrybbjymx1fys3wkbbhkj6h6652gnp0b2y0n2"; + version = "12.22.7"; + sha256 = "0sszg3k5jd26hymqhs5328kvnxsb3x78sg4gpna9lrvh92s26snc"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index f89f98f63200..698108a42b60 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.10.0"; - sha256 = "04krpy0r8msv64rcf0vy2l2yzf0a401km8p5p7h12j9b4g51mp4p"; + version = "16.11.1"; + sha256 = "0y32mdv8zs35la2bny8d9rxjvj1vr8z079ji1g6ajc2yw96pyn37"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index abcf6bfc16ed..0ec3754bffdc 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "8.10.0"; + version = "9.0.5"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "05f3eaa229483a7e1f698e6e2ea2031d37687de540d4fad05ce677ac216db24d"; + sha256 = "1z28v5vrjld99ydai66k8hw01x54647324ax459bvblw989lzp7v"; name = "${pname}.tar.gz"; }; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { rm $out/share/postman/Postman mkdir -p $out/bin - ln -s $out/share/postman/_Postman $out/bin/postman + ln -s $out/share/postman/postman $out/bin/postman mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ @@ -88,8 +88,8 @@ stdenv.mkDerivation rec { postFixup = '' pushd $out/share/postman - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" _Postman - for file in $(find . -type f \( -name \*.node -o -name _Postman -o -name \*.so\* \) ); do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" postman + for file in $(find . -type f \( -name \*.node -o -name postman -o -name \*.so\* \) ); do ORIGIN=$(patchelf --print-rpath $file); \ patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file done @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { description = "API Development Environment"; license = licenses.postman; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ xurei evanjs ]; + maintainers = with maintainers; [ johnrichardrinehart evanjs ]; }; } diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix new file mode 100644 index 000000000000..51a242a6cfdf --- /dev/null +++ b/pkgs/games/ddnet/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, pkg-config +, curl +, freetype +, libGLU +, libnotify +, libogg +, libX11 +, opusfile +, pcre +, python3 +, SDL2 +, sqlite +, wavpack +}: + +stdenv.mkDerivation rec { + pname = "ddnet"; + version = "15.5.4"; + + src = fetchFromGitHub { + owner = "ddnet"; + repo = pname; + rev = version; + sha256 = "sha256-vJMYPaLK2CK+nbojLstXgxqIUaf7jNynpklFgtIpvGM="; + }; + + nativeBuildInputs = [ cmake ninja pkg-config ]; + + buildInputs = [ + curl + freetype + libGLU + libnotify + libogg + libX11 + opusfile + pcre + python3 + SDL2 + sqlite + wavpack + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DAUTOUPDATE=OFF" + "-GNinja" + ]; + + postPatch = '' + substituteInPlace src/engine/shared/storage.cpp \ + --replace /usr/ $out/ + ''; + + meta = with lib; { + description = "A Teeworlds modification with a unique cooperative gameplay."; + longDescription = '' + DDraceNetwork (DDNet) is an actively maintained version of DDRace, + a Teeworlds modification with a unique cooperative gameplay. + Help each other play through custom maps with up to 64 players, + compete against the best in international tournaments, + design your own maps, or run your own server. + ''; + homepage = "https://ddnet.tw"; + license = licenses.asl20; + maintainers = with maintainers; [ sirseruju legendofmiracles ]; + mainProgram = "DDNet"; + }; +} diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix new file mode 100644 index 000000000000..a4b30c572a00 --- /dev/null +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, libX11, freeglut, glew, libXNVCtrl, libXext, lib }: + +stdenv.mkDerivation rec { + pname = "gl-gsync-demo"; + version = "unstable-2020-12-27"; + + src = fetchFromGitHub { + owner = "dahenry"; + repo = "gl-gsync-demo"; + rev = "4fd963a8ad880dc2d846394c8c80b2091a119591"; + sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d"; + }; + + buildInputs = [ libX11 freeglut glew libXNVCtrl libXext ]; + + installPhase = '' + runHook preInstall + + install -D gl-gsync-demo -t $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + license = with licenses; mit; + platforms = platforms.linux; + maintainers = with maintainers; [ atemu ]; + description = "A very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux"; + longDescription = '' + The demo simply draws a vertical bar moving accross the screen at constant speed, but deliberately rendered at a variable frame rate. + + The min and max frame rates can be manually changed at runtime, by step of 10 fps and with a min of 10 fps. + + The demo also allows to toggle V-Sync on/off. + ''; + homepage = "https://github.com/dahenry/gl-gsync-demo"; + }; +} diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 787184273fc3..beba37c07aca 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 , game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }: @@ -28,13 +28,13 @@ let gzdoom = stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.5.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "0kmqnyhdi5psi7zwrx9j3pz0cplypsvhg4cr8w2jbawh6jb71sk9"; + sha256 = "0xxxy7k2zr5g0vr1lnwv4n5amiwq1wln7r6hr37gmrjr72zkcjqn"; fetchSubmodules = true; }; @@ -43,7 +43,7 @@ let SDL2 libGL openal - fluidsynth_1 + fluidsynth bzip2 zlib libjpeg diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index 84e80d7d6327..84970d110550 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "julius"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bvschaik"; repo = "julius"; rev = "v${version}"; - sha256 = "0nfdn8n6ywhm69ckz9a1chl5xxiqyaj3l337wadsbppnpscjihrc"; + sha256 = "0w7kmgz9ya0ck9cxhsyralarg7y6ydx4plmh33r4mkxkamlr7493"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 0af9968f20e7..93641a1651f6 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -9,20 +9,20 @@ let ]; dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-net = dotnetCorePackages.net_5_0; + dotnet-runtime = dotnetCorePackages.runtime_5_0; # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids runtimeId = "linux-x64"; in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.815.0"; + version = "2021.1016.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "z5z/BKi9W4i7fbDmzKUscyNByDwe4nJXyUED8SROCrg="; + sha256 = "PaN/+t5qnHaOjh+DfM/Ylw1vESCM3Tejd3li9ml2Z+A="; }; nativeBuildInputs = [ @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { --output $out/lib/osu makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \ - --set DOTNET_ROOT "${dotnet-net}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" for i in 16 32 48 64 96 128 256 512 1024; do install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png @@ -117,6 +117,7 @@ in stdenv.mkDerivation rec { ]; maintainers = with maintainers; [ oxalica ]; platforms = [ "x86_64-linux" ]; + mainProgram = "osu!"; }; passthru.updateScript = ./update.sh; } diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 8866a38643f8..d89a24b379e6 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -4,9 +4,9 @@ (fetchNuGet { name = "DiffPlex"; version = "1.7.0"; sha256 = "09a8hkbx99iwikfl8war629945yv7i8llj9480dbc4kyp6qqlr00"; }) (fetchNuGet { name = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) - (fetchNuGet { name = "Fody"; version = "6.5.2"; sha256 = "0vq97mkfk5ijinwnhpkm212y69ik6cd5x0n61ssyxmz50q1vp84f"; }) + (fetchNuGet { name = "Fody"; version = "6.5.3"; sha256 = "14yj3xj4jh2ayl8jsyypxv9af0xbw30946kn14m0bfmlyl027wkp"; }) (fetchNuGet { name = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { name = "HtmlAgilityPack"; version = "1.11.34"; sha256 = "078dad719hkv806qgj1f0hkn7di5zvvm594awfn5bsgb9afq94a7"; }) + (fetchNuGet { name = "HtmlAgilityPack"; version = "1.11.37"; sha256 = "1q0kkw2rhvxi67hqv18ziv2dvmhi7f68745gcs1253mwv5da4vy6"; }) (fetchNuGet { name = "Humanizer"; version = "2.11.10"; sha256 = "057pqzvdxsbpnnc5f1xkqg7j3ywp68ggia3w74fgqp0158dm6rdk"; }) (fetchNuGet { name = "Humanizer.Core"; version = "2.11.10"; sha256 = "0z7kmd5rh1sb6izq0vssk6c2p63n00xglk45s7ga9z18z9aaskxv"; }) (fetchNuGet { name = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) @@ -62,20 +62,20 @@ (fetchNuGet { name = "ManagedBass.Fx"; version = "3.0.0"; sha256 = "0sck1wmjlcy8q941bamk1i0k4yrklyilsgg6c832xdh96sdc049s"; }) (fetchNuGet { name = "ManagedBass.Mix"; version = "3.0.0"; sha256 = "0brnm0ry96b81hgffbaj52s53bsn9c8cx4q24j0whsvmcqqxhs4v"; }) (fetchNuGet { name = "managed-midi"; version = "1.9.14"; sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; }) - (fetchNuGet { name = "Markdig"; version = "0.25.0"; sha256 = "1f7iqkaphfyf6szjrp0633rj44wynqgiqyivbja5djyxjy4csfyy"; }) - (fetchNuGet { name = "MessagePack"; version = "2.3.75"; sha256 = "0mcpxym6g47lyfalnr27mmavmgmd46k6f9g7id8cn1anbbvd4xv1"; }) - (fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.75"; sha256 = "06a1ys161gvw1sr771w909gwd1y4dizdvldknkhy8484drj90prd"; }) + (fetchNuGet { name = "Markdig"; version = "0.26.0"; sha256 = "1pg0yica8h1c2kx10pqzc5iclmlfll5wbw1bxa8l251w1qnfglv2"; }) + (fetchNuGet { name = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) + (fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "5.0.8"; sha256 = "13k0p0k1gqk12hnxj4l5yjbyv8y51ggkybrqjjr3yf3411vyy4q2"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.8"; sha256 = "0rladdnd7g8gh7hj5gbrcp3dlspngad4xhgk0qmpzhlc3qr4snf2"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.8"; sha256 = "03d2ydy7zap5hri7k1f30d1i9jaqj0nijwgp2z6b36gwqck9rys7"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "5.0.8"; sha256 = "1amyhi7m2g3al3ams5fdzqk9xablw14vfpvn819mym1ml1y6lbb7"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client"; version = "5.0.8"; sha256 = "0a25gzp6p5ii0p4g9n1vlsc085bvy7m02cdpyb2zxl10iggzqj57"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "5.0.8"; sha256 = "09yaqai0ld25p27nndw9bg7p0vm11y4jc00xcl3vh0jb0lqhkznf"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; version = "5.0.8"; sha256 = "0j1wa67n22gbwswn8457m3cl6jw099wn84qxj9qsrsylv4md58n6"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "5.0.8"; sha256 = "1nms7rs157njhh0lvkhk4hv5i6ds54jx5fw5iy2jwa7qajic1yjv"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "5.0.8"; sha256 = "02rbz3wlfq8bnd4h7d0pd2f9lvpcyjf7ak73wbl8y0fi19xda07i"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "5.0.8"; sha256 = "1qwn1263jxc90mbapfkr4a1238q76clv2c38n0w3ybdxy3md8n34"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "5.0.10"; sha256 = "11pp78728irwdc7l8pc1972ipap3ghzw4f33jqklg4vnywc8qcdl"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.10"; sha256 = "0hn5w6vpyz6x49glallp0x2l4q52bvw9xx5g2syisw67a0hphdkn"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.10"; sha256 = "11nm7m1cw26vswdyjcxwbvf3jj8n84378q9n233mw0fmjkz1sb33"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "5.0.10"; sha256 = "1lzjg799kn8cr6jfz5cxjqnisisvas1dgc1jnsk20m5xanik8r94"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client"; version = "5.0.10"; sha256 = "126ypvmrsi8gbwdahvz48rw5m850y5z9cyxlqyf35xanql3jvln8"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "5.0.10"; sha256 = "1rq9ayaa6m0vcksbvqx52kmfbdvd6jkilmg4p9b8x18nkycf36pc"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; version = "5.0.10"; sha256 = "158iiijqkingba7s01gyrcc6dbsqnbg5834nrj3whi3wj2dbr01q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "5.0.10"; sha256 = "0ypbfrv9xq947p7612gzda7fl2vsml44fv46j0d3f2glxdzkwzci"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "5.0.10"; sha256 = "08xv5w4r9fm0xqsfn4m3gj8v2bizx6qb5vs9ds9mcd3f94a66z4v"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "5.0.10"; sha256 = "064qrjfj4j63v4181g45dxbshjbmafcp8mkya9hdsmja4vq5phb2"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) @@ -83,12 +83,12 @@ (fetchNuGet { name = "Microsoft.Build.Locator"; version = "1.4.1"; sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.2"; sha256 = "1r8mfbpfy8jdinhfviwhv2vjsz950wn2vwz17lfw5kya1n13nj56"; }) - (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "3.10.0"; sha256 = "12a7wq45liw89ylnf2b7v374s3m0lbknkx7kazk3bf6nd1b8ny81"; }) - (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "3.10.0"; sha256 = "0plpvimh9drip1fvic3zfg1gmiw3q8xb85nqjqy1hq140p4him6k"; }) - (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.10.0"; sha256 = "0g12hg6r8h2s99p8a0rx8h71rlmj9aff2hr26fkw7i734n39p070"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "3.11.0"; sha256 = "0pwidgg4ifm7cirdy3hf61dyvg6lk4vgb6q7lyb4y0h0b6mvkrcl"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "3.11.0"; sha256 = "1h16b7dsp1mq7d7picyfhkssqr6xiyywi5x1fd4jwclyrvanyl81"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.11.0"; sha256 = "16myshcix4a37c4vlig4gi9jnhb6p6py171xgn6b0ab6wz020r71"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "5.0.3"; sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg"; }) - (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "3.10.0"; sha256 = "1hr3ndhb7sw0l63blgp2y0a6d1pgkxah0ls1v7kdxmkdazv35svc"; }) - (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.MSBuild"; version = "3.10.0"; sha256 = "13h0wza8anac6snkry9fvzd188vnykifzy43ms8x07d40zmqnicd"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "3.11.0"; sha256 = "07iaqjdhp55cw3y159i3h4j30l9s69gn5q6rv08bkizv8yk7yhls"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.MSBuild"; version = "3.11.0"; sha256 = "0jmcjx37b3649b16kisg9pjmz3m86pba9b1p1y0vlq1r4hyzvn3m"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) @@ -118,7 +118,7 @@ (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) - (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "5.0.8"; sha256 = "06hfa4crnmf72rw1znqw2fmknshsjnvaa3xgmw4kswd3y622ljxg"; }) + (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; sha256 = "07fk669pjydkcg6bxxv7aj548fzab4yb7ba8370d719lgi9y425l"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) @@ -144,28 +144,28 @@ (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) (fetchNuGet { name = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { name = "NuGet.Common"; version = "5.10.0"; sha256 = "0qy6blgppgvxpfcricmvva3qzddk18dza5vy851jrbqshvf9g7kx"; }) - (fetchNuGet { name = "NuGet.Configuration"; version = "5.10.0"; sha256 = "0xb1n94lrwa6k83i9xcsq68202086p2gj74gzlbhlvb8c2pw6lbb"; }) - (fetchNuGet { name = "NuGet.DependencyResolver.Core"; version = "5.10.0"; sha256 = "0dhhclm281ihpfsjzxw34l6zlw49nwzyjiynkmsbcj9icfkp3y4r"; }) - (fetchNuGet { name = "NuGet.Frameworks"; version = "5.10.0"; sha256 = "0gb6n8rg2jpjp52icgpb3wjdfs3qllh5vbcz8hbcix3l7dncy3v2"; }) - (fetchNuGet { name = "NuGet.LibraryModel"; version = "5.10.0"; sha256 = "0b6mmq2mqfr06ypc772dmcd8bz55gkyfrgn0j3nrgkcdww4fzf9q"; }) - (fetchNuGet { name = "NuGet.Packaging"; version = "5.10.0"; sha256 = "11g0v061axhp0nisclq5cm2mc92d69z92giz9l40ih478c5nishw"; }) - (fetchNuGet { name = "NuGet.ProjectModel"; version = "5.10.0"; sha256 = "1cqg319n986wciskrqsfawfhqp1d7a7i2qjd0qplpckyw8msng2i"; }) - (fetchNuGet { name = "NuGet.Protocol"; version = "5.10.0"; sha256 = "0cs9qp169zx6g2w5bzrlhxv0q1i8mb8dxlb2nkiq7pkvah86rxkc"; }) - (fetchNuGet { name = "NuGet.Versioning"; version = "5.10.0"; sha256 = "10vvw6vjpx0c26rlxh7dnpyp4prahn25717ccd8bzkjmyzhm90cs"; }) + (fetchNuGet { name = "NuGet.Common"; version = "5.11.0"; sha256 = "1amf6scr5mcjdvd1fflag6i4qjwmydq5qwp6g3f099n901zq0dr3"; }) + (fetchNuGet { name = "NuGet.Configuration"; version = "5.11.0"; sha256 = "1s9pbrh7xy9jz7npz0sahdsj1cw8gfx1fwf3knv0ms1n0c9bk53l"; }) + (fetchNuGet { name = "NuGet.DependencyResolver.Core"; version = "5.11.0"; sha256 = "0yllxfv8lx1b7zj114mpxw03186q5ynsdvza6llp3wypxp367inr"; }) + (fetchNuGet { name = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) + (fetchNuGet { name = "NuGet.LibraryModel"; version = "5.11.0"; sha256 = "18kcxl46d004brvj7xmpskgml5qq001ip7bc7vhg2q92cisqa1by"; }) + (fetchNuGet { name = "NuGet.Packaging"; version = "5.11.0"; sha256 = "0rxgnsh8ny37bv6cdn70prqbq3xavncyd3nqhw5yarxkp29i11xv"; }) + (fetchNuGet { name = "NuGet.ProjectModel"; version = "5.11.0"; sha256 = "1i0dcak9qdj8s68c5f3zhrjs5sc4rsim92dy1qw4x9cavv5jrp05"; }) + (fetchNuGet { name = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) + (fetchNuGet { name = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { name = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) (fetchNuGet { name = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) (fetchNuGet { name = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; version = "2021.725.0"; sha256 = "00nvk8kw94v0iq5k7y810sa235lqdjlggq7f00c64c3d1zam4203"; }) (fetchNuGet { name = "ppy.ManagedBass"; version = "3.1.3-alpha"; sha256 = "0qdrklalp42pbyb30vpr7c0kwjablsja0s6xplxxkpfd14y8mzk4"; }) - (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.813.0"; sha256 = "1zwx2jq6r1xcp72f484nhicmf472pad84p2hxwhli7xczq0n0fbc"; }) + (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1014.0"; sha256 = "0j0b9hhglpqgla82c8yxqangjxqabsc9xb0z1jc6lb7rh854xzli"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; version = "2021.805.0"; sha256 = "004c053s6p7339bfw68lvlyk9jkbw6djkf2d72dz8wam546k8dcl"; }) - (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.813.0"; sha256 = "1g7f15khni624024c87cx0hihpd4syl1vss8nyrxqmkqqlif6da1"; }) - (fetchNuGet { name = "ppy.osuTK.NS20"; version = "1.0.177"; sha256 = "0l5if7phd0pvnsvqlbzaz5bizxb6w2i412wyc0wfcrl3p6pm4y7m"; }) - (fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.367-alpha"; sha256 = "0mg45c81wzxdr7v4kygmvgipgs1s24v3bkyn64c0xl1vb015l2bx"; }) + (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1015.0"; sha256 = "0h2sb35yajgnfhn9729p9r83m8mwv7r03gd55b07wl8vhzb2r3s5"; }) + (fetchNuGet { name = "ppy.osuTK.NS20"; version = "1.0.178"; sha256 = "1bv77rrf3g6zr4bzfrrqqzl0vjj4c8izc0sakckda8dlm6h3gxln"; }) + (fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.452-alpha"; sha256 = "0l59cfji8w0x2nrp3m7xvfpw4y7z5dhwsq4wq3wf4r6npwnra0hc"; }) (fetchNuGet { name = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) - (fetchNuGet { name = "Realm"; version = "10.3.0"; sha256 = "12zmp43cf2kilzq1yi9x2hy1jdh51c0kbnddw5s960k1kvyx2s2v"; }) - (fetchNuGet { name = "Realm.Fody"; version = "10.3.0"; sha256 = "0mhjkahi2ldxcizv08i70mrpwgrvljxdjlr81x3dmwgpxxfji18d"; }) + (fetchNuGet { name = "Realm"; version = "10.6.0"; sha256 = "0vsd99zr22a2cvyx71gdqqvr2ld239v5s4dhhfdkjgvadz5dyc2a"; }) + (fetchNuGet { name = "Realm.Fody"; version = "10.6.0"; sha256 = "031igfdwrkgn5nh19qxh6s6l8l1ni6lgk65dhqrzqc202xqidsdm"; }) (fetchNuGet { name = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) @@ -187,11 +187,11 @@ (fetchNuGet { name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) (fetchNuGet { name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) (fetchNuGet { name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { name = "Sentry"; version = "3.8.3"; sha256 = "0ymr3f36illxk2949nfyd91anw46n19wd1rl1id4l6yql9fl6b30"; }) + (fetchNuGet { name = "Sentry"; version = "3.9.4"; sha256 = "19mmd4zki9wd09sbmvaxi8vm64gjmrjwv8xcanqf3w3pslzi5g2g"; }) (fetchNuGet { name = "SharpCompress"; version = "0.17.1"; sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; }) - (fetchNuGet { name = "SharpCompress"; version = "0.28.3"; sha256 = "1svymm2vyg3815p3sbwjdk563mz0a4ag1sr30pm0ki01brqpaaas"; }) + (fetchNuGet { name = "SharpCompress"; version = "0.29.0"; sha256 = "0saq8lf4srfxdihl7vdikn88hpgb7wrjm3la7fshw30blnikr78z"; }) (fetchNuGet { name = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) - (fetchNuGet { name = "SixLabors.ImageSharp"; version = "1.0.3"; sha256 = "1y43zvhjgi9rhylc8451784hhdi5b551hf7fsa6187b83wgxc47g"; }) + (fetchNuGet { name = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) (fetchNuGet { name = "Splat"; version = "1.6.2"; sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf"; }) (fetchNuGet { name = "SQLitePCLRaw.bundle_green"; version = "1.1.12"; sha256 = "0jbyd25ag15fyn9nawjikv0v5ylk2zh5pxgr6gm4kpbpqys86sq9"; }) (fetchNuGet { name = "SQLitePCLRaw.core"; version = "1.1.12"; sha256 = "03gflsn2wl6v0a8zvh6y5xdhx0xxmfrn6jfldiy829x3fx74zgdl"; }) @@ -358,4 +358,5 @@ (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { name = "TagLibSharp"; version = "2.2.0"; sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; }) ] diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix new file mode 100644 index 000000000000..8b678d792fcb --- /dev/null +++ b/pkgs/games/runescape-launcher/default.nix @@ -0,0 +1,103 @@ +{ stdenv, lib, buildFHSUserEnv, dpkg, glibc, gcc-unwrapped, autoPatchelfHook, fetchurl, wrapGAppsHook +, gnome2, xorg +, libSM, libXxf86vm, libX11, glib, pango, cairo, gtk2-x11, zlib, openssl +, libpulseaudio +, SDL2, xorg_sys_opengl, libGL +}: +let + + runescape = stdenv.mkDerivation rec { + pname = "runescape-launcher"; + version = "2.2.9"; + + src = fetchurl { + url = "https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb"; + sha256 = "0r5v1pwh0aas31b1d3pkrc8lqmqz9b4fml2b4kxmg5xzp677h271"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + dpkg + ]; + + buildInputs = [ + glibc + gcc-unwrapped + libSM + libXxf86vm + libX11 + glib + pango + cairo + gtk2-x11 + zlib + openssl + ]; + + runtimeDependencies = [ + libpulseaudio + libGL + SDL2 + xorg_sys_opengl + openssl + zlib + ]; + + dontUnpack = true; + + preBuild = '' + export DH_VERBOSE=1 + ''; + + envVarsWithXmodifiers = '' + export MESA_GLSL_CACHE_DIR=~/Jagex + export GDK_SCALE=2 + unset XMODIFIERS + ''; + + installPhase = '' + mkdir -p $out/bin $out/share + dpkg -x $src $out + + patchShebangs $out/usr/bin/runescape-launcher + substituteInPlace $out/usr/bin/runescape-launcher \ + --replace "unset XMODIFIERS" "$envVarsWithXmodifiers" \ + --replace "/usr/share/games/runescape-launcher/runescape" "$out/share/games/runescape-launcher/runescape" + + cp -r $out/usr/bin $out/ + cp -r $out/usr/share $out/ + + rm -r $out/usr + ''; + + + meta = with lib; { + description = "Launcher for RuneScape 3, the current main RuneScape"; + homepage = "https://www.runescape.com/"; + license = licenses.unfree; + maintainers = with lib.maintainers; [ grburst ]; + platforms = [ "x86_64-linux" ]; + }; + }; + +in + + /* + * We can patch the runescape launcher, but it downloads a client at runtime and checks it for changes. + * For that we need use a buildFHSUserEnv. + * FHS simulates a classic linux shell + */ + buildFHSUserEnv { + name = "RuneScape"; + targetPkgs = pkgs: [ + runescape + dpkg glibc gcc-unwrapped + libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl + libpulseaudio + xorg.libX11 + SDL2 xorg_sys_opengl libGL + ]; + multiPkgs = pkgs: [ libGL ]; + runScript = "runescape-launcher"; +} diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 5aa2408afd12..05caaaed63e7 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { Stockfish is one of the strongest chess engines in the world. It is also much stronger than the best human chess grandmasters. ''; - maintainers = with maintainers; [ luispedro peti siraben ]; + maintainers = with maintainers; [ luispedro siraben ]; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; license = licenses.gpl2; }; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index b813900ca39f..e064be66cb33 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -8,11 +8,11 @@ assert tlsSupport -> gnutls != null; stdenv.mkDerivation rec { pname = "tintin"; - version = "2.02.05"; + version = "2.02.11"; src = fetchurl { url = "mirror://sourceforge/tintin/tintin-${version}.tar.gz"; - sha256 = "sha256-Y6cAUhItJNade8ASOVdF8aBBLf/UVqjoqrhXBNRL1aE="; + sha256 = "sha256-s5KJ7x4m0vW39+M/cLzYlAYMld2WwVe7l28GPFmosfU="; }; nativeBuildInputs = lib.optional tlsSupport gnutls.dev; diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index cfe53e48d679..f43f3fc4f3a6 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -49,6 +49,6 @@ in stdenv.mkDerivation rec { homepage = "http://splix.ap2c.org"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau peti ]; + maintainers = with maintainers; [ jfrankenau ]; }; } diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index bd4022526ed4..72c342e7b6a9 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, fetchurl, sconsPackages, libX11, pkg-config -, libusb1, boost, glib, dbus-glib }: +{ lib +, stdenv +, fetchFromGitHub +, sconsPackages +, libX11 +, pkg-config +, libusb1 +, boost +, glib +, dbus-glib +}: -let - version = "0.8.8"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xboxdrv"; - inherit version; + version = "0.8.8"; - src = fetchurl { - url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz"; - sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id"; + src = fetchFromGitHub { + owner = "xboxdrv"; + repo = "xboxdrv"; + rev = "v${version}"; + hash = "sha256-R0Bt4xfzQA1EmZbf7lcWLwSSUayf5Y711QhlAVhiLrY="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -24,5 +33,4 @@ in stdenv.mkDerivation { maintainers = [ ]; platforms = platforms.linux; }; - } diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 8e08be28eda8..06b1221dccb8 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,13 +21,14 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-14002"; + version = "5.0-15260"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "53222560650e4a99eceafcd537d4e04d1c50b3a6"; - sha256 = "1m71gk9hm011fpv5hmpladf7abkylmawgr60d0czkr276pzg04ky"; + rev = "207c931a04c8e2629a735bc2b3f36b5c89365ca7"; + sha256 = "15r9syk7f62h16klcznw7css6sng8nqkkz4d1qr8d988rdfaiypx"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ] diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 78f942352d8c..e584331ea669 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -1,11 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs -, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert +{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem , libX11, libgdiplus, ffmpeg , SDL2_mixer, openal, libsoundio, sndio, pulseaudio , gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook }: -let +buildDotnetModule rec { + pname = "ryujinx"; + version = "1.0.7065"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + + src = fetchFromGitHub { + owner = "Ryujinx"; + repo = "Ryujinx"; + rev = "c54a14d0b8d445d9d0074861dca816cc801e4008"; + sha256 = "13j91413x1bvg27vcx9sgc7gv00q84d8f5pllih5g5plzld4r541"; + }; + + projectFile = "Ryujinx.sln"; + executables = [ "Ryujinx" ]; + nugetDeps = ./deps.nix; + + nativeBuildInputs = [ wrapGAppsHook gobject-introspection gdk-pixbuf ]; runtimeDeps = [ gtk3 libX11 @@ -17,81 +31,24 @@ let sndio pulseaudio ]; -in stdenv.mkDerivation rec { - pname = "ryujinx"; - version = "1.0.7058"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx - - src = fetchFromGitHub { - owner = "Ryujinx"; - repo = "Ryujinx"; - rev = "d92fff541bf6fddadabf6ab628ddf8fec41cd52e"; - sha256 = "1lsg4v15x8i43pwkgn4y8d2m95m6w7izwm4zhspnq8r2lv18lqb2"; - }; - - nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; - - nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { - fetchNuGet = { name, version, sha256 }: fetchurl { - name = "nuget-${name}-${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${name}/${version}"; - inherit sha256; - }; - }); patches = [ ./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. ]; - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - - nuget sources Add -Name nixos -Source "$PWD/nixos" - nuget init "$nugetDeps" "$PWD/nixos" - - # FIXME: https://github.com/NuGet/Home/issues/4413 - mkdir -p $HOME/.nuget/NuGet - cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - - dotnet restore --source "$PWD/nixos" Ryujinx.sln - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - dotnet build Ryujinx.sln \ - --no-restore \ - --configuration Release \ - -p:Version=${version} - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - dotnet publish Ryujinx.sln \ - --no-build \ - --configuration Release \ - --no-self-contained \ - --output $out/lib/ryujinx - shopt -s extglob - + preInstall = '' # TODO: fix this hack https://github.com/Ryujinx/Ryujinx/issues/2349 mkdir -p $out/lib/sndio-6 ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6 - makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \ - --set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \ - --suffix LD_LIBRARY_PATH : "${builtins.concatStringsSep ":" [ (lib.makeLibraryPath runtimeDeps) "$out/lib/sndio-6" ]}" \ - ''${gappsWrapperArgs[@]} + makeWrapperArgs+=( + --suffix LD_LIBRARY_PATH : "$out/lib/sndio-6" + ) for i in 16 32 48 64 96 128 256 512 1024; do install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png done + cp -r ${makeDesktopItem { desktopName = "Ryujinx"; name = "ryujinx"; @@ -101,13 +58,8 @@ in stdenv.mkDerivation rec { type = "Application"; categories = "Game;"; }}/share/applications $out/share - - runHook postInstall ''; - # Strip breaks the executable. - dontStrip = true; - meta = with lib; { description = "Experimental Nintendo Switch Emulator written in C#"; homepage = "https://ryujinx.org/"; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 618fb3beeeb4..7b87c4acbff0 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,16 +44,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.17"; + version = "6.19"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-nbHyQ12AJiw3dzF98HWFWu6j5qUst3xjDsGysfuUjwg="; + sha256 = "sha256-QYLi2WJ3BMw3b0b8MQlYDqkHd5b0T17oPgjj6Wvwq2Y="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "6.3.0"; + version = "6.4.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-pfAtMqAoNpKkpiX1Qc+7tFGIMShHTFyANiOFMXzQmfA="; + sha256 = "sha256-24uF87kQWQ9hrb+gAFqZXWE+KZocxz0AVT1w3IEBDjY="; }; patches = [ @@ -65,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-rR5m6D8M3vTXXIHzsF8+o2G5rlRS2HLfCHoatbJwlrQ="; + sha256 = "sha256-1Ng+kFFnqEndlCvI0eG1YmyqPdcolD3cVJ2KU5GU7Z4="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/emulators/zesarux/default.nix b/pkgs/misc/emulators/zesarux/default.nix new file mode 100644 index 000000000000..4df6cfafbc01 --- /dev/null +++ b/pkgs/misc/emulators/zesarux/default.nix @@ -0,0 +1,89 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, SDL2 +, aalib +, alsa-lib +, libXext +, libXxf86vm +, libcaca +, libpulseaudio +, libsndfile +, ncurses +, openssl +, which +}: + +stdenv.mkDerivation rec { + pname = "zesarux"; + version = "10.0"; + + src = fetchFromGitHub { + owner = "chernandezba"; + repo = pname; + rev = version; + hash = "sha256-cxV2dAzGnIzJiCRdq8vN/Cl4AQeJqjmiCAahijIJQ9k="; + }; + + nativeBuildInputs = [ + which + ]; + + buildInputs = [ + SDL2 + aalib + alsa-lib + libXxf86vm + libXext + libcaca + libpulseaudio + libsndfile + ncurses + openssl + ]; + + patches = [ + # Patch the shell scripts; remove it when the next version arrives + (fetchpatch { + name = "000-fix-shebangs.patch"; + url = "https://github.com/chernandezba/zesarux/commit/4493439b38f565c5be7c36239ecaf0cf80045627.diff"; + sha256 = "sha256-f+21naPcPXdcVvqU8ymlGfl1WkYGOeOBe9B/WFUauTI="; + }) + ]; + + postPatch = '' + cd src + patchShebangs ./configure *.sh + ''; + + configureFlags = [ + "--prefix=${placeholder "out"}" + "--c-compiler ${stdenv.cc.targetPrefix}cc" + "--enable-cpustats" + "--enable-memptr" + "--enable-sdl2" + "--enable-ssl" + "--enable-undoc-scfccf" + "--enable-visualmem" + ]; + + installPhase = '' + runHook preInstall + + ./generate_install_sh.sh + patchShebangs ./install.sh + ./install.sh + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/chernandezba/zesarux"; + description = " ZX Second-Emulator And Released for UniX"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: Darwin support diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 369add0a586b..676c24b3f7d0 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -157,5 +157,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.viric ]; + mainProgram = "gs"; }; } diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index 43c9af533fae..4edbd70a2211 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.5307"; + version = "1.0.5415"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "VsOoW8h7yFgMRVTP6AHs2HOqSwXMnRNgJI8FM/rHp2I="; + sha256 = "XvW+bAuad1IKJPZzVJBkT7vA2BBDFQBvTWtbyK/in6A="; }; dontBuild = true; diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 47cbb59f2f01..2cfd1519795d 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -1,4 +1,4 @@ -{ lib, lndir, symlinkJoin, makeWrapper +{ lib, symlinkJoin, makeWrapper , lilypond, openlilylib-fonts }: @@ -8,11 +8,10 @@ lib.appendToName "with-fonts" (symlinkJoin { paths = [ lilypond ] ++ openlilylib-fonts.all; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ lndir ]; postBuild = '' for p in $out/bin/*; do - wrapProgram "$p" --set LILYPOND_DATADIR "$datadir" + wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}" done ''; }) diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/misc/screensavers/pipes-rs/default.nix index 5e55f13c2b43..22443dc11732 100644 --- a/pkgs/misc/screensavers/pipes-rs/default.nix +++ b/pkgs/misc/screensavers/pipes-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pipes-rs"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "lhvy"; repo = pname; rev = "v${version}"; - sha256 = "drqoKkju1EkcWGNnliEah37wVhtU2ddJSOZ5MnCNbuo="; + sha256 = "sha256-BC6QqSZ7siDVSO8oOH7DimTe6RFnCBygmvtPrQgsC/Q="; }; - cargoSha256 = "0j6b5697ichw4ly7lsj3nbm0mw6bvjma81nd0fl7v1ra9kbmsysk"; + cargoSha256 = "sha256-nctkc2vDE7WXm84g/EkGKc1/ju/Xy9d/nc8NPIVFl58="; doInstallCheck = true; diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index be605192acce..996260187506 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, makeWrapper, coreutils, ncurses }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "pipes"; version = "1.3.0"; - src = fetchurl { - url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz"; - sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; + src = fetchFromGitHub { + owner = "pipeseroni"; + repo = "pipes.sh"; + rev = "v${version}"; + hash = "sha256-856OWlnNiGB20571TJg7Ayzcz4r6NqdW5DMDiim09mc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 821ff43c2d49..34cf4d4e9e90 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2021-09-04"; + version = "2021-10-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "0fb731c66abbacf5cdf19ccbdf326e50e0111498"; - sha256 = "0m2dwcl9nc9kv2dmyazz9xrv19dzkdwkvkdyh2naycpbr1sj2w0b"; + rev = "eeae1b63602ac360d24cc6a22376fa103d0228cc"; + sha256 = "1mfqqkvijpc89d2szi30jry5mrzlgrnqvy7h0qkldgd7r3476vhs"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-10-02"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f9deee0e416f626d8597e3e6ea8e89172e5aaa78"; - sha256 = "0qa0lprnhhdlfahjic1nq71cn4q7slnb2rg7mfhbd1791zscffwg"; + rev = "16898417e68ffb6034b2a6de0c1b25502bd846d8"; + sha256 = "1zyzw8m8bfs3p06nq582pb5lja204xhzkd60bp1wyyq1q5qv9y3v"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,24 +101,24 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-10-01"; + version = "2021-10-09"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "f764c5cf633a89ea71a41055413e3a36acb43541"; - sha256 = "1za93194wdhw29fz6z4lj8xh8cq38gq9sdavc2syyc50amfqpxh3"; + rev = "836779b75c332d3063a628fd1050a4b0a6d57882"; + sha256 = "0cv3ki2xhz1rwz9wd2lyyv8zpdyflmjmb51k1kcy16jlp2ahgxi6"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-07-27"; + version = "2021-10-07"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "40e28ee318b968c09a1724cd25cd450330b136c9"; - sha256 = "09fcn2mdi05alhzkk89namymk7lryycb303nah9i63km39h5rs12"; + rev = "c84f8bb203c49d9da28e4ea7a32d951ccde1d40f"; + sha256 = "1ii58rvc8mvv33kbfnn7b66mpf08hn3vm2swjgaaw4dwvzffzi71"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -197,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-09-30"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "25603ba44b1439a7e69637a7ee37c5dba63b5623"; - sha256 = "014pnjinm30jjh4dmxxbfnriijpa83z9g65hilmvwndqf6z7nndj"; + rev = "6ea04b2b1a01e2c00e1b126af2b43a15c2fab441"; + sha256 = "1lzv98cjqla7py5xh4qk7p89qqlfadyspj20vfblv9gsxnhl5acy"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -233,12 +233,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-10-05"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "dc7619fc3c6e3368ae449bf8ae1ad7630a720406"; - sha256 = "0izpxbwa144r9wjiy1m0r19hfwdlm2r3pggn178gj56ll7y2njnk"; + rev = "6f9506c1a8445b902e121a630613b94c8b0cd52a"; + sha256 = "0gxf67a2l1sc5svrs6jkp6rawbjj54dvsqfr0prqindpdivxihic"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -327,6 +327,18 @@ final: prev: meta.homepage = "https://github.com/rbgrouleff/bclose.vim/"; }; + better-escape-nvim = buildVimPluginFrom2Nix { + pname = "better-escape.nvim"; + version = "2021-10-18"; + src = fetchFromGitHub { + owner = "max397574"; + repo = "better-escape.nvim"; + rev = "bbb8b0e3d1b1088a1db6b5ece776a41709929128"; + sha256 = "1xiaywjy12rj25qdq5ys8ayrwlw9p9frpjzzagx1p6zgp03jpq63"; + }; + meta.homepage = "https://github.com/max397574/better-escape.nvim/"; + }; + BetterLua-vim = buildVimPluginFrom2Nix { pname = "BetterLua.vim"; version = "2020-08-14"; @@ -449,12 +461,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-10-06"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d84f60a07871fa8efef59d350f9884fd8a542a98"; - sha256 = "1y9pkgwkc0cga25afknn5xrbn2kx46kg97348gjnk9bg297qm05g"; + rev = "47071cacfb9bcd5ac86dddb1e3ef272ca7ac254d"; + sha256 = "1b2dx5j44441xgfk3dj8f135kim38fnp2s8rpf098q8r2gn3zv8d"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -569,24 +581,24 @@ final: prev: cmp-calc = buildVimPluginFrom2Nix { pname = "cmp-calc"; - version = "2021-08-25"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-calc"; - rev = "cda036bfd147288c107b840e917fdd0a3e18f404"; - sha256 = "1s2sx9pzafrs0132qh7jym9kppyz9rk2hs3sdnizj62m4d3lwm5l"; + rev = "eb7bd1d7382ac26d8eb7346e36405c0ae94333a2"; + sha256 = "0b88fn4zb2sp4c9fnn9m8qb41djv17mmydhx6bryqnrc8mqycajy"; }; meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; cmp-conjure = buildVimPluginFrom2Nix { pname = "cmp-conjure"; - version = "2021-09-10"; + version = "2021-10-09"; src = fetchFromGitHub { owner = "PaterJason"; repo = "cmp-conjure"; - rev = "27cfdac78ec099a8d1e82b7a810f451ff0f80a30"; - sha256 = "1hbkafpqpzf4bzy8cyzg1zxnnpmhfkpz2vj8v8by5ym4qx8b747p"; + rev = "ca39e595a0a64150a3fbad340635b0179fe275ec"; + sha256 = "08vpd8ibz9472iblw0qc64phvwvkm0byrkvw9b9lq0jcsmw2sgs5"; }; meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; @@ -617,60 +629,60 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-09-30"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "f93a6cf9761b096ff2c28a4f0defe941a6ffffb5"; - sha256 = "02x4jp79lll4fm34x7rjkimlx32gfp2jd1kl6zjwszbfg8wziwmx"; + rev = "accbe6d97548d8d3471c04d512d36fa61d0e4be8"; + sha256 = "1dqx6yrd60x9ncjnpja87wv5zgnij7qmzbyh5xfyslk67c0i6mwm"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; cmp-nvim-lua = buildVimPluginFrom2Nix { pname = "cmp-nvim-lua"; - version = "2021-08-30"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lua"; - rev = "44acf47b28ff77b4b18d69d5b51b03184c87ccdf"; - sha256 = "053xmzzrw04n8rdxivy222ivqswh5mka1kawl470f7f0b67yfjlp"; + rev = "d276254e7198ab7d00f117e88e223b4bd8c02d21"; + sha256 = "11mhpb2jdc7zq7yiwzkks844b7alrdd08h96r6y7p3cxjv1iy5gz"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-10-06"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "8d88c92dd5a202a996b4caac7284e4ea2f086765"; - sha256 = "0m7wmnanhmvx4ww5xiz6rfjzk3ci10gk4dda8qd87kdiszq1zay7"; + rev = "2b1d31fef79a4c0ff803f6230859faf76e4409f9"; + sha256 = "1l3lyzgwlr7drxzig01by99vrgi7flvrnln3dmy14pg2x56lsbf3"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; cmp-spell = buildVimPluginFrom2Nix { pname = "cmp-spell"; - version = "2021-08-28"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "f3fora"; repo = "cmp-spell"; - rev = "7157c9fa1029269d97d9ed5632ec575bb71981b4"; - sha256 = "1xrc3zs9jz7dvdfhfx9ikg7abxgvjns0iqr9yzn3jzqm4a37zc62"; + rev = "4ce11f44edc54f7e3087c85c1b7b388f9aece983"; + sha256 = "05akncv4w8p3h25q5dmx8h0jbn2b4l5mz9x62wj7d7qks4fjik4j"; }; meta.homepage = "https://github.com/f3fora/cmp-spell/"; }; cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2021-09-30"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "71fd46be319f96dc35ecda2fb2641a643c1ca3ba"; - sha256 = "08kqzhzx90r06hjbbr5y79bh4xgg4nj73lsam0wcvq6xyjh7qbnn"; + rev = "f788bb17e1de13b49e197b68edb501010b64e975"; + sha256 = "1c21y5vz9afzmx7l0ifv6gc2a6mfmsa8r0igxgyin0jj6ipk5kkl"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -701,12 +713,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2021-10-03"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "05b8e44df876743e278e5ecd6247c3bb371a3565"; - sha256 = "10x1qvi6xvnhnzq3r4cg9wcjarj95kz2xcpbb2q3niz8kq88lavj"; + rev = "8da7e78e54415753d6b688f96d54290d754f7c6b"; + sha256 = "0s9s2kpfg6mqrl0xdqxl1k17vj4pc433v89i1p5kcrxsydfvdxp3"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -737,24 +749,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-09-12"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "2d9deb2a3b05a0c09f01edda0a4abd542cb3eebd"; - sha256 = "0y1yh5sf0irk9rr0d5vzvf58y5q5i50b9wdpbjy1b4dfvnax00gn"; + rev = "f9188b2652d7bf7131c74532e52ba25340d63b9f"; + sha256 = "093chsnh5fx4qwdw5dnn7h48fn2zlq0skwanlwm6ajws397n194k"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-10-01"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "d288ef453066afd1845c17883e26c4d1c9b6a3ae"; - sha256 = "154gblar7qpkfff2n29cg0xjhxgjdg51djgq3qzj9f0fc1bcm68k"; + rev = "ee767ef4db8e5606c8c4edc304a75053ac943804"; + sha256 = "1rv47115xbbsnkzs18bp60advhd3mz16w1aigfxk30cmajfydwvg"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -856,6 +868,18 @@ final: prev: meta.homepage = "https://github.com/wincent/command-t/"; }; + comment-nvim = buildVimPluginFrom2Nix { + pname = "comment.nvim"; + version = "2021-10-18"; + src = fetchFromGitHub { + owner = "numtostr"; + repo = "comment.nvim"; + rev = "5365cc7f1fc2522ffa1b560830d3125372928d6a"; + sha256 = "0lvcl3pykcry35r6c9fxmjklzvzz7lpxfchbz1qgadpq45pidyir"; + }; + meta.homepage = "https://github.com/numtostr/comment.nvim/"; + }; + committia-vim = buildVimPluginFrom2Nix { pname = "committia.vim"; version = "2020-08-27"; @@ -942,12 +966,12 @@ final: prev: completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2021-08-02"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "139fb6cfbd9f7384a5489d3e4afdacb8ed977ab0"; - sha256 = "1641gx74mqbsp42m6z695l8xlr56b79vklghjdxywi35xbz4yq22"; + rev = "87b0f86da3dffef63b42845049c648b5d90f1c4d"; + sha256 = "07n5h3jbbjpciwpd6j8dnclvb70a5hwv00605cybcc5l4xvvvsga"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -990,24 +1014,24 @@ final: prev: conflict-marker-vim = buildVimPluginFrom2Nix { pname = "conflict-marker.vim"; - version = "2020-09-23"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "rhysd"; repo = "conflict-marker.vim"; - rev = "6a9b8f92a57ea8a90cbf62c960db9e5894be2d7a"; - sha256 = "0vw5kvnmwwia65gni97vk42b9s47r3p5bglrhpcxsvs3f4s250vq"; + rev = "22b6133116795ea8fb6705ddca981aa8faecedda"; + sha256 = "0rh3c1sl145hwyh6idwgyqbrgnwvd91spxc5qs2hfr1xsh53ssx2"; }; meta.homepage = "https://github.com/rhysd/conflict-marker.vim/"; }; conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-10-01"; + version = "2021-10-09"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "2c1105f1e21544db614caed82b2873b563b31620"; - sha256 = "1ndh772dml8d4y347smlg7bap2h6mnd3q77canzgashj1ramk4rh"; + rev = "1a30578ff37e33e8a5687a9488c86d0d880d8893"; + sha256 = "1phjrz46ahdwg1af2n6x3y6nims4c2hwmx6z3zwi5bb7wmc0jyn8"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1206,12 +1230,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2021-09-18"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "9983f2cee6374da84be1d0189cc9add7605eeb56"; - sha256 = "0r7illv3v53fqq9xvic10hgqgd2863gv0s0x94i8vj6y04g3h2lj"; + rev = "701b2a9b04055d056cd2e3e1f6f6fa555b0c4cb6"; + sha256 = "1q8nqg5dq3m3m884s67yv2i9b8m94myyx56xyw7f3g4b4ivcsyy4"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1254,24 +1278,24 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite.nvim"; - version = "2021-09-28"; + version = "2021-10-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "6be8af3a55b79afad17714c8c8b12b2900a330b1"; - sha256 = "1x7zgb3cldc900fikfa83x0xvndsbvzjbykw16gnn224mf6kbacs"; + rev = "3f9df74f2d7e698e6479c5cff8a02da95016f403"; + sha256 = "1bniby3qr0d4k7j17y2z83ppx7gmah2gb5qn3vx7gw50i89j6gls"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2021-09-13"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "03b772ed3e91b8bdbf5260d76f84c5e90a42a8f0"; - sha256 = "0nbwb2kcmd88zqk1v1zndbrjfpsj5jy99bzm81sx5k9yslhl854n"; + rev = "b39664490b640bb4b80f5d2490e03ffa4947d736"; + sha256 = "11j70qwl2amxiw39602anx1vxqzjk5vfidpk3vcarlcfxm750aj2"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1388,12 +1412,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2021-09-08"; + version = "2021-10-07"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "6299a22bedfb4f814d95cb0010291501472f8fd0"; - sha256 = "01gbjhzgy64398idd3hx0805aaa9ynsxyl52qirr16sy3ydpw0rc"; + rev = "f3d1f14fa8a8cf882be39605fb037ee982c3f37c"; + sha256 = "0qngyypp8md9rq06xvmwy5qwpa5al6kscj9ivad9mg3wzw6rmya6"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1518,6 +1542,18 @@ final: prev: meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; + diaglist-nvim = buildVimPluginFrom2Nix { + pname = "diaglist.nvim"; + version = "2021-10-15"; + src = fetchFromGitHub { + owner = "onsails"; + repo = "diaglist.nvim"; + rev = "5221d8e4fd5522fb9e81b8131ff714b464dd0bb2"; + sha256 = "0xsm6s8qr5q52hmbhxr0hxhwar5d04gmwzf2ci82scvf85ar9l9g"; + }; + meta.homepage = "https://github.com/onsails/diaglist.nvim/"; + }; + diagnostic-nvim = buildVimPluginFrom2Nix { pname = "diagnostic-nvim"; version = "2020-11-13"; @@ -1532,12 +1568,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-10-02"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "b0a86fef8e7f4f85cc37915fcd439e99f648f14c"; - sha256 = "1b24baqcsw3yals07vd6dksghggymlp7xvag53iy5v08f11i9bbc"; + rev = "2a838d444ef38e07170b161ed12ce241a8d8c54f"; + sha256 = "1d23mxvc4ldlsv5a6zy0glxfnfmx08fvp1zyxds1v369pn6x61pi"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1592,24 +1628,24 @@ final: prev: echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc.vim"; - version = "2021-09-27"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "7a43055fe5307ac2a44532fab0dc65538e5c9895"; - sha256 = "00kxkqybfziq1bk3wbfc1r2ni74w9svi3vafsz5azixylabx4grr"; + rev = "a5568996527e2bc563dcfae2bfc78a3760f40d55"; + sha256 = "13h37vkrbr3zq9l3d542z0rc8b9d6zxpp5r0cg89xa0q360y9l9w"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-10-04"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "73671fbfc70f0b78c743894b31c009b22a6ddaa3"; - sha256 = "0mbz6901l0i0cy49d63542jfvzk93d2xnbkpnih65x8whhx35vdc"; + rev = "1a91fe0efc1bb1c4564140b6a5be7e3bf5ac0873"; + sha256 = "17a9lnhwf8vsfx2pm5bwzd6khfb3w954kx1w72msfmqf46v3d1ah"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1726,12 +1762,12 @@ final: prev: far-vim = buildVimPluginFrom2Nix { pname = "far.vim"; - version = "2021-02-19"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "e67b1dbe5842b709687c214fea38ca00f0ffe6c6"; - sha256 = "1ljvl7p2k3bgl54srf6kvshqq16qwfa34ppj982fp2bzzal819l1"; + rev = "9b6cc10650128a7830fb92425ad978ae8d6132bc"; + sha256 = "0kyjz4zq9rdyxvrs4l3ficrhpfwb5p01x84x17vcqbrc68kksw04"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -1762,12 +1798,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-10-03"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "6b788d198f01a1f29bce0da8f89cd874343db747"; - sha256 = "1ii4b70z5pb804004xz2hcnn2n7yjanzqvk54ki9kshshw4y1qmp"; + rev = "4ef5e1516395eea731275e0f58b6bfba5c6ac9c1"; + sha256 = "12fci8gkbs3gf7cx68dpczkvsgy7bbax6f5fdl6fbjszpwr96lhw"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1786,12 +1822,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2021-09-19"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "264a73d4df15a9234a4ec74ecd70e9a0b9d45bf7"; - sha256 = "165kac22gmfm8f64rb5xgv8pqap2zh87xvhnd7i1fy34yzj0n514"; + rev = "41197d23b2975fb373b0affc090ff4fe52a7429c"; + sha256 = "0djjik0q4pczw3r6v2xpmww1wv6rw69jxmdpnwfxss2fdpz5a9wl"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1822,12 +1858,12 @@ final: prev: FixCursorHold-nvim = buildVimPluginFrom2Nix { pname = "FixCursorHold.nvim"; - version = "2021-04-16"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "FixCursorHold.nvim"; - rev = "b5158c93563ee6192ce8d903bfef839393bfeccd"; - sha256 = "1y6hv7vl268zbf3bzd72l43jjgi0cq364p15z8ia9jlph1syk9zz"; + rev = "f2572b0163d7b19b4e8a7c76a3eb084921d736de"; + sha256 = "06agspmka503yn75873kk0g5v2m91df1zblsh96gkc4h6wm52liv"; }; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; @@ -1871,12 +1907,12 @@ final: prev: floobits-neovim = buildVimPluginFrom2Nix { pname = "floobits-neovim"; - version = "2018-08-01"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "floobits"; repo = "floobits-neovim"; - rev = "29ab2ed4bd5c879df0bd6df313a776155eb98ad8"; - sha256 = "0bnncn3waw9birpd51j27hrzlriz8dk4naxdajmbwznwcnbkkgwx"; + rev = "dbfa051e4f097dfa3f46997a2019556a62861258"; + sha256 = "1zsr1536qf7zqdskpshf366m333w66hfjrfdw3ws5yz2l7kq5bcm"; }; meta.homepage = "https://github.com/floobits/floobits-neovim/"; }; @@ -1907,12 +1943,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-09-23"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "4b64ba3e4ed30e96125b5725a3475ca6fb417c6c"; - sha256 = "0i5qp89ggwknh99yxrsdb8ywffsdhr2lrigllhl4ad1lrgbfmjz7"; + rev = "59507a9773ea1a24072342da357da0708b303ef9"; + sha256 = "1d5ragvg9jxs3axln3cqj7i37c0vxdyfwl4ll06yslghb77krf6w"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1979,24 +2015,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2021-10-04"; + version = "2021-10-06"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "8ffc845bdd546ff3a6f5d90096a52542a1463de0"; - sha256 = "0d98hhhyxknimppp144kj3432xxd284zs0xxiilwybsx0pzpl3qk"; + rev = "180b979697493d3b0878829202e8c9b0a27aa2cd"; + sha256 = "0nypq514xx6rcvszxv2sz3s6vlg54adqkn2iawfy2jms93brcqs5"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2021-09-29"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "e393108bfae7ab308aa6ea38e0df19253cdc8499"; - sha256 = "08ks0hs4rnqc1w0paaqwb4rvp8rqd08pdivbhvqa55barjqg3dir"; + rev = "0452b71830b1a219b8cdc68141ee58ec288ea711"; + sha256 = "0z2p1j9ri71f0ynwppjg7d4gi3srcg58km5ggc55s0dwwwndb8k4"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2039,12 +2075,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-07-03"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "a1a83a3385e0d67c9875492aaa9cbbab2322dbdc"; - sha256 = "0agsajz53409zvzpwbw24cfny027ymlw32jrakqdizmgrl46zm45"; + rev = "b18ad1643f753f39e924909ecd957cb6b5a5fa89"; + sha256 = "1swwz4kzc1d41nbvvar3a2c71xy524fsyf5kjyrbbivrghcifpl8"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2123,24 +2159,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2021-07-15"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "585f2eab74cb872c421f564274ef050fa74937ab"; - sha256 = "1zc9yr7b53akn639xhczala7vqz7rdy61xnndwn37bdxzvjqm59j"; + rev = "a6fb6d1ec2746fc18f81433648416edfb1a96d43"; + sha256 = "0c417li0jx970h8qkgrww7ifzjjknfi26i7n13qx96c5axjxady5"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-10-04"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ceb2dcb23f569ce337deb1b1ce7d4a51434cec32"; - sha256 = "0q7a2pa6am99656a07zpnhqlgzjkn9z0jg6lvc45c7mqavl21xis"; + rev = "552f114caeaec4ce97822cb55dfa7c7e5368136b"; + sha256 = "0qdafm3arjf8bcqpvv085dwzbikad3sr3xzvrn3gfa0dsls8pg6q"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2207,12 +2243,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-10-03"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "b04d83414d113aedf2e4beb1dd030f8a909ee8a8"; - sha256 = "0mdkz8hcdvr6f77y9b7zb04sv3xw1v8j4rpim6fxcbg38q267wcp"; + rev = "05c6983e6d6cb6e35367a13eeda1ffb160f48753"; + sha256 = "1qa22gsa62ginkad21bigj8qgbh8h3car598gl59643y2kc7lip3"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2243,12 +2279,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-08-20"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "dba3e04ab97bf80d41c0d30f34ecde8ca2762c47"; - sha256 = "1kryx30fzj33lm969jgx3715s3cz5cp7hlxjs5d29a11gqbmpi0n"; + rev = "961cc1850bd7d5657aa5789f81487d4d85747d2b"; + sha256 = "1kvl264xmk6vk5kqp6d32lfxyb5rx320kc3fhmjzkyaa2p4k3j25"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -2267,12 +2303,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-10-04"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "8f95a04c0a8d4d7b84b089a11a2c41d58693d89c"; - sha256 = "1nzr0148zi89mq4yil77ns2nrs0ldnl3fh8aqxa89fivy8lg9p64"; + rev = "fa709b95ba0cbc35310125bc2e42ffeb2576bd4d"; + sha256 = "06vzhcciifb8vwzmkbwy4hnzwrj2rgz3zl91xh8dbf1g4fh54w8x"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2387,12 +2423,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2021-09-06"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "a3f11483e1ffd5946914db505c7b917bb6c95515"; - sha256 = "0asabmaacvfyv48rwzgcy4vy5wrp72rjmgn53ann9asfxw9ipjsh"; + rev = "2097f623b6b04f9d03e1d23c08e975e5079be64f"; + sha256 = "0d1brmiqsnq0crm5844m2sj2df7vj0ad1bkdrmyxvgnphq0z443p"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2495,12 +2531,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-10-06"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "948b6ac3303b9e2e75daad0bd0ec844ed6b06d4a"; - sha256 = "1adsy4nkl8dm6bqkc2chy47na3kqh8g1lkmxzvc5wdfw0c27z0i0"; + rev = "0a98fa8dacafe22df0c44658f9de3968dc284d20"; + sha256 = "1mwj3wsp6b1m6amii5pz2b0nbs6ac8w0285wg8gd3g2y3ywihi2g"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2688,12 +2724,12 @@ final: prev: kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2021-08-26"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "09d332c66b7155b14eb22c9129aee44d9d2ff496"; - sha256 = "1cdzsqilnb90wqicjb9v58wiayp8a7wa44q4aw7a5a74yyxysfhy"; + rev = "8f1cd74ad28de7d7c4fda5d8e8557ff240904b42"; + sha256 = "0avd7v0nzz31nf5vj29npw5g7c2rrlirvkyd042qlh5y2vas7b2g"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; @@ -2784,12 +2820,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-10-05"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "583358ec0dd9a6a1937eb3e46614ebad017325b9"; - sha256 = "1ngf54bz0v940y0sf9axbvsf3vcnajdrp4lhvbh0zw28piqxlkap"; + rev = "869a4005f63eba5a9e6e175bca0c50d73be48e2d"; + sha256 = "08yf8cqnzbm5cb5s2ynhj15l2lw73xhmfab15jnfyx14jd9pgyk6"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2928,12 +2964,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-10-05"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "9340b1bb6ec9f92939a323889200e3032f8ed6fe"; - sha256 = "1w9x9g3l0hnc157fjq0qyz52mr4s6m56zwsmc0l0b53z9prma5mz"; + rev = "d2d47534b00d6fcd16cabab8ec8a6cd15c40ebf3"; + sha256 = "13yb0srx7g9yf6rrr0bycxr4kac1ip1a1nzz27hamfkq3l9rcgn5"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2952,12 +2988,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2021-09-20"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "bc14ddcb173d332e62ce3712eb0ca3ac6d9fa59a"; - sha256 = "1sh13m98dni9dspjiwsaafzvg3nlwd41v5ma5achpzla80hzm2h1"; + rev = "5a7b21b0fdafe73719902b9848880fb3eb8500aa"; + sha256 = "0pdswmrmc2nicii5szhig4qnmcx2cks6rc5g7s787cc0c458l98p"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3024,24 +3060,24 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-10-04"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "24bea0c8697a360f96f7050b15b46e5f1ab8383a"; - sha256 = "0xdr9n6jq9ma1bkck05xcpxja1wwvqwhg36s2v5kl11anb67vqhz"; + rev = "422006c33c0da8947772c3a1040fa6c93be418d8"; + sha256 = "0079b9zac83yjmv6ln37fzyl91f4pw8bzy075czvsx7kbpcg2a04"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2021-10-06"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "0df591f3001d8c58b7d71a8dc7e006b8cea4959d"; - sha256 = "02w8wagfssbail50p1pb6bdjig6y9ns0bbmdal4kfdq797sh4c3n"; + rev = "0f7851772ebdd5cb67a04b3d3cda5281a1eb83c1"; + sha256 = "0jk1xlp8x6vw40dl96zvmdxv0p8100rzx7za58xpahz10232lckx"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; @@ -3084,24 +3120,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-10-05"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "7ae2627a8088f879272f85b9ac97d346ec554521"; - sha256 = "0agwval3hpkmgr56jnf6x2yhdy5bqzw4z1vcnh2qbp34yi0r5a07"; + rev = "4526e71635b2d238c0f76f058e8c4de3a6b5bd51"; + sha256 = "08xrppvjzc6hnzfkjy1y7k4n5pxgamrzchv9nry6yzi9w3ijnhyb"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2021-09-05"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "63e11d96191b66a5d7c288bad08187aebbfca97b"; - sha256 = "1g2d0c4asdc8ad0009habivppahy925sfs9zz61l22yfgwp9wvdr"; + rev = "80366a41bcbb0dbbcaa6e6f51156d37c405e1d0b"; + sha256 = "08xbiwqv69cjy28m3yirqa2f0vfm816gmsa3zp38ih5i41gfbqnr"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3180,24 +3216,24 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2021-08-27"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "45a8eabefd500ab4496ee790d3ac178eb4de9fb9"; - sha256 = "13mlcjkdbhpfgcg45m7whylxsaylgx1lysr5npc7gk6a85l2slzq"; + rev = "5c54258d34b8ae4be70a8fbc09b400eb7be0bee8"; + sha256 = "0gy5c5v80xbgx511xk1zp2scxzmgipwad1zqpsff4grz80vzsa13"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; minsnip-nvim = buildVimPluginFrom2Nix { pname = "minsnip.nvim"; - version = "2021-09-16"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "minsnip.nvim"; - rev = "f145d2d01103eb2e1f895f9baf438f042ad3509e"; - sha256 = "03b20cb4cifrwfsnw2zgpgd9n5wx731ygkg2x2fj5n6hw1klbfzj"; + rev = "ee71cda58f2e5ad6303338f1db3083e59ca35db1"; + sha256 = "1fvz1n6qy3wvn42rmchg58d8l187g52q1ibx757jwrjg6dbaw2xn"; }; meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; @@ -3240,12 +3276,12 @@ final: prev: ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2020-12-19"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "3de17695c58f309642c5148b21d47fac61937a96"; - sha256 = "1415yjxydyamsyx6fmb5wawgcgqqr96cv6vy60f5h5x4dsaqvs24"; + rev = "d2d8cc430232f385d8468f44da8635febb9a92ad"; + sha256 = "1zkl8g7kf95rbyk9zs1xwr0n76l1f9vvwc2432rsmgj2bdly8vby"; }; meta.homepage = "https://github.com/ncm2/ncm2/"; }; @@ -3348,12 +3384,12 @@ final: prev: ncm2-neosnippet = buildVimPluginFrom2Nix { pname = "ncm2-neosnippet"; - version = "2019-01-26"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-neosnippet"; - rev = "650552528a2297179b8bb3afc1d9bb44ea97911b"; - sha256 = "14ammx1qa72m6mafd64mc9qw3sgnmjqgq5vvcylqzqwy26wwla1b"; + rev = "1df7dcc1e22a6f769f54e90fbbff68d9e4fdd5fe"; + sha256 = "1bbqy4ak0abn73fwnv02c2b6ivfaqj31g2qbj39zqrls0vzrd70q"; }; meta.homepage = "https://github.com/ncm2/ncm2-neosnippet/"; }; @@ -3468,12 +3504,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-09-20"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "cd666d51cb4d03e509039fd35e5744bbf9db431b"; - sha256 = "0q3sdrdi78p09mns9mdpicvhrm8y6n1vna96n0v4yfjknkxa02yw"; + rev = "253dc1d0c7de287440cc5e93c3e60d93cd92f096"; + sha256 = "0xfb4dry3ybv1q2gkqbxkj4y9q6g7hvc4x6z4mvxfks96lcmgrm8"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3516,12 +3552,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-10-03"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "71208c83f9e061675943416009c91f8f8f9e5668"; - sha256 = "00ia5hq4lfnyyml003g6va8zv00d7jdqv1mwir873ii4i1v8dq22"; + rev = "727652348bf4f39a354e88d1b2cbf36220d109db"; + sha256 = "07skmgl78vqks21lr64sm808zqbqf2013rf7ph9rkfz5wrn4zcvd"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3576,12 +3612,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-09-11"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "4c71e58684dee52f1f19f2d10e7dd4f9a50eaba7"; - sha256 = "0l12j53ga7ycm773jddi9nj0bkdjwh3d3cx9zgnxgn0ra0niq3fs"; + rev = "376e3e6087dacaf24467bc8aad3a97ea15b98245"; + sha256 = "0cy85239glpcw9ndyskvnw507f1laq7fr2pwnvmpijr7pjhfsik8"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -3648,12 +3684,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2021-10-05"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "750d2246d38cd2839356ab8506fc8328a76d33db"; - sha256 = "0gg11pswi2alz2khd7ygjhq6kb2nnawpd1f2vvgpc3wpqhp6lk92"; + rev = "baf9ac7f20dbc225644ab4825f007bc65e944dce"; + sha256 = "0x0y78kps2p9skqykcrvlgbhmmm5x5c5kkwz1dfc0akzkdjy8505"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -3768,12 +3804,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2021-10-06"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "9727b081eaab33e7ba7d6593e85e1ff2c854ecaa"; - sha256 = "065bp6aq5kx7kkngjim8q314balbn36aamf71g1aqklxxkkiyfz5"; + rev = "dfaacec99f03a8412538974e8d6a96a0916a3a5f"; + sha256 = "0hjqbisj9kd181qc6jav43r3jk2qyf79n56mxrjzwb8i5rndlr93"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -3804,12 +3840,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn.vim"; - version = "2021-09-30"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "892ca98fa8ecedb4f14988451a5cf539250c8b86"; - sha256 = "192lfhgzci09n1j56nj80nj12a3qx7r6qj21vnvqai0xh59dgy42"; + rev = "f7ebbaa41da15a964758f009e8e05463974a0aee"; + sha256 = "1spma6n0vyavllawd98zccwmkscisq69547qqxqgfz9j69dllrfg"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3828,12 +3864,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2021-09-27"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "46d9df8bf6535c1bc751a4134fc52ea91068cfaa"; - sha256 = "19b4ix8py8vg2jrzhhzcp69jyl6snplii6bpyaasj5nhhjxslmlq"; + rev = "99941237d7b54831ce31026b2bf48f5af7c3eaa3"; + sha256 = "1z46fkjyhfnaw3x8id7xs2fkglkbbv6sp45zmzg0f1r881dismi2"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3864,12 +3900,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-10-05"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "1c482001bd3dc044f973efc474919b33a9994e5a"; - sha256 = "120vkg5q8ilnvmymk6zi42bxifabvzr4yc0d83kb7457xk0xkdpz"; + rev = "9534bda66ec8e919bace771bec74678b50b87a88"; + sha256 = "0n61rf8qg8kqxa9hmf7jvnrj36xqi5ml9h3kfwszzbjmq89533kw"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3900,24 +3936,24 @@ final: prev: nvim-ale-diagnostic = buildVimPluginFrom2Nix { pname = "nvim-ale-diagnostic"; - version = "2021-09-06"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "nathanmsmith"; repo = "nvim-ale-diagnostic"; - rev = "f475b8909c448bfb64b9506426fdaf98a808ade1"; - sha256 = "1infpcrpy21jmn2aw4ch0b3qck24s1dkr97h3dr1q9lzi6hdzfbn"; + rev = "8ac8c4c44108ab294a89927e2a5848b2b05c52e7"; + sha256 = "0la2wsm89r3a3n003hsljlshyby68shiwp86yc8vkmlcgmqn6wpb"; }; meta.homepage = "https://github.com/nathanmsmith/nvim-ale-diagnostic/"; }; nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-10-05"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "85fd134e6a6d3dfcca43f5f75f0262348ae20dd2"; - sha256 = "07mdc7p2ymxvmm810w79n224vx5bpp374r95dxc7v37ngpsv32nz"; + rev = "7becc6bc9d8baa62eb0dbf65305f8e7f1470ace7"; + sha256 = "1ihz1kci00r93f52fzz5nx9byh7rrax1sknmj9q232z1wv7dxb06"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3972,24 +4008,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-10-06"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "a39f72a4634e4bb05371a6674e3e9218cbfc6b20"; - sha256 = "04ksgg491nmyy7khdid9j45pv65yp7ksa0q7cr7gvqrh69v55daj"; + rev = "a6a98856c3986de675bc40c9c98b7458fb19e95c"; + sha256 = "0x0hzymvna939iscz0llm64ic28iinh4bn6xihv8afgm693j3jbi"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2021-10-03"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "7361b5637930999d01b93b6ab4c45b784fa0618a"; - sha256 = "12xl0dxd341mmbv4lg28s1qlv9xg8vjv79sb9x2dv5g3994jf9q6"; + rev = "977abc8bbf83c5e1c7c476223bcec7b7036c0b5a"; + sha256 = "0jf0kiawhslk5y8h14p9abxsp7iigni6jps3gcirswvxw8clhpxl"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4044,12 +4080,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-10-02"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "f9eaa955c832339e148b10f4bf47d498005c0a16"; - sha256 = "14kz1y9na14apygp927n9qw8phyaifnyabslz13gxkhw5637gdv8"; + rev = "fafd7f9a7ab70fd2cb519a98b594859ba4eefcd7"; + sha256 = "11ky72s1vk9bnf6dji913hiifxdvih0a17yljxs03qhnynvlc5p9"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4104,36 +4140,36 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-10-06"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "449dc8b5b34d54504d8331b9fa7eee95520400cc"; - sha256 = "1baa9l71dgn2chbkj6p00rkj8xdq6d8icr93w31wmas6470bwgf2"; + rev = "5576661c8ddd3c881b5f97446b919090033ce74f"; + sha256 = "1zvbiys1wgyc5figabw9p8dvz3jj756wgjdjg7k44cfn5c0vld42"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-09-18"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "d380c831f7d0cb65d3ec3fc468392f79a79f678a"; - sha256 = "10s6qzma4fk8yd9yvfq52lslr2kzj7skl91yz0b19vv7mg9pclb1"; + rev = "50fa45e42a2cedf14e9d406ec7f1e68270c7f467"; + sha256 = "0q9llakdn52qdcqx2zv5byszvyadfh0kgzqv2zdjf5qffvbg9hl3"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-09-16"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "fc8a5a3dfafd703a454a5a294ef8cc69d17b4ee6"; - sha256 = "1jn3ay74sf1z7mwm4sv4nz7lcq7qpyr2vx6h8j844nkb0azvhi5q"; + rev = "5217443bb675539d87b90133a91a7e36ad1e517d"; + sha256 = "17p3x7s50r5fj1fhzx7nm7hk81h85hihk6svsgp99a1cjys6w9zk"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4164,24 +4200,36 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-10-04"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "fb7fa4adf6c6464784e248b3a12e6ca0b3f4855a"; - sha256 = "1p7i1vq6w9ghp9xhv78rbjj9c5sp01b3qqyhskqdzn1pkgj4pwr8"; + rev = "66223954d7bd7d4358c36d157c25503168d04319"; + sha256 = "0jghq2fkvibilb1zglkckhpmq6dgi1q87fcwpvcv9slk1qlgw19d"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; + nvim-lsp-ts-utils = buildVimPluginFrom2Nix { + pname = "nvim-lsp-ts-utils"; + version = "2021-10-18"; + src = fetchFromGitHub { + owner = "jose-elias-alvarez"; + repo = "nvim-lsp-ts-utils"; + rev = "cae4c06308c1ba4f2fdde31836fd98de3fc3e2b5"; + sha256 = "1s2jbl4wpylvqfc4mrycd211xsi1p97r8r579fccjxpswvsm4bbk"; + }; + meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; + }; + nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-10-05"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "66659884c36dadd1f445f9012fcf4e7600286d3e"; - sha256 = "1hp3rqk1zfvxgjmllfdh5as9112x54mfa73l3dxawqfv4cfi25w5"; + rev = "7f902f952944aa708c78138f6536c0dc55aec3a2"; + sha256 = "1n8srlrfliak2587r30la87x3jgl9iq1x8jdxlhrx7i874ha3ykp"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4212,12 +4260,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-10-02"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "712c79efad72f73dd4e554999d82bd9b31e56c64"; - sha256 = "13pwnhcg70ld3n7c8pvb945axlz7sf5mfgr6xkl9xv6a9n76dilk"; + rev = "4743b32755ff3cb2e03fd4a0a6413bb7ea9e2617"; + sha256 = "06v0swwlk22n0x26bgw1krf26vr7khkc2yjdi4y13saj47c46z4p"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4236,12 +4284,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-09-09"; + version = "2021-10-09"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "e4c243ebdbe1a224016d7139169789c9ba5d6426"; - sha256 = "0hq6m68ydmg24q5ksz5im61wvqdm08v7j3bp76vsw7x06igxp12l"; + rev = "fb35d9d7b52985baac5d77ec52d6b6b35403fb8a"; + sha256 = "013gmwrcanvsa95jgl4xd5agci7j05w9yvqayns83gxbsbl7bsjs"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4284,12 +4332,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2021-10-05"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "7ca37f824bc79bcaa8d6a5d8f94295d625269e0e"; - sha256 = "0n3m44pykba0vn7440n8s6i7i8ii0r7wcnpdym9vdk4skpn1y3fa"; + rev = "ec3f10e2116f344d9cc5c9980bddf7819f27d8ae"; + sha256 = "0vwlxghxyc82w2vmn6nylnvhcvr91k9z0szjwn67f8n1bnii2fn7"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4368,24 +4416,24 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-10-03"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "9cac1e40e396110ffb2cf04622ea7a7725436dae"; - sha256 = "0s34808s7nkqfz0pznzm517x4rsjy9dc3y2brmxk8gp4vfj7jz13"; + rev = "2bd142b45fbe890d9588a50df3f26212c2b87c80"; + sha256 = "09hcwm10b5rb77rpv0qbwak1x8hhqr0wqnrn118b7768pkqqwka0"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-10-03"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "9ed2037df0ee87d0d6c084187d1e340b4eac7587"; - sha256 = "1fkwbs6lpxrks3wb3l5laxjraxwwzlmmw7i4r7yawa2kyf05hvvy"; + rev = "ee101462d127ed6a5561ce9ce92bfded87d7d478"; + sha256 = "097i8x5yyr0krq4jn5zwn6lild8dwv7yqdmlgrwbmywad32vfyh2"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4476,24 +4524,24 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2021-10-04"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "5675f60acdf31fef35acf066ff754173d0cffa44"; - sha256 = "1q1d6b8yyknhsfaqk2805hivxv7rq6y0fsj45n7hwgqll195hcci"; + rev = "836551aee06e07dc77ff0aa5dc1de4ace50596a1"; + sha256 = "0s654i6xlk3nkhjdrdmx202f9ig0xby5p9n98ajkhi6wq2yhfr72"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2021-09-25"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "cc8ecccd324ea0d8f07dc54806057806d0aff1d8"; - sha256 = "19jairk59a0f4p34h84sy8ia1qk2bcbwxk5i49vf5gxmi31pjpy4"; + rev = "e86ce939d85576fb7ce6c1c45fd49c8a570c24cc"; + sha256 = "19wq5xg1yvk5153c1b0zbhdzaga0ja45m3zm6a1wqb437wcqdqlx"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -4548,12 +4596,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2021-09-22"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "a97caceb6b911bfd4b9fff91d38dae845192eb82"; - sha256 = "0j15m3xyw315rs0hhp86aqwk13bjac2q7z1zxa0zpq236njcr6ch"; + rev = "257d6d30e4bd4ab8f5d2a40d73a9f1a4a65779fc"; + sha256 = "0nxr1hy2hlqlmxaf2n8l8qkb1jk2rb8y6p4076zyhmg8lgn8gs8a"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4572,12 +4620,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2021-09-17"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "643afbb7158b77cbd491fd9874a8758d0484255a"; - sha256 = "14dzmavrak99i2ahwwccxcqkkj9a1b7ch9mlmpg56y6y4v65ss1h"; + rev = "d0d32dc5e92564b63ec905a9423984b5d503c24a"; + sha256 = "1h9ql0ryqblnmiksskh4phah1br1gbfc3zyylc8gczppgnxvgq5p"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -4656,12 +4704,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2021-09-30"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "6bb0e09030a7c2af19bf288088ca815228de9429"; - sha256 = "12c3xfqmhnk0k1x6jjh4hbhw0w3d42afsfpvg542nwly17hy3sfg"; + rev = "901b96d37a30be0504c97cc2c05d3a99b4cca842"; + sha256 = "14nkpj4x9213waqsy93sdgnll42s4dxxpq5kv6g8w015drjrbwhv"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4813,12 +4861,12 @@ final: prev: quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2021-06-22"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "51d02018e66f010d5c65fb0dc822fd42d9cb5a3a"; - sha256 = "0nf29j3xy3wai76ivh3fld23gcvg6f1cw51lnimsac4j2nvc5x7y"; + rev = "892a2334be832e6834db68c2355e6f59dc6536bd"; + sha256 = "03ip76w8mib8dxn3vm9fp3z4i8vgga97q2gkifgcc3qjj2b71qg7"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -4849,12 +4897,12 @@ final: prev: rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2020-05-28"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "4d15633cdaf61602e1d9fd216a77fc02e0881b2d"; - sha256 = "168mbdf2h3zhkqrdyyhh0pbkjdvxwida80rdwk8ml97mxxii8ziw"; + rev = "e96f502eb0e88968858a2cb0348c8e2253637bcc"; + sha256 = "02lj86yrqjpcs83z4qfh3nhiy4nsq1fdrrcy3x56701zsiml511i"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; @@ -4933,24 +4981,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-09-22"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "040bf049b4696b1f9413a915f94bf49e41e53817"; - sha256 = "0ws3vc3iildz4w425w8dg6pximx27m3ikw6jllg8ass2sf7izf55"; + rev = "3990e5b3609bd883fdc432082f5e1c467ae7d615"; + sha256 = "0hh4wysfm1p8kkh6ji27vmvxvg2nm7fnkicaby6y88v0zf5scham"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2021-09-09"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "3f522bd7375dc780714c1ebe7fe398f4e45f0e52"; - sha256 = "013n3ci6605qa6dvabg02nhln9s5ahh9gvzh07w3ikvb53wp31h4"; + rev = "35227ec930cfa836f9a82bfdc3afc302b68a372f"; + sha256 = "1pcc5bhacs6h0bxr3ksr6bwdgl75irqwmiwk4l3dwifdj1arhvq7"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5041,12 +5089,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-10-05"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "046f18f2b4af2cd928bdb1736f83fea54efd3dcb"; - sha256 = "1h9y5jj90vkl50vfwi1hvhn2z71yhjsfvfldlvwakjx92izn84dm"; + rev = "441e0104648e1bae89e3eac6857590a64f17583d"; + sha256 = "13g6vlg3r49vmzl0q6z2mqwz2p2chcjc74bfgn89c284bjri8x94"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5294,12 +5342,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-10-04"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "81e19fc3db1af37ec5acf2d7cb11b97ae48c34b6"; - sha256 = "1g67hpnk366z71an7kl0g8x0ikn9v4yiaqv87b5n6s2ax6h3z9lr"; + rev = "995c6d30ac2846c8230488246057c1ad1aa0b908"; + sha256 = "0vbw5sbm1ldqb38g5if1p1wn41n1vra6lnqc1crz4vl3wiqra6v5"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5535,24 +5583,24 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2021-09-30"; + version = "2021-10-06"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "28c5b0513a9da37b1842a16184555a041eb4b72d"; - sha256 = "1gwcgxx22chwmg8hl318z02n5y8y2dxf2324263fn9nqd6gswv68"; + rev = "a1bbef84b7c7240f88092c57732c5b8eb6f48234"; + sha256 = "0vai0p365hwjs8vzadfgx66ax6jdx6pivfzzjr5v63c83kc466hq"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-09-06"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "97bf9ec720662af51ae403b6dfe720d4a24bfcbc"; - sha256 = "0rcivwwvb6hmd420jkgy8gnzyv78z0bb8gw6232qrwf9m2lskzad"; + rev = "d086f49d389e1c2d58211b1f92cf20c9f63dc325"; + sha256 = "0cnd2m1dnx69657dpckiiy1slx2fpnpggm3qs0nzm5rm3qpzx185"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -5620,12 +5668,12 @@ final: prev: tagalong-vim = buildVimPluginFrom2Nix { pname = "tagalong.vim"; - version = "2021-08-19"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "6c8c0f4903daed1c11087a014a8bc23ac4334850"; - sha256 = "1vcymd05pacs3ywf4bq20vhn46a3d4hpl2lwcbc5z1cv18iwd3ip"; + rev = "18c010e0f28fea012f537bc1abd468a063c36b9c"; + sha256 = "0qq1saqkk0cd09zppz469idzvl5d0aagq5gw908whz5dd72yl8al"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; @@ -5668,12 +5716,12 @@ final: prev: taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2021-09-22"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "c4392c36c01cfffcb06f460d722990b98bc53bdb"; - sha256 = "1z60rb7nbxmbjw8vbfb1f2dg0w7sfsp9923abjj5rs6qxym4bg22"; + rev = "25d47074a5bd34010648a23923432d2290e32dd7"; + sha256 = "1f7gprn1xjs2pk9kaixszhqxj5mpvg33vibhlijk830xj7gw9gcx"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -5690,14 +5738,26 @@ final: prev: meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-cheat-nvim = buildVimPluginFrom2Nix { + pname = "telescope-cheat.nvim"; + version = "2021-09-24"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-cheat.nvim"; + rev = "4a58b92fc70af622ddc115f843b0e552ca5bd6ea"; + sha256 = "132drgpak97sbwjma6h7zwflg386xhqmdb3rqvzgxav36p9f0xsw"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/"; + }; + telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2021-09-14"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "7b8aa399b31998b7adf3da505a1952b1310d429c"; - sha256 = "1x1m13yk222lay6j4w76y9ydbvn52022gif34d452n2x7jk0cvbf"; + rev = "fc72e26b7a47e99e8ccdc21d76fd2ebc18fd34e2"; + sha256 = "0f41f85m8s8smbqin9cflzkvd9cyknjps8hix566cfvx3qsx0ib7"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -5765,12 +5825,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2021-08-03"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "6f63c15efc4994e54c3240db8ed4089c926083d8"; - sha256 = "0mda6cak1qqa5h9j5xng8wq81aqfypizmxpfdfqhzjsswwpa9bjy"; + rev = "348f5c77fc1581063c5c30eed5fd79561ca203fe"; + sha256 = "0ply7ffv5r6p0n7agix329h226c0rlyvqvw2l9jxfn0z2wmc2y3x"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -5789,24 +5849,24 @@ final: prev: telescope-z-nvim = buildVimPluginFrom2Nix { pname = "telescope-z.nvim"; - version = "2021-08-12"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-z.nvim"; - rev = "8015020205e702bb62b4077294a59ee445e061f5"; - sha256 = "01vjdzjfz7293dwxilihk5qpgf92j59hdq3cl62630vhfxlbc1m0"; + rev = "11cb74a421156a39c41e480d5dba3fbcaf35f84f"; + sha256 = "06gznf97xl08czifv6lcb1nd00lmqb85phdxh5p7r38hjr4lfvah"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-10-04"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ec487779909ebc8bffbbe054a2e8a4fbe05c0e51"; - sha256 = "0xwl54wfh78s0gs6hdqhj7k3smdqsjdifxibkb9543msdnpvh0y0"; + rev = "b5c63c6329cff8dd8e23047eecd1f581379f1587"; + sha256 = "16xd50ihmdlsbjidykqc53zk98vc0yfpj7rkmyha2jkvanxy53yh"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6018,12 +6078,12 @@ final: prev: TrueZen-nvim = buildVimPluginFrom2Nix { pname = "TrueZen.nvim"; - version = "2021-09-11"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "Pocco81"; repo = "TrueZen.nvim"; - rev = "5dfd2c23ce269a7b70708d84f3ce44bfc10d7830"; - sha256 = "100gncjw94di6j9f9wl266s5cp2lywp18gzwzq4mzvp9y4kk7baf"; + rev = "508b977d71650da5c9243698614a9a1416f116d4"; + sha256 = "0sr4y1mg83l28l5ias2pv0gxkcgwailfjn2skx35z63f2il3zkbx"; }; meta.homepage = "https://github.com/Pocco81/TrueZen.nvim/"; }; @@ -6090,12 +6150,12 @@ final: prev: undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2021-05-28"; + version = "2021-10-09"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "1cc3b9069e4356efd4ce1c3c4bdbb227fb54e1e5"; - sha256 = "0m8wc66ml2h6lsbwq452w8y9s95a4kwp4lfdw94pi4q3h5qhvkxj"; + rev = "bdd715338a3a0c82674153108a3deaf827d36cfb"; + sha256 = "1g66hh0aava3kj90wijp1qcmgmfi2n8qcjs99k19yj1l9m5r12i7"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -6174,12 +6234,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2021-10-05"; + version = "2021-10-07"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "85d7681b004d1a32dd02a5790d713e06f4a251b8"; - sha256 = "0f3bq3d0nhxxsdmzq2qb7jjnwf8blkzsbnprqb715f5lqr6diwls"; + rev = "8b8b5541fa35cd39c652e451796589ff0bf289cc"; + sha256 = "02451hgzyjrjkidsjycsxvbwr3wi350dns6swfyfalyix76fhfsw"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -6342,12 +6402,12 @@ final: prev: vim-addon-other = buildVimPluginFrom2Nix { pname = "vim-addon-other"; - version = "2020-02-07"; + version = "2021-10-06"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-other"; - rev = "7a395970b8817296c11e1de8310194c4ae6e1f89"; - sha256 = "0sding7rc11imf5k9ki4h426wjiz8ywxa81v74xj3m23zm6l77sa"; + rev = "450e22043f056b376f048d4689f4ad5e29fc91bc"; + sha256 = "14dj4mb3dnr7zml69rmwc23gz7xz5fnhw3n7imswbk44a6yw5shq"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-other/"; }; @@ -6558,24 +6618,24 @@ final: prev: vim-auto-save = buildVimPluginFrom2Nix { pname = "vim-auto-save"; - version = "2019-03-19"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "907th"; repo = "vim-auto-save"; - rev = "8c1d5dc919030aa712ad7201074ffb60961e9dda"; - sha256 = "0dj45g56n0q4advc9sgch11ghb2h5ahk601gndwy02a0937axjh2"; + rev = "d8ff037621e2351278cf0892ca19ee7ce479e802"; + sha256 = "1z075hb5wi7sv9yha4fxfxakcayymicg6av2gc9skaw8y2sx6jzn"; }; meta.homepage = "https://github.com/907th/vim-auto-save/"; }; vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-10-05"; + version = "2021-10-07"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "7d7662e3f958e729ce21fee0ae623e3b2c438e3d"; - sha256 = "0ijciwpxjkykk6cc1a55bwbc9kbbac8yq33gh331323gmzm517h8"; + rev = "d8a6962524ed4afbf7c92e7678bacf91d66f097d"; + sha256 = "0sscvgj6fwa9yy2p999rr7chp1xgg8japzwpfwwnzw77x3ikv3cp"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -6846,12 +6906,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2021-04-15"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "793d816524934e6553c76437120eea5df8e85a1e"; - sha256 = "174wq1sq862s474bhfq0w8lnmcilq75gf2sdp1hws7wj0fvn10h3"; + rev = "f3a5dc78b94874320cc48543e31de08df20c67af"; + sha256 = "0290wcvg0f3z9bcsd2ykqi5rw9wz60hvkc9ladh2xfrndhw77s2x"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -7146,12 +7206,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2021-10-05"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "77eae77073b285f7b6967922447370f2952d4e4d"; - sha256 = "0wkz452gchd796h8ysr0xccpk86q8i63mk7ywfrxghf3a7zk0kan"; + rev = "f297b2effb0ec879f33a8539b9701d048d44f295"; + sha256 = "02fag2mar06845dricviqb3jfc05f13na3svhcpddw7gdpimsdmv"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -7170,12 +7230,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2021-09-12"; + version = "2021-10-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "c88f1b1e4fd428d826fa38c272ed80b6518d37eb"; - sha256 = "13zxw6779drlhcms5pmdxp5k4nmvxjzjsw64jkqjmabdsjlm0hz7"; + rev = "11420880486936bcbadd271e818e22337a874501"; + sha256 = "1b2g77fyiw3b1qipscnc99by4xwmap0vw0wyshqy1jf3pla8shjh"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -7518,12 +7578,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-10-03"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "1c0a5359251778c8da4ad1f31d8186c8dfa66a82"; - sha256 = "05hv6s38g1jalhm7vkzcqwgd6dadh36fv8daak5swv9i4pqv3xyv"; + rev = "d8e62cea4c57c9284a0d6bc92140deb1a7034a1d"; + sha256 = "0a5yh0w143lvg934pwsln2n34zh7x2d6bxfp9cmw897nl6qlzrdj"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -7578,12 +7638,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-10-01"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a67854368ea9810936d57e3fea00a4c05bf47c26"; - sha256 = "0zqlbiqgxijf7ddhl99ys7162mjr9agk3j59nal2bpfgzh3b70rq"; + rev = "4d29c1d6a0def18923b4762c8f85ca3ee5ae6c83"; + sha256 = "1m8qw6pqgyvfnbph8xwpsvgwdyapsg2abxbpqvsjhcg6ylbxfx17"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7638,12 +7698,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-09-11"; + version = "2021-10-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "8565831452c355cd4aa49d6877c094c377cd5ce8"; - sha256 = "0i8h4wp036j1ll36gzqypxxxnwp6084127753pqg2c1pi37hk4mp"; + rev = "74063729aee801ee0cd4a968194ea61a36df091d"; + sha256 = "195x75y5108wx7s68k1a5wz03gzm63l33b62gmq9rrq77wagv1g1"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -7710,12 +7770,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-10-05"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "81f8cd0ca270a7f6e3773644e163ac7de263e24c"; - sha256 = "08y3maidpya4qb5n7rrywnzk551m2dky428aw69r44597a2ivnqr"; + rev = "66ce1595569513a23e3e0dc7aeb8bcacec3b220c"; + sha256 = "0bcbrbyqbn993g1i5py2ix8rnsvcxzyhn9fbk7c08257l2i7cc6x"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8023,12 +8083,12 @@ final: prev: vim-indent-guides = buildVimPluginFrom2Nix { pname = "vim-indent-guides"; - version = "2018-05-14"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "nathanaelkane"; repo = "vim-indent-guides"; - rev = "54d889a63716ee2f1818aa2ec5082db47147147b"; - sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2"; + rev = "765084d38bf102a95ab966fb06472e83fa7deff7"; + sha256 = "0gffchphg5chg3311x0mb8xd4ir8psdmdscqpx37bxz5w9n7qsdp"; }; meta.homepage = "https://github.com/nathanaelkane/vim-indent-guides/"; }; @@ -8180,12 +8240,12 @@ final: prev: vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-08-15"; + version = "2021-10-09"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "85c248898f5ca66a865e917b30e0e75579fa5463"; - sha256 = "056v6g1fszw77nncbmrz8mv3zchp17g3d5cqmc1sawrfif131gyb"; + rev = "854e51531b3da28ccbd8e853dd947fafa72b035e"; + sha256 = "09pbg2301xyhpa4wcmw2ki3gmrz5l8f0hj9fsi32rwzfiv3qlkaj"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -8444,12 +8504,12 @@ final: prev: vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { pname = "vim-lsp-cxx-highlight"; - version = "2021-04-29"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "jackguo380"; repo = "vim-lsp-cxx-highlight"; - rev = "9e42350272a413a51ce9a93b00c98682815ff7c1"; - sha256 = "1nsac8f2c0lj42a77wxcv3k6i8sbpm5ghip6nx7yz0dj7zd4xm10"; + rev = "679db721db12c2a1c3ae7addf2cc17ae9a26cf08"; + sha256 = "064sqa11hnnxj6fnnp9dvd7m367ywg6vzwvqxawqv3cwvgr7123w"; }; meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; @@ -8541,12 +8601,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-10-06"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "ce323c1ed83866fa28371c800d8d9afb24f1a64d"; - sha256 = "16sgpdygilvd3mpqhm61lqiybnq100fdqd826zfvff2cri24dscl"; + rev = "d0a84be64812f20d92fcd573980f0bc86e7c9bf5"; + sha256 = "19sks7zai88mw0fvr8ksbwmzf1k34kv7kbkkr1xiqw82zkp7b544"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9189,12 +9249,12 @@ final: prev: vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-11-25"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "26a75886caef937bfad4201d5478571a992984c2"; - sha256 = "1qgwn57hs82a6pjilnqafd4c2za4r3vkys9i9apbxqhcxypx05hl"; + rev = "d0b89c2dc0f6af09d7876963e94e5c7567eacac6"; + sha256 = "1m8kjnj3xz5vmzs0ycbwm700jczmhgf2y1sfjx178b0jachfyq0j"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -9429,12 +9489,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2021-09-03"; + version = "2021-09-11"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "785fb39d79bb843b545f1d8a9265bd8f2e2285f8"; - sha256 = "01arkxk1kvd8l0v0ckg89favy629mnvl3vnb24abfkldhsrrzjfq"; + rev = "4cd1ea8db6aa43af8e1996422e2010c49d3a5998"; + sha256 = "1nvjhx5y3rjy5lkm66hgrnsx8j7db7spvwy624qas1xhdqbadb6y"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -9657,12 +9717,12 @@ final: prev: vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2021-07-11"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "95374ad3e4b5ef902854e8f4bcfa9a7a31a91d71"; - sha256 = "0ns80kjirk72l5lapl7m32ybyr5q71p2mr8a45ihh1k2dlc2wv06"; + rev = "94c2de47ab301d476a2baec9ffda07367046bec9"; + sha256 = "110f06rf1m6p0asr5h4sr80wpwji3krwna5vdn6aakvcr8a7qqdi"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -9681,12 +9741,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-09-30"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "0a2c7355e2986fb032aa84442f6fab45c70fc106"; - sha256 = "1yzhar6cmlvvz0jl36d8fbcyx78wlvydbd34snizqp6i0lmir9gs"; + rev = "c28bef69fdb26825a93ac1e90ca6f5ba19116d88"; + sha256 = "1fg60jfm5bw1m20133vl06nb8z9ckrwqq37jz493xi34j5fymi4w"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9825,12 +9885,12 @@ final: prev: vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2019-11-28"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "f51a26d3710629d031806305b6c8727189cd1935"; - sha256 = "0aqrqn35xdiy80y7skxfsh3m33n6cdxw6lzz6aspfgzwllx2f0kr"; + rev = "aeb933272e72617f7c4d35e1f003be16836b948d"; + sha256 = "1b0bd5m5lv1p4d299mrwjfs2gk0zqwyaqdaid9hs9yqlxnr8s5nf"; }; meta.homepage = "https://github.com/tpope/vim-surround/"; }; @@ -9861,12 +9921,12 @@ final: prev: vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2021-10-05"; + version = "2021-10-07"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "eb42c62812f149f7315552f43e3dd617a43b2ab4"; - sha256 = "04cl96qy6db0r07wg5vwhwpbcma53868gy75lfl21is87biz0d6b"; + rev = "2e95bc699179f505d4b66b2904a475a3614cf8cb"; + sha256 = "1w4v4zmi714x54vkqfflvf4p56xpc8cd06skg1j6y3rnrvjqqx5d"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -9922,12 +9982,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-09-30"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "611bf381c212acfe4811ea085fd353f6f3856d66"; - sha256 = "0cnn4zhlabzi39vq6wg3gkilal8grjgr1zgb0pzi604klyk1gyl8"; + rev = "2052bd926c37b5c828dd07c47ac676102ca34a0e"; + sha256 = "1lyx57jryxx5r9s60hg3v6y0kx5p2qc408nl8zhffqhzzmxvkgp9"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -10066,12 +10126,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2021-05-29"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "0cabb1ef01af0986b7bf6fb7acf631debdbbb470"; - sha256 = "0xxc5wpyfqv7f7sfy6xncy7ipj0cvshw28s12ld3jfgyimjllr62"; + rev = "9ca5bfe5bd274051b5dd796cc150348afc993b80"; + sha256 = "11qv4bqwwf7wh3l729c9za6kzpyry91q3cks2z51znppkyd20gb7"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -10090,24 +10150,24 @@ final: prev: vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2021-09-26"; + version = "2021-10-09"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "8f40e6db284db7e893fceff64c62358862bceb88"; - sha256 = "1cna785z0y2w20psx43346vx03i2li7i1a1mf01x0a2qd557bw15"; + rev = "717bd87ef928293e0cc6cfc12ebf2e007cb25311"; + sha256 = "1pbpj0wlh65hf474lrylwcsqfpv5wy4m7mhbkplgch7v8iabshqv"; }; meta.homepage = "https://github.com/cespare/vim-toml/"; }; vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-09-29"; + version = "2021-10-09"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "bf1530788d44332f77a7f2764e20db83c4b6a761"; - sha256 = "0nv2s8fgrzqs993jmqwh746krxj0i6pwab3lrdi7vcsxrmgbd03c"; + rev = "38eb11b71e279936d18d75afcbf2095a54cf10b0"; + sha256 = "0fdpnnq3xghdzjlyw5rwk3i7iqpybscqvyk442qmq7rak6gb1z09"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -10162,12 +10222,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-10-05"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "7861d1925baef8fe3fa313affdfbdcaa6b2af26f"; - sha256 = "165klmixdch1nc9cxdldl5yg4q79q58riw0mg0mahqvvr5m1yrw3"; + rev = "71290da8930cddb946758e108f01a9546c5dda75"; + sha256 = "0jjb8b20dy65rjfmhhxq4jlcpdfqvmi4ianc6h2m6n08h5a4iw61"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -10186,12 +10246,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2021-09-24"; + version = "2021-10-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "39f195d7e66141d7f1fa683927547026501e9961"; - sha256 = "0bbiv32brznns82v8s0s2fylcn4j5d3vw4x2kp5h6zb4lqgya30q"; + rev = "e4006d68cd4f390efef935bc09be0ce3bd022e72"; + sha256 = "048n8p7bjpcwdk924glqkwkp10fl813ffrjsagwwzsnakax3da5f"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -10258,12 +10318,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-09-14"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "9ac8044206d32bea4dba34e77b6a3b7b87f65df6"; - sha256 = "0m488cfpl7yszyhgz12binrmxysa05wxypdgy83cdxb0npka20ff"; + rev = "32ddc125ec6f5a07fe59b3ab6b4b5f50093102ee"; + sha256 = "0jis4zxs1fjczyj9c38mbicsnpyvxr4hlxg0292zk6qhmgwd8dd6"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -10390,12 +10450,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-09-22"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "6ff20c655dd5b6f6050a234638d83ee7f65ba164"; - sha256 = "08mg6kcayp8m0vfcvk0afppslkszf7fjskb39b94df0sh7ymkw5p"; + rev = "2797c6c9d5278241a5932b5b31168fe2daa894de"; + sha256 = "1rvnm0xk8s9m6s9aycbzlnxbl8f03c3dqn74qrz5pw0r0vclfsv5"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -10582,12 +10642,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-09-30"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "726a06e0d043e5897ade0624da2ecbbceab53484"; - sha256 = "1swc8bzq5fifjkqxp6svzbipx0akmcj9ars7bxcgagzdndpz117s"; + rev = "3aab9711c06186fc8205e920a82f9e357be66666"; + sha256 = "16wssm6b0fsj45h4354xbwjz02gg0kasw7907hdhi4jyhpnn0xxs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10595,12 +10655,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-10-04"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "fc51b70d818a1df807f414b6ee47e7e0fbf74903"; - sha256 = "1n7390x33pk48sxiyhp0nsw87mj837535is3dmz8si5jj7nf6lb8"; + rev = "0824ade4187472fcdc1634f462da84b3cfc5931f"; + sha256 = "0p7308x3yy9n43jhpggqb1vmz39k00ckx3svpxbckwh9y21hjxnc"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10617,18 +10677,6 @@ final: prev: meta.homepage = "https://github.com/preservim/vimux/"; }; - vimway-lsp-diag-nvim = buildVimPluginFrom2Nix { - pname = "vimway-lsp-diag.nvim"; - version = "2021-09-30"; - src = fetchFromGitHub { - owner = "onsails"; - repo = "vimway-lsp-diag.nvim"; - rev = "4c714b712637abaaefc2dd3401862a15f5f0cba6"; - sha256 = "1m3x6ngzamxkl9fp345gbs5iphgk1594k16snmp9n3jzkqxghfbr"; - }; - meta.homepage = "https://github.com/onsails/vimway-lsp-diag.nvim/"; - }; - vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; version = "2020-05-26"; @@ -10727,12 +10775,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2021-10-06"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "666b1778031c288615715ebd837acb1f946d83a7"; - sha256 = "1sx4rczbvg78gyyap56wa48i2lvy8x6briyp8jv500sh7x89q4zm"; + rev = "52ff550ef05a0110f4decc4629e0a58b94ca97b8"; + sha256 = "1xwn6jcgf1wbyzsm64n51m82xpy8s6k7yhyvd7c8byp2gbh7z0r8"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -10848,12 +10896,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-09-19"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4117a99861b537830d717c3113e3d584523bc573"; - sha256 = "1c0p1zk54rcn4ph1h17qyfrsdx90rgw7cc9hp1n8xpb9nhwvx494"; + rev = "69430d7ee6f204e0148102ba9c1b9b31a6315cf8"; + sha256 = "1qqjnhybzf34xmzhhjk5zwv2aly2my51f4r81h54q5xqmkk05sgc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -10909,24 +10957,24 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2021-09-29"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "e77b52c561eef4e3489dde560efce6def68c35d0"; - sha256 = "0793bb45zmdrcg2xnpy1yfn5ajmi9apca30rxsw5b2yr9mp142wd"; + rev = "0adf3a1407bdf60a6c1446fb6a9a05c9823e4290"; + sha256 = "0sdjznbzwj180g1jgn6rizbq2dq2clpcj1rj1xb3m127w4rgqhyj"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zoomwintab-vim = buildVimPluginFrom2Nix { pname = "zoomwintab.vim"; - version = "2020-10-13"; + version = "2021-10-10"; src = fetchFromGitHub { owner = "troydm"; repo = "zoomwintab.vim"; - rev = "3b33368ed2ff6138d07f7ee148306cce7d7f6b7c"; - sha256 = "0jx6860ajw50fn0l5p3dm3fcfwklqs1lf22yyrb09iljavixj777"; + rev = "7a354f3f0aa7807d822c03c8c24dc6c1cced9d3c"; + sha256 = "18b9c90nrbia3bdx9liznkm05pr7qlya7fdllqnnmpb4v047c06f"; }; meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 3fe11c3a2d88..887a0fb1778d 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -560,6 +560,10 @@ self: super: { }; }); + telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs (old: { + dependencies = with self; [ sqlite-lua telescope-nvim ]; + }); + telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: { dependencies = with self; [ sqlite-lua telescope-nvim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4311949a7ed7..90ec235376e6 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -290,6 +290,7 @@ josa42/coc-lua josa42/vim-lightline-coc jose-elias-alvarez/minsnip.nvim@main jose-elias-alvarez/null-ls.nvim@main +jose-elias-alvarez/nvim-lsp-ts-utils@main joshdick/onedark.vim@main jpalardy/vim-slime@main jparise/vim-graphql @@ -428,6 +429,7 @@ mattn/emmet-vim mattn/vim-gist mattn/webapi-vim matze/vim-move +max397574/better-escape.nvim maximbaz/lightline-ale MaxMEllon/vim-jsx-pretty mbbill/undotree @@ -517,6 +519,7 @@ norcalli/nvim-terminal.lua norcalli/snippets.nvim ntpeters/vim-better-whitespace numirias/semshi +numtostr/comment.nvim nvie/vim-flake8 nvim-lua/completion-nvim nvim-lua/diagnostic-nvim @@ -525,6 +528,7 @@ nvim-lua/lsp_extensions.nvim nvim-lua/plenary.nvim nvim-lua/popup.nvim nvim-neorg/neorg@main +nvim-telescope/telescope-cheat.nvim nvim-telescope/telescope-dap.nvim nvim-telescope/telescope-frecency.nvim nvim-telescope/telescope-fzf-native.nvim@main @@ -548,8 +552,8 @@ ojroques/vim-oscyank@main Olical/aniseed Olical/conjure olimorris/onedark.nvim +onsails/diaglist.nvim onsails/lspkind-nvim -onsails/vimway-lsp-diag.nvim OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index d464e735b8be..c000bb71bdd9 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1176,17 +1176,7 @@ let }; }; - ms-toolsai.jupyter = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "jupyter"; - publisher = "ms-toolsai"; - version = "2021.5.745244803"; - sha256 = "0gjpsp61l8daqa87mpmxcrvsvb0pc2vwg7xbkvwn0f13c1739w9p"; - }; - meta = { - license = lib.licenses.unfree; - }; - }; + ms-toolsai.jupyter = callPackage ./ms-toolsai-jupyter {}; mvllow.rose-pine = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix b/pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix new file mode 100644 index 000000000000..6be5e225fa38 --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix @@ -0,0 +1,42 @@ +{ lib, vscode-utils, jq, moreutils }: + +let + inherit (vscode-utils) buildVscodeMarketplaceExtension; + +in buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter"; + publisher = "ms-toolsai"; + version = "2021.9.1101343141"; + sha256 = "1c5dgkk5yn6a8k3blbqakqdy8ppwgfbm0ciki7ix696bvlksbpdg"; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + postPatch = '' + # Patch 'packages.json' so that the expected '__metadata' field exists. + # This works around observed extension load failure on vscode's attempt + # to rewrite 'packages.json' with this new information. + print_jq_query() { + cat <<"EOF" + .__metadata = { + "id": "6c2f1801-1e7f-45b2-9b5c-7782f1e076e8", + "publisherId": "ac8eb7c9-3e59-4b39-8040-f0484d8170ce", + "publisherDisplayName": "Microsoft", + "installedTimestamp": 0 + } + EOF + } + jq "$(print_jq_query)" ./package.json | sponge ./package.json + ''; + + meta = with lib; { + description = "Jupyter extension for vscode"; + homepage = "https://github.com/microsoft/vscode-jupyter"; + license = licenses.mit; + maintainers = with maintainers; [ jraygauthier ]; + }; +} diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 89950a51598c..4a03c46dce4a 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, vscode-utils, extractNuGet -, icu, curl, openssl, lttng-ust, autoPatchelfHook +, icu, curl, openssl, liburcu, lttng-ust, autoPatchelfHook , python3, musl , pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. @@ -12,6 +12,24 @@ assert ctagsUseFixed -> null != ctags; let + liburcu-0-12 = liburcu.overrideAttrs (oldAttrs: rec { + version = "0.12.2"; + src = fetchurl { + url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; + sha256 = "0yx69kbx9zd6ayjzvwvglilhdnirq4f1x1sdv33jy8bc9wgc3vsf"; + }; + }); + + lttng-ust-2-10 = (lttng-ust.override { + liburcu = liburcu-0-12; + }).overrideAttrs (oldAttrs: rec { + version = "2.10.5"; + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/lttng-ust-${version}.tar.bz2"; + sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; + }; + }); + pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python"; ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags"; @@ -54,7 +72,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { icu curl openssl - lttng-ust + lttng-ust-2-10 musl ]; @@ -75,6 +93,19 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { # Patch `packages.json` so that nix's *ctags* is used as default value for `python.workspaceSymbols.ctagsPath`. substituteInPlace "./package.json" \ --replace "\"default\": \"ctags\"" "\"default\": \"${ctagsDefaultsTo}\"" + + # Similar cleanup to what's done in the `debugpy` python package. + # This prevent our autopatchelf logic to bark on unsupported binaries (`attach_x86.so` + # was problematic) but also should make our derivation less heavy. + ( + cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process + declare kept_aside="${{ + "x86_64-linux" = "attach_linux_amd64.so"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}" + mv "$kept_aside" "$kept_aside.hidden" + rm *.so *.dylib *.dll *.exe *.pdb + mv "$kept_aside.hidden" "$kept_aside" + ) ''; postInstall = '' diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index ed08833f958b..1998d1e46a36 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "vscode-lldb", - "version": "1.6.7", + "version": "1.6.8", "dependencies": { "string-argv": "^0.3.1", "yaml": "^1.10.0", diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 93bb0e570dd0..3a01058c99c2 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.6.7"; + version = "1.6.8"; vscodeExtUniqueId = "${publisher}.${pname}"; @@ -13,7 +13,7 @@ let owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-9rqdqpxUWcUV9RnZOTxg+zMW7wlTXZVkoKYHuv/lE7c="; + sha256 = "sha256-/2iyWJfNjvk5n7KwWIu2gc24/21KWibU6IAPN/tJ8Q4="; }; lldb = callPackage ./lldb.nix {}; @@ -25,7 +25,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-KeZpjMCBdOJTLj8pA5WWi3EMyhhWw/+aik4IJqIs/mk="; + cargoSha256 = "sha256-rG+Qw8ac9cCgCjfLFXLlohLk+zV5s1OaqzU0/nXiqgU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh index 34bb5dbc33d5..2fe0cc5cf297 100755 --- a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -19,17 +19,26 @@ repo=vscode-lldb version="$1" sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile" -srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version" --fetchSubmodules) +srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version") sed -E 's#\bsha256 = ".*?"#sha256 = "'$srcHash'"#' --in-place "$nixFile" cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile" src="$(nix-build $nixpkgs -A vscode-extensions.vadimcn.vscode-lldb.src --no-out-link)" +oldDeps="$(jq '.dependencies' build-deps/package.json)" +newDeps="$(jq '.dependencies + .devDependencies' "$src/package.json")" jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) }' \ --arg version "$version" \ "$src/package.json" \ > build-deps/package.json -# Regenerate nodePackages. -cd "$nixpkgs/pkgs/development/node-packages" -exec ./generate.sh +if [[ "$oldDeps" == "$newDeps" ]]; then + echo "Dependencies not changed" + sed '/"vscode-lldb-build-deps-/,+3 s/version = ".*"/version = "'"$version"'"/' \ + --in-place "$nixpkgs/pkgs/development/node-packages/node-packages.nix" +else + echo "Dependencies changed" + # Regenerate nodePackages. + cd "$nixpkgs/pkgs/development/node-packages" + exec ./generate.sh +fi diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index d38a97387f5a..dd9436d9b0ea 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , meson , ninja , pkg-config @@ -30,6 +31,25 @@ stdenv.mkDerivation rec { sha256 = "1phgp8fs0dlj74kbkqlvfniwc32daz47b3pvsxlfxqzyrp77xrfm"; }; + patches = [ + # meson install tries to create /var/lib/boltd + ./0001-skip-mkdir.patch + + # https://github.com/NixOS/nixpkgs/issues/104429 + # Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167 + (fetchpatch { + name = "disable-atime-tests.diff"; + url = "https://gitlab.freedesktop.org/roberth/bolt/-/commit/1f672a7de2ebc4dd51590bb90f3b873a8ac0f4e6.diff"; + sha256 = "134f5s6kjqs6612pwq5pm1miy58crn1kxbyyqhzjnzmf9m57fnc8"; + }) + + # Fix tests with newer umockdev + (fetchpatch { + url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/130e09d1c7ff02c09e4ad1c9c36e9940b68e58d8.patch"; + sha256 = "HycuM7z4VvtBuZZLU68tBxGT1YjaqJRS4sKyoTGHZEk="; + }) + ]; + nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 @@ -61,19 +81,6 @@ stdenv.mkDerivation rec { (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) ]; - patches = [ - # meson install tries to create /var/lib/boltd - ./0001-skip-mkdir.patch - - # https://github.com/NixOS/nixpkgs/issues/104429 - # Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167 - (fetchpatch { - name = "disable-atime-tests.diff"; - url = "https://gitlab.freedesktop.org/roberth/bolt/-/commit/1f672a7de2ebc4dd51590bb90f3b873a8ac0f4e6.diff"; - sha256 = "134f5s6kjqs6612pwq5pm1miy58crn1kxbyyqhzjnzmf9m57fnc8"; - }) - ]; - postPatch = '' patchShebangs scripts tests ''; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 4949cd7c14a8..b8a017adcf42 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -49,14 +49,14 @@ in stdenv.mkDerivation rec { pname = "busybox"; - version = "1.33.1"; + version = "1.34.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0a0dcvsh7nxnhxc5y73fky0z30i9p7r30qfidm2akn0n5fywdkhj"; + sha256 = "0jfm9fik7nv4w21zqdg830pddgkdjmplmna9yjn9ck1lwn4vsps1"; }; hardeningDisable = [ "format" "pie" ] @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { CONFIG_LFS y + # More features for modprobe. + ${lib.optionalString (!enableMinimal) '' + CONFIG_FEATURE_MODPROBE_BLACKLIST y + CONFIG_FEATURE_MODUTILS_ALIAS y + CONFIG_FEATURE_MODUTILS_SYMBOLS y + CONFIG_MODPROBE_SMALL n + ''} + ${lib.optionalString enableStatic '' CONFIG_STATIC y ''} @@ -135,7 +143,7 @@ stdenv.mkDerivation rec { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = "https://busybox.net/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ TethysSvensson ]; + maintainers = with maintainers; [ TethysSvensson qyliss ]; platforms = platforms.linux; priority = 10; }; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6b9aaccadd36..8e1902b61dc1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,32 +1,32 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.248-hardened1.patch", - "sha256": "1lwqlpd21f8rwqfyz61083w0lg2bjzdjf7rzrqxsw1jz0l879035", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.248-hardened1/linux-hardened-4.14.248-hardened1.patch" + "name": "linux-hardened-4.14.250-hardened1.patch", + "sha256": "1jgqmrj5djapvk56jwlfq181knhywzrk9cswv1lp5y2jwnnvlj9x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.250-hardened1/linux-hardened-4.14.250-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.208-hardened1.patch", - "sha256": "0bg45n1kgd628gwjkp1vxslxyci6589ygy9mmmhpl7kj3y7370ck", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.208-hardened1/linux-hardened-4.19.208-hardened1.patch" + "name": "linux-hardened-4.19.210-hardened1.patch", + "sha256": "0lnv0ym6jcf460hsn26lax65n2yb1vvzsfmckaz04jb2kdgm6hr5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.210-hardened1/linux-hardened-4.19.210-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.70-hardened1.patch", - "sha256": "12r6x7v7n3f7c7pn86ivykg6gqmqlzwrsncdkvj5qf7raw38ad5r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.70-hardened1/linux-hardened-5.10.70-hardened1.patch" + "name": "linux-hardened-5.10.72-hardened1.patch", + "sha256": "14zchx1hc4jrq7prv4kkswjnmyqv74wfkjvky57scc8yl04yaqs6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.72-hardened1/linux-hardened-5.10.72-hardened1.patch" }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.9-hardened1.patch", - "sha256": "190588p6xw65y1f106zgnv5s043yi633vg0zdbz85qjz27g49db8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.9-hardened1/linux-hardened-5.14.9-hardened1.patch" + "name": "linux-hardened-5.14.11-hardened1.patch", + "sha256": "05n74rnq5c2jx7iynxwgj5wypb0i0p3dar0ri2zxmyssasmbkfa7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.11-hardened1/linux-hardened-5.14.11-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.150-hardened1.patch", - "sha256": "0vaxp5lfs7d5py0530sdhz8yzbzjxlwaam63mflwfd4mm8gf3ggc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.150-hardened1/linux-hardened-5.4.150-hardened1.patch" + "name": "linux-hardened-5.4.152-hardened1.patch", + "sha256": "01rf9za9sv14pxpi0pj1izq4bihhldi2qnhaka5rxlw7nifzzsj2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.152-hardened1/linux-hardened-5.4.152-hardened1.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8eff0d4d78f9..6044967eaf69 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.249"; + version = "4.14.251"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wn4yw9fliw3a8knvj2hdprbyyx7akm9ycclr2y1whpa5gmrc3rj"; + sha256 = "08g1i6wylwi50rns2grdi9f0m8np64qvfqb28drafy772m2klinp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 1e4abbdb67f7..3cb9fb7009f4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.209"; + version = "4.19.212"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04z9hxgqw2p86xxi2667kaj2w99xxxiw9gn9i1217c305swxa9vk"; + sha256 = "0hxn3mzxh4hpnrkyjv9gipb81k6p0zd07a3xvb6fb6njvmwdpvsw"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 72a0d434e819..a0d6115a856b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.287"; + version = "4.4.289"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qraild006in01vsqbhx1lf585g34skzwi2m3hv3kal8s03q0gzw"; + sha256 = "1g77kf0yzwvpdxs3kw7wdvb07mmk3zm6ydjcw5dnsza8q2inl69k"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 8b67538fb302..b4952dcb9277 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.285"; + version = "4.9.287"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hkkk4mhr5qnrhwqcz0b20rff6j8pnwd868a5hsq8s867pa24ajb"; + sha256 = "1hlpxnlz0y5vxcmkavsirk2kfb2l34fcvmhlcb99slh28xkjhhfl"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 0f7acb6ccc20..a16c96b9eb83 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.71"; + version = "5.10.74"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "15x4jbwy6j78ss31avdl7nr0mw4w6a1y6c6dyljh6gwngp98irh2"; + sha256 = "1c717mn47mg43k7xfwydygwv14r67aksn1c24c99hf8qf14acmap"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index c0864239133f..ec19fa2357f2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.10"; + version = "5.14.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1n454038vp55wbi814fqpidjmk8k6p6h0jl07hknpd6imgh2bkj5"; + sha256 = "0kcn9g5jyd043f75wk3k34j430callzhw5jh1if9zacqq2s7haw3"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index ca4ad25ebf1d..4b02d19d1cca 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.151"; + version = "5.4.154"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "04rkymyg79mp1frdlkizc7k33palplmnnnz8klkag9ii7jw3zrxv"; + sha256 = "01iwbz1ncakw90yykdw3cx04wnclwf1qa8nmlis08svbcvs99285"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index d9f8912416a5..8ee8c663b3b5 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18314"; - sha256 = "0fic073zafwdsw7i0j4z57a4aknk8kpgnbrxpbi181n5axdlm99k"; + rev = "18380"; + sha256 = "0sg7mnxqzc5zdnl8l7gfy1kc52w7c85fdhywvdbjgs7inx2bb1qd"; } , ... }: @@ -16,7 +16,7 @@ let in linux.override { argsOverride = { - modDirVersion = "${linux.modDirVersion}-gnu"; + modDirVersion = "${linux.modDirVersion}-gnu1"; isLibre = true; src = stdenv.mkDerivation { @@ -35,8 +35,6 @@ in linux.override { ''; }; - extraMeta.broken = true; - passthru.updateScript = ./update-libre.sh; maintainers = [ lib.maintainers.qyliss ]; diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index e5a9032d3bda..a0da293548d9 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.9"; - suffix = "lqx4"; + version = "5.14.11"; + suffix = "lqx1"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-nT8lc/JeuXsKVHGPQxK+w8BTasxyIfxCdKbAvoFgbYg="; + sha256 = "sha256-4SSAcI1TwaKgz/bwma+YQtIBtodEAYxqdtUI3ESM7I8="; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index daa3c67da962..6ef781f6095c 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.65-rt53"; # updated by ./update-rt.sh + version = "5.10.73-rt54"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0riyq1gdm18642fpnhpcw8hspcjqzprzhqnygjxabjjvrvdxxlzd"; + sha256 = "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1sxyic3895dch3x7cabiip5lxv9wqypn22hcy02jg9825260cmd3"; + sha256 = "0szqm9f939p9z701i5hj881nf5bhfa0a6037bbcz974y0x8g9nmk"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 793579fd2c45..08ed46bb0d43 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.14.9"; + version = "5.14.12"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-CMCZjuK9ofRup05l7HNg87jHTg4jOGrkmtvoxuNGwXE="; + sha256 = "sha256-JVTi319BLHM4CgF7KaN3C/92N4uwh59po1AcOinNpww="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 44e0b1d77b2d..9c67df13d314 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -56,6 +56,7 @@ let # Dependencies that are required to build kernel modules moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf; + installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!${stdenv.shell} -e mkdir -p $4 @@ -88,6 +89,8 @@ let isModular = config.isYes "MODULES"; + buildDTBs = kernelConf.DTB or false; + installsFirmware = (config.isEnabled "FW_LOADER") && (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) && (lib.versionOlder version "4.14"); @@ -175,15 +178,16 @@ let "KBUILD_BUILD_VERSION=1-NixOS" kernelConf.target "vmlinux" # for "perf" and things like that - ] - ++ optional isModular "modules" + ] ++ optional isModular "modules" + ++ optional buildDTBs "dtbs" ++ extraMakeFlags; installFlags = [ "INSTALLKERNEL=${installkernel}" "INSTALL_PATH=$(out)" ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") - ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; + ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware" + ++ optionals buildDTBs ["dtbs_install" "INSTALL_DTBS_PATH=$(out)/dtbs"]; preInstall = '' installFlagsArray+=("-j$NIX_BUILD_CORES") @@ -199,9 +203,7 @@ let postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware - '') + (if (kernelConf.DTB or false) then '' - make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs - '' else "") + (if isModular then '' + '') + (if isModular then '' mkdir -p $dev cp vmlinux $dev/ if [ -z "''${dontStrip-}" ]; then @@ -315,9 +317,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] - ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ] + ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] ++ optional (lib.versionAtLeast version "5.8") elfutils - ++ optional (lib.versionAtLeast version "5.2") zlib ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index b58bca352e63..045f80ce9ac2 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,5 +1,5 @@ { lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper -, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils +, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils-unwrapped , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl , zlib , withGtk ? false, gtk2 @@ -54,7 +54,6 @@ stdenv.mkDerivation { "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" - "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" "-Wno-error=stringop-truncation" ]; @@ -69,8 +68,9 @@ stdenv.mkDerivation { installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; preFixup = '' + # pull in 'objdump' into PATH to make annotations work wrapProgram $out/bin/perf \ - --prefix PATH : "${binutils}/bin" + --prefix PATH : "${binutils-unwrapped}/bin" ''; meta = { diff --git a/pkgs/os-specific/linux/mceinject/default.nix b/pkgs/os-specific/linux/mceinject/default.nix new file mode 100644 index 000000000000..3e89ed83361f --- /dev/null +++ b/pkgs/os-specific/linux/mceinject/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, bison, flex }: + +stdenv.mkDerivation rec { + pname = "mceinject"; + version = "unstable-2013-01-19"; + + src = fetchFromGitHub { + owner = "andikleen"; + repo = "mce-inject"; + rev = "4cbe46321b4a81365ff3aafafe63967264dbfec5"; + sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z"; + }; + + nativeBuildInputs = [ flex bison ]; + + NIX_CFLAGS_COMPILE = "-Os -g -Wall"; + + NIX_LDFLAGS = [ "-lpthread" ]; + + makeFlags = [ "prefix=" ]; + + enableParallelBuilding = true; + + installFlags = [ "destdir=$(out)" "manprefix=/share" ]; + + meta = with lib; { + description = "A tool to inject machine checks into x86 kernel for testing"; + longDescription = '' + mce-inject allows to inject machine check errors on the software level + into a running Linux kernel. This is intended for validation of the + kernel machine check handler. + ''; + homepage = "https://github.com/andikleen/mce-inject/"; + license = licenses.gpl2; + maintainers = with maintainers; [ arkivm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 241498057232..13e989243646 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -19,9 +19,11 @@ stdenv.mkDerivation rec { substituteInPlace libmultipath/Makefile \ --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h + # systemd-udev-settle.service is deprecated. substituteInPlace multipathd/multipathd.service \ --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ - --replace /sbin/multipathd "$out/bin/multipathd" + --replace /sbin/multipathd "$out/bin/multipathd" \ + --replace " systemd-udev-settle.service" "" sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index 0526c02f75f8..24fc9e188741 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -1,12 +1,13 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "numad"; version = "0.5"; - src = fetchurl { - url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/numad-${version}.tar.xz"; - sha256 = "08zd1yc3w00yv4mvvz5sq1gf91f6p2s9ljcd72m33xgnkglj60v4"; + src = fetchgit { + url = "https://pagure.io/numad.git"; + rev = "334278ff3d774d105939743436d7378a189e8693"; + sha256 = "sha256-6nrbfooUI1ufJhsPf68li5584oKQcznXQlxfpStuX5I="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 6d21a4fca61b..a8655596c513 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,10 +27,10 @@ rec { else legacy_390; beta = generic { - version = "470.42.01"; - sha256_64bit = "04w9nmi3vyww07pmgbd2r1x37s5p6xiy4qg9s06a1kjwzpm59xfd"; - settingsSha256 = "Ohbkm7j0/V0kzcxfsHujBkrdnaefneoLutf2Rju2hIQ="; - persistencedSha256 = "1gfj4ffkidbhgjzdi6sv2sngdcb27w7b0rvfnj129rs36mcxy02j"; + version = "495.29.05"; + sha256_64bit = "sha256-9yVLl9QAxpJQR5ZJb059j2TpOx4xxCeGCk8hmhhvEl4="; + settingsSha256 = "sha256-dcEI+3bxSTwVbHcR6IgvIUFt4vWtK5T4NMGVhmmeVJ0="; + persistencedSha256 = "sha256-OT/hOXEPatc6pAKrxDe0jsmaDFCtVXAbdW4elKe6xE8="; }; # Vulkan developer beta driver diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 79594a87c515..b8a0487bc7e7 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils +{ lib, stdenv, fetchFromGitHub, gettext, libnl, ncurses, pciutils , pkg-config, zlib, autoreconfHook }: stdenv.mkDerivation rec { @@ -17,14 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; - patches = lib.optional stdenv.hostPlatform.isMusl ( - fetchpatch { - name = "strerror_r.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; - sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; - } - ); - NIX_LDFLAGS = [ "-lpthread" ]; postPatch = '' @@ -36,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Analyze power consumption on Intel-based laptops"; homepage = "https://01.org/powertop"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 5ee5b0bda57f..c783c7924b59 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, withoutInitTools ? false }: -let version = "2.99"; in +let version = "3.00"; in stdenv.mkDerivation { name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version; src = fetchurl { url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz"; - sha256 = "sha256-sFw2d7tpiv5kyZeWiwDEmyqb0yDOljUjIw7n6kEZd1c="; + sha256 = "sha256-7WvCCttnNTiYQefT64ZQ+nUMdq8gv07XOxMwpNTBQBc="; }; prePatch = '' diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index f2a7b692baa3..54268693454c 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -59,6 +59,6 @@ in stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; - broken = lib.versionAtLeast kernel.version "4.18"; + broken = true; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c9f0438c86f5..cd25f0e981bd 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -140,6 +140,13 @@ let "INSTALL_MOD_PATH=\${out}" ]; + # Enabling BTF causes zfs to be build with debug symbols. + # Since zfs compress kernel modules on installation, our strip hooks skip stripping them. + # Hence we strip modules prior to compression. + postBuild = optionalString buildKernel '' + find . -name "*.ko" -print0 | xargs -0 -P$NIX_BUILD_CORES strip --strip-debug + ''; + postInstall = optionalString buildKernel '' # Add reference that cannot be detected due to compressed kernel module mkdir -p "$out/nix-support" diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 4fec4390e345..e2db02f0def2 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -12,9 +12,9 @@ let jre = jre11; }; "2.8" = { - kafkaVersion = "2.8.0"; + kafkaVersion = "2.8.1"; scalaVersion = "2.13"; - sha256 = "1iljfjlp29m4s6gkja9fxkzj8a8p0qc0sfy8x4g1318kbnp818rz"; + sha256 = "0fgil47hxdnc374k0p9sxv6b163xknp3pkihv3r99p977czb1228"; jre = jre11; }; }; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index ce514ea31c03..28a6536cfaed 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libtool llvm-bintools ninja ]; buildInputs = [ boost brotli capnproto cctz clang-unwrapped double-conversion - icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl perl + icu jemalloc libxml2 lld llvm lz4 libmysqlclient openssl perl poco protobuf python3 rapidjson re2 rdkafka readline sparsehash unixODBC xxHash zstd - ]; + ] ++ lib.optional stdenv.hostPlatform.isx86 libcpuid; postPatch = '' patchShebangs src/ diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 7820dbaff744..13f69fcf4a35 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, libtool, gettext, zlib, readline, gsasl -, guile, python2, pcre, libffi, groff }: +, guile, python3, pcre, libffi, groff }: stdenv.mkDerivation rec { pname = "dico"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = - [ libtool gettext zlib readline gsasl guile python2 pcre libffi groff ]; + [ libtool gettext zlib readline gsasl guile python3 pcre libffi groff ]; doCheck = true; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 6fd7eb42c994..753a361fc18b 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "Domain name server"; license = licenses.mpl20; - maintainers = with maintainers; [ peti globin ]; + maintainers = with maintainers; [ globin ]; platforms = platforms.unix; outputsToInstall = [ "out" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 4363f9665fa4..6f0c7c9ab8fb 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "580087695df350898b2da8a5c2bdf1dc5eb262ed5ff2cb1538cee480a50fa094"; + sha256 = "a3fc448cbce3209575f93a3cf1224fa37802fc6606f7c7d4bb3aa6dbeaed2c64"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 9e7e6c249e1f..420b09234547 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "fb8b962dd9ef744e2551c4f052454bc2a30e39c1f662f4f3522e8f221d8e3d66"; + sha256 = "ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index da57282ae08f..881fef7f32f1 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.5.4"; + version = "4.5.6"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0sl98ykk2bh0v2aw2hyak7wk9k3pbhvmfkb3i4a72jlsixm60p81"; + sha256 = "004jwyg64ww6sfwlfpyfvh6vymildygwkjhkin2fsrq4h79wv2dv"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index 67b328d661a9..9c14c466852f 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -2,13 +2,13 @@ python2.pkgs.buildPythonApplication rec { pname = "headphones"; - version = "0.5.19"; + version = "0.5.20"; src = fetchFromGitHub { owner = "rembo10"; repo = "headphones"; rev = "v${version}"; - sha256 = "0z39gyan3ksdhnjxxs7byamrzmrk8cn15g300iqigzvgidff1lq0"; + sha256 = "0m234fr1i8bb8mgmjsdpkbaa3l16y23ca6s7nyyl5ismmjxhi4mz"; }; dontBuild = true; @@ -18,10 +18,12 @@ python2.pkgs.buildPythonApplication rec { buildInputs = [ python2 ]; installPhase = '' - mkdir -p $out/bin - cp -R {data,headphones,lib,Headphones.py} $out/ + mkdir -p $out/bin $out/opt/headphones + cp -R {data,headphones,lib,Headphones.py} $out/opt/headphones - makeWrapper $out/Headphones.py $out/bin/headphones + echo v${version} > $out/opt/headphones/version.txt + + makeWrapper $out/opt/headphones/Headphones.py $out/bin/headphones ''; meta = with lib; { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e9b203554c64..5b00199373e6 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.10.0"; + version = "2021.10.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -19,7 +19,7 @@ "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ airly ]; "airnow" = ps: with ps; [ pyairnow ]; - "airthings" = ps: with ps; [ ]; # missing inputs: airthings_cloud + "airthings" = ps: with ps; [ airthings-cloud ]; "airtouch4" = ps: with ps; [ ]; # missing inputs: airtouch4pyapi "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ aladdin-connect ]; @@ -216,7 +216,7 @@ "edimax" = ps: with ps; [ pyedimax ]; "edl21" = ps: with ps; [ pysml ]; "ee_brightbox" = ps: with ps; [ eebrightbox ]; - "efergy" = ps: with ps; [ ]; # missing inputs: pyefergy + "efergy" = ps: with ps; [ pyefergy ]; "egardia" = ps: with ps; [ pythonegardia ]; "eight_sleep" = ps: with ps; [ pyeight ]; "elgato" = ps: with ps; [ elgato ]; @@ -859,7 +859,7 @@ "tankerkoenig" = ps: with ps; [ pytankerkoenig ]; "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ aiohttp-cors hatasmota paho-mqtt ]; - "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli + "tautulli" = ps: with ps; [ pytautulli ]; "tcp" = ps: with ps; [ ]; "ted5000" = ps: with ps; [ xmltodict ]; "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 970f14bbec22..49cb6670de20 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -114,7 +114,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.10.0"; + hassVersion = "2021.10.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -131,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0m54ynx0i4a6wljg6d9i6xa79c15cqah5cgaswgrbaxhjw5q78iv"; + sha256 = "1cl0h15285x7xba425d9anv882adi6bdqx4i3cicg3gf0nzcc8am"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -214,6 +214,7 @@ in with py.pkgs; buildPythonApplication rec { "air_quality" "airly" "airnow" + "airthings" "airvisual" "alarm_control_panel" "alarmdecoder" @@ -768,8 +769,6 @@ in with py.pkgs; buildPythonApplication rec { # wemo/test_sensor.py: KeyError for various power attributes "--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable" "--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable" - # tado/test_climate.py: Tries to connect to my.tado.com - "--deselect tests/components/tado/test_climate.py::test_air_con" # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container' "--deselect tests/helpers/test_system_info.py::test_container_installationtype" # tests are located in tests/ @@ -784,7 +783,8 @@ in with py.pkgs; buildPythonApplication rec { "tests/auth/mfa_modules/test_notify.py" # emulated_hue/test_upnp.py: Tries to establish the public ipv4 address "tests/components/emulated_hue/test_upnp.py" - + # tado/test_climate.py: Tries to connect to my.tado.com + "tests/components/tado/test_climate.py" ]; disabledTests = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index c7e6c6b7e4a4..7207a937c38d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20211006.0"; + version = "20211007.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rlscTHqa1TMsIVW7kWFGR/feak0XewDRkybpo8dPXj0="; + sha256 = "sha256-wsDNLwzhpwH5vwdHRWhZGlumjFM8/S+kXProbD+VpE8="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 6e6eca69da3c..3b8a4acbfc94 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://httpd.apache.org/"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ lovek323 peti ]; + maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index a0a6235ace50..4f4236e91b58 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -20,8 +20,18 @@ stdenv.mkDerivation rec { }) ]; installPhase = '' + runHook preInstall + mkdir -p $out/modules cp src/.libs/mod_dnssd.so $out/modules + + runHook postInstall + ''; + + preFixup = '' + # TODO: Packages in non-standard directories not stripped. + # https://github.com/NixOS/nixpkgs/issues/141554 + stripDebugList=modules ''; meta = with lib; { diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 39f21b189378..86c9ad6c00dc 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.peti ]; broken = true; # patch 'compile-against-apache24.diff' no longer works }; } diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 94b94081d430..50d4012297fc 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 +{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_78 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { pname = "couchdb"; - version = "3.1.1"; + version = "3.2.0"; # when updating this, please consider bumping the erlang/OTP version # in all-packages.nix src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "18wcqxrv2bz88xadkqpqznprrxmcmwr0g6k895xrm8rbp9mpdzlg"; + sha256 = "035hy76399yy32rxl536gv7nh8ijihqxhhh5cxn95c3bm97mgslb"; }; - buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; + buildInputs = [ erlang icu openssl spidermonkey_78 (python3.withPackages(ps: with ps; [ requests ]))]; postPatch = '' - substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey_68.dev}/include/mozjs-68" + substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-78' "${spidermonkey_78.dev}/include/mozjs-78" patchShebangs bin/rebar ''; dontAddPrefix= "True"; - configureFlags = ["--spidermonkey-version=68"]; + configureFlags = ["--spidermonkey-version=78"]; buildFlags = ["release"]; installPhase = '' diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 568f6d8b9e50..2919438d1e4b 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -452,6 +452,16 @@ in }; }; + upload = { + src = fetchFromGitHub { + name = "upload"; + owner = "fdintino"; + repo = "nginx-upload-module"; + rev = "2.3.0"; + sha256 = "8veZP516oC7TESO368ZsZreetbDt+1eTcamk7P1kWjU="; + }; + }; + upstream-check = { src = fetchFromGitHub { name = "upstream-check"; @@ -499,10 +509,10 @@ in name = "vod"; owner = "kaltura"; repo = "nginx-vod-module"; - rev = "e46079f51282d5a378e6911714b5f3a533bb7700"; - sha256 = "0pzzq4xcq7jg8mxwnz7srj1nczg9ajd1b8q58qlm03lny8nd2hr5"; + rev = "1.29"; + sha256 = "1z0ka0cwqbgh3fv2d5yva395sf90626rdzx7lyfrgs89gy4h9nrr"; }; - inputs = [ pkgs.ffmpeg_3 pkgs.fdk_aac pkgs.openssl pkgs.libxml2 pkgs.libiconv ]; + inputs = with pkgs; [ ffmpeg fdk_aac openssl libxml2 libiconv ]; }; vts = { diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 8bb383d59964..a6efda3bed7a 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "5b0c229ba5fe"; # branch=quic - sha256 = "1bb6n6b4nkc1cfllj75lwr4gjijl8883bkcvq8ncg7r4s5xs7r90"; + rev = "404de224517e"; # branch=quic + sha256 = "00x8djp3hqnq60jzpddfrj0v23j2fbl27jyw609ha3wqkkbxrip9"; }; preConfigure = '' diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 4814f956411d..ffbeab36ff4f 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.582"; + version = "0.18.925"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-WwTeUvBD790CP+mph2xKm/m7csYQgmXgJa4TLn5nsVI="; + sha256 = "1md0iy6sx0agsnvrj9m7bq1lvp5z34x7zv3pvwy4zw8b46w97mnz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index c2c9df4b814b..b9924c69e857 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -15,6 +15,8 @@ }: let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; runtimeDeps = [ ffmpeg fontconfig @@ -34,10 +36,6 @@ let "musl-"); # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids runtimeId = "${os}-${musl}${arch}"; - - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-net = dotnetCorePackages.net_5_0; - dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; in stdenv.mkDerivation rec { pname = "jellyfin"; diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 0bf023668abc..7c2d8b80de0c 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.1-551-g2ad6eb0b"; + version = "2.1-570-gb802be83"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "XwVcjvBtJkZP46kGMnE4R1ax7Re725GMoV+pCnCNpak="; + sha256 = "0SLaCIjMN2/+Iushyz8OQpRHHBYVqn6+DpwNGbQEzy4="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index 658d5e34fb33..3381b7858beb 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -1,31 +1,39 @@ -{ lib, buildGoModule, fetchFromGitHub, coreutils }: +{ lib, buildGoModule, fetchFromGitHub, coreutils, installShellFiles, scdoc }: buildGoModule rec { pname = "maddy"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-SxJfuNZBtwaILF4zD4hrTANc/GlOG53XVwg3NvKYAkg="; + sha256 = "sha256-b85g8Eu7qWTI+ggMr7JL/2BAVbkXocpsR89P6s6TfMg="; }; - vendorSha256 = "sha256-bxKEQaOubjRfLX+dMxVDzLOUInHykUdy9X8wvFE6Va4="; + vendorSha256 = "sha256-kzSwqT3r6uGxq1GNzCWCn8VoCxmVtiUb23XLCpsPv/c="; ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; + nativeBuildInputs = [ installShellFiles scdoc ]; + postInstall = '' + for f in docs/man/*.scd; do + local page="docs/man/$(basename "$f" .scd)" + scdoc < "$f" > "$page" + installManPage "$page" + done + mkdir -p $out/lib/systemd/system substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \ - --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/usr/local/bin/maddy" "$out/bin/maddy" \ --replace "/bin/kill" "${coreutils}/bin/kill" substitute dist/systemd/maddy@.service $out/lib/systemd/system/maddy@.service \ - --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/usr/local/bin/maddy" "$out/bin/maddy" \ --replace "/bin/kill" "${coreutils}/bin/kill" ''; @@ -33,6 +41,6 @@ buildGoModule rec { description = "Composable all-in-one mail server"; homepage = "https://maddy.email"; license = licenses.gpl3Plus; - maintainers = with maintainers; []; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 6f5d065e488c..8fd6dc447a06 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ]; - maintainers = with maintainers; [ peti fpletz globin ajs124 ]; + maintainers = with maintainers; [ fpletz globin ajs124 ]; platforms = platforms.unix; }; passthru.tests = { diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 3ef9cafebaf0..1213347a0ac7 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ peti qyliss ]; + maintainers = with lib.maintainers; [ qyliss ]; }; } diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 33d31fb8e722..1c20e33bd0c2 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Archiver for GNU Mailman v3"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ peti globin qyliss ]; + maintainers = with lib.maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 222a21bcb7f1..d807f7f797c0 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin peti qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 434f5b3191ed..10adb49be84f 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { meta = with lib; { description = "Django project for Mailman 3 web interface"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ peti qyliss m1cr0man ]; + maintainers = with maintainers; [ qyliss m1cr0man ]; }; } diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 348a2088f2c2..ca86b4b525f2 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -38,6 +38,6 @@ perlPackages.buildPerlPackage rec { description = "Open-Source Spam Filter"; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ peti qknight qyliss ]; + maintainers = with lib.maintainers; [ qknight qyliss ]; }; } diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix index 82d8d3026590..5272b389b2b3 100644 --- a/pkgs/servers/mail/sympa/default.nix +++ b/pkgs/servers/mail/sympa/default.nix @@ -61,13 +61,13 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.60"; + version = "6.2.64"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "0mnpmkvxf3bmrmahkf3d0i5r6sj7xb1yca5v7xdnwnh5wh9vlx7v"; + sha256 = "sha256-7bBOhx6sDyln37OEgRLJwgu0rklJm872hINog2EJ/+E="; }; configureFlags = [ 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 index eb70d21ed5cb..2a83c5fcf6d9 100644 --- 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 @@ -1,7 +1,7 @@ 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 +Subject: [PATCH 1/2] 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, diff --git a/pkgs/servers/matrix-synapse/0002-Expose-generic-worker-as-binary-under-NixOS.patch b/pkgs/servers/matrix-synapse/0002-Expose-generic-worker-as-binary-under-NixOS.patch new file mode 100644 index 000000000000..11dd53c9ad3e --- /dev/null +++ b/pkgs/servers/matrix-synapse/0002-Expose-generic-worker-as-binary-under-NixOS.patch @@ -0,0 +1,43 @@ +From 3089758015c64cc1e6788793c4fe40a0e1783457 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Tue, 5 Oct 2021 22:33:12 +0200 +Subject: [PATCH 2/2] Expose generic worker as binary under NixOS + +--- + setup.py | 3 ++- + synapse/app/generic_worker.py | 6 +++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 27f1d842c..6383aed6f 100755 +--- a/setup.py ++++ b/setup.py +@@ -135,7 +135,8 @@ setup( + python_requires="~=3.6", + entry_points={ + 'console_scripts': [ +- 'homeserver = synapse.app.homeserver:main' ++ 'homeserver = synapse.app.homeserver:main', ++ 'worker = synapse.app.generic_worker:main' + ] + }, + classifiers=[ +diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py +index 3b7131af8..c77a6a95c 100644 +--- a/synapse/app/generic_worker.py ++++ b/synapse/app/generic_worker.py +@@ -491,6 +491,10 @@ def start(config_options): + _base.start_worker_reactor("synapse-generic-worker", config) + + +-if __name__ == "__main__": ++def main(): + with LoggingContext("main"): + start(sys.argv[1:]) ++ ++ ++if __name__ == "__main__": ++ main() +-- +2.31.1 + diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c59bdb4b356e..e87bead4b609 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -36,6 +36,7 @@ buildPythonApplication rec { patches = [ ./0001-setup-add-homeserver-as-console-script.patch + ./0002-Expose-generic-worker-as-binary-under-NixOS.patch ]; buildInputs = [ openssl ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 596739a45d73..327ab8a672db 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -3,8 +3,8 @@ let src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-appservice-slack"; - rev = "1.8.0"; - sha256 = "sha256-FA6SMivMnloeZmnUhGx6N+ZLDTZFO3y17xJYclkp5w0="; + rev = "1.9.0"; + sha256 = "tx+dul+O7HZTGYW8ZSxoOZZmzm44nz0pYGQYp8xaVCw="; }; nodePackages = import ./node-composition.nix { diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh index 9fab48891701..33f0554573bd 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -# Download package.json and package-lock.json from the v1.8.0 release -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package.json -o package.json -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package-lock.json -o package-lock.json +# Download package.json and package-lock.json from the v1.9.0 release +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.9.0/package.json -o package.json +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.9.0/package-lock.json -o package-lock.json node2nix \ --nodejs-12 \ diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index bc5bc8cf1c72..9fa290f1c79b 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -4,6 +4,15 @@ let sources = { + "@alloc/quick-lru-5.2.0" = { + name = "_at_alloc_slash_quick-lru"; + packageName = "@alloc/quick-lru"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz"; + sha512 = "UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="; + }; + }; "@babel/code-frame-7.12.11" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; @@ -49,40 +58,77 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@eslint/eslintrc-0.4.0" = { + "@es-joy/jsdoccomment-0.9.0-alpha.1" = { + name = "_at_es-joy_slash_jsdoccomment"; + packageName = "@es-joy/jsdoccomment"; + version = "0.9.0-alpha.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.9.0-alpha.1.tgz"; + sha512 = "Clxxc0PwpISoYYBibA+1L2qFJ7gvFVhI2Hos87S06K+Q0cXdOhZQJNKWuaQGPAeHjZEuUB/YoWOfwjuF2wirqA=="; + }; + }; + "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.4.0"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; - sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@humanwhocodes/config-array-0.5.0" = { + name = "_at_humanwhocodes_slash_config-array"; + packageName = "@humanwhocodes/config-array"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; + }; + }; + "@humanwhocodes/object-schema-1.2.0" = { + name = "_at_humanwhocodes_slash_object-schema"; + packageName = "@humanwhocodes/object-schema"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; + sha512 = "wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w=="; + }; + }; + "@matrix-org/olm-https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz" = { + name = "_at_matrix-org_slash_olm"; + packageName = "@matrix-org/olm"; + version = 1; + src = fetchurl { + name = "olm-1.tar.gz"; + url = "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz"; + sha512 = "ddaXWILlm1U0Z9qpcZffJjBFZRpz/GxQ1n/Qth3xKvYRUbniuPOgftNTDaxkEC4h04uJG5Ls/OdI1YJUyfuRzQ=="; + }; + }; + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; "@slack/logger-2.0.0" = { @@ -121,6 +167,42 @@ let sha512 = "tjQ8Zqv/Fmj9SOL9yIEd7IpTiKfKHi9DKAkfRVeotoX0clMr3SqQtBqO+KZMX27gm7dmgJsQaDKlILyzdCO+IA=="; }; }; + "@tsconfig/node10-1.0.8" = { + name = "_at_tsconfig_slash_node10"; + packageName = "@tsconfig/node10"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz"; + sha512 = "6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg=="; + }; + }; + "@tsconfig/node12-1.0.9" = { + name = "_at_tsconfig_slash_node12"; + packageName = "@tsconfig/node12"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz"; + sha512 = "/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw=="; + }; + }; + "@tsconfig/node14-1.0.1" = { + name = "_at_tsconfig_slash_node14"; + packageName = "@tsconfig/node14"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz"; + sha512 = "509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg=="; + }; + }; + "@tsconfig/node16-1.0.1" = { + name = "_at_tsconfig_slash_node16"; + packageName = "@tsconfig/node16"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.1.tgz"; + sha512 = "FTgBI767POY/lKNDNbIzgAX6miIDBs6NTCbdlDb8TrWovHsSvaVIZDlTqym29C6UqhzwcJx4CYr+AlrMywA0cA=="; + }; + }; "@types/body-parser-1.19.0" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -130,13 +212,13 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/chai-4.2.16" = { + "@types/chai-4.2.21" = { name = "_at_types_slash_chai"; packageName = "@types/chai"; - version = "4.2.16"; + version = "4.2.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.16.tgz"; - sha512 = "vI5iOAsez9+roLS3M3+Xx7w+WRuDtSmF8bQkrbcIJ2sC1PcDgVoA0WGpa+bIrJ+y8zqY2oi//fUctkxtIcXJCw=="; + url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.21.tgz"; + sha512 = "yd+9qKmJxm496BOV9CMNaey8TWsikaZOwMRwPHQIjcOJM9oV+fi9ZMNw3JsVnbEEbo2gRTDnGEBv8pjyn67hNg=="; }; }; "@types/connect-3.4.34" = { @@ -148,13 +230,13 @@ let sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; - "@types/express-4.17.11" = { + "@types/express-4.17.13" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.11"; + version = "4.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; - sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; "@types/express-serve-static-core-4.17.19" = { @@ -175,22 +257,22 @@ let sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg=="; }; }; - "@types/js-yaml-4.0.0" = { + "@types/js-yaml-4.0.2" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.0.tgz"; - sha512 = "4vlpCM5KPCL5CfGmTbpjwVKbISRYhduEJvvUWsH5EB7QInhEj94XPZ3ts/9FPiLZFqYO0xoW4ZL8z2AabTGgJA=="; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.2.tgz"; + sha512 = "KbeHS/Y4R+k+5sWXEYzAZKuB1yQlZtEghuhRxrVRLaqhtoG5+26JwQsa4HyS3AWX8v1Uwukma5HheduUDskasA=="; }; }; - "@types/json-schema-7.0.7" = { + "@types/json-schema-7.0.8" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.7"; + version = "7.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; - sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz"; + sha512 = "YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="; }; }; "@types/mime-1.3.2" = { @@ -202,31 +284,31 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mocha-8.2.2" = { + "@types/mocha-8.2.3" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "8.2.2"; + version = "8.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz"; - sha512 = "Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz"; + sha512 = "ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw=="; }; }; - "@types/nedb-1.8.11" = { + "@types/nedb-1.8.12" = { name = "_at_types_slash_nedb"; packageName = "@types/nedb"; - version = "1.8.11"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.11.tgz"; - sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; + url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.12.tgz"; + sha512 = "ICDoQMORMjOSqfNFXT4ENXfwwCir1BPblXNm0SPH7C4Q10ou+pvVagcFAJ+rrzf3A47tGU4K/KbzKu7wO9j45Q=="; }; }; - "@types/node-14.14.41" = { + "@types/node-12.20.16" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.41"; + version = "12.20.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz"; - sha512 = "dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.16.tgz"; + sha512 = "6CLxw83vQf6DKqXxMPwl8qpF8I7THFZuIwLt4TnNsumxkp1VsRZWT8txQxncT/Rl2UojTsFzWgDG4FRMwafrlA=="; }; }; "@types/node-emoji-1.8.1" = { @@ -238,13 +320,13 @@ let sha512 = "0fRfA90FWm6KJfw6P9QGyo0HDTCmthZ7cWaBQndITlaWLTZ6njRyKwrwpzpg+n6kBXBIGKeUHEQuBx7bphGJkA=="; }; }; - "@types/nunjucks-3.1.4" = { + "@types/nunjucks-3.1.5" = { name = "_at_types_slash_nunjucks"; packageName = "@types/nunjucks"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.4.tgz"; - sha512 = "cR65PLlHKW/qxxj840dbNb3ICO+iAVQzaNKJ8TcKOVKFi+QcAkhw9SCY8VFAyU41SmJMs+2nrIN2JGhX+jYb7A=="; + url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.5.tgz"; + sha512 = "0zEdmQNNvQ+xyV9kqQvAV93UVroTwhE78toVUDT0GBnGcW2jQBZnB4al9qq2LqI5qHOqROy/DvvAY/UwrbvV1A=="; }; }; "@types/p-queue-2.3.2" = { @@ -265,13 +347,13 @@ let sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA=="; }; }; - "@types/randomstring-1.1.6" = { + "@types/randomstring-1.1.7" = { name = "_at_types_slash_randomstring"; packageName = "@types/randomstring"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/randomstring/-/randomstring-1.1.6.tgz"; - sha512 = "XRIZIMTxjcUukqQcYBdpFWGbcRDyNBXrvTEtTYgFMIbBNUVt+9mCKsU+jUUDLeFO/RXopUgR5OLiBqbY18vSHQ=="; + url = "https://registry.npmjs.org/@types/randomstring/-/randomstring-1.1.7.tgz"; + sha512 = "S6NRYPiH8VGcLW4m9KEMUPtGxXqToCOLLCutQh8sSMaZGrL6/PEQCZAPGBtMP6SKd43ep5eWuPFN732h23h15w=="; }; }; "@types/range-parser-1.2.3" = { @@ -301,13 +383,13 @@ let sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; - "@types/uuid-8.3.0" = { + "@types/uuid-8.3.1" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz"; - sha512 = "eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz"; + sha512 = "Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg=="; }; }; "@types/ws-7.2.6" = { @@ -319,94 +401,85 @@ let sha512 = "Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ=="; }; }; - "@types/yargs-15.0.13" = { + "@types/yargs-17.0.3" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.13"; + version = "17.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz"; - sha512 = "kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.3.tgz"; + sha512 = "K7rm3Ke3ag/pAniBe80A6J6fjoqRibvCrl3dRmtXV9eCEt9h/pZwmHX9MzjQVUc/elneQTL4Ky7XKorC71Lmxw=="; }; }; - "@types/yargs-parser-15.0.0" = { + "@types/yargs-parser-20.2.1" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "15.0.0"; + version = "20.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; + sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; }; - "@typescript-eslint/eslint-plugin-4.22.0" = { + "@typescript-eslint/eslint-plugin-4.28.4" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz"; - sha512 = "U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz"; + sha512 = "s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw=="; }; }; - "@typescript-eslint/eslint-plugin-tslint-4.22.0" = { - name = "_at_typescript-eslint_slash_eslint-plugin-tslint"; - packageName = "@typescript-eslint/eslint-plugin-tslint"; - version = "4.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.22.0.tgz"; - sha512 = "r4lhAPmd69ohf5grgDALtekETv4WVCpvfXtT3Nf3UUO/88sn4HB4h8xN1afwL48BprQ4TxH7ZUv7Ou6xgRlkAA=="; - }; - }; - "@typescript-eslint/experimental-utils-4.22.0" = { + "@typescript-eslint/experimental-utils-4.28.4" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz"; - sha512 = "xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz"; + sha512 = "OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA=="; }; }; - "@typescript-eslint/parser-4.22.0" = { + "@typescript-eslint/parser-4.28.4" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz"; - sha512 = "z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.4.tgz"; + sha512 = "4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA=="; }; }; - "@typescript-eslint/scope-manager-4.22.0" = { + "@typescript-eslint/scope-manager-4.28.4" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz"; - sha512 = "OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz"; + sha512 = "ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w=="; }; }; - "@typescript-eslint/types-4.22.0" = { + "@typescript-eslint/types-4.28.4" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz"; - sha512 = "sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.4.tgz"; + sha512 = "3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww=="; }; }; - "@typescript-eslint/typescript-estree-4.22.0" = { + "@typescript-eslint/typescript-estree-4.28.4" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz"; - sha512 = "TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz"; + sha512 = "z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ=="; }; }; - "@typescript-eslint/visitor-keys-4.22.0" = { + "@typescript-eslint/visitor-keys-4.28.4" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz"; - sha512 = "nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz"; + sha512 = "NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -418,12 +491,12 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" = { + "Slackdown-git+https://Half-Shot@github.com/half-shot/slackdown.git#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" = { name = "Slackdown"; packageName = "Slackdown"; version = "0.1.2"; src = fetchgit { - url = "git://github.com/half-shot/slackdown"; + url = "https://Half-Shot@github.com/half-shot/slackdown.git"; rev = "efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4"; sha256 = "474e972819b3e1db3af70be75966a3d501c6b9285f4550ff5548193e031eaf9b"; }; @@ -464,13 +537,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-jsx-5.3.1" = { + "acorn-jsx-5.3.2" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; }; "ajv-6.12.6" = { @@ -509,6 +582,15 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; "ansi-regex-3.0.0" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -554,6 +636,24 @@ let sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.7" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + }; + }; "arg-4.1.3" = { name = "arg"; packageName = "arg"; @@ -716,13 +816,13 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "axios-0.21.1" = { + "axios-0.21.4" = { name = "axios"; packageName = "axios"; - version = "0.21.1"; + version = "0.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"; - sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; + sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; "balanced-match-1.0.2" = { @@ -743,6 +843,15 @@ let sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA=="; }; }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; "basic-auth-2.0.1" = { name = "basic-auth"; packageName = "basic-auth"; @@ -761,6 +870,15 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "better-sqlite3-7.4.3" = { + name = "better-sqlite3"; + packageName = "better-sqlite3"; + version = "7.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.4.3.tgz"; + sha512 = "07bKjClZg/f4KMVRkzWtoIvazVPcF1gsvVKVIXlxwleC2DxuIhnra3KCMlUT1rFeRYXXckot2a46UciF2d9KLw=="; + }; + }; "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -779,6 +897,15 @@ let sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; }; }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; "bintrees-1.0.1" = { name = "bintrees"; packageName = "bintrees"; @@ -788,6 +915,24 @@ let sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; }; }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; + "bluebird-3.7.2" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; + }; + }; "body-parser-1.19.0" = { name = "body-parser"; packageName = "body-parser"; @@ -842,6 +987,15 @@ let sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a"; }; }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; "buffer-from-1.1.1" = { name = "buffer-from"; packageName = "buffer-from"; @@ -941,13 +1095,31 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; - "chokidar-3.5.1" = { + "chokidar-3.5.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; - sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; + sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; + }; + }; + "chownr-1.1.4" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + }; + }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; "cliui-7.0.4" = { @@ -959,6 +1131,15 @@ let sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; "color-3.0.0" = { name = "color"; packageName = "color"; @@ -1013,6 +1194,15 @@ let sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; + "colorette-1.4.0" = { + name = "colorette"; + packageName = "colorette"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"; + sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; + }; + }; "colors-1.3.3" = { name = "colors"; packageName = "colors"; @@ -1049,13 +1239,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "comment-parser-0.7.6" = { + "comment-parser-1.1.6-beta.0" = { name = "comment-parser"; packageName = "comment-parser"; - version = "0.7.6"; + version = "1.1.6-beta.0"; src = fetchurl { - url = "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz"; - sha512 = "GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg=="; + url = "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.6-beta.0.tgz"; + sha512 = "q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw=="; }; }; "concat-map-0.0.1" = { @@ -1067,6 +1257,15 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; "content-disposition-0.5.3" = { name = "content-disposition"; packageName = "content-disposition"; @@ -1157,6 +1356,15 @@ let sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; }; }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; "decamelize-4.0.0" = { name = "decamelize"; packageName = "decamelize"; @@ -1166,6 +1374,15 @@ let sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; }; }; + "decompress-response-4.2.1" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; + }; + }; "deep-eql-3.0.1" = { name = "deep-eql"; packageName = "deep-eql"; @@ -1175,6 +1392,15 @@ let sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; }; }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; "deep-is-0.1.3" = { name = "deep-is"; packageName = "deep-is"; @@ -1184,6 +1410,15 @@ let sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; + "deepmerge-4.2.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + }; + }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -1193,6 +1428,15 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; "depd-1.1.2" = { name = "depd"; packageName = "depd"; @@ -1220,6 +1464,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; "diff-4.0.2" = { name = "diff"; packageName = "diff"; @@ -1256,6 +1509,51 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; + "dom-serializer-1.3.2" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + }; + }; + "domelementtype-2.2.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + }; + }; + "domhandler-3.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"; + sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; + }; + }; + "domhandler-4.2.2" = { + name = "domhandler"; + packageName = "domhandler"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; + sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; + }; + }; + "domutils-2.8.0" = { + name = "domutils"; + packageName = "domutils"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -1301,6 +1599,15 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; "enquirer-2.3.6" = { name = "enquirer"; packageName = "enquirer"; @@ -1310,6 +1617,15 @@ let sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; }; }; + "entities-2.2.0" = { + name = "entities"; + packageName = "entities"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -1346,22 +1662,22 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-7.24.0" = { + "eslint-7.31.0" = { name = "eslint"; packageName = "eslint"; - version = "7.24.0"; + version = "7.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz"; - sha512 = "k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz"; + sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA=="; }; }; - "eslint-plugin-jsdoc-30.7.13" = { + "eslint-plugin-jsdoc-35.5.0" = { name = "eslint-plugin-jsdoc"; packageName = "eslint-plugin-jsdoc"; - version = "30.7.13"; + version = "35.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz"; - sha512 = "YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ=="; + url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.5.0.tgz"; + sha512 = "QBtfGeKvSFjbMLl28fRVyk/V7NhdSy+/4a6nOUXNsJ+Ya4G88YwbBiHIZgU4COeMKPb+OGGnrLwxYO0tZiw+kg=="; }; }; "eslint-plugin-prefer-arrow-1.2.3" = { @@ -1391,6 +1707,15 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; + "eslint-utils-3.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; + }; + }; "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -1499,6 +1824,15 @@ let sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; + "expand-template-2.0.3" = { + name = "expand-template"; + packageName = "expand-template"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; + }; + }; "express-4.17.1" = { name = "express"; packageName = "express"; @@ -1535,13 +1869,13 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-glob-3.2.5" = { + "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.5"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; - sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -1571,13 +1905,13 @@ let sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="; }; }; - "fastq-1.11.0" = { + "fastq-1.11.1" = { name = "fastq"; packageName = "fastq"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; - sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz"; + sha512 = "HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw=="; }; }; "fecha-4.2.0" = { @@ -1607,6 +1941,15 @@ let sha512 = "VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ=="; }; }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; "fill-range-7.0.1" = { name = "fill-range"; packageName = "fill-range"; @@ -1679,13 +2022,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.13.1" = { + "follow-redirects-1.14.4" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.13.1"; + version = "1.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz"; - sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz"; + sha512 = "zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="; }; }; "forever-agent-0.6.1" = { @@ -1733,6 +2076,24 @@ let sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1769,6 +2130,15 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -1823,13 +2193,22 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.6" = { + "github-from-package-0.0.0" = { + name = "github-from-package"; + packageName = "github-from-package"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + }; + }; + "glob-7.1.7" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; }; "glob-parent-5.1.2" = { @@ -1841,31 +2220,40 @@ let sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; - "globals-12.4.0" = { - name = "globals"; - packageName = "globals"; - version = "12.4.0"; + "glob-to-regexp-0.4.1" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; - sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; - "globals-13.8.0" = { + "globals-13.10.0" = { name = "globals"; packageName = "globals"; - version = "13.8.0"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz"; - sha512 = "rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q=="; + url = "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz"; + sha512 = "piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g=="; }; }; - "globby-11.0.3" = { + "globby-11.0.4" = { name = "globby"; packageName = "globby"; - version = "11.0.3"; + version = "11.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; - sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; + sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; + }; + }; + "graceful-fs-4.2.8" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "growl-1.10.5" = { @@ -1931,6 +2319,24 @@ let sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "hash.js-1.1.7" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -1940,6 +2346,42 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; + "html-to-text-6.0.0" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-6.0.0.tgz"; + sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA=="; + }; + }; + "htmlencode-0.0.4" = { + name = "htmlencode"; + packageName = "htmlencode"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlencode/-/htmlencode-0.0.4.tgz"; + sha1 = "f7e2d6afbe18a87a78e63ba3308e753766740e3f"; + }; + }; + "htmlparser2-4.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; + }; + }; + "htmlparser2-6.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; + }; + }; "http-errors-1.7.2" = { name = "http-errors"; packageName = "http-errors"; @@ -1967,6 +2409,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; "ignore-4.0.6" = { name = "ignore"; packageName = "ignore"; @@ -2030,6 +2481,24 @@ let sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-1.3.8" = { + name = "ini"; + packageName = "ini"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + }; "ipaddr.js-1.9.1" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -2075,6 +2544,15 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; "is-fullwidth-code-point-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -2147,6 +2625,24 @@ let sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; }; }; + "is-plain-object-5.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; + }; + }; + "is-promise-2.2.2" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; + }; + }; "is-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -2192,6 +2688,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-unicode-supported-0.1.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -2237,15 +2742,6 @@ let sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; - "js-yaml-4.0.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz"; - sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; - }; - }; "js-yaml-4.1.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -2264,13 +2760,13 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsdoctypeparser-9.0.0" = { - name = "jsdoctypeparser"; - packageName = "jsdoctypeparser"; - version = "9.0.0"; + "jsdoc-type-pratt-parser-1.0.4" = { + name = "jsdoc-type-pratt-parser"; + packageName = "jsdoc-type-pratt-parser"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz"; - sha512 = "jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw=="; + url = "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.0.4.tgz"; + sha512 = "jzmW9gokeq9+bHPDR1nCeidMyFUikdZlbOhKzh9+/nJqB75XhpNKec1/UuxW5c4+O+Pi31Gc/dCboyfSm/pSpQ=="; }; }; "json-schema-0.2.3" = { @@ -2336,6 +2832,15 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; + "klona-2.0.4" = { + name = "klona"; + packageName = "klona"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"; + sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + }; + }; "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; @@ -2381,15 +2886,6 @@ let sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; }; - "lodash-4.17.20" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.20"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; - sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; - }; - }; "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; @@ -2417,6 +2913,15 @@ let sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; }; }; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + }; "lodash.toarray-4.4.0" = { name = "lodash.toarray"; packageName = "lodash.toarray"; @@ -2435,13 +2940,13 @@ let sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; }; }; - "log-symbols-4.0.0" = { + "log-symbols-4.1.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz"; - sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; "logform-2.2.0" = { @@ -2462,6 +2967,15 @@ let sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; }; }; + "lowdb-1.0.0" = { + name = "lowdb"; + packageName = "lowdb"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz"; + sha512 = "2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -2489,13 +3003,22 @@ let sha512 = "mfgMpmV3dWLtzrd4V/3XtqUD0P44I/mTgsRreW5jMhSaUnnRGZbpptBw2q4/axbLjw2FarlWtOVgertDGMtccA=="; }; }; - "matrix-appservice-bridge-2.6.0" = { + "matrix-appservice-bridge-3.1.0" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "2.6.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.6.0.tgz"; - sha512 = "o1KHQHG1GdfUhTFBXVLztwbTowuCFO9/h8n2zdkRK/bZsdcXSFQVfUwDtRULcyinD4N7r0Lrwlg1LyR0pg2WSw=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-3.1.0.tgz"; + sha512 = "mNLWyqLigy5TboZw+EJ38mtsVlJUKa50HEjtyzx0aJLySNvnCgDFFlMahJWedOrZ3ipultnhtaRbtU1ZVsu6yA=="; + }; + }; + "matrix-bot-sdk-0.6.0-beta.2" = { + name = "matrix-bot-sdk"; + packageName = "matrix-bot-sdk"; + version = "0.6.0-beta.2"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-bot-sdk/-/matrix-bot-sdk-0.6.0-beta.2.tgz"; + sha512 = "D9aQ2++1bJIzka2uIz22HkaeyT058QGOh96xdxiDOaezyzLY5BN7ehYg+P0xRzDYDFKx9DbqDYCt97IkfahtPw=="; }; }; "matrix-js-sdk-9.11.0" = { @@ -2579,6 +3102,24 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; + "mimic-response-2.1.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; + }; + }; + "minimalistic-assert-1.0.1" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -2597,6 +3138,24 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; + "minipass-3.1.5" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; + sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + }; + }; + "minizlib-2.1.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -2606,13 +3165,31 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mocha-8.3.2" = { + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; + }; + }; + "mocha-9.0.2" = { name = "mocha"; packageName = "mocha"; - version = "8.3.2"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz"; - sha512 = "UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.0.2.tgz"; + sha512 = "FpspiWU+UT9Sixx/wKimvnpkeW0mh6ROAKkIaPokj3xZgxeRhcna/k5X57jJghEr8X+Cgu/Vegf8zCX5ugSuTA=="; }; }; "moment-2.29.1" = { @@ -2669,13 +3246,22 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "nanoid-3.1.20" = { + "nanoid-3.1.23" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.20"; + version = "3.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz"; - sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz"; + sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; + }; + }; + "napi-build-utils-1.0.2" = { + name = "napi-build-utils"; + packageName = "napi-build-utils"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; }; "natural-compare-1.4.0" = { @@ -2705,6 +3291,15 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; + "node-abi-2.30.1" = { + name = "node-abi"; + packageName = "node-abi"; + version = "2.30.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; + }; + }; "node-emoji-1.10.0" = { name = "node-emoji"; packageName = "node-emoji"; @@ -2732,6 +3327,24 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; "nunjucks-3.2.3" = { name = "nunjucks"; packageName = "nunjucks"; @@ -2750,6 +3363,15 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; "object-hash-2.1.1" = { name = "object-hash"; packageName = "object-hash"; @@ -2903,6 +3525,15 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; + "parse-srcset-1.0.2" = { + name = "parse-srcset"; + packageName = "parse-srcset"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; + sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; + }; + }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -2975,13 +3606,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.5.1" = { + "pg-8.6.0" = { name = "pg"; packageName = "pg"; - version = "8.5.1"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz"; - sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.6.0.tgz"; + sha512 = "qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ=="; }; }; "pg-connection-string-2.5.0" = { @@ -3020,13 +3651,13 @@ let sha512 = "0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg=="; }; }; - "pg-promise-10.10.1" = { + "pg-promise-10.10.2" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.10.1"; + version = "10.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.10.1.tgz"; - sha512 = "sopmuOr2PrUNh3XI0Y15ssmjcwhZnGHyGYwuDDmWFnBydq7lvrhTMBI3hefAp3YMx07+HSXfSpJse9z5vC4bsw=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.10.2.tgz"; + sha512 = "ezc5Jn2DdtYpNoDjo7v9TVQFXBEGR+tnseot8IsZ3/B4XD/CnIjyUPMfizDdbXWNO66hN8p2m8nNrcrJ8uhM/g=="; }; }; "pg-protocol-1.5.0" = { @@ -3065,6 +3696,24 @@ let sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; }; }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "postcss-8.3.6" = { + name = "postcss"; + packageName = "postcss"; + version = "8.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; + }; + }; "postgres-array-2.0.0" = { name = "postgres-array"; packageName = "postgres-array"; @@ -3101,6 +3750,15 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; + "prebuild-install-6.1.4" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; + }; + }; "prelude-ls-1.2.1" = { name = "prelude-ls"; packageName = "prelude-ls"; @@ -3155,6 +3813,15 @@ let sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -3200,13 +3867,13 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; - "quick-lru-5.1.1" = { - name = "quick-lru"; - packageName = "quick-lru"; - version = "5.1.1"; + "randombytes-2.0.3" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"; - sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz"; + sha1 = "674c99760901c3c4112771a31e521dc349cc09ec"; }; }; "randombytes-2.1.0" = { @@ -3218,13 +3885,13 @@ let sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; - "randomstring-1.1.5" = { + "randomstring-1.2.1" = { name = "randomstring"; packageName = "randomstring"; - version = "1.1.5"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/randomstring/-/randomstring-1.1.5.tgz"; - sha1 = "6df0628f75cbd5932930d9fe3ab4e956a18518c3"; + url = "https://registry.npmjs.org/randomstring/-/randomstring-1.2.1.tgz"; + sha512 = "eMnfell9XuU3jfCx3f4xCaFAt0YMFPZhx9R3PSStmLarDKg5j5vivqKhf/8pvG+VX/YkxsckHK/VPUrKa5V07A=="; }; }; "range-parser-1.2.1" = { @@ -3245,6 +3912,15 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; @@ -3263,13 +3939,13 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "readdirp-3.5.0" = { + "readdirp-3.6.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; - sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; "regenerator-runtime-0.13.7" = { @@ -3290,13 +3966,13 @@ let sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; }; }; - "regextras-0.7.1" = { + "regextras-0.8.0" = { name = "regextras"; packageName = "regextras"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz"; - sha512 = "9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w=="; + url = "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz"; + sha512 = "k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ=="; }; }; "request-2.88.2" = { @@ -3308,6 +3984,24 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; + "request-promise-4.2.6" = { + name = "request-promise"; + packageName = "request-promise"; + version = "4.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz"; + sha512 = "HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ=="; + }; + }; + "request-promise-core-1.1.4" = { + name = "request-promise-core"; + packageName = "request-promise-core"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; + }; + }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -3398,6 +4092,24 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; + "sanitize-html-2.5.1" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.1.tgz"; + sha512 = "hUITPitQk+eFNLtr4dEkaaiAJndG2YE87IOpcfBSL1XdklWgwcNDJdr9Ppe8QKL/C3jFt1xH/Mbj20e0GZQOfg=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; "semver-7.3.4" = { name = "semver"; packageName = "semver"; @@ -3407,6 +4119,15 @@ let sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; }; }; + "semver-7.3.5" = { + name = "semver"; + packageName = "semver"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + }; "send-0.17.1" = { name = "send"; packageName = "send"; @@ -3416,13 +4137,13 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "serialize-javascript-5.0.1" = { + "serialize-javascript-6.0.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; - sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; }; }; "serve-static-1.14.1" = { @@ -3434,6 +4155,15 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; "setprototypeof-1.1.1" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -3470,6 +4200,33 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; + "signal-exit-3.0.4" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz"; + sha512 = "rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="; + }; + }; + "simple-concat-1.0.1" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + }; + "simple-get-3.1.0" = { + name = "simple-get"; + packageName = "simple-get"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz"; + sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; + }; + }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -3506,6 +4263,15 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; + "source-map-js-0.6.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; + sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; + }; + }; "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; @@ -3596,6 +4362,33 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; + "stealthy-require-1.1.1" = { + name = "stealthy-require"; + packageName = "stealthy-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + }; + "steno-0.4.4" = { + name = "steno"; + packageName = "steno"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz"; + sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; "string-width-2.1.1" = { name = "string-width"; packageName = "string-width"; @@ -3632,6 +4425,15 @@ let sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; "strip-ansi-4.0.0" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -3650,6 +4452,15 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -3695,6 +4506,33 @@ let sha512 = "WMBBLuauiLXJjth35K4vOnd/xkaZ/dxEcyoZ+YhxSwfxFqvh+av06+oRqIwbR14m1lENB1egSWOFv/bNEt2D8A=="; }; }; + "tar-6.1.11" = { + name = "tar"; + packageName = "tar"; + version = "6.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + }; + }; + "tar-fs-2.1.1" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; + }; + }; + "tar-stream-2.2.0" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; + }; + }; "tdigest-0.1.1" = { name = "tdigest"; packageName = "tdigest"; @@ -3758,13 +4596,13 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-9.1.1" = { + "ts-node-10.1.0" = { name = "ts-node"; packageName = "ts-node"; - version = "9.1.1"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz"; - sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz"; + sha512 = "6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA=="; }; }; "tslib-1.14.1" = { @@ -3830,15 +4668,6 @@ let sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; }; - "type-fest-0.8.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; - sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; - }; - }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -3848,13 +4677,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.2.4" = { + "typescript-4.4.3" = { name = "typescript"; packageName = "typescript"; - version = "4.2.4"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz"; - sha512 = "V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; + sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; }; }; "underscore-1.4.4" = { @@ -3983,13 +4812,13 @@ let sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-daily-rotate-file-4.5.2" = { + "winston-daily-rotate-file-4.5.5" = { name = "winston-daily-rotate-file"; packageName = "winston-daily-rotate-file"; - version = "4.5.2"; + version = "4.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.2.tgz"; - sha512 = "DpAz9djExzFGVGRIKCKzsjOQaIINbjOUJ8CRsZGz0SQOMMcO1kM7jqTdzQAM9CRTEksZV9bBw9TT0ddQBGxs9g=="; + url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.5.tgz"; + sha512 = "ds0WahIjiDhKCiMXmY799pDBW+58ByqIBtUcsqr4oDoXrAI3Zn+hbgFdUxzMfqA93OG0mPLYVMiotqTgE/WeWQ=="; }; }; "winston-transport-4.4.0" = { @@ -4010,13 +4839,13 @@ let sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; - "workerpool-6.1.0" = { + "workerpool-6.1.5" = { name = "workerpool"; packageName = "workerpool"; - version = "6.1.0"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz"; - sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz"; + sha512 = "XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw=="; }; }; "wrap-ansi-7.0.0" = { @@ -4037,13 +4866,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-5.2.2" = { + "ws-5.2.3" = { name = "ws"; packageName = "ws"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; + sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; }; }; "xtend-4.0.2" = { @@ -4055,13 +4884,13 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-5.0.5" = { + "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; - version = "5.0.5"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz"; - sha512 = "hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="; + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; }; "yallist-4.0.0" = { @@ -4082,6 +4911,15 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; + "yargs-17.2.1" = { + name = "yargs"; + packageName = "yargs"; + version = "17.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz"; + sha512 = "XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q=="; + }; + }; "yargs-parser-20.2.4" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -4122,9 +4960,10 @@ let args = { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.8.0"; + version = "1.9.0"; src = ./.; dependencies = [ + sources."@alloc/quick-lru-5.2.0" sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.13.10" // { @@ -4135,18 +4974,25 @@ let }) sources."@babel/runtime-7.13.10" sources."@dabh/diagnostics-2.0.2" - (sources."@eslint/eslintrc-0.4.0" // { + sources."@es-joy/jsdoccomment-0.9.0-alpha.1" + (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ - sources."debug-4.3.1" - sources."globals-12.4.0" - sources."ignore-4.0.6" + sources."debug-4.3.2" sources."js-yaml-3.14.1" sources."ms-2.1.2" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + (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."@matrix-org/olm-https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@slack/logger-2.0.0" (sources."@slack/rtm-api-5.0.5" // { dependencies = [ @@ -4154,71 +5000,83 @@ let ]; }) sources."@slack/types-1.10.0" - (sources."@slack/web-api-5.15.0" // { - dependencies = [ - sources."axios-0.21.1" - ]; - }) + sources."@slack/web-api-5.15.0" + sources."@tsconfig/node10-1.0.8" + sources."@tsconfig/node12-1.0.9" + sources."@tsconfig/node14-1.0.1" + sources."@tsconfig/node16-1.0.1" sources."@types/body-parser-1.19.0" - sources."@types/chai-4.2.16" + sources."@types/chai-4.2.21" sources."@types/connect-3.4.34" - sources."@types/express-4.17.11" + sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.19" sources."@types/is-stream-1.1.0" - sources."@types/js-yaml-4.0.0" - sources."@types/json-schema-7.0.7" + sources."@types/js-yaml-4.0.2" + sources."@types/json-schema-7.0.8" sources."@types/mime-1.3.2" - sources."@types/mocha-8.2.2" - sources."@types/nedb-1.8.11" - sources."@types/node-14.14.41" + sources."@types/mocha-8.2.3" + sources."@types/nedb-1.8.12" + sources."@types/node-12.20.16" sources."@types/node-emoji-1.8.1" - sources."@types/nunjucks-3.1.4" + sources."@types/nunjucks-3.1.5" sources."@types/p-queue-2.3.2" sources."@types/qs-6.9.6" - sources."@types/randomstring-1.1.6" + sources."@types/randomstring-1.1.7" sources."@types/range-parser-1.2.3" sources."@types/retry-0.12.0" sources."@types/serve-static-1.13.9" - sources."@types/uuid-8.3.0" + sources."@types/uuid-8.3.1" sources."@types/ws-7.2.6" - sources."@types/yargs-15.0.13" - sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-4.22.0" // { + sources."@types/yargs-17.0.3" + sources."@types/yargs-parser-20.2.1" + (sources."@typescript-eslint/eslint-plugin-4.28.4" // { + dependencies = [ + sources."debug-4.3.1" + sources."ms-2.1.2" + sources."semver-7.3.5" + ]; + }) + (sources."@typescript-eslint/experimental-utils-4.28.4" // { + dependencies = [ + sources."eslint-utils-3.0.0" + ]; + }) + (sources."@typescript-eslint/parser-4.28.4" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/eslint-plugin-tslint-4.22.0" - sources."@typescript-eslint/experimental-utils-4.22.0" - (sources."@typescript-eslint/parser-4.22.0" // { + sources."@typescript-eslint/scope-manager-4.28.4" + sources."@typescript-eslint/types-4.28.4" + (sources."@typescript-eslint/typescript-estree-4.28.4" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" + sources."semver-7.3.5" ]; }) - sources."@typescript-eslint/scope-manager-4.22.0" - sources."@typescript-eslint/types-4.22.0" - (sources."@typescript-eslint/typescript-estree-4.22.0" // { - dependencies = [ - sources."debug-4.3.1" - sources."ms-2.1.2" - ]; - }) - sources."@typescript-eslint/visitor-keys-4.22.0" + sources."@typescript-eslint/visitor-keys-4.28.4" sources."@ungap/promise-all-settled-1.1.2" - sources."Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" + sources."Slackdown-git+https://Half-Shot@github.com/half-shot/slackdown.git#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."another-json-0.2.0" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.7" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" @@ -4235,20 +5093,30 @@ let sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.21.1" + sources."axios-0.21.4" sources."balanced-match-1.0.2" sources."base-x-3.0.8" + sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" + sources."better-sqlite3-7.4.3" sources."binary-extensions-2.2.0" sources."binary-search-tree-0.2.5" + sources."bindings-1.5.0" sources."bintrees-1.0.1" + (sources."bl-4.1.0" // { + dependencies = [ + sources."inherits-2.0.4" + ]; + }) + sources."bluebird-3.7.2" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-request-0.3.3" sources."browser-stdout-1.3.1" sources."bs58-4.0.1" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."buffer-writer-2.0.0" sources."bytes-3.1.0" @@ -4267,17 +5135,22 @@ let ]; }) sources."check-error-1.0.2" - sources."chokidar-3.5.1" + sources."chokidar-3.5.2" + sources."chownr-2.0.0" + sources."cliui-7.0.4" + sources."code-point-at-1.1.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" + sources."colorette-1.4.0" sources."colors-1.3.3" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" sources."commander-5.1.0" - sources."comment-parser-0.7.6" + sources."comment-parser-1.1.6-beta.0" sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."cookie-0.4.0" @@ -4288,36 +5161,54 @@ let sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-4.0.0" + sources."decompress-response-4.2.1" sources."deep-eql-3.0.1" + sources."deep-extend-0.6.0" sources."deep-is-0.1.3" + sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" + sources."detect-libc-1.0.3" sources."diff-4.0.2" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" + (sources."dom-serializer-1.3.2" // { + dependencies = [ + sources."domhandler-4.2.2" + ]; + }) + sources."domelementtype-2.2.0" + sources."domhandler-3.3.0" + (sources."domutils-2.8.0" // { + dependencies = [ + sources."domhandler-4.2.2" + ]; + }) sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" + sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.24.0" // { + (sources."eslint-7.31.0" // { dependencies = [ sources."debug-4.3.1" - sources."ignore-4.0.6" sources."js-yaml-3.14.1" - sources."lodash-4.17.21" sources."ms-2.1.2" ]; }) - (sources."eslint-plugin-jsdoc-30.7.13" // { + (sources."eslint-plugin-jsdoc-35.5.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" + sources."semver-7.3.5" ]; }) sources."eslint-plugin-prefer-arrow-1.2.3" @@ -4348,17 +5239,19 @@ let sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-3.1.2" + sources."expand-template-2.0.3" sources."express-4.17.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.6" - sources."fastq-1.11.0" + sources."fastq-1.11.1" sources."file-entry-cache-6.0.1" sources."file-stream-rotator-0.5.7" + sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-up-5.0.0" @@ -4367,45 +5260,69 @@ let sources."flat-cache-3.0.4" sources."flatted-3.1.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.14.4" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.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" + ]; + }) sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-func-name-2.0.0" sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."github-from-package-0.0.0" + sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.8.0" // { + sources."glob-to-regexp-0.4.1" + (sources."globals-13.10.0" // { dependencies = [ sources."type-fest-0.20.2" ]; }) - sources."globby-11.0.3" + (sources."globby-11.0.4" // { + dependencies = [ + sources."ignore-5.1.8" + ]; + }) + sources."graceful-fs-4.2.8" sources."growl-1.10.5" 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-symbols-1.0.2" + sources."has-unicode-2.0.1" + sources."hash.js-1.1.7" sources."he-1.2.0" + sources."html-to-text-6.0.0" + sources."htmlencode-0.0.4" + sources."htmlparser2-4.1.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ignore-5.1.8" + sources."ieee754-1.2.1" + sources."ignore-4.0.6" sources."immediate-3.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.8" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" @@ -4418,10 +5335,13 @@ let sources."is-number-7.0.0" sources."is-number-object-1.0.4" sources."is-plain-obj-2.1.0" + sources."is-plain-object-5.0.0" + sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-string-1.0.5" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -4432,24 +5352,26 @@ let ]; }) sources."jsbn-0.1.1" - sources."jsdoctypeparser-9.0.0" + sources."jsdoc-type-pratt-parser-1.0.4" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonpointer-4.1.0" sources."jsprim-1.4.1" + sources."klona-2.0.4" sources."kuler-2.0.0" sources."levn-0.4.1" sources."lie-3.1.1" sources."localforage-1.7.3" sources."locate-path-6.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" sources."lodash.flatten-4.4.0" + sources."lodash.merge-4.6.2" sources."lodash.toarray-4.4.0" sources."lodash.truncate-4.4.2" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" (sources."logform-2.2.0" // { dependencies = [ sources."fecha-4.2.0" @@ -4457,15 +5379,23 @@ let ]; }) sources."loglevel-1.7.1" + sources."lowdb-1.0.0" sources."lru-cache-6.0.0" sources."make-error-1.3.6" - (sources."matrix-appservice-0.8.0" // { + (sources."matrix-appservice-bridge-3.1.0" // { dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" + (sources."matrix-appservice-0.8.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + ]; + }) + ]; + }) + (sources."matrix-bot-sdk-0.6.0-beta.2" // { + dependencies = [ + sources."mkdirp-1.0.4" ]; }) - sources."matrix-appservice-bridge-2.6.0" (sources."matrix-js-sdk-9.11.0" // { dependencies = [ sources."qs-6.10.1" @@ -4479,12 +5409,16 @@ let sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" + sources."mimic-response-2.1.0" + sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" + sources."minipass-3.1.5" + sources."minizlib-2.1.2" sources."mkdirp-0.5.5" - (sources."mocha-8.3.2" // { + sources."mkdirp-classic-0.5.3" + (sources."mocha-9.0.2" // { dependencies = [ - sources."argparse-2.0.1" (sources."debug-4.3.1" // { dependencies = [ sources."ms-2.1.2" @@ -4492,9 +5426,9 @@ let }) sources."diff-5.0.0" sources."has-flag-4.0.0" - sources."js-yaml-4.0.0" sources."ms-2.1.3" sources."supports-color-8.1.1" + sources."yargs-16.2.0" ]; }) sources."moment-2.29.1" @@ -4504,15 +5438,24 @@ let ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.20" + sources."nanoid-3.1.23" + sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" + (sources."node-abi-2.30.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."node-emoji-1.10.0" sources."nopt-5.0.0" sources."normalize-path-3.0.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."nunjucks-3.2.3" sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."object-hash-2.1.1" sources."object-inspect-1.9.0" sources."on-finished-2.3.0" @@ -4533,6 +5476,7 @@ let sources."p-timeout-3.2.0" sources."packet-reader-1.0.0" sources."parent-module-1.0.1" + sources."parse-srcset-1.0.2" sources."parseurl-1.3.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -4541,39 +5485,47 @@ let sources."path-type-4.0.0" sources."pathval-1.1.1" sources."performance-now-2.1.0" - sources."pg-8.5.1" + sources."pg-8.6.0" sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" sources."pg-pool-3.3.0" - sources."pg-promise-10.10.1" + sources."pg-promise-10.10.2" sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" sources."picomatch-2.2.3" + sources."pify-3.0.0" + sources."postcss-8.3.6" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" + sources."prebuild-install-6.1.4" sources."prelude-ls-1.2.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."prom-client-13.1.0" sources."proxy-addr-2.0.6" sources."psl-1.8.0" + sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - sources."randombytes-2.1.0" - sources."randomstring-1.1.5" + sources."randombytes-2.0.3" + sources."randomstring-1.2.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" + (sources."rc-1.2.8" // { + dependencies = [ + sources."strip-json-comments-2.0.1" + ]; + }) sources."readable-stream-3.6.0" - sources."readdirp-3.5.0" + sources."readdirp-3.6.0" sources."regenerator-runtime-0.13.7" sources."regexpp-3.1.0" - sources."regextras-0.7.1" + sources."regextras-0.8.0" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" @@ -4581,6 +5533,8 @@ let sources."uuid-3.4.0" ]; }) + sources."request-promise-4.2.6" + sources."request-promise-core-1.1.4" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."resolve-from-4.0.0" @@ -4590,18 +5544,32 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + (sources."sanitize-html-2.5.1" // { + dependencies = [ + sources."domhandler-4.2.2" + sources."htmlparser2-6.1.0" + ]; + }) sources."semver-7.3.4" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" ]; }) - sources."serialize-javascript-5.0.1" + (sources."serialize-javascript-6.0.0" // { + dependencies = [ + sources."randombytes-2.1.0" + ]; + }) sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" + sources."signal-exit-3.0.4" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -4612,6 +5580,7 @@ let ]; }) sources."source-map-0.6.1" + sources."source-map-js-0.6.2" sources."source-map-support-0.5.19" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -4622,6 +5591,8 @@ let sources."sshpk-1.16.1" sources."stack-trace-0.0.10" sources."statuses-1.5.0" + sources."stealthy-require-1.1.1" + sources."steno-0.4.4" sources."string-width-4.2.0" (sources."string_decoder-1.3.0" // { dependencies = [ @@ -4637,6 +5608,17 @@ let sources."json-schema-traverse-1.0.0" ]; }) + (sources."tar-6.1.11" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) + (sources."tar-fs-2.1.1" // { + dependencies = [ + sources."chownr-1.1.4" + ]; + }) + sources."tar-stream-2.2.0" sources."tdigest-0.1.1" sources."text-hex-1.0.0" sources."text-table-0.2.0" @@ -4644,16 +5626,15 @@ let sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."triple-beam-1.3.0" - sources."ts-node-9.1.1" + sources."ts-node-10.1.0" sources."tslib-1.14.1" sources."tsutils-3.21.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" sources."type-detect-4.0.8" - sources."type-fest-0.8.1" sources."type-is-1.6.18" - sources."typescript-4.2.4" + sources."typescript-4.4.3" sources."underscore-1.4.4" sources."unhomoglyph-1.0.6" sources."unpipe-1.0.0" @@ -4677,15 +5658,9 @@ let dependencies = [ sources."async-3.2.0" sources."is-stream-2.0.0" - sources."string_decoder-1.1.1" - (sources."winston-transport-4.4.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - ]; - }) ]; }) - sources."winston-daily-rotate-file-4.5.2" + sources."winston-daily-rotate-file-4.5.5" (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -4693,22 +5668,20 @@ let ]; }) sources."word-wrap-1.2.3" - sources."workerpool-6.1.0" - sources."wrappy-1.0.2" - sources."ws-5.2.2" - sources."xtend-4.0.2" - sources."yallist-4.0.0" - (sources."yargs-16.2.0" // { + sources."workerpool-6.1.5" + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.5" - sources."yargs-parser-20.2.4" ]; }) + sources."wrappy-1.0.2" + sources."ws-5.2.3" + sources."xtend-4.0.2" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + sources."yargs-17.2.1" sources."yargs-parser-20.2.4" sources."yargs-unparser-2.0.0" sources."yn-3.1.1" diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 02d6fd78285d..520f5e5a3742 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.30"; + version = "0.31"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9e7c2e2540fb786c1064a9a2bfe6ef3ec8b0ed27f6fd6beda80ed615c72a6103"; + sha256 = "1098a5248a1e2de53ced3c699b3b78ced3327c5f4e0ff092a95ef4940e4f9c6e"; }; postPatch = '' diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 14996cecc659..4bf4a41234c8 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,23 +1,24 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: +{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoModule, buildEnv }: let - version = "5.32.1"; + version = "5.37.2"; - mattermost-server = buildGoPackage rec { + mattermost-server = buildGoModule rec { pname = "mattermost-server"; inherit version; src = fetchFromGitHub { owner = "mattermost"; - repo = "mattermost-server"; + repo = pname; rev = "v${version}"; - sha256 = "BssrTfkIxUbXYXIfz9i+5b4rEYSzBim+/riK78m8Bxo="; + sha256 = "sha256-kO5wSj/ApPhS2k9a9VjS3Qk55azNZeiFmevAxSkdGe0="; }; - goPackagePath = "github.com/mattermost/mattermost-server"; + vendorSha256 = null; + doCheck = false; ldflags = [ - "-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}" + "-s" "-w" "-X github.com/mattermost/mattermost-server/v${lib.versions.major version}/model.BuildNumber=${version}" ]; }; @@ -28,7 +29,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "kRerl3fYRTrotj86AIFSor3GpjhABkCmego1ms9HmkQ="; + sha256 = "sha256-BzQVkOPo/f6O2ncQ0taS3cZkglOL+D+zBcfNYrpMgTM="; }; installPhase = '' diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index e67a23f13450..bf5ca7233a03 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -4,19 +4,19 @@ # * Download the tarball of the new version to use. # * Remove the `resolutions`-section from upstream `package.json` # as this breaks with `yarn2nix`. -# * Regenerate `yarn.lock` and `yarn2nix`. +# * Regenerate `yarn.lock` and `yarn2nix --no-patch`. # * Replace new `package.json`, `yarn.nix`, `yarn.lock` here. # * Update `version`+`hash` and rebuild. mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-PEi8jreYCafKBa8M5Mo6/g03pS1PHvmhgMpuwIlUePY="; + sha256 = "sha256-1xHRfEjtxiXXRt6Rpl4j8xxTQ6qXG4/ps885CLc35OQ="; }; buildPhase = '' diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 1cd26f57b9fa..335f641ed26c 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -8,7 +8,7 @@ "url": "http://github.com/grafana/grafana-image-renderer.git" }, "scripts": { - "eslint": "eslint -c eslint.json", + "eslint": "eslint . --ext .ts", "typecheck": "tsc --noEmit", "prettier:check": "prettier --list-different \"**/*.ts\"", "prettier:write": "prettier --list-different \"**/*.ts\" --write", @@ -22,7 +22,6 @@ "@grpc/proto-loader": "^0.5.4", "@hapi/boom": "^9.1.0", "chokidar": "^3.5.2", - "eslint": "^7.13.0", "express": "^4.16.3", "express-prom-bundle": "^5.1.5", "google-protobuf": "3.5.0", @@ -37,11 +36,20 @@ "winston": "^3.2.1" }, "devDependencies": { + "@grafana/eslint-config": "^2.5.0", "@types/express": "^4.11.1", "@types/node": "^14.14.41", + "@typescript-eslint/eslint-plugin": "^4.32.0", + "@typescript-eslint/parser": "^4.32.0", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-jsdoc": "^36.1.0", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-react": "^7.26.1", + "eslint-plugin-react-hooks": "^4.2.0", "husky": "^4.3.8", - "lint-staged": "^9.5.0", - "pkg": "^5.1.0", + "lint-staged": "^11.2.0", + "pkg": "^5.3.3", "prettier": "2.2.1", "tsc-watch": "^4.2.3", "typescript": "^4.3.2" @@ -53,8 +61,7 @@ }, "lint-staged": { "*.ts": [ - "prettier --write", - "git add" + "prettier --write" ] }, "pkg": { diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index b58c74f73eee..19a7f5edafb0 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -10,23 +10,23 @@ "@babel/highlight" "^7.10.4" "@babel/code-frame@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503" + integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg== dependencies: - "@babel/highlight" "^7.12.13" + "@babel/highlight" "^7.14.5" -"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" - integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== +"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.5": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== -"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" - integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== +"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== dependencies: - "@babel/helper-validator-identifier" "^7.14.0" + "@babel/helper-validator-identifier" "^7.14.5" chalk "^2.0.0" js-tokens "^4.0.0" @@ -53,25 +53,50 @@ enabled "2.0.x" kuler "^2.0.0" -"@eslint/eslintrc@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" - integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== +"@es-joy/jsdoccomment@0.10.8": + version "0.10.8" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz#b3152887e25246410ed4ea569a55926ec13b2b05" + integrity sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ== + dependencies: + comment-parser "1.2.4" + esquery "^1.4.0" + jsdoc-type-pratt-parser "1.1.1" + +"@eslint/eslintrc@^0.4.0", "@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@grafana/eslint-config@^2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.0.tgz#d028898e201f242748a94d5582f0e14a493f5853" + integrity sha512-JHckBXfUoGYXT18br2n2nTqo4eX7V51/Ec4Y2I7ALh5XsW6OnO+/1AAPymE2J/4WGt3IocW7vJoNV2GRW1JSQg== + dependencies: + "@typescript-eslint/eslint-plugin" "4.28.0" + "@typescript-eslint/parser" "4.28.0" + eslint "7.21.0" + eslint-config-prettier "7.2.0" + eslint-plugin-jsdoc "31.6.1" + eslint-plugin-prettier "3.3.1" + eslint-plugin-react "7.22.0" + eslint-plugin-react-hooks "4.2.0" + prettier "2.2.1" + typescript "4.3.4" + "@grpc/grpc-js@^1.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.0.tgz#c6febaaf00ce7f53b5ec52c7cf3e2a4725b82bcb" - integrity sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q== + version "1.3.7" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.7.tgz#58b687aff93b743aafde237fd2ee9a3259d7f2d8" + integrity sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA== dependencies: "@types/node" ">=12.12.47" @@ -84,36 +109,50 @@ protobufjs "^6.8.6" "@hapi/boom@^9.1.0": - version "9.1.2" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.2.tgz#48bd41d67437164a2d636e3b5bc954f8c8dc5e38" - integrity sha512-uJEJtiNHzKw80JpngDGBCGAmWjBtzxDCz17A9NO2zCi8LLBlb5Frpq4pXwyN+2JQMod4pKz5BALwyneCgDg89Q== + version "9.1.4" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6" + integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw== dependencies: "@hapi/hoek" "9.x.x" "@hapi/hoek@9.x.x": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" - integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug== + version "9.2.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== -"@nodelib/fs.scandir@2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" - integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== dependencies: - "@nodelib/fs.stat" "2.0.4" + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" + integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" - integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" - integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: - "@nodelib/fs.scandir" "2.1.4" + "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": @@ -169,54 +208,44 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= -"@samverschueren/stream-to-observable@^0.3.0": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301" - integrity sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ== - dependencies: - any-observable "^0.3.0" - "@types/body-parser@*": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" - integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== + version "1.19.1" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" + integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== dependencies: "@types/connect" "*" "@types/node" "*" "@types/connect@*": - version "3.4.34" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901" - integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ== + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== dependencies: "@types/node" "*" "@types/express-serve-static-core@^4.17.18": - version "4.17.19" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d" - integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA== + version "4.17.24" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" + integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/express@^4.11.1": - version "4.17.11" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545" - integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg== + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "^4.17.18" "@types/qs" "*" "@types/serve-static" "*" -"@types/glob@^7.1.1": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" - integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" +"@types/json-schema@^7.0.7": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== "@types/long@^4.0.1": version "4.0.1" @@ -228,20 +257,15 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== -"@types/minimatch@*": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" - integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== - "@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": - version "15.0.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" - integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== + version "16.10.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.3.tgz#7a8f2838603ea314d1d22bb3171d899e15c57bd5" + integrity sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ== "@types/node@^14.14.41": - version "14.14.44" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" - integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== + version "14.17.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz#6359d8cf73481e312a43886fa50afc70ce5592c6" + integrity sha512-zv8ukKci1mrILYiQOwGSV4FpkZhyxQtuFWGya2GujWg+zVAeRQ4qbaMmWp9vb9889CFA8JECH7lkwCL6Ygg8kA== "@types/parse-json@^4.0.0": version "4.0.0" @@ -249,30 +273,169 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/qs@*": - version "6.9.6" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1" - integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA== + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== "@types/range-parser@*": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" - integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== "@types/serve-static@*": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e" - integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA== + version "1.13.10" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== dependencies: "@types/mime" "^1" "@types/node" "*" "@types/yauzl@^2.9.1": - version "2.9.1" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af" - integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA== + version "2.9.2" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a" + integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA== dependencies: "@types/node" "*" +"@typescript-eslint/eslint-plugin@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz#1a66f03b264844387beb7dc85e1f1d403bd1803f" + integrity sha512-KcF6p3zWhf1f8xO84tuBailV5cN92vhS+VT7UJsPzGBm9VnQqfI9AsiMUFUCYHTYPg1uCCo+HyiDnpDuvkAMfQ== + dependencies: + "@typescript-eslint/experimental-utils" "4.28.0" + "@typescript-eslint/scope-manager" "4.28.0" + debug "^4.3.1" + functional-red-black-tree "^1.0.1" + regexpp "^3.1.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/eslint-plugin@^4.32.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" + integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg== + dependencies: + "@typescript-eslint/experimental-utils" "4.33.0" + "@typescript-eslint/scope-manager" "4.33.0" + debug "^4.3.1" + functional-red-black-tree "^1.0.1" + ignore "^5.1.8" + regexpp "^3.1.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/experimental-utils@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz#13167ed991320684bdc23588135ae62115b30ee0" + integrity sha512-9XD9s7mt3QWMk82GoyUpc/Ji03vz4T5AYlHF9DcoFNfJ/y3UAclRsfGiE2gLfXtyC+JRA3trR7cR296TEb1oiQ== + dependencies: + "@types/json-schema" "^7.0.7" + "@typescript-eslint/scope-manager" "4.28.0" + "@typescript-eslint/types" "4.28.0" + "@typescript-eslint/typescript-estree" "4.28.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + +"@typescript-eslint/experimental-utils@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd" + integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q== + dependencies: + "@types/json-schema" "^7.0.7" + "@typescript-eslint/scope-manager" "4.33.0" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/typescript-estree" "4.33.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + +"@typescript-eslint/parser@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.0.tgz#2404c16751a28616ef3abab77c8e51d680a12caa" + integrity sha512-7x4D22oPY8fDaOCvkuXtYYTQ6mTMmkivwEzS+7iml9F9VkHGbbZ3x4fHRwxAb5KeuSkLqfnYjs46tGx2Nour4A== + dependencies: + "@typescript-eslint/scope-manager" "4.28.0" + "@typescript-eslint/types" "4.28.0" + "@typescript-eslint/typescript-estree" "4.28.0" + debug "^4.3.1" + +"@typescript-eslint/parser@^4.32.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899" + integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA== + dependencies: + "@typescript-eslint/scope-manager" "4.33.0" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/typescript-estree" "4.33.0" + debug "^4.3.1" + +"@typescript-eslint/scope-manager@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz#6a3009d2ab64a30fc8a1e257a1a320067f36a0ce" + integrity sha512-eCALCeScs5P/EYjwo6se9bdjtrh8ByWjtHzOkC4Tia6QQWtQr3PHovxh3TdYTuFcurkYI4rmFsRFpucADIkseg== + dependencies: + "@typescript-eslint/types" "4.28.0" + "@typescript-eslint/visitor-keys" "4.28.0" + +"@typescript-eslint/scope-manager@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3" + integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ== + dependencies: + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/visitor-keys" "4.33.0" + +"@typescript-eslint/types@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.0.tgz#a33504e1ce7ac51fc39035f5fe6f15079d4dafb0" + integrity sha512-p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA== + +"@typescript-eslint/types@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" + integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== + +"@typescript-eslint/typescript-estree@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz#e66d4e5aa2ede66fec8af434898fe61af10c71cf" + integrity sha512-m19UQTRtxMzKAm8QxfKpvh6OwQSXaW1CdZPoCaQuLwAq7VZMNuhJmZR4g5281s2ECt658sldnJfdpSZZaxUGMQ== + dependencies: + "@typescript-eslint/types" "4.28.0" + "@typescript-eslint/visitor-keys" "4.28.0" + debug "^4.3.1" + globby "^11.0.3" + is-glob "^4.0.1" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/typescript-estree@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609" + integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA== + dependencies: + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/visitor-keys" "4.33.0" + debug "^4.3.1" + globby "^11.0.3" + is-glob "^4.0.1" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/visitor-keys@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz#255c67c966ec294104169a6939d96f91c8a89434" + integrity sha512-PjJyTWwrlrvM5jazxYF5ZPs/nl0kHDZMVbuIcbpawVXaDPelp3+S9zpOz5RmVUfS/fD5l5+ZXNKnWhNYjPzCvw== + dependencies: + "@typescript-eslint/types" "4.28.0" + eslint-visitor-keys "^2.0.0" + +"@typescript-eslint/visitor-keys@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd" + integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg== + dependencies: + "@typescript-eslint/types" "4.33.0" + eslint-visitor-keys "^2.0.0" + accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -282,9 +445,9 @@ accepts@~1.3.7: negotiator "0.6.2" acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn@^7.4.0: version "7.4.1" @@ -317,9 +480,9 @@ ajv@^6.10.0, ajv@^6.12.4: uri-js "^4.2.2" ajv@^8.0.1: - version "8.2.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" - integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== + version "8.6.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" + integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -331,10 +494,12 @@ ansi-colors@^4.1.1: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== -ansi-escapes@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" - integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== +ansi-escapes@^4.3.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== + dependencies: + type-fest "^0.21.3" ansi-regex@^2.0.0: version "2.1.1" @@ -346,15 +511,10 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.1: version "3.2.1" @@ -370,11 +530,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -any-observable@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" - integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== - anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" @@ -389,9 +544,9 @@ aproba@^1.0.3: integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== dependencies: delegates "^1.0.0" readable-stream "^2.0.6" @@ -408,33 +563,46 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= +array-includes@^3.1.1, array-includes@^3.1.3: + version "3.1.4" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" + integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + get-intrinsic "^1.1.1" + is-string "^1.0.7" + array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== +array.prototype.flatmap@^1.2.3, array.prototype.flatmap@^1.2.4: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" + integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.19.0" + astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== async@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== + version "3.2.1" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" + integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== at-least-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -axios@^0.21.1: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -520,42 +688,20 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -caller-callsite@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: - callsites "^2.0.0" - -caller-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= - dependencies: - caller-callsite "^2.0.0" - -callsites@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= + function-bind "^1.1.1" + get-intrinsic "^1.0.2" callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -chalk@^1.0.0, chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -565,9 +711,9 @@ chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: supports-color "^5.3.0" chalk@^4.0.0, chalk@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -602,20 +748,20 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-cursor@^2.0.0, cli-cursor@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== dependencies: - restore-cursor "^2.0.0" + restore-cursor "^3.1.0" -cli-truncate@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" - integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= +cli-truncate@2.1.0, cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== dependencies: - slice-ansi "0.0.4" - string-width "^1.0.1" + slice-ansi "^3.0.0" + string-width "^4.2.0" cliui@^7.0.2: version "7.0.4" @@ -656,9 +802,9 @@ color-name@^1.0.0, color-name@~1.1.4: integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== color-string@^1.5.2: - version "1.5.5" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" - integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== + version "1.6.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" + integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" @@ -671,6 +817,11 @@ color@3.0.x: color-convert "^1.9.1" color-string "^1.5.2" +colorette@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" + integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== + colors@^1.2.1: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -684,10 +835,20 @@ colorspace@1.1.x: color "3.0.x" text-hex "1.0.x" -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz#37fe2bde301d87d47a53adeff8b5915db1381ca8" + integrity sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA== + +comment-parser@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.2.tgz#e5317d7a2ec22b470dcb54a29b25426c30bf39d8" + integrity sha512-AOdq0i8ghZudnYv8RUnHrhTgafUGs61Rdz9jemU5x2lnZwAWyOq7vySo626K59e1fVKH1xSRorJwPVRLSWOoAQ== + +comment-parser@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz#489f3ee55dfd184a6e4bffb31baba284453cb760" + integrity sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw== compare-versions@^3.6.0: version "3.6.0" @@ -727,24 +888,14 @@ cookie@0.4.0: integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cosmiconfig@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" - integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== - dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.13.1" - parse-json "^4.0.0" - -cosmiconfig@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" - integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== +cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== dependencies: "@types/parse-json" "^4.0.0" import-fresh "^3.2.1" @@ -752,7 +903,7 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" -cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -761,11 +912,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -date-fns@^1.27.2: - version "1.30.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" - integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== - debug@2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -773,7 +919,14 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4, debug@4.3.1, debug@^4.0.1, debug@^4.1.1: +debug@4, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + +debug@4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -787,34 +940,22 @@ decompress-response@^4.2.0: dependencies: mimic-response "^2.0.0" -dedent@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= - deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deep-is@^0.1.3, deep-is@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -del@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7" - integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA== +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== dependencies: - globby "^10.0.1" - graceful-fs "^4.2.2" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.1" - p-map "^3.0.0" - rimraf "^3.0.0" - slash "^3.0.0" + object-keys "^1.0.12" delegates@^1.0.0: version "1.0.0" @@ -841,10 +982,10 @@ detect-libc@^1.0.3: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= -devtools-protocol@0.0.883894: - version "0.0.883894" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.883894.tgz#d403f2c75cd6d71c916aee8dde9258da988a4da9" - integrity sha512-33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg== +devtools-protocol@0.0.901419: + version "0.0.901419" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd" + integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ== dir-glob@^3.0.1: version "3.0.1" @@ -853,6 +994,13 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -870,11 +1018,6 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -elegant-spinner@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" - integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -897,7 +1040,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enquirer@^2.3.5: +enquirer@^2.3.5, enquirer@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== @@ -911,6 +1054,41 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +es-abstract@^1.19.0, es-abstract@^1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" + has "^1.0.3" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + is-callable "^1.2.4" + is-negative-zero "^2.0.1" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.1" + is-string "^1.0.7" + is-weakref "^1.0.1" + object-inspect "^1.11.0" + object-keys "^1.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -921,11 +1099,16 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -938,6 +1121,100 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" +eslint-config-prettier@7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9" + integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg== + +eslint-config-prettier@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" + integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== + +eslint-plugin-jsdoc@31.6.1: + version "31.6.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-31.6.1.tgz#98040c801500572fff71c984a097d89946f1e450" + integrity sha512-5hCV3u+1VSEUMyfdTl+dpWsioD7tqQr2ILQw+KbXrF42AVxCLO8gnNLR6zDCDjqGGpt79V1sgY0RRchCWuCigg== + dependencies: + comment-parser "1.1.2" + debug "^4.3.1" + jsdoctypeparser "^9.0.0" + lodash "^4.17.20" + regextras "^0.7.1" + semver "^7.3.4" + spdx-expression-parse "^3.0.1" + +eslint-plugin-jsdoc@^36.1.0: + version "36.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz#124cd0e53a5d07f01ebde916a96dd1a6009625d6" + integrity sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ== + dependencies: + "@es-joy/jsdoccomment" "0.10.8" + comment-parser "1.2.4" + debug "^4.3.2" + esquery "^1.4.0" + jsdoc-type-pratt-parser "^1.1.1" + lodash "^4.17.21" + regextras "^0.8.0" + semver "^7.3.5" + spdx-expression-parse "^3.0.1" + +eslint-plugin-prettier@3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7" + integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ== + dependencies: + prettier-linter-helpers "^1.0.0" + +eslint-plugin-prettier@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0" + integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ== + dependencies: + prettier-linter-helpers "^1.0.0" + +eslint-plugin-react-hooks@4.2.0, eslint-plugin-react-hooks@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" + integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== + +eslint-plugin-react@7.22.0: + version "7.22.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269" + integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA== + dependencies: + array-includes "^3.1.1" + array.prototype.flatmap "^1.2.3" + doctrine "^2.1.0" + has "^1.0.3" + jsx-ast-utils "^2.4.1 || ^3.0.0" + object.entries "^1.1.2" + object.fromentries "^2.0.2" + object.values "^1.1.1" + prop-types "^15.7.2" + resolve "^1.18.1" + string.prototype.matchall "^4.0.2" + +eslint-plugin-react@^7.26.1: + version "7.26.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz#41bcfe3e39e6a5ac040971c1af94437c80daa40e" + integrity sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ== + dependencies: + array-includes "^3.1.3" + array.prototype.flatmap "^1.2.4" + doctrine "^2.1.0" + estraverse "^5.2.0" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.0.4" + object.entries "^1.1.4" + object.fromentries "^2.0.4" + object.hasown "^1.0.0" + object.values "^1.1.4" + prop-types "^15.7.2" + resolve "^2.0.0-next.3" + semver "^6.3.0" + string.prototype.matchall "^4.0.5" + eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -953,6 +1230,13 @@ eslint-utils@^2.1.0: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" @@ -963,10 +1247,10 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@^7.13.0: - version "7.25.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" - integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== +eslint@7.21.0: + version "7.21.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83" + integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.0" @@ -985,7 +1269,7 @@ eslint@^7.13.0: file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^13.6.0" + globals "^12.1.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -993,7 +1277,7 @@ eslint@^7.13.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.21" + lodash "^4.17.20" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -1006,6 +1290,52 @@ eslint@^7.13.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" +eslint@^7.32.0: + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + espree@^7.3.0, espree@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" @@ -1067,19 +1397,19 @@ event-stream@=3.3.4: stream-combiner "~0.0.4" through "~2.3.1" -execa@^2.0.3: - version "2.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99" - integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw== +execa@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" is-stream "^2.0.0" merge-stream "^2.0.0" - npm-run-path "^3.0.0" - onetime "^5.1.0" - p-finally "^2.0.0" - signal-exit "^3.0.2" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" strip-final-newline "^2.0.0" expand-template@^2.0.3: @@ -1142,22 +1472,26 @@ extract-zip@2.0.1: optionalDependencies: "@types/yauzl" "^2.9.1" -fast-deep-equal@^3.1.1: +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.0.3, fast-glob@^3.1.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" - integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + +fast-glob@^3.1.1: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" + glob-parent "^5.1.2" merge2 "^1.3.0" - micromatch "^4.0.2" - picomatch "^2.2.1" + micromatch "^4.0.4" fast-json-stable-stringify@^2.0.0: version "2.1.0" @@ -1169,15 +1503,10 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fast-safe-stringify@^2.0.4: - version "2.0.7" - resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" - integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== - fastq@^1.6.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" - integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== dependencies: reusify "^1.0.4" @@ -1193,21 +1522,6 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== -figures@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" - integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= - dependencies: - escape-string-regexp "^1.0.5" - object-assign "^4.1.0" - -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -1267,24 +1581,19 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" - integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + version "3.2.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" + integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== fn.name@1.x.x: version "1.1.0" resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@^1.14.0: - version "1.14.3" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e" - integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw== - -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== fresh@0.5.2: version "0.5.2" @@ -1358,24 +1667,46 @@ get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== -get-stream@^5.0.0, get-stream@^5.1.0: +get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== dependencies: pump "^3.0.0" +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + github-from-package@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.2: +glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -1383,9 +1714,9 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.2: is-glob "^4.0.1" glob@^7.1.3: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1401,31 +1732,17 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" -globals@^13.6.0: - version "13.8.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" - integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== +globals@^13.6.0, globals@^13.9.0: + version "13.11.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" + integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== dependencies: type-fest "^0.20.2" -globby@^10.0.1: - version "10.0.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" - integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg== - dependencies: - "@types/glob" "^7.1.1" - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.0.3" - glob "^7.1.3" - ignore "^5.1.1" - merge2 "^1.2.3" - slash "^3.0.0" - globby@^11.0.3: - version "11.0.3" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" - integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -1439,17 +1756,15 @@ google-protobuf@3.5.0: resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz#b8cc63c74d83457bd8a9a904503c8efb26bca339" integrity sha1-uMxjx02DRXvYqakEUDyO+ya8ozk= -graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== has-flag@^3.0.0: version "3.0.0" @@ -1461,6 +1776,18 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -1495,7 +1822,7 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -https-proxy-agent@5.0.0: +https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== @@ -1503,6 +1830,11 @@ https-proxy-agent@5.0.0: agent-base "6" debug "4" +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + husky@^4.3.8: version "4.3.8" resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d" @@ -1536,19 +1868,11 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.1, ignore@^5.1.4: +ignore@^5.1.4, ignore@^5.1.8: version "5.1.8" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== -import-fresh@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" - integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= - dependencies: - caller-path "^2.0.0" - resolve-from "^3.0.0" - import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -1562,11 +1886,6 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= -indent-string@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" - integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= - indent-string@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" @@ -1595,6 +1914,15 @@ ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + into-stream@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz#4bfc1244c0128224e18b8870e85b2de8e66c6702" @@ -1618,6 +1946,13 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -1625,17 +1960,32 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== + is-core-module@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" - integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== + version "2.7.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3" + integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ== dependencies: has "^1.0.3" -is-directory@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= +is-date-object@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" is-extglob@^2.1.1: version "2.1.1" @@ -1660,12 +2010,24 @@ is-fullwidth-code-point@^3.0.0: integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" +is-negative-zero@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + +is-number-object@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -1676,42 +2038,49 @@ is-obj@^1.0.1: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= -is-observable@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e" - integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA== +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: - symbol-observable "^1.1.0" - -is-path-cwd@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" - integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== - -is-path-inside@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-promise@^2.1.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" - integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= +is-shared-array-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + +is-weakref@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" + integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ== + dependencies: + call-bind "^1.0.0" isarray@~1.0.0: version "1.0.0" @@ -1723,7 +2092,7 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -js-tokens@^4.0.0: +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== @@ -1736,10 +2105,20 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -json-parse-better-errors@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +jsdoc-type-pratt-parser@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz#10fe5e409ba38de22a48b555598955a26ff0160f" + integrity sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g== + +jsdoc-type-pratt-parser@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz#3482a3833b74a88c95a6ba7253f0c0de3b77b9f5" + integrity sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg== + +jsdoctypeparser@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz#8c97e2fb69315eb274b0f01377eaa5c940bd7b26" + integrity sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw== json-parse-even-better-errors@^2.3.0: version "2.3.1" @@ -1770,6 +2149,14 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.2.1" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" + integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== + dependencies: + array-includes "^3.1.3" + object.assign "^4.1.2" + kuler@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" @@ -1796,69 +2183,38 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -lint-staged@^9.5.0: - version "9.5.0" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.5.0.tgz#290ec605252af646d9b74d73a0fa118362b05a33" - integrity sha512-nawMob9cb/G1J98nb8v3VC/E8rcX1rryUYXVZ69aT9kde6YWX+uvNOEHY5yf2gcWcTJGiD0kqXmCnS3oD75GIA== +lint-staged@^11.2.0: + version "11.2.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.1.tgz#e49104cb4eb01ef36742531385be2efe2b85ed94" + integrity sha512-p56vAvBwABYSThvncT1Vuq0u6A8ZS56oC+eURfoavqyhBPJv+RGAmIU2kEYQOO19LPQVHQJ56eoBq/ARPlBoVQ== dependencies: - chalk "^2.4.2" - commander "^2.20.0" - cosmiconfig "^5.2.1" - debug "^4.1.1" - dedent "^0.7.0" - del "^5.0.0" - execa "^2.0.3" - listr "^0.14.3" - log-symbols "^3.0.0" - micromatch "^4.0.2" + cli-truncate "2.1.0" + colorette "^1.4.0" + commander "^8.2.0" + cosmiconfig "^7.0.1" + debug "^4.3.2" + enquirer "^2.3.6" + execa "^5.1.1" + listr2 "^3.12.2" + micromatch "^4.0.4" normalize-path "^3.0.0" - please-upgrade-node "^3.1.1" - string-argv "^0.3.0" - stringify-object "^3.3.0" + please-upgrade-node "^3.2.0" + string-argv "0.3.1" + stringify-object "3.3.0" + supports-color "8.1.1" -listr-silent-renderer@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" - integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= - -listr-update-renderer@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2" - integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA== +listr2@^3.12.2: + version "3.12.2" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.12.2.tgz#2d55cc627111603ad4768a9e87c9c7bb9b49997e" + integrity sha512-64xC2CJ/As/xgVI3wbhlPWVPx0wfTqbUAkpb7bjDi0thSWMqrf07UFhrfsGoo8YSXmF049Rp9C0cjLC8rZxK9A== dependencies: - chalk "^1.1.3" - cli-truncate "^0.2.1" - elegant-spinner "^1.0.1" - figures "^1.7.0" - indent-string "^3.0.0" - log-symbols "^1.0.2" - log-update "^2.3.0" - strip-ansi "^3.0.1" - -listr-verbose-renderer@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db" - integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw== - dependencies: - chalk "^2.4.1" - cli-cursor "^2.1.0" - date-fns "^1.27.2" - figures "^2.0.0" - -listr@^0.14.3: - version "0.14.3" - resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586" - integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA== - dependencies: - "@samverschueren/stream-to-observable" "^0.3.0" - is-observable "^1.1.0" - is-promise "^2.1.0" - is-stream "^1.1.0" - listr-silent-renderer "^1.1.1" - listr-update-renderer "^0.5.0" - listr-verbose-renderer "^0.5.0" - p-map "^2.0.0" - rxjs "^6.3.3" + cli-truncate "^2.1.0" + colorette "^1.4.0" + log-update "^4.0.0" + p-map "^4.0.0" + rxjs "^6.6.7" + through "^2.3.8" + wrap-ansi "^7.0.0" locate-path@^5.0.0: version "5.0.0" @@ -1884,53 +2240,40 @@ lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= -lodash.flatten@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= -lodash@^4.17.19, lodash@^4.17.21: +lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" - integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= +log-update@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" + integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== dependencies: - chalk "^1.0.0" - -log-symbols@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" - integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== - dependencies: - chalk "^2.4.2" - -log-update@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708" - integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= - dependencies: - ansi-escapes "^3.0.0" - cli-cursor "^2.0.0" - wrap-ansi "^3.0.1" + ansi-escapes "^4.3.0" + cli-cursor "^3.1.0" + slice-ansi "^4.0.0" + wrap-ansi "^6.2.0" logform@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" - integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.3.0.tgz#a3997a05985de2ebd325ae0d166dffc9c6fe6b57" + integrity sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ== dependencies: colors "^1.2.1" - fast-safe-stringify "^2.0.4" fecha "^4.2.0" ms "^2.1.1" + safe-stable-stringify "^1.1.0" triple-beam "^1.3.0" long@^4.0.0: @@ -1938,6 +2281,13 @@ long@^4.0.0: resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== +loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -1965,7 +2315,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.2.3, merge2@^1.3.0: +merge2@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -1975,7 +2325,7 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^4.0.2: +micromatch@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== @@ -1983,28 +2333,23 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.47.0: - version "1.47.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" - integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== +mime-db@1.50.0: + version "1.50.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" + integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== mime-types@~2.1.24: - version "2.1.30" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" - integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== + version "2.1.33" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb" + integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g== dependencies: - mime-db "1.47.0" + mime-db "1.50.0" mime@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== - mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -2094,9 +2439,9 @@ negotiator@0.6.2: integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== node-abi@^2.7.0: - version "2.26.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.26.0.tgz#355d5d4bc603e856f74197adbf3f5117a396ba40" - integrity sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ== + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== dependencies: semver "^5.4.1" @@ -2110,6 +2455,13 @@ node-fetch@2.6.1: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== +node-fetch@^2.6.1: + version "2.6.5" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" + integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== + dependencies: + whatwg-url "^5.0.0" + noop-logger@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" @@ -2120,10 +2472,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-run-path@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5" - integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg== +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== dependencies: path-key "^3.0.0" @@ -2142,11 +2494,66 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -object-assign@^4.1.0: +object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +object.entries@^1.1.2, object.entries@^1.1.4: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" + integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.fromentries@^2.0.2, object.fromentries@^2.0.4: + version "2.0.5" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" + integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.hasown@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" + integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.values@^1.1.1, object.values@^1.1.4: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + on-finished@^2.3.0, on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -2173,14 +2580,7 @@ one-time@^1.0.0: dependencies: fn.name "1.x.x" -onetime@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= - dependencies: - mimic-fn "^1.0.0" - -onetime@^5.1.0: +onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -2216,11 +2616,6 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -p-finally@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" - integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== - p-is-promise@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" @@ -2254,15 +2649,10 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -p-map@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" - integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== - -p-map@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d" - integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ== +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== dependencies: aggregate-error "^3.0.0" @@ -2278,14 +2668,6 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - parse-json@^5.0.0: version "5.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" @@ -2344,9 +2726,9 @@ pend@~1.2.0: integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" - integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== pkg-dir@4.2.0: version "4.2.0" @@ -2362,22 +2744,23 @@ pkg-dir@^5.0.0: dependencies: find-up "^5.0.0" -pkg-fetch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.0.4.tgz#8321eff936bf4eb088a333cf23494be0ded173b7" - integrity sha512-XgMXcco5hy0/Q7OXfQ/FbBnPvS4e7gWB9BCcUWUgaHYo3JretihmJjr62EZWmxAjvodoWLGMZ3E7XHf8Q2LfBg== +pkg-fetch@3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.3.tgz#9825febf4eadd470c126d3f6bdc2cb6996861d36" + integrity sha512-bv9vYANgAZ2Lvxn5Dsq7E0rLqzcqYkV4gnwe2f7oHV9N4SVMfDOIjjFCRuuTltop5EmsOcu7XkQpB5A/pIgC1g== dependencies: - axios "^0.21.1" chalk "^4.1.0" fs-extra "^9.1.0" + https-proxy-agent "^5.0.0" + node-fetch "^2.6.1" progress "^2.0.3" semver "^7.3.5" yargs "^16.2.0" -pkg@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.1.0.tgz#25f92666a4164bbc5495c862de9370ed48788667" - integrity sha512-rWTwvLJakQnEVg03s97KNtGkhM3pPfxk7XinjR7H1bToMZQMNpBTwahrAPoFHdQyfn6odI76DP6vX3Br9VubNQ== +pkg@^5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.3.3.tgz#5ad1dadfc4e55169f0e1046626e669e0428d4cd7" + integrity sha512-48qPxwyPvKfUuXxeK+kS3mBvfWWTX2khAdceDThbWCc8OUz3RFyO1Ft8SVkq2gQfPU2DtiPtWaf2SKH0Dlx59g== dependencies: "@babel/parser" "7.13.13" "@babel/types" "7.13.12" @@ -2388,14 +2771,14 @@ pkg@^5.1.0: into-stream "^6.0.0" minimist "^1.2.5" multistream "^4.1.0" - pkg-fetch "3.0.4" + pkg-fetch "3.2.3" prebuild-install "6.0.1" progress "^2.0.3" resolve "^1.20.0" stream-meter "^1.0.4" tslib "2.1.0" -please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: +please-upgrade-node@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== @@ -2433,6 +2816,13 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + prettier@2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" @@ -2460,6 +2850,15 @@ prom-client@^11.5.3: dependencies: tdigest "^0.1.1" +prop-types@^15.7.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.8.1" + protobufjs@^6.8.6: version "6.11.2" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" @@ -2480,11 +2879,11 @@ protobufjs@^6.8.6: long "^4.0.0" proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== dependencies: - forwarded "~0.1.2" + forwarded "0.2.0" ipaddr.js "1.9.1" proxy-from-env@1.1.0: @@ -2520,12 +2919,12 @@ puppeteer-cluster@^0.22.0: debug "^4.1.1" puppeteer@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.0.0.tgz#1b597c956103e2d989ca17f41ba4693b20a3640c" - integrity sha512-AxHvCb9IWmmP3gMW+epxdj92Gglii+6Z4sb+W+zc2hTTu10HF0yg6hGXot5O74uYkVqG3lfDRLfnRpi6WOwi5A== + version "10.4.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.4.0.tgz#a6465ff97fda0576c4ac29601406f67e6fea3dc7" + integrity sha512-2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w== dependencies: debug "4.3.1" - devtools-protocol "0.0.883894" + devtools-protocol "0.0.901419" extract-zip "2.0.1" https-proxy-agent "5.0.0" node-fetch "2.6.1" @@ -2572,6 +2971,11 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +react-is@^16.8.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.7: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" @@ -2601,10 +3005,28 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" +regexp.prototype.flags@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" - integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + +regextras@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz#be95719d5f43f9ef0b9fa07ad89b7c606995a3b2" + integrity sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w== + +regextras@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217" + integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ== require-directory@^2.1.1: version "2.1.1" @@ -2616,17 +3038,12 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -resolve-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve@^1.20.0: +resolve@^1.18.1, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -2634,12 +3051,20 @@ resolve@^1.20.0: is-core-module "^2.2.0" path-parse "^1.0.6" -restore-cursor@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= +resolve@^2.0.0-next.3: + version "2.0.0-next.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== dependencies: - onetime "^2.0.0" + is-core-module "^2.2.0" + path-parse "^1.0.6" + +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" signal-exit "^3.0.2" reusify@^1.0.4: @@ -2647,7 +3072,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@3.0.2, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -2661,7 +3086,7 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -rxjs@^6.3.3: +rxjs@^6.6.7: version "6.6.7" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== @@ -2678,6 +3103,11 @@ safe-buffer@^5.0.1, safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-stable-stringify@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a" + integrity sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw== + "safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -2689,16 +3119,21 @@ semver-compare@^1.0.0: integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= semver-regex@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807" - integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3" + integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ== semver@^5.4.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^7.2.1, semver@^7.3.5: +semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.2.1, semver@^7.3.4, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -2756,10 +3191,19 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: + version "3.0.5" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" + integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== simple-concat@^1.0.0: version "1.0.1" @@ -2787,10 +3231,14 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slice-ansi@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" - integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" slice-ansi@^4.0.0: version "4.0.0" @@ -2806,6 +3254,24 @@ source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.10" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" + integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== + split@0.3: version "0.3.3" resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" @@ -2842,16 +3308,16 @@ stream-meter@^1.0.4: dependencies: readable-stream "^2.1.4" +string-argv@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" + integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== + string-argv@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz#c5b7bc03fb2b11983ba3a72333dd0559e77e4738" integrity sha512-mBqPGEOMNJKXRo7z0keX0wlAhbBAjilUdPW13nN0PecVryZxdHIeM7TqbsSUA7VYuS00HGC6mojP7DlQzfa9ZA== -string-argv@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" - integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== - string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -2861,7 +3327,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.1.1: +"string-width@^1.0.2 || 2": version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -2869,14 +3335,44 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" + +string.prototype.matchall@^4.0.2, string.prototype.matchall@^4.0.5: + version "4.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" + integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + get-intrinsic "^1.1.1" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + regexp.prototype.flags "^1.3.1" + side-channel "^1.0.4" + +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" string_decoder@^1.1.1: version "1.3.0" @@ -2892,7 +3388,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -stringify-object@^3.3.0: +stringify-object@3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== @@ -2915,12 +3411,12 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: - ansi-regex "^5.0.0" + ansi-regex "^5.0.1" strip-final-newline@^2.0.0: version "2.0.0" @@ -2937,10 +3433,12 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= +supports-color@8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" supports-color@^5.3.0: version "5.5.0" @@ -2956,23 +3454,17 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -symbol-observable@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" - integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== - -table@^6.0.4: - version "6.6.0" - resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e" - integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg== +table@^6.0.4, table@^6.0.9: + version "6.7.2" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0" + integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g== dependencies: ajv "^8.0.1" lodash.clonedeep "^4.5.0" - lodash.flatten "^4.4.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" - string-width "^4.2.0" - strip-ansi "^6.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" tar-fs@2.0.0: version "2.0.0" @@ -3044,15 +3536,20 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + triple-beam@^1.2.0, triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== tsc-watch@^4.2.3: - version "4.2.9" - resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.9.tgz#d93fc74233ca4ef7ee6b12d08c0fe6aca3e19044" - integrity sha512-DlTaoDs74+KUpyWr7dCGhuscAUKCz6CiFduBN7R9RbLJSSN1moWdwoCLASE7+zLgGvV5AwXfYDiEMAsPGaO+Vw== + version "4.5.0" + resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.5.0.tgz#d6884b932822b2c2ccd37f1c1f3748304566a474" + integrity sha512-aXhN4jY+1YEcn/NwCQ/+fHqU43EqOpW+pS+933EPsVEsrKhvyrodPDIjQsk1a1niFrabAK3RIBrRbAslVefEbQ== dependencies: cross-spawn "^7.0.3" node-cleanup "^2.1.2" @@ -3065,11 +3562,18 @@ tslib@2.1.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== -tslib@^1.9.0: +tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== + dependencies: + tslib "^1.8.1" + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -3096,6 +3600,11 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" @@ -3109,10 +3618,25 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typescript@4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" + integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew== + typescript@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805" - integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw== + version "4.4.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324" + integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA== + +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" unbzip2-stream@1.3.3: version "1.3.3" @@ -3178,6 +3702,30 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + which-pm-runs@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" @@ -3225,13 +3773,14 @@ word-wrap@^1.2.3, word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wrap-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" - integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" wrap-ansi@^7.0.0: version "7.0.0" @@ -3268,9 +3817,9 @@ yaml@^1.10.0: integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== yargs-parser@^20.2.2: - version "20.2.7" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" - integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs@^16.2.0: version "16.2.0" diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index dcf5351e45bd..d9bc794b1828 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -10,27 +10,27 @@ }; } { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; + name = "_babel_code_frame___code_frame_7.15.8.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + name = "_babel_code_frame___code_frame_7.15.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz"; + sha1 = "45990c47adadb00c03677baa89221f7cc23d2503"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; - sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; + sha1 = "220df993bfe904a4a6b02ab4f3385a5ebf6e2389"; }; } { - name = "_babel_highlight___highlight_7.14.0.tgz"; + name = "_babel_highlight___highlight_7.14.5.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; - sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; }; } { @@ -58,19 +58,35 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + name = "_es_joy_jsdoccomment___jsdoccomment_0.10.8.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; - sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547"; + name = "_es_joy_jsdoccomment___jsdoccomment_0.10.8.tgz"; + url = "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz"; + sha1 = "b3152887e25246410ed4ea569a55926ec13b2b05"; }; } { - name = "_grpc_grpc_js___grpc_js_1.3.0.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; path = fetchurl { - name = "_grpc_grpc_js___grpc_js_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.0.tgz"; - sha1 = "c6febaaf00ce7f53b5ec52c7cf3e2a4725b82bcb"; + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha1 = "9e42981ef035beb3dd49add17acb96e8ff6f394c"; + }; + } + { + name = "_grafana_eslint_config___eslint_config_2.5.0.tgz"; + path = fetchurl { + name = "_grafana_eslint_config___eslint_config_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.0.tgz"; + sha1 = "d028898e201f242748a94d5582f0e14a493f5853"; + }; + } + { + name = "_grpc_grpc_js___grpc_js_1.3.7.tgz"; + path = fetchurl { + name = "_grpc_grpc_js___grpc_js_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.7.tgz"; + sha1 = "58b687aff93b743aafde237fd2ee9a3259d7f2d8"; }; } { @@ -82,43 +98,59 @@ }; } { - name = "_hapi_boom___boom_9.1.2.tgz"; + name = "_hapi_boom___boom_9.1.4.tgz"; path = fetchurl { - name = "_hapi_boom___boom_9.1.2.tgz"; - url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.2.tgz"; - sha1 = "48bd41d67437164a2d636e3b5bc954f8c8dc5e38"; + name = "_hapi_boom___boom_9.1.4.tgz"; + url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz"; + sha1 = "1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6"; }; } { - name = "_hapi_hoek___hoek_9.2.0.tgz"; + name = "_hapi_hoek___hoek_9.2.1.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz"; - sha1 = "f3933a44e365864f4dad5db94158106d511e8131"; + name = "_hapi_hoek___hoek_9.2.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz"; + sha1 = "9551142a1980503752536b5050fd99f4a7f13b17"; }; } { - name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; path = fetchurl { - name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha1 = "d4b3549a5db5de2683e0c1071ab4f140904bbf69"; + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha1 = "1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"; }; } { - name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha1 = "a3f2dd61bab43b8db8fa108a121cfffe4c676655"; + name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; + sha1 = "87de7af9c231826fdd68ac7258f77c429e0e5fcf"; }; } { - name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha1 = "cce9396b30aa5afe9e3756608f5831adcb53d063"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha1 = "7619c2eb21b25483f6d167548b4cfd5a7488c3d5"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha1 = "5bd262af94e9d25bd1e71b05deed44876a222e8b"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha1 = "e95737e8bb6746ddedf69c556953494f196fe69a"; }; } { @@ -202,51 +234,43 @@ }; } { - name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.1.tgz"; + name = "_types_body_parser___body_parser_1.19.1.tgz"; path = fetchurl { - name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz"; - sha1 = "a21117b19ee9be70c379ec1877537ef2e1c63301"; + name = "_types_body_parser___body_parser_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha1 = "0c0174c42a7d017b818303d4b5d969cb0b75929c"; }; } { - name = "_types_body_parser___body_parser_1.19.0.tgz"; + name = "_types_connect___connect_3.4.35.tgz"; path = fetchurl { - name = "_types_body_parser___body_parser_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha1 = "0685b3c47eb3006ffed117cdd55164b61f80538f"; + name = "_types_connect___connect_3.4.35.tgz"; + url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz"; + sha1 = "5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"; }; } { - name = "_types_connect___connect_3.4.34.tgz"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; path = fetchurl { - name = "_types_connect___connect_3.4.34.tgz"; - url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz"; - sha1 = "170a40223a6d666006d93ca128af2beb1d9b1901"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; + sha1 = "ea41f93bf7e0d59cd5a76665068ed6aab6815c07"; }; } { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.19.tgz"; + name = "_types_express___express_4.17.13.tgz"; path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.19.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; - sha1 = "00acfc1632e729acac4f1530e9e16f6dd1508a1d"; + name = "_types_express___express_4.17.13.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; + sha1 = "a76e2995728999bab51a33fabce1d705a3709034"; }; } { - name = "_types_express___express_4.17.11.tgz"; + name = "_types_json_schema___json_schema_7.0.9.tgz"; path = fetchurl { - name = "_types_express___express_4.17.11.tgz"; - url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz"; - sha1 = "debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"; - }; - } - { - name = "_types_glob___glob_7.1.3.tgz"; - path = fetchurl { - name = "_types_glob___glob_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; - sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; + name = "_types_json_schema___json_schema_7.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha1 = "97edc9037ea0c38585320b28964dde3b39e4660d"; }; } { @@ -266,27 +290,19 @@ }; } { - name = "_types_minimatch___minimatch_3.0.4.tgz"; + name = "_types_node___node_16.10.3.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; + name = "_types_node___node_16.10.3.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.10.3.tgz"; + sha1 = "7a8f2838603ea314d1d22bb3171d899e15c57bd5"; }; } { - name = "_types_node___node_15.0.2.tgz"; + name = "_types_node___node_14.17.21.tgz"; path = fetchurl { - name = "_types_node___node_15.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; - sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; - }; - } - { - name = "_types_node___node_14.14.44.tgz"; - path = fetchurl { - name = "_types_node___node_14.14.44.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz"; - sha1 = "df7503e6002847b834371c004b372529f3f85215"; + name = "_types_node___node_14.17.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz"; + sha1 = "6359d8cf73481e312a43886fa50afc70ce5592c6"; }; } { @@ -298,35 +314,147 @@ }; } { - name = "_types_qs___qs_6.9.6.tgz"; + name = "_types_qs___qs_6.9.7.tgz"; path = fetchurl { - name = "_types_qs___qs_6.9.6.tgz"; - url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz"; - sha1 = "df9c3c8b31a247ec315e6996566be3171df4b3b1"; + name = "_types_qs___qs_6.9.7.tgz"; + url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz"; + sha1 = "63bb7d067db107cc1e457c303bc25d511febf6cb"; }; } { - name = "_types_range_parser___range_parser_1.2.3.tgz"; + name = "_types_range_parser___range_parser_1.2.4.tgz"; path = fetchurl { - name = "_types_range_parser___range_parser_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz"; - sha1 = "7ee330ba7caafb98090bece86a5ee44115904c2c"; + name = "_types_range_parser___range_parser_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha1 = "cd667bcfdd025213aafb7ca5915a932590acdcdc"; }; } { - name = "_types_serve_static___serve_static_1.13.9.tgz"; + name = "_types_serve_static___serve_static_1.13.10.tgz"; path = fetchurl { - name = "_types_serve_static___serve_static_1.13.9.tgz"; - url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz"; - sha1 = "aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"; + name = "_types_serve_static___serve_static_1.13.10.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha1 = "f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"; }; } { - name = "_types_yauzl___yauzl_2.9.1.tgz"; + name = "_types_yauzl___yauzl_2.9.2.tgz"; path = fetchurl { - name = "_types_yauzl___yauzl_2.9.1.tgz"; - url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz"; - sha1 = "d10f69f9f522eef3cf98e30afb684a1e1ec923af"; + name = "_types_yauzl___yauzl_2.9.2.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz"; + sha1 = "c48e5d56aff1444409e39fa164b0b4d4552a7b7a"; + }; + } + { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz"; + sha1 = "1a66f03b264844387beb7dc85e1f1d403bd1803f"; + }; + } + { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.33.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz"; + sha1 = "c24dc7c8069c7706bc40d99f6fa87edcb2005276"; + }; + } + { + name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz"; + sha1 = "13167ed991320684bdc23588135ae62115b30ee0"; + }; + } + { + name = "_typescript_eslint_experimental_utils___experimental_utils_4.33.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_experimental_utils___experimental_utils_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz"; + sha1 = "6f2a786a4209fa2222989e9380b5331b2810f7fd"; + }; + } + { + name = "_typescript_eslint_parser___parser_4.28.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_4.28.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.0.tgz"; + sha1 = "2404c16751a28616ef3abab77c8e51d680a12caa"; + }; + } + { + name = "_typescript_eslint_parser___parser_4.33.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz"; + sha1 = "dfe797570d9694e560528d18eecad86c8c744899"; + }; + } + { + name = "_typescript_eslint_scope_manager___scope_manager_4.28.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_scope_manager___scope_manager_4.28.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz"; + sha1 = "6a3009d2ab64a30fc8a1e257a1a320067f36a0ce"; + }; + } + { + name = "_typescript_eslint_scope_manager___scope_manager_4.33.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_scope_manager___scope_manager_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz"; + sha1 = "d38e49280d983e8772e29121cf8c6e9221f280a3"; + }; + } + { + name = "_typescript_eslint_types___types_4.28.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_types___types_4.28.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.0.tgz"; + sha1 = "a33504e1ce7ac51fc39035f5fe6f15079d4dafb0"; + }; + } + { + name = "_typescript_eslint_types___types_4.33.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_types___types_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz"; + sha1 = "a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz"; + sha1 = "e66d4e5aa2ede66fec8af434898fe61af10c71cf"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.33.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz"; + sha1 = "0dfb51c2908f68c5c08d82aefeaf166a17c24609"; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz"; + sha1 = "255c67c966ec294104169a6939d96f91c8a89434"; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.33.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz"; + sha1 = "2a22f77a41604289b7a186586e9ec48ca92ef1dd"; }; } { @@ -338,11 +466,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha1 = "7ed5bb55908b3b2f1bc55c6af1653bada7f07937"; }; } { @@ -378,11 +506,11 @@ }; } { - name = "ajv___ajv_8.2.0.tgz"; + name = "ajv___ajv_8.6.3.tgz"; path = fetchurl { - name = "ajv___ajv_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz"; - sha1 = "c89d3380a784ce81b2085f48811c4c101df4c602"; + name = "ajv___ajv_8.6.3.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz"; + sha1 = "11a66527761dc3e9a3845ea775d2d3c0414e8764"; }; } { @@ -394,11 +522,11 @@ }; } { - name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; }; } { @@ -418,19 +546,11 @@ }; } { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; + name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; - }; - } - { - name = "ansi_styles___ansi_styles_2.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; }; } { @@ -449,14 +569,6 @@ sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; }; } - { - name = "any_observable___any_observable_0.3.0.tgz"; - path = fetchurl { - name = "any_observable___any_observable_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz"; - sha1 = "af933475e5806a67d0d7df090dd5e8bef65d119b"; - }; - } { name = "anymatch___anymatch_3.1.2.tgz"; path = fetchurl { @@ -474,11 +586,11 @@ }; } { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha1 = "b15474a932adab4ff8a50d9adfa7e4e926f21146"; }; } { @@ -497,6 +609,14 @@ sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; } + { + name = "array_includes___array_includes_3.1.4.tgz"; + path = fetchurl { + name = "array_includes___array_includes_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz"; + sha1 = "f5b493162c760f3539631f005ba2bb46acb45ba9"; + }; + } { name = "array_union___array_union_2.1.0.tgz"; path = fetchurl { @@ -505,6 +625,14 @@ sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; }; } + { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.5.tgz"; + path = fetchurl { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz"; + sha1 = "908dc82d8a406930fdf38598d51e7411d18d4446"; + }; + } { name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { @@ -514,11 +642,11 @@ }; } { - name = "async___async_3.2.0.tgz"; + name = "async___async_3.2.1.tgz"; path = fetchurl { - name = "async___async_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; - sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; + name = "async___async_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz"; + sha1 = "d3274ec66d107a47476a4c49136aacdb00665fc8"; }; } { @@ -529,14 +657,6 @@ sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; }; } - { - name = "axios___axios_0.21.4.tgz"; - path = fetchurl { - name = "axios___axios_0.21.4.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; - sha1 = "c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"; - }; - } { name = "balanced_match___balanced_match_1.0.2.tgz"; path = fetchurl { @@ -634,27 +754,11 @@ }; } { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; + name = "call_bind___call_bind_1.0.2.tgz"; path = fetchurl { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; - }; - } - { - name = "caller_path___caller_path_2.0.0.tgz"; - path = fetchurl { - name = "caller_path___caller_path_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; - }; - } - { - name = "callsites___callsites_2.0.0.tgz"; - path = fetchurl { - name = "callsites___callsites_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; }; } { @@ -665,14 +769,6 @@ sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; }; } - { - name = "chalk___chalk_1.1.3.tgz"; - path = fetchurl { - name = "chalk___chalk_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - } { name = "chalk___chalk_2.4.2.tgz"; path = fetchurl { @@ -682,11 +778,11 @@ }; } { - name = "chalk___chalk_4.1.1.tgz"; + name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; - sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; }; } { @@ -722,19 +818,19 @@ }; } { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; + name = "cli_cursor___cli_cursor_3.1.0.tgz"; path = fetchurl { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; }; } { - name = "cli_truncate___cli_truncate_0.2.1.tgz"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; path = fetchurl { - name = "cli_truncate___cli_truncate_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz"; - sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha1 = "c39e28bf05edcde5be3b98992a22deed5a2b93c7"; }; } { @@ -786,11 +882,11 @@ }; } { - name = "color_string___color_string_1.5.5.tgz"; + name = "color_string___color_string_1.6.0.tgz"; path = fetchurl { - name = "color_string___color_string_1.5.5.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz"; - sha1 = "65474a8f0e7439625f3d27a6a19d89fc45223014"; + name = "color_string___color_string_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz"; + sha1 = "c3915f61fe267672cb7e1e064c9d692219f6c312"; }; } { @@ -801,6 +897,14 @@ sha1 = "d920b4328d534a3ac8295d68f7bd4ba6c427be9a"; }; } + { + name = "colorette___colorette_1.4.0.tgz"; + path = fetchurl { + name = "colorette___colorette_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz"; + sha1 = "5190fbb87276259a86ad700bff2c6d6faa3fca40"; + }; + } { name = "colors___colors_1.4.0.tgz"; path = fetchurl { @@ -818,11 +922,27 @@ }; } { - name = "commander___commander_2.20.3.tgz"; + name = "commander___commander_8.2.0.tgz"; path = fetchurl { - name = "commander___commander_2.20.3.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; - sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + name = "commander___commander_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz"; + sha1 = "37fe2bde301d87d47a53adeff8b5915db1381ca8"; + }; + } + { + name = "comment_parser___comment_parser_1.1.2.tgz"; + path = fetchurl { + name = "comment_parser___comment_parser_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.2.tgz"; + sha1 = "e5317d7a2ec22b470dcb54a29b25426c30bf39d8"; + }; + } + { + name = "comment_parser___comment_parser_1.2.4.tgz"; + path = fetchurl { + name = "comment_parser___comment_parser_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz"; + sha1 = "489f3ee55dfd184a6e4bffb31baba284453cb760"; }; } { @@ -882,27 +1002,19 @@ }; } { - name = "core_util_is___core_util_is_1.0.2.tgz"; + name = "core_util_is___core_util_is_1.0.3.tgz"; path = fetchurl { - name = "core_util_is___core_util_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; }; } { - name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; path = fetchurl { - name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; - }; - } - { - name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; - sha1 = "ef9b44d773959cae63ddecd122de23853b60f8d3"; + name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; + sha1 = "714d756522cace867867ccb4474c5d01bbae5d6d"; }; } { @@ -913,14 +1025,6 @@ sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; }; } - { - name = "date_fns___date_fns_1.30.1.tgz"; - path = fetchurl { - name = "date_fns___date_fns_1.30.1.tgz"; - url = "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz"; - sha1 = "2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"; - }; - } { name = "debug___debug_2.6.9.tgz"; path = fetchurl { @@ -929,6 +1033,14 @@ sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; }; } + { + name = "debug___debug_4.3.2.tgz"; + path = fetchurl { + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + }; + } { name = "debug___debug_4.3.1.tgz"; path = fetchurl { @@ -945,14 +1057,6 @@ sha1 = "414023cc7a302da25ce2ec82d0d5238ccafd8986"; }; } - { - name = "dedent___dedent_0.7.0.tgz"; - path = fetchurl { - name = "dedent___dedent_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz"; - sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; - }; - } { name = "deep_extend___deep_extend_0.6.0.tgz"; path = fetchurl { @@ -962,19 +1066,19 @@ }; } { - name = "deep_is___deep_is_0.1.3.tgz"; + name = "deep_is___deep_is_0.1.4.tgz"; path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + name = "deep_is___deep_is_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; + sha1 = "a6f2dce612fadd2ef1f519b73551f17e85199831"; }; } { - name = "del___del_5.1.0.tgz"; + name = "define_properties___define_properties_1.1.3.tgz"; path = fetchurl { - name = "del___del_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz"; - sha1 = "d9487c94e367410e6eff2925ee58c0c84a75b3a7"; + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; }; } { @@ -1018,11 +1122,11 @@ }; } { - name = "devtools_protocol___devtools_protocol_0.0.883894.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.883894.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.883894.tgz"; - sha1 = "d403f2c75cd6d71c916aee8dde9258da988a4da9"; + name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; + sha1 = "79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"; }; } { @@ -1033,6 +1137,14 @@ sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; }; } + { + name = "doctrine___doctrine_2.1.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; + sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + }; + } { name = "doctrine___doctrine_3.0.0.tgz"; path = fetchurl { @@ -1057,14 +1169,6 @@ sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; } - { - name = "elegant_spinner___elegant_spinner_1.0.1.tgz"; - path = fetchurl { - name = "elegant_spinner___elegant_spinner_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz"; - sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; - }; - } { name = "emoji_regex___emoji_regex_8.0.0.tgz"; path = fetchurl { @@ -1113,6 +1217,22 @@ sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; }; } + { + name = "es_abstract___es_abstract_1.19.1.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz"; + sha1 = "d4885796876916959de78edaa0df456627115ec3"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + }; + } { name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { @@ -1137,6 +1257,14 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } { name = "escodegen___escodegen_2.0.0.tgz"; path = fetchurl { @@ -1145,6 +1273,78 @@ sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; }; } + { + name = "eslint_config_prettier___eslint_config_prettier_7.2.0.tgz"; + path = fetchurl { + name = "eslint_config_prettier___eslint_config_prettier_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz"; + sha1 = "f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"; + }; + } + { + name = "eslint_config_prettier___eslint_config_prettier_8.3.0.tgz"; + path = fetchurl { + name = "eslint_config_prettier___eslint_config_prettier_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; + sha1 = "f7471b20b6fe8a9a9254cc684454202886a2dd7a"; + }; + } + { + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_31.6.1.tgz"; + path = fetchurl { + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_31.6.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-31.6.1.tgz"; + sha1 = "98040c801500572fff71c984a097d89946f1e450"; + }; + } + { + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.1.tgz"; + path = fetchurl { + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz"; + sha1 = "124cd0e53a5d07f01ebde916a96dd1a6009625d6"; + }; + } + { + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; + path = fetchurl { + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz"; + sha1 = "7079cfa2497078905011e6f82e8dd8453d1371b7"; + }; + } + { + name = "eslint_plugin_prettier___eslint_plugin_prettier_4.0.0.tgz"; + path = fetchurl { + name = "eslint_plugin_prettier___eslint_plugin_prettier_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz"; + sha1 = "8b99d1e4b8b24a762472b4567992023619cb98e0"; + }; + } + { + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; + path = fetchurl { + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz"; + sha1 = "8c229c268d468956334c943bb45fc860280f5556"; + }; + } + { + name = "eslint_plugin_react___eslint_plugin_react_7.22.0.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.22.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz"; + sha1 = "3d1c542d1d3169c45421c1215d9470e341707269"; + }; + } + { + name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz"; + sha1 = "41bcfe3e39e6a5ac040971c1af94437c80daa40e"; + }; + } { name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { @@ -1161,6 +1361,14 @@ sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; }; } + { + name = "eslint_utils___eslint_utils_3.0.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha1 = "8aebaface7345bb33559db0a1f13a1d2d48c3672"; + }; + } { name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; path = fetchurl { @@ -1178,11 +1386,19 @@ }; } { - name = "eslint___eslint_7.25.0.tgz"; + name = "eslint___eslint_7.21.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.25.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz"; - sha1 = "1309e4404d94e676e3e831b3a3ad2b050031eb67"; + name = "eslint___eslint_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz"; + sha1 = "4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"; + }; + } + { + name = "eslint___eslint_7.32.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.32.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz"; + sha1 = "c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"; }; } { @@ -1258,11 +1474,11 @@ }; } { - name = "execa___execa_2.1.0.tgz"; + name = "execa___execa_5.1.1.tgz"; path = fetchurl { - name = "execa___execa_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz"; - sha1 = "e5d3ecd837d2a60ec50f3da78fd39767747bbe99"; + name = "execa___execa_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; + sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; }; } { @@ -1306,11 +1522,19 @@ }; } { - name = "fast_glob___fast_glob_3.2.5.tgz"; + name = "fast_diff___fast_diff_1.2.0.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.5.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz"; - sha1 = "7939af2a656de79a4f1901903ee8adcaa7cb9661"; + name = "fast_diff___fast_diff_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz"; + sha1 = "73ee11982d86caaf7959828d519cfe927fac5f03"; + }; + } + { + name = "fast_glob___fast_glob_3.2.7.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; + sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; }; } { @@ -1330,19 +1554,11 @@ }; } { - name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; + name = "fastq___fastq_1.13.0.tgz"; path = fetchurl { - name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; - sha1 = "124aa885899261f68aedb42a7c080de9da608743"; - }; - } - { - name = "fastq___fastq_1.11.0.tgz"; - path = fetchurl { - name = "fastq___fastq_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz"; - sha1 = "bb9fb955a07130a918eb63c1f5161cc32a5d0858"; + name = "fastq___fastq_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz"; + sha1 = "616760f88a7526bdfc596b7cab8c18938c36b98c"; }; } { @@ -1361,22 +1577,6 @@ sha1 = "0a83ad8f86ef62a091e22bb5a039cd03d23eecce"; }; } - { - name = "figures___figures_1.7.0.tgz"; - path = fetchurl { - name = "figures___figures_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz"; - sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; - }; - } - { - name = "figures___figures_2.0.0.tgz"; - path = fetchurl { - name = "figures___figures_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; - }; - } { name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { @@ -1434,11 +1634,11 @@ }; } { - name = "flatted___flatted_3.1.1.tgz"; + name = "flatted___flatted_3.2.2.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; - sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; + name = "flatted___flatted_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz"; + sha1 = "64bfed5cb68fe3ca78b3eb214ad97b63bedce561"; }; } { @@ -1450,19 +1650,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.3.tgz"; + name = "forwarded___forwarded_0.2.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.3.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz"; - sha1 = "6ada78118d8d24caee595595accdc0ac6abd022e"; - }; - } - { - name = "forwarded___forwarded_0.1.2.tgz"; - path = fetchurl { - name = "forwarded___forwarded_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + name = "forwarded___forwarded_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; + sha1 = "2269936428aad4c15c7ebe9779a84bf0b2a81811"; }; } { @@ -1553,6 +1745,14 @@ sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; }; } + { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + path = fetchurl { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; + }; + } { name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { @@ -1569,6 +1769,22 @@ sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; }; } + { + name = "get_stream___get_stream_6.0.1.tgz"; + path = fetchurl { + name = "get_stream___get_stream_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; + sha1 = "a262d8eef67aced57c2852ad6167526a43cbf7b7"; + }; + } + { + name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; + path = fetchurl { + name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; + sha1 = "7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"; + }; + } { name = "github_from_package___github_from_package_0.0.0.tgz"; path = fetchurl { @@ -1586,11 +1802,11 @@ }; } { - name = "glob___glob_7.1.6.tgz"; + name = "glob___glob_7.2.0.tgz"; path = fetchurl { - name = "glob___glob_7.1.6.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; - sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + name = "glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; + sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; }; } { @@ -1602,27 +1818,19 @@ }; } { - name = "globals___globals_13.8.0.tgz"; + name = "globals___globals_13.11.0.tgz"; path = fetchurl { - name = "globals___globals_13.8.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; - sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + name = "globals___globals_13.11.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz"; + sha1 = "40ef678da117fe7bd2e28f1fab24951bd0255be7"; }; } { - name = "globby___globby_10.0.2.tgz"; + name = "globby___globby_11.0.4.tgz"; path = fetchurl { - name = "globby___globby_10.0.2.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz"; - sha1 = "277593e745acaa4646c3ab411289ec47a0392543"; - }; - } - { - name = "globby___globby_11.0.3.tgz"; - path = fetchurl { - name = "globby___globby_11.0.3.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz"; - sha1 = "9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"; + name = "globby___globby_11.0.4.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; + sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; }; } { @@ -1634,19 +1842,19 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; }; } { - name = "has_ansi___has_ansi_2.0.0.tgz"; + name = "has_bigints___has_bigints_1.0.1.tgz"; path = fetchurl { - name = "has_ansi___has_ansi_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + name = "has_bigints___has_bigints_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; + sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; }; } { @@ -1665,6 +1873,22 @@ sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; }; } + { + name = "has_symbols___has_symbols_1.0.2.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; + sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; + }; + } + { + name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; + path = fetchurl { + name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha1 = "7e133818a7d394734f941e73c3d3f9291e658b25"; + }; + } { name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { @@ -1705,6 +1929,14 @@ sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; }; } + { + name = "human_signals___human_signals_2.1.0.tgz"; + path = fetchurl { + name = "human_signals___human_signals_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; + sha1 = "dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"; + }; + } { name = "husky___husky_4.3.8.tgz"; path = fetchurl { @@ -1745,14 +1977,6 @@ sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; }; } - { - name = "import_fresh___import_fresh_2.0.0.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; - sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; - }; - } { name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { @@ -1769,14 +1993,6 @@ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } - { - name = "indent_string___indent_string_3.2.0.tgz"; - path = fetchurl { - name = "indent_string___indent_string_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz"; - sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; - }; - } { name = "indent_string___indent_string_4.0.0.tgz"; path = fetchurl { @@ -1817,6 +2033,14 @@ sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } + { + name = "internal_slot___internal_slot_1.0.3.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; + sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; + }; + } { name = "into_stream___into_stream_6.0.0.tgz"; path = fetchurl { @@ -1849,6 +2073,14 @@ sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; }; } + { + name = "is_bigint___is_bigint_1.0.4.tgz"; + path = fetchurl { + name = "is_bigint___is_bigint_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz"; + sha1 = "08147a1875bc2b32005d41ccd8291dffc6691df3"; + }; + } { name = "is_binary_path___is_binary_path_2.1.0.tgz"; path = fetchurl { @@ -1858,19 +2090,35 @@ }; } { - name = "is_core_module___is_core_module_2.3.0.tgz"; + name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz"; - sha1 = "d341652e3408bca69c4671b79a0954a3d349f887"; + name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha1 = "5c6dc200246dd9321ae4b885a114bb1f75f63719"; }; } { - name = "is_directory___is_directory_0.3.1.tgz"; + name = "is_callable___is_callable_1.2.4.tgz"; path = fetchurl { - name = "is_directory___is_directory_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; - sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + name = "is_callable___is_callable_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz"; + sha1 = "47301d58dd0259407865547853df6d61fe471945"; + }; + } + { + name = "is_core_module___is_core_module_2.7.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz"; + sha1 = "3c0ef7d31b4acfc574f80c58409d568a836848e3"; + }; + } + { + name = "is_date_object___is_date_object_1.0.5.tgz"; + path = fetchurl { + name = "is_date_object___is_date_object_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz"; + sha1 = "0841d5536e724c25597bf6ea62e1bd38298df31f"; }; } { @@ -1906,11 +2154,27 @@ }; } { - name = "is_glob___is_glob_4.0.1.tgz"; + name = "is_glob___is_glob_4.0.3.tgz"; path = fetchurl { - name = "is_glob___is_glob_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; - sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + name = "is_glob___is_glob_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; + sha1 = "64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"; + }; + } + { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + }; + } + { + name = "is_number_object___is_number_object_1.0.6.tgz"; + path = fetchurl { + name = "is_number_object___is_number_object_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz"; + sha1 = "6a7aaf838c7f0686a50b4553f7e54a96494e89f0"; }; } { @@ -1930,35 +2194,11 @@ }; } { - name = "is_observable___is_observable_1.1.0.tgz"; + name = "is_regex___is_regex_1.1.4.tgz"; path = fetchurl { - name = "is_observable___is_observable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz"; - sha1 = "b3e986c8f44de950867cab5403f5a3465005975e"; - }; - } - { - name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; - path = fetchurl { - name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; - sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; - }; - } - { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; - }; - } - { - name = "is_promise___is_promise_2.2.2.tgz"; - path = fetchurl { - name = "is_promise___is_promise_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz"; - sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1"; + name = "is_regex___is_regex_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; + sha1 = "eef5663cd59fa4c0ae339505323df6854bb15958"; }; } { @@ -1970,19 +2210,43 @@ }; } { - name = "is_stream___is_stream_1.1.0.tgz"; + name = "is_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; path = fetchurl { - name = "is_stream___is_stream_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + name = "is_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"; + sha1 = "97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"; }; } { - name = "is_stream___is_stream_2.0.0.tgz"; + name = "is_stream___is_stream_2.0.1.tgz"; path = fetchurl { - name = "is_stream___is_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; - sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; + name = "is_stream___is_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; + sha1 = "fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"; + }; + } + { + name = "is_string___is_string_1.0.7.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz"; + sha1 = "0dd12bf2006f255bb58f695110eff7491eebc0fd"; + }; + } + { + name = "is_symbol___is_symbol_1.0.4.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; + sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; + }; + } + { + name = "is_weakref___is_weakref_1.0.1.tgz"; + path = fetchurl { + name = "is_weakref___is_weakref_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz"; + sha1 = "842dba4ec17fa9ac9850df2d6efbc1737274f2a2"; }; } { @@ -2018,11 +2282,27 @@ }; } { - name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_1.1.1.tgz"; path = fetchurl { - name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz"; + sha1 = "10fe5e409ba38de22a48b555598955a26ff0160f"; + }; + } + { + name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_1.2.0.tgz"; + path = fetchurl { + name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz"; + sha1 = "3482a3833b74a88c95a6ba7253f0c0de3b77b9f5"; + }; + } + { + name = "jsdoctypeparser___jsdoctypeparser_9.0.0.tgz"; + path = fetchurl { + name = "jsdoctypeparser___jsdoctypeparser_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz"; + sha1 = "8c97e2fb69315eb274b0f01377eaa5c940bd7b26"; }; } { @@ -2065,6 +2345,14 @@ sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; }; } + { + name = "jsx_ast_utils___jsx_ast_utils_3.2.1.tgz"; + path = fetchurl { + name = "jsx_ast_utils___jsx_ast_utils_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz"; + sha1 = "720b97bfe7d901b927d87c3773637ae8ea48781b"; + }; + } { name = "kuler___kuler_2.0.0.tgz"; path = fetchurl { @@ -2098,43 +2386,19 @@ }; } { - name = "lint_staged___lint_staged_9.5.0.tgz"; + name = "lint_staged___lint_staged_11.2.1.tgz"; path = fetchurl { - name = "lint_staged___lint_staged_9.5.0.tgz"; - url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.5.0.tgz"; - sha1 = "290ec605252af646d9b74d73a0fa118362b05a33"; + name = "lint_staged___lint_staged_11.2.1.tgz"; + url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.1.tgz"; + sha1 = "e49104cb4eb01ef36742531385be2efe2b85ed94"; }; } { - name = "listr_silent_renderer___listr_silent_renderer_1.1.1.tgz"; + name = "listr2___listr2_3.12.2.tgz"; path = fetchurl { - name = "listr_silent_renderer___listr_silent_renderer_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz"; - sha1 = "924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"; - }; - } - { - name = "listr_update_renderer___listr_update_renderer_0.5.0.tgz"; - path = fetchurl { - name = "listr_update_renderer___listr_update_renderer_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz"; - sha1 = "4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"; - }; - } - { - name = "listr_verbose_renderer___listr_verbose_renderer_0.5.0.tgz"; - path = fetchurl { - name = "listr_verbose_renderer___listr_verbose_renderer_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz"; - sha1 = "f1132167535ea4c1261102b9f28dac7cba1e03db"; - }; - } - { - name = "listr___listr_0.14.3.tgz"; - path = fetchurl { - name = "listr___listr_0.14.3.tgz"; - url = "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz"; - sha1 = "2fea909604e434be464c50bddba0d496928fa586"; + name = "listr2___listr2_3.12.2.tgz"; + url = "https://registry.yarnpkg.com/listr2/-/listr2-3.12.2.tgz"; + sha1 = "2d55cc627111603ad4768a9e87c9c7bb9b49997e"; }; } { @@ -2170,11 +2434,11 @@ }; } { - name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + name = "lodash.merge___lodash.merge_4.6.2.tgz"; path = fetchurl { - name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; - sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; }; } { @@ -2194,35 +2458,19 @@ }; } { - name = "log_symbols___log_symbols_1.0.2.tgz"; + name = "log_update___log_update_4.0.0.tgz"; path = fetchurl { - name = "log_symbols___log_symbols_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz"; - sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + name = "log_update___log_update_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz"; + sha1 = "589ecd352471f2a1c0c570287543a64dfd20e0a1"; }; } { - name = "log_symbols___log_symbols_3.0.0.tgz"; + name = "logform___logform_2.3.0.tgz"; path = fetchurl { - name = "log_symbols___log_symbols_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz"; - sha1 = "f3a08516a5dea893336a7dee14d18a1cfdab77c4"; - }; - } - { - name = "log_update___log_update_2.3.0.tgz"; - path = fetchurl { - name = "log_update___log_update_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz"; - sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; - }; - } - { - name = "logform___logform_2.2.0.tgz"; - path = fetchurl { - name = "logform___logform_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz"; - sha1 = "40f036d19161fc76b68ab50fdc7fe495544492f2"; + name = "logform___logform_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.3.0.tgz"; + sha1 = "a3997a05985de2ebd325ae0d166dffc9c6fe6b57"; }; } { @@ -2233,6 +2481,14 @@ sha1 = "9a7b71cfb7d361a194ea555241c92f7468d5bf28"; }; } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } { name = "lru_cache___lru_cache_6.0.0.tgz"; path = fetchurl { @@ -2298,19 +2554,19 @@ }; } { - name = "mime_db___mime_db_1.47.0.tgz"; + name = "mime_db___mime_db_1.50.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.47.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; - sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; + name = "mime_db___mime_db_1.50.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz"; + sha1 = "abd4ac94e98d3c0e185016c67ab45d5fde40c11f"; }; } { - name = "mime_types___mime_types_2.1.30.tgz"; + name = "mime_types___mime_types_2.1.33.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.30.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; - sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; + name = "mime_types___mime_types_2.1.33.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz"; + sha1 = "1fa12a904472fafd068e48d9e8401f74d3f70edb"; }; } { @@ -2321,14 +2577,6 @@ sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; }; } - { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha1 = "820c86a39334640e99516928bd03fca88057d022"; - }; - } { name = "mimic_fn___mimic_fn_2.1.0.tgz"; path = fetchurl { @@ -2450,11 +2698,11 @@ }; } { - name = "node_abi___node_abi_2.26.0.tgz"; + name = "node_abi___node_abi_2.30.1.tgz"; path = fetchurl { - name = "node_abi___node_abi_2.26.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.26.0.tgz"; - sha1 = "355d5d4bc603e856f74197adbf3f5117a396ba40"; + name = "node_abi___node_abi_2.30.1.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz"; + sha1 = "c437d4b1fe0e285aaf290d45b45d4d7afedac4cf"; }; } { @@ -2473,6 +2721,14 @@ sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; }; } + { + name = "node_fetch___node_fetch_2.6.5.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.5.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; + sha1 = "42735537d7f080a7e5f78b6c549b7146be1742fd"; + }; + } { name = "noop_logger___noop_logger_0.1.1.tgz"; path = fetchurl { @@ -2490,11 +2746,11 @@ }; } { - name = "npm_run_path___npm_run_path_3.1.0.tgz"; + name = "npm_run_path___npm_run_path_4.0.1.tgz"; path = fetchurl { - name = "npm_run_path___npm_run_path_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz"; - sha1 = "7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"; + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; }; } { @@ -2521,6 +2777,62 @@ sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; } + { + name = "object_inspect___object_inspect_1.11.0.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; + sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object.assign___object.assign_4.1.2.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; + sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; + }; + } + { + name = "object.entries___object.entries_1.1.5.tgz"; + path = fetchurl { + name = "object.entries___object.entries_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz"; + sha1 = "e1acdd17c4de2cd96d5a08487cfb9db84d881861"; + }; + } + { + name = "object.fromentries___object.fromentries_2.0.5.tgz"; + path = fetchurl { + name = "object.fromentries___object.fromentries_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz"; + sha1 = "7b37b205109c21e741e605727fe8b0ad5fa08251"; + }; + } + { + name = "object.hasown___object.hasown_1.1.0.tgz"; + path = fetchurl { + name = "object.hasown___object.hasown_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz"; + sha1 = "7232ed266f34d197d15cac5880232f7a4790afe5"; + }; + } + { + name = "object.values___object.values_1.1.5.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz"; + sha1 = "959f63e3ce9ef108720333082131e4a459b716ac"; + }; + } { name = "on_finished___on_finished_2.3.0.tgz"; path = fetchurl { @@ -2553,14 +2865,6 @@ sha1 = "e06bc174aed214ed58edede573b433bbf827cb45"; }; } - { - name = "onetime___onetime_2.0.1.tgz"; - path = fetchurl { - name = "onetime___onetime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - } { name = "onetime___onetime_5.1.2.tgz"; path = fetchurl { @@ -2593,14 +2897,6 @@ sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; }; } - { - name = "p_finally___p_finally_2.0.1.tgz"; - path = fetchurl { - name = "p_finally___p_finally_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz"; - sha1 = "bd6fcaa9c559a096b680806f4d657b3f0f240561"; - }; - } { name = "p_is_promise___p_is_promise_3.0.0.tgz"; path = fetchurl { @@ -2642,19 +2938,11 @@ }; } { - name = "p_map___p_map_2.1.0.tgz"; + name = "p_map___p_map_4.0.0.tgz"; path = fetchurl { - name = "p_map___p_map_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; - sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; - }; - } - { - name = "p_map___p_map_3.0.0.tgz"; - path = fetchurl { - name = "p_map___p_map_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz"; - sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d"; + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; }; } { @@ -2673,14 +2961,6 @@ sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; }; } - { - name = "parse_json___parse_json_4.0.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; - }; - } { name = "parse_json___parse_json_5.2.0.tgz"; path = fetchurl { @@ -2762,11 +3042,11 @@ }; } { - name = "picomatch___picomatch_2.2.3.tgz"; + name = "picomatch___picomatch_2.3.0.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz"; - sha1 = "465547f359ccc206d3c48e46a1bcb89bf7ee619d"; + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; }; } { @@ -2786,19 +3066,19 @@ }; } { - name = "pkg_fetch___pkg_fetch_3.0.4.tgz"; + name = "pkg_fetch___pkg_fetch_3.2.3.tgz"; path = fetchurl { - name = "pkg_fetch___pkg_fetch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.0.4.tgz"; - sha1 = "8321eff936bf4eb088a333cf23494be0ded173b7"; + name = "pkg_fetch___pkg_fetch_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.3.tgz"; + sha1 = "9825febf4eadd470c126d3f6bdc2cb6996861d36"; }; } { - name = "pkg___pkg_5.1.0.tgz"; + name = "pkg___pkg_5.3.3.tgz"; path = fetchurl { - name = "pkg___pkg_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/pkg/-/pkg-5.1.0.tgz"; - sha1 = "25f92666a4164bbc5495c862de9370ed48788667"; + name = "pkg___pkg_5.3.3.tgz"; + url = "https://registry.yarnpkg.com/pkg/-/pkg-5.3.3.tgz"; + sha1 = "5ad1dadfc4e55169f0e1046626e669e0428d4cd7"; }; } { @@ -2833,6 +3113,14 @@ sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; }; } + { + name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; + path = fetchurl { + name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha1 = "d23d41fe1375646de2d0104d3454a3008802cf7b"; + }; + } { name = "prettier___prettier_2.2.1.tgz"; path = fetchurl { @@ -2873,6 +3161,14 @@ sha1 = "5fedfce1083bac6c2b223738e966d0e1643756f8"; }; } + { + name = "prop_types___prop_types_15.7.2.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + }; + } { name = "protobufjs___protobufjs_6.11.2.tgz"; path = fetchurl { @@ -2882,11 +3178,11 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; + name = "proxy_addr___proxy_addr_2.0.7.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha1 = "f19fe69ceab311eeb94b42e70e8c2070f9ba1025"; }; } { @@ -2930,11 +3226,11 @@ }; } { - name = "puppeteer___puppeteer_10.0.0.tgz"; + name = "puppeteer___puppeteer_10.4.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.0.0.tgz"; - sha1 = "1b597c956103e2d989ca17f41ba4693b20a3640c"; + name = "puppeteer___puppeteer_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.4.0.tgz"; + sha1 = "a6465ff97fda0576c4ac29601406f67e6fea3dc7"; }; } { @@ -2977,6 +3273,14 @@ sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; }; } + { + name = "react_is___react_is_16.13.1.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + }; + } { name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { @@ -3002,11 +3306,35 @@ }; } { - name = "regexpp___regexpp_3.1.0.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; path = fetchurl { - name = "regexpp___regexpp_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; - sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; + }; + } + { + name = "regexpp___regexpp_3.2.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; + sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; + }; + } + { + name = "regextras___regextras_0.7.1.tgz"; + path = fetchurl { + name = "regextras___regextras_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz"; + sha1 = "be95719d5f43f9ef0b9fa07ad89b7c606995a3b2"; + }; + } + { + name = "regextras___regextras_0.8.0.tgz"; + path = fetchurl { + name = "regextras___regextras_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz"; + sha1 = "ec0f99853d4912839321172f608b544814b02217"; }; } { @@ -3025,14 +3353,6 @@ sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; }; } - { - name = "resolve_from___resolve_from_3.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; - }; - } { name = "resolve_from___resolve_from_4.0.0.tgz"; path = fetchurl { @@ -3050,11 +3370,19 @@ }; } { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; + name = "resolve___resolve_2.0.0_next.3.tgz"; path = fetchurl { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + name = "resolve___resolve_2.0.0_next.3.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz"; + sha1 = "d41016293d4a8586a39ca5d9b5f15cbea1f55e46"; + }; + } + { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; }; } { @@ -3105,6 +3433,14 @@ sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; }; } + { + name = "safe_stable_stringify___safe_stable_stringify_1.1.1.tgz"; + path = fetchurl { + name = "safe_stable_stringify___safe_stable_stringify_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz"; + sha1 = "c8a220ab525cd94e60ebf47ddc404d610dc5d84a"; + }; + } { name = "safer_buffer___safer_buffer_2.1.2.tgz"; path = fetchurl { @@ -3122,11 +3458,11 @@ }; } { - name = "semver_regex___semver_regex_3.1.2.tgz"; + name = "semver_regex___semver_regex_3.1.3.tgz"; path = fetchurl { - name = "semver_regex___semver_regex_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz"; - sha1 = "34b4c0d361eef262e07199dbef316d0f2ab11807"; + name = "semver_regex___semver_regex_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz"; + sha1 = "b2bcc6f97f63269f286994e297e229b6245d0dc3"; }; } { @@ -3137,6 +3473,14 @@ sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; }; } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } { name = "semver___semver_7.3.5.tgz"; path = fetchurl { @@ -3194,11 +3538,19 @@ }; } { - name = "signal_exit___signal_exit_3.0.3.tgz"; + name = "side_channel___side_channel_1.0.4.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; - sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + name = "side_channel___side_channel_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; + sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; + }; + } + { + name = "signal_exit___signal_exit_3.0.5.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; + sha1 = "9e3e8cc0c75a99472b44321033a7702e7738252f"; }; } { @@ -3234,11 +3586,11 @@ }; } { - name = "slice_ansi___slice_ansi_0.0.4.tgz"; + name = "slice_ansi___slice_ansi_3.0.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz"; - sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha1 = "31ddc10930a1b7e0b67b08c96c2f49b77a789787"; }; } { @@ -3257,6 +3609,30 @@ sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; }; } + { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; + sha1 = "0d9becccde7003d6c658d487dd48a32f0bf3014b"; + }; + } { name = "split___split_0.3.3.tgz"; path = fetchurl { @@ -3305,14 +3681,6 @@ sha1 = "52af95aa5ea760a2491716704dbff90f73afdd1d"; }; } - { - name = "string_argv___string_argv_0.1.2.tgz"; - path = fetchurl { - name = "string_argv___string_argv_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz"; - sha1 = "c5b7bc03fb2b11983ba3a72333dd0559e77e4738"; - }; - } { name = "string_argv___string_argv_0.3.1.tgz"; path = fetchurl { @@ -3321,6 +3689,14 @@ sha1 = "95e2fbec0427ae19184935f816d74aaa4c5c19da"; }; } + { + name = "string_argv___string_argv_0.1.2.tgz"; + path = fetchurl { + name = "string_argv___string_argv_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz"; + sha1 = "c5b7bc03fb2b11983ba3a72333dd0559e77e4738"; + }; + } { name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { @@ -3338,11 +3714,35 @@ }; } { - name = "string_width___string_width_4.2.2.tgz"; + name = "string_width___string_width_4.2.3.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; - sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + name = "string_width___string_width_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; + sha1 = "269c7117d27b05ad2e536830a8ec895ef9c6d010"; + }; + } + { + name = "string.prototype.matchall___string.prototype.matchall_4.0.6.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz"; + sha1 = "5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; }; } { @@ -3386,11 +3786,11 @@ }; } { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; + name = "strip_ansi___strip_ansi_6.0.1.tgz"; path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha1 = "9e26c63d30f53443e9489495b2105d37b67a85d9"; }; } { @@ -3418,11 +3818,11 @@ }; } { - name = "supports_color___supports_color_2.0.0.tgz"; + name = "supports_color___supports_color_8.1.1.tgz"; path = fetchurl { - name = "supports_color___supports_color_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + name = "supports_color___supports_color_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; + sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; }; } { @@ -3442,19 +3842,11 @@ }; } { - name = "symbol_observable___symbol_observable_1.2.0.tgz"; + name = "table___table_6.7.2.tgz"; path = fetchurl { - name = "symbol_observable___symbol_observable_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz"; - sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804"; - }; - } - { - name = "table___table_6.6.0.tgz"; - path = fetchurl { - name = "table___table_6.6.0.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz"; - sha1 = "905654b79df98d9e9a973de1dd58682532c40e8e"; + name = "table___table_6.7.2.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz"; + sha1 = "a8d39b9f5966693ca8b0feba270a78722cbaf3b0"; }; } { @@ -3537,6 +3929,14 @@ sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; }; } + { + name = "tr46___tr46_0.0.3.tgz"; + path = fetchurl { + name = "tr46___tr46_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; + sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + }; + } { name = "triple_beam___triple_beam_1.3.0.tgz"; path = fetchurl { @@ -3546,11 +3946,11 @@ }; } { - name = "tsc_watch___tsc_watch_4.2.9.tgz"; + name = "tsc_watch___tsc_watch_4.5.0.tgz"; path = fetchurl { - name = "tsc_watch___tsc_watch_4.2.9.tgz"; - url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.9.tgz"; - sha1 = "d93fc74233ca4ef7ee6b12d08c0fe6aca3e19044"; + name = "tsc_watch___tsc_watch_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.5.0.tgz"; + sha1 = "d6884b932822b2c2ccd37f1c1f3748304566a474"; }; } { @@ -3569,6 +3969,14 @@ sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; }; } + { + name = "tsutils___tsutils_3.21.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_3.21.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; + sha1 = "b48717d394cea6c1e096983eed58e9d61715b623"; + }; + } { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { @@ -3601,6 +4009,14 @@ sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; }; } + { + name = "type_fest___type_fest_0.21.3.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.21.3.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; + sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; + }; + } { name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { @@ -3618,11 +4034,27 @@ }; } { - name = "typescript___typescript_4.3.2.tgz"; + name = "typescript___typescript_4.3.4.tgz"; path = fetchurl { - name = "typescript___typescript_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz"; - sha1 = "399ab18aac45802d6f2498de5054fcbbe716a805"; + name = "typescript___typescript_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz"; + sha1 = "3f85b986945bcf31071decdd96cf8bfa65f9dcbc"; + }; + } + { + name = "typescript___typescript_4.4.3.tgz"; + path = fetchurl { + name = "typescript___typescript_4.4.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz"; + sha1 = "bdc5407caa2b109efd4f82fe130656f977a29324"; + }; + } + { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + path = fetchurl { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha1 = "085e215625ec3162574dc8859abee78a59b14471"; }; } { @@ -3713,6 +4145,30 @@ sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; } + { + name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + }; + } + { + name = "whatwg_url___whatwg_url_5.0.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + }; + } + { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + path = fetchurl { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; + }; + } { name = "which_pm_runs___which_pm_runs_1.0.0.tgz"; path = fetchurl { @@ -3762,11 +4218,11 @@ }; } { - name = "wrap_ansi___wrap_ansi_3.0.1.tgz"; + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; path = fetchurl { - name = "wrap_ansi___wrap_ansi_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; }; } { @@ -3818,11 +4274,11 @@ }; } { - name = "yargs_parser___yargs_parser_20.2.7.tgz"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.7.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; - sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; }; } { diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 7f0e5c78eba9..ea4a511f7222 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.1.2"; + version = "1.2.2"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "1kz52zhsm0xx63vczzplj15hli4i22qfxl08grb7m50bqk651j1n"; + sha256 = "11xjbkws3vv5r4p6w6qfmm9wrmlhzwmvlx3vcgz99ylz34r19xvc"; }; - vendorSha256 = "05lr2ln87902bwamw4l3rrk2j9sdgv1pcvxyvzbga64rymi9dmjb"; + vendorSha256 = "0wwji220pidrmsjzd9c3n40v237680av750jf6hdvp0aqi63p9nr"; # FIXME: tests fail due to read-only nix store doCheck = false; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index a830cfe3427b..918aea224305 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.20.0"; + version = "1.20.2"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-whsPXevnN/Kg09hcjEAeAduLZsYbo7IvUm5z4HodwrQ="; + sha256 = "sha256-6XPdqTW5dP5nOfV9fdnXkyzWPYEILEx4AF61u691b6c="; }; - vendorSha256 = "sha256-VywVlCcdOV/TdXQBa88oU9V8U4EbuYMId4aT4YAY1Wk="; + vendorSha256 = "sha256-7Crf2mQy0C7Fw6S7KY3bQj4Cu8GceFxoB7D2Vkv6X9U="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index 00d721be2e83..9e1c82836c2c 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -15,13 +15,13 @@ let ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2021-09-21"; + version = "unstable-2021-10-03"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "2447ccab6252fddc829da3eec8b29d1abe3dee60"; - sha256 = "qaorF26e2pkOCxiUfo8MOPQVpZjx5G1uo66jFoQpMcs="; + rev = "c3f1b290f8667f771f2d58a3f012e87853c4e85c"; + sha256 = "a49sVvgzpGHrjWbSH6GiH5kGeXm1LrLgd+lKv7Xxi9w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 042772c95db8..f4fa1320c944 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -116,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.10"; + version = "0.22.11"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-h9dmi8AI8ZCjF4nlTi07uOWKs+8gly2HhSbPRB3Jl0g="; + sha256 = "sha256-X+FnZ5W1p9GuOSIxTSp1Yok+kKsLjNPOKZkJSCYk8kM="; }; buildInputs = [ diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix new file mode 100644 index 000000000000..b0f255e16544 --- /dev/null +++ b/pkgs/servers/mycorrhiza/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, buildGoModule +, makeWrapper, git +}: + +buildGoModule rec { + pname = "mycorrhiza"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "bouncepaw"; + repo = "mycorrhiza"; + rev = "v${version}"; + sha256 = "0manay7gfybzk28dp9a8xdfpbhxm1dbnvcyp4mjhh449n8jlp4bq"; + }; + + vendorSha256 = "1br1p8cnyv2xpwnld3ydd87zxbdwl962f6yww8i8xbsm7881bl0d"; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/mycorrhiza \ + --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + meta = with lib; { + description = "Filesystem and git-based wiki engine written in Go using mycomarkup as its primary markup language"; + homepage = "https://github.com/bouncepaw/mycorrhiza"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ chekoopa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix index 36bffaa3ec61..7abd3e865fcb 100644 --- a/pkgs/servers/nitter/default.nix +++ b/pkgs/servers/nitter/default.nix @@ -46,6 +46,6 @@ nimPackages.buildNimPackage rec { maintainers = with maintainers; [ erdnaxe ]; license = licenses.agpl3Only; platforms = [ "x86_64-linux" ]; + mainProgram = "nitter"; }; } - diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 4a6db24bc4c4..769c45ffc6c5 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -2,13 +2,15 @@ , fetchFromGitHub , fetchurl , makeWrapper -, dotnet-sdk +, dotnetCorePackages , mono , Nuget }: let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + deps = import ./deps.nix { inherit fetchurl; }; in diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 802e53820796..47198243cbce 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.24.3.5033-757abe6b4"; + version = "1.24.4.5081-e362dc1ee"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "063llf34h6dbzrysm98xwwmv8fwyk8vsc3sj7dniy9j29wwygwdz"; + sha256 = "0q3s1qcr65rx2jbf9k0i38w5xvnzw1wcy13gvm0150ad2hqw358b"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0cnv1i00xv7ls5yb9xlim4haal7bvn41p3zskbab85vwhffr9irx"; + sha256 = "17igy0lq7mjmrw5xq92b57np422x8hj6m8qzjri493yc6fw1cl1m"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix new file mode 100644 index 000000000000..9cfc26925cc6 --- /dev/null +++ b/pkgs/servers/prowlarr/default.nix @@ -0,0 +1,61 @@ +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnetCorePackages, openssl, nixosTests }: + +let + os = + if stdenv.isDarwin then + "osx" + else if stdenv.isLinux then + "linux" + else + throw "Not supported on ${stdenv.hostPlatform.system}."; + + arch = { + x86_64-linux = "x64"; + aarch64-linux = "arm64"; + x86_64-darwin = "x64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + hash = { + x64-linux_hash = "sha256-9DoqyotXAUha2TMSgDIot5PD8ABpfZ8gsshS1ypr5SY="; + arm64-linux_hash = "sha256-r22c70OuevRsF8gOHZOkkhlRtoD4nsTHnXF82elQIF8="; + x64-osx_hash = "sha256-6jVM4iSGT7tpagocI/1nuBPVvAegfFqsCfrz2fPKCI4="; + }."${arch}-${os}_hash"; + +in stdenv.mkDerivation rec { + pname = "prowlarr"; + version = "0.1.1.978"; + + src = fetchurl { + url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; + sha256 = hash; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version}/. + + makeWrapper "${dotnetCorePackages.runtime_3_1}/bin/dotnet" $out/bin/Prowlarr \ + --add-flags "$out/share/${pname}-${version}/Prowlarr.dll" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ + curl sqlite libmediainfo mono openssl icu ]} + + runHook postInstall + ''; + + passthru = { + updateScript = ./update.sh; + tests.smoke-test = nixosTests.prowlarr; + }; + + meta = with lib; { + description = "An indexer manager/proxy built on the popular arr .net/reactjs base stack"; + homepage = "https://wiki.servarr.com/prowlarr"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jdreaver ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/servers/prowlarr/update.sh b/pkgs/servers/prowlarr/update.sh new file mode 100755 index 000000000000..d61edda5a0a3 --- /dev/null +++ b/pkgs/servers/prowlarr/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch jq + +set -eou pipefail + +dirname="$(dirname "$0")" + +updateHash() +{ + version=$1 + arch=$2 + os=$3 + + hashKey="${arch}-${os}_hash" + + url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.develop.$version.$os-core-$arch.tar.gz" + hash=$(nix-prefetch-url --type sha256 $url) + sriHash="$(nix hash to-sri --type sha256 $hash)" + + sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" +} + +updateVersion() +{ + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" +} + +currentVersion=$(cd $dirname && nix eval --raw -f ../../.. prowlarr.version) + +# N.B. Prowlarr is still in development, so +# https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest +# returns nothing. Once this endpoint returns something, we should use +# it. Until then, we use jq to sort releases (N.B. the "sort_by(. | +# split(".") | map(tonumber))" incantation is to sort the version +# number properly and not as a string). + +# latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name") +# latestVersion="$(expr $latestTag : 'v\(.*\)')" +latestVersion=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/git/refs/tags | jq '. | map(.ref | sub("refs/tags/v";"")) | sort_by(. | split(".") | map(tonumber)) | .[-1]' -r) + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Prowlarr is up-to-date: ${currentVersion}" + exit 0 +fi + +updateVersion $latestVersion + +updateHash $latestVersion x64 linux +updateHash $latestVersion arm64 linux +updateHash $latestVersion x64 osx diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix index 67529b7d5bb8..044852bdfefb 100644 --- a/pkgs/servers/pufferpanel/default.nix +++ b/pkgs/servers/pufferpanel/default.nix @@ -54,6 +54,6 @@ buildGoModule rec { description = "A free, open source game management panel"; homepage = "https://www.pufferpanel.com/"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ronthecookie ]; + maintainers = with maintainers; [ ckie ]; }; } diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index dd2480de2e66..acb3ba82a4ac 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/{bin,share/${pname}-${version}} cp -r * $out/share/${pname}-${version}/. - makeWrapper "${dotnetCorePackages.netcore_3_1}/bin/dotnet" $out/bin/Radarr \ + makeWrapper "${dotnetCorePackages.runtime_3_1}/bin/dotnet" $out/bin/Radarr \ --add-flags "$out/share/${pname}-${version}/Radarr.dll" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo mono openssl icu ]} diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 7fdb4bbc8693..5fa96c91c5ef 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.3.7"; + version = "3.3.8"; pname = "shairport-sync"; src = fetchFromGitHub { - sha256 = "110k196y62zy6cmdvcnf74iamqj7jq0ybnqh1q1irjak81s3yz12"; + sha256 = "sha256-YxTJ3XEbBgOQqUJGGsjba2PjyTudWZiH9FqXlnvlsp0="; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index f713ab39cb96..d55888066a00 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }: let - pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); + pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.16"; + version = "0.25.11"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-Kx3vTbwYfILxn7n4upyVZo0V6S2lTStlezku9bfwGVw="; + sha256 = "sha256-0/Ez10IWvh84G//1vCZMLiu4+Y2+XcVLw9Gm9X+DY0s="; }; dontBuild = true; @@ -19,11 +19,15 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; - installPhase = '' - mkdir -p $out/bin - cp -R {autoProcessTV,gui,lib,sickbeard,sickgear.py,SickBeard.py} $out/ + postPatch = '' + substituteInPlace sickgear.py --replace "/usr/bin/env python2" "/usr/bin/env python" + ''; - makeWrapper $out/SickBeard.py $out/bin/sickgear + installPhase = '' + mkdir -p $out/bin $out/opt/sickgear + cp -R {autoProcessTV,gui,lib,sickbeard,sickgear.py} $out/opt/sickgear/ + + makeWrapper $out/opt/sickgear/sickgear.py $out/bin/sickgear ''; meta = with lib; { diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index d9629207a8d4..29d56fd98fda 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,4 +1,3 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev { lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils }: let webassets = fetchFromGitHub { @@ -10,14 +9,14 @@ let in buildGoModule rec { pname = "teleport"; - version = "7.2.0"; + version = "7.3.0"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-JLYma/LB/3xLWaFcIbe32pAz6P8hBiLlMuTUBVfqfsw="; + sha256 = "sha256-Dy6L0dvbR8wgcRePG1jFmiJV3oYtBZuExD2bf8Uq78Y="; }; vendorSha256 = null; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d2cbf8c0d520..5209927c506d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -34,7 +34,7 @@ let description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen globin patryk27 ]; + maintainers = with maintainers; [ erictapen globin patryk27 pennae ]; }; }; diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 4060917ad537..94ef0b23f3b7 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.34.1"; + version = "0.35.1"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "sha256-UUqETnvkdLBoxUHUpcfE3bxE7fZJEToDxz2Q6kN1/n4="; + sha256 = "sha256-dKf68WjCynB73RBWneBsMoyowUcrEaBTnMKVKB0sgsg="; }; vendorSha256 = "sha256-ifH+420FIrib+zQtzzHtMMYd84BED+vgnRw4xToYIl4="; diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index 2766b645349f..947e0ff9196c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -11,6 +11,7 @@ in discourse-ldap-auth = callPackage ./discourse-ldap-auth {}; discourse-math = callPackage ./discourse-math {}; discourse-migratepassword = callPackage ./discourse-migratepassword {}; + discourse-openid-connect = callPackage ./discourse-openid-connect {}; discourse-solved = callPackage ./discourse-solved {}; discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; discourse-yearly-review = callPackage ./discourse-yearly-review {}; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile new file mode 100644 index 000000000000..7da32ec03949 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' + +group :development do + gem 'rubocop-discourse' +end diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock new file mode 100644 index 000000000000..0987b206fa66 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock @@ -0,0 +1,37 @@ +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.1) + parallel (1.19.2) + parser (2.7.2.0) + ast (~> 2.4.1) + rainbow (3.0.0) + regexp_parser (1.8.1) + rexml (3.2.5) + rubocop (0.93.0) + parallel (~> 1.10) + parser (>= 2.7.1.5) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8) + rexml + rubocop-ast (>= 0.6.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.7.1) + parser (>= 2.7.1.5) + rubocop-discourse (2.3.2) + rubocop (>= 0.69.0) + rubocop-rspec (>= 1.39.0) + rubocop-rspec (1.43.2) + rubocop (~> 0.87) + ruby-progressbar (1.10.1) + unicode-display_width (1.7.0) + +PLATFORMS + ruby + +DEPENDENCIES + rubocop-discourse + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix new file mode 100644 index 000000000000..7162aa8a16ff --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -0,0 +1,19 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-openid-connect"; + bundlerEnvArgs.gemdir = ./.; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-openid-connect"; + rev = "615038bd65f4fbe4dfdf8444b2f5eb06986b80b8"; + sha256 = "n8feZkP80iNc+BzTPyKD7kEgFSIkk091eJYuqonN/NU="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-openid-connect"; + maintainers = with maintainers; [ mkg20001 ]; + license = licenses.mit; + description = "Discourse plugin to integrate Discourse with an openid-connect login provider."; + }; +} + diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix new file mode 100644 index 000000000000..2a546e7a1c87 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix @@ -0,0 +1,127 @@ +{ + ast = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; + type = "gem"; + }; + version = "2.4.1"; + }; + parallel = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; + type = "gem"; + }; + version = "1.19.2"; + }; + parser = { + dependencies = ["ast"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; + type = "gem"; + }; + version = "2.7.2.0"; + }; + rainbow = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; + }; + regexp_parser = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n"; + type = "gem"; + }; + version = "1.8.1"; + }; + rexml = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rubocop = { + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nrv7i81549addig09grw17qkab3l4319dcsf9y7psl7aa76ng3a"; + type = "gem"; + }; + version = "0.93.0"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "129hgz4swc8n0g01715v7y00k0h4mlzkxh63q7z27q7mjp54rl74"; + type = "gem"; + }; + version = "0.7.1"; + }; + rubocop-discourse = { + dependencies = ["rubocop" "rubocop-rspec"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10l2wwnvd4xccgqsyhxrhc5bw10b7an4awl0v90fw5xf2qdjiflw"; + type = "gem"; + }; + version = "2.3.2"; + }; + rubocop-rspec = { + dependencies = ["rubocop"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sc0bwdxzfr8byxzwvfyf22lwzqcaa6ca7wzxx31mk7vvy7r7dhl"; + type = "gem"; + }; + version = "1.43.2"; + }; + ruby-progressbar = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + type = "gem"; + }; + version = "1.10.1"; + }; + unicode-display_width = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + type = "gem"; + }; + version = "1.7.0"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/up-plugin.sh b/pkgs/servers/web-apps/discourse/plugins/up-plugin.sh new file mode 100755 index 000000000000..ba103c5f6b2b --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/up-plugin.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl ruby.devEnv git sqlite libpcap postgresql libxml2 libxslt pkg-config bundix gnumake +# src https://nixos.wiki/wiki/Packaging/Ruby + +# This script should be ran afte rupdating a plugin that has a gemset.nix +# Usage: ./up-plugin.sh +# NOTE: Script must be ran directly as ./up-plugin, otherwise the nix-shell won't work + +set -exuo pipefail + +PLUGIN="$1" +SELF="$(dirname "$(readlink -f "$0")")" + +PL_DIR="$SELF/$PLUGIN" +TOP="$SELF/../../../../.." +TMP=$(mktemp -d) + +pushd "$TMP" + +if cat "$PL_DIR/default.nix" | grep gemdir >/dev/null; then + nix-build -A discourse.plugins.$PLUGIN.src "$TOP" + if [ -e result/Gemfile ]; then + cp result/Gemfile Gemfile + if [ -e result/Gemfile.lock ]; then + cp result/Gemfile.lock Gemfile.lock + fi + else + echo '# frozen_string_literal: true + +source "https://rubygems.org"' > Gemfile + cat result/plugin.rb | grep "^gem" >> Gemfile + fi + if [ ! -e Gemfile.lock ]; then + bundle install + fi + bundix + cp Gemfile Gemfile.lock gemset.nix "$PL_DIR" +fi + diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 5752d94d6a5c..9151202d94a9 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.5307"; + version = "1.0.5415"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "epdVQnuL5dJ7DmoqyjfiLEfZxr4IQwkFEla/Y034sgg="; + sha256 = "DJk+2EAADIz3Jck5Tf3AMWq0pZn3q1JQpDm/VdIz7nc="; }; dontBuild = true; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1223b0a50739..018ec774a3a9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1902,11 +1902,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { pname = "xev"; - version = "1.2.3"; + version = "1.2.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xev-1.2.3.tar.bz2"; - sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; + url = "mirror://xorg/individual/app/xev-1.2.4.tar.bz2"; + sha256 = "1ql592pdhddhkipkrsxn929y9l2nn02a5fh2z3dx47kmzs5y006p"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index b24dc504288e..64ecbfa0a4a5 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -35,7 +35,7 @@ mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.12.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 -mirror://xorg/individual/app/xev-1.2.3.tar.bz2 +mirror://xorg/individual/app/xev-1.2.4.tar.bz2 mirror://xorg/individual/app/xeyes-1.2.0.tar.bz2 mirror://xorg/individual/app/xfd-1.1.3.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 diff --git a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch index 6ca55a147688..ca2792099bd1 100644 --- a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch +++ b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch @@ -1,4 +1,4 @@ -From db38a11228eceea10dc97ecc87023b4919caa918 Mon Sep 17 00:00:00 2001 +From 8823e48b055b7e574c08069048ba21ffa4393699 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 21 Feb 2020 21:52:00 -0500 Subject: [PATCH] Don't use file timestamp in cache filename @@ -14,13 +14,13 @@ unique. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/includes/functions.php b/web/includes/functions.php -index 19567a5c1..0242c09bc 100644 +index 89d2cc8ad..52cbb6f38 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php -@@ -2223,7 +2223,8 @@ function cache_bust($file) { +@@ -1941,7 +1941,8 @@ function cache_bust($file) { $parts = pathinfo($file); global $css; - $dirname = preg_replace('/\//', '_', $parts['dirname']); + $dirname = str_replace('/', '_', $parts['dirname']); - $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension']; + $srcHash = '@srcHash@'; + $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension']; @@ -28,5 +28,4 @@ index 19567a5c1..0242c09bc 100644 return 'cache/'.$cacheFile; } else { -- -2.25.1 - +2.32.0 diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 2ea162b0d60e..3aed72eb8b8d 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -78,13 +78,14 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.34.22"; + version = "1.36.8"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83"; + sha256 = "sha256-UUpq4CCZq+EwVNGsLCQuVWdY3yoGw977AaMk1iJ6a5U="; + fetchSubmodules = true; }; patches = [ @@ -130,7 +131,7 @@ in stdenv.mkDerivation rec { for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ scripts/zmupdate.pl.in \ - src/zm_config.h.in \ + src/zm_config_data.h.in \ web/api/app/Config/bootstrap.php.in \ web/includes/config.php.in ; do substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index b3259466ddb1..84cbba8eac4a 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -132,7 +132,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = [ maintainers.peti ]; }; passthru = { diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index ddf2edfd1db6..efa90b0499eb 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = with maintainers; [ peti dtzWill ]; + maintainers = with maintainers; [ dtzWill ]; }; passthru = { diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 0ebcaa9e8645..6571d572a429 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.peti maintainers.xfix ]; + maintainers = [ maintainers.xfix ]; }; } diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index be2bdf318f40..a4a54e45c636 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -2,25 +2,24 @@ buildGoModule rec { pname = "hilbish"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - sha256 = "sha256-557Je9KeBpkZxVAxcjWAhybIJJYlzhtbnIyZh0rCRUc="; + sha256 = "sha256-ACHHHGT3VGnvZVi1UZb57+g/slcld5e3bh+DDhUVVpQ="; fetchSubmodules = true; }; - vendorSha256 = "sha256-8l+Kb1ADMLwv0Hf/ikok8eUcEEST07rhk8BjHxJI0lc="; + vendorSha256 = "sha256-SVGPMFpQjVOWCfiPpEmqhp6MEO0wqeyAZVyeNmTuXl0="; buildInputs = [ readline ]; ldflags = [ "-s" "-w" ]; postPatch = '' - # in master vars.go is called vars_linux.go - substituteInPlace vars.go \ + substituteInPlace vars_linux.go \ --replace "/usr/share" "${placeholder "out"}/share/" ''; @@ -28,8 +27,13 @@ buildGoModule rec { mkdir -p "$out/share/hilbish" cp .hilbishrc.lua $out/share/hilbish/ + cp -r docs -t $out/share/hilbish cp -r libs -t $out/share/hilbish/ cp preload.lua $out/share/hilbish/ + + # segfaults and it's already been generated upstream + # we copy the docs over with the above cp command + rm $out/bin/docgen ''; meta = with lib; { diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 3ebdc4c8e5a6..14137fa0e607 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Qdol0ohg2Oo3rC59jPvqHZJtQOQ5W+aZVxTxsxrG51E="; + sha256 = "155rn0balgikkhy77gbva6a88pgwm27flzgjyphiwzwnah1mmhca"; }; - cargoSha256 = "sha256-EP4DzfufQ9y0x2rI4MGBLu48VKoUY9ETKPlUt9Abum8="; + cargoSha256 = "1pk56s47mk0f8cww6h1y43jdnf311g35xynz1jvhrk31yyjhb0jl"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 41ff2b435426..c284c83b4168 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-10-06"; + version = "2021-10-13"; pname = "oh-my-zsh"; - rev = "29b5c182bec4cec7704fb8bac9ee0ab971dfb89a"; + rev = "19f9b6f1ade7788b07480be685cf3fcb117cad84"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "pPBeZj/QTQCIuBtE7+4CmuXacblU4RGXty+cdeQw+54="; + sha256 = "aC7tn5nNbkmyZ6oGKIQnWE+1LNcZH5P2pPgtnUhru/Y="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/shells/zsh/zsh-autocomplete/default.nix new file mode 100644 index 000000000000..a58a941189c9 --- /dev/null +++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "zsh-autocomplete"; + version = "21.09.22"; + + src = fetchFromGitHub { + owner = "marlonrichert"; + repo = "zsh-autocomplete"; + rev = version; + sha256 = "sha256-c4+5ta0ATuy9hIygSnqaquHf+YIStvHMaABwq3qyru8="; + }; + + installPhase = '' + install -D zsh-autocomplete.plugin.zsh $out/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh + cp -R scripts $out/share/zsh-autocomplete/scripts + cp -R functions $out/share/zsh-autocomplete/functions + ''; + + meta = with lib; { + description = "Real-time type-ahead completion for Zsh. Asynchronous find-as-you-type autocompletion"; + homepage = "https://github.com/marlonrichert/zsh-autocomplete/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.em0lar ]; + }; +} diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 5bffa1077647..b205f959ee35 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -3,8 +3,7 @@ , fetchFromGitHub , fetchurl , linkFarmFromDrvs -, dotnet-netcore -, dotnet-sdk +, dotnetCorePackages , dotnetPackages , dpkg , gtk3 @@ -21,6 +20,10 @@ , wrapGAppsHook }: +let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-runtime = dotnetCorePackages.runtime_5_0; +in stdenv.mkDerivation rec { pname = "OpenTabletDriver"; version = "0.5.3.3"; @@ -114,19 +117,19 @@ stdenv.mkDerivation rec { makeWrapper $out/lib/OpenTabletDriver.Console $out/bin/otd \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" makeWrapper $out/lib/OpenTabletDriver.Daemon $out/bin/otd-daemon \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" makeWrapper $out/lib/OpenTabletDriver.UX.Gtk $out/bin/otd-gui \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" mkdir -p $out/lib/OpenTabletDriver diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index f3318eb55077..54d863bb958f 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://www.c-amie.co.uk/software/analog/"; license = lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.all; }; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index f2fec6fe6be7..4f0609d0a55a 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.28.0"; + version = "2.28.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-fTt6tIcc96f8t3NUaR0RG0JQ+LPgqSHuJSmVx4a6X7M="; + sha256 = "sha256-9EkCScEj5kuKtkfnCmFUZg/qDzvmI3rvDS+NtkZC7sk="; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 6441b0782d50..4c6c6971fc92 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr"; + sha256 = "sha256-Fv2vM3mdYxBONH4BM/kJGW/pDQxQUV0BC8tCLrWgCBg="; }; nativeBuildInputs = [ libxslt docbook_xsl ]; diff --git a/pkgs/tools/admin/damon/default.nix b/pkgs/tools/admin/damon/default.nix new file mode 100644 index 000000000000..10687bce0908 --- /dev/null +++ b/pkgs/tools/admin/damon/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "damon"; + version = "unstable-2021-10-06"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "damon"; + rev = "542c79aecc44b1d0500f9cb9b2e13f07db1e2f35"; + sha256 = "sha256-vg5PISNqk8N2nn7eABm+/7qzePDbKPkvovdZk2sZYsg="; + }; + + vendorSha256 = "sha256-/ZZxw6qEUJQUz3J0TxUYJECCcX276r74g0N2tV77+8I="; + + meta = with lib; { + homepage = "https://github.com/hashicorp/damon"; + license = licenses.mpl20; + description = "A terminal UI (TUI) for HashiCorp Nomad"; + maintainers = teams.iog.members; + }; +} diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 79e0559eaaa8..9b318ec462fb 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.68.0"; + version = "0.69.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-J4suRGr00mdgZv6q9Ar9x4HFZxk4gtUFF1TE3WyNlvE="; + sha256 = "sha256-mRY/czMf6KefYCqfCVRtcHuUuqAxyPUd8TJmx7vzOsk="; }; vendorSha256 = "sha256-cUo+tcHhnbJbn3HS/I8lnkvfv+6+htIs1dMtKuEArQg="; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index b4dfcd17aeb3..e0206b120a5b 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -13,7 +13,7 @@ let pythonEnv = python.withPackages (p: with p; [ cffi cryptography - pyopenssl + openssl crcmod ] ++ lib.optional (with-gce) google-compute-engine); @@ -21,33 +21,33 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1a17bbvimdqq4k25lprqk9cq3lpfchd65hzjf23ha4imndpbjgqr"; + sha256 = "0cjy6znhpv90mj7463lghmzhivwhaxa7q9da37wdpwh53h7kf05r"; }; aarch64-darwin = { url = "${baseUrl}/${name}-darwin-arm.tar.gz"; - sha256 = "184k1kv10g4zzzxgmwpakvg5ffxhz01dd01kb5h32mf1j5fid1zh"; + sha256 = "0phby3s9375zyphjwk1hrpr8fiybik1ag3yfnpmi7msq54lf4h3x"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0hhaq5hf5nvaah06h6v8q2hpn8hc815ihsi74dpwg6pmg9h266pr"; + sha256 = "0j1n8mzck3sizjslm12x4lgxklw1xvbxp2186xnxm4pmj4kwp4k1"; }; i686-linux = { url = "${baseUrl}/${name}-linux-x86.tar.gz"; - sha256 = "14z1nzwc0j3qhbw2ldrskd8zjsslwgsw7pxxq3v0ypc1rjibsql5"; + sha256 = "1sll47bhd4x5r0z65325ak0wbbky07qbzqkf7w97nilv7wz5dgxa"; }; aarch64-linux = { url = "${baseUrl}/${name}-linux-arm.tar.gz"; - sha256 = "0f6xrij2wbx57s4897bi12l9fz3flj1wyibbk7jjg0l5332h4yhr"; + sha256 = "1jk17fn3q1i625q1cdyxlvv58rw9ma7lwvngc04jqrccczsl1jqr"; }; - }.${system}; + }.${system} or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "351.0.0"; + version = "360.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch b/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch index 64ec6cdb1b65..74c0754f3ceb 100644 --- a/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch +++ b/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch @@ -33,15 +33,14 @@ diff --git a/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/lib/googleclou index 4330988d6..37424b841 100644 --- a/lib/googlecloudsdk/api_lib/container/kubeconfig.py +++ b/lib/googlecloudsdk/api_lib/container/kubeconfig.py -@@ -255,7 +255,7 @@ def _AuthProvider(name='gcp'): - raise Error(SDK_BIN_PATH_NOT_FOUND) +@@ -352,7 +352,7 @@ def _AuthProvider(name='gcp', + if sdk_bin_path is None: + log.error(SDK_BIN_PATH_NOT_FOUND) + raise Error(SDK_BIN_PATH_NOT_FOUND) +- cmd_path = os.path.join(sdk_bin_path, bin_name) ++ cmd_path = bin_name + cfg = { # Command for gcloud credential helper -- 'cmd-path': os.path.join(sdk_bin_path, bin_name), -+ 'cmd-path': bin_name, - # Args for gcloud credential helper - 'cmd-args': 'config config-helper --format=json', - # JSONpath to the field that is the raw access token -- 2.21.0 - diff --git a/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch index 1147668862b0..a262dcabf74e 100644 --- a/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch +++ b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch @@ -2,7 +2,7 @@ diff --git a/platform/gsutil/gslib/command_runner.py b/platform/gsutil/gslib/com index f490bb3..dc6bbcc 100644 --- a/platform/gsutil/gslib/command_runner.py +++ b/platform/gsutil/gslib/command_runner.py -@@ -330,17 +330,6 @@ class CommandRunner(object): +@@ -330,18 +330,6 @@ class CommandRunner(object): Returns: Return value(s) from Command that was run. """ @@ -17,10 +17,11 @@ index f490bb3..dc6bbcc 100644 - if system_util.IsRunningInteractively() and collect_analytics: - metrics.CheckAndMaybePromptForAnalyticsEnabling() - +- self.MaybePromptForPythonUpdate(command_name) + if not args: args = [] - -@@ -413,18 +402,10 @@ class CommandRunner(object): +@@ -415,15 +403,6 @@ class CommandRunner(object): ShutDownGsutil() if GetFailureCount() > 0: return_code = 1 @@ -35,6 +36,10 @@ index f490bb3..dc6bbcc 100644 - ))) return return_code + def SkipUpdateCheck(self): +@@ -467,6 +446,7 @@ class CommandRunner(object): + return True + def MaybeCheckForAndOfferSoftwareUpdate(self, command_name, debug): + return False """Checks the last time we checked for an update and offers one if needed. diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/tools/admin/netplan/default.nix index b9dc2c070731..77f2ad26de1d 100644 --- a/pkgs/tools/admin/netplan/default.nix +++ b/pkgs/tools/admin/netplan/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "netplan"; - version = "0.101"; + version = "0.103"; src = fetchFromGitHub { - owner = "CanonicalLtd"; + owner = "canonical"; repo = "netplan"; rev = version; - hash = "sha256-bCK7J2pCQUwjZu8c1n6jhF6T/gvUGwydqAXpxUMLgMc="; + hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE="; fetchSubmodules = false; }; @@ -45,6 +45,9 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \ --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \ --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= ' + + # from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81 + sed -e "s/-Werror//g" -i Makefile ''; makeFlags = [ diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 43ef985c41cc..39ee5a67a5d6 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -9,8 +9,8 @@ sha256 = "02s759rm633h4v5a1s3jxwvkahfjrbkz561spijrp3mihrws3xhb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-linux-amd64.tar.gz"; - sha256 = "0ainrb9i14wcq64pg99kb0s41bpmczp1h4sz85kj1a4ic0yrfq14"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-linux-amd64.tar.gz"; + sha256 = "0k67bsqiqalqrifd6r7nm6c2g4ckrfhh7a7nfgfmpvqs7cxx1kfm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-linux-amd64.tar.gz"; @@ -21,8 +21,8 @@ sha256 = "1lmy0dmpspzflc9z8p4w1cz47lbqnbkq8dng3v40lpbs75pnprvs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-linux-amd64.tar.gz"; - sha256 = "1w7ppcqkhh9k9iw10f4d93glmphyvachrkj6p8b6i93n0k78rxv7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-linux-amd64.tar.gz"; + sha256 = "0jl4ic18kf0qcys5mhp6ar4p1bj6ndhi11b51dvzdj5lb39dv43q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-linux-amd64.tar.gz"; @@ -37,12 +37,12 @@ sha256 = "1h5159y7xlslnijs8lpi4vqgvj2px6whxk9m17p9n7wiyqbmd5na"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-linux-amd64.tar.gz"; - sha256 = "0kxwx1lk54kdfw49s719g4vwr2iv6fzr82cxi5siykzpf9gfk7bd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-linux-amd64.tar.gz"; + sha256 = "0rmzb3wn5hmx8z8ly85spizinp6ja861k05fhw7l63zhqr8pnls2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-amd64.tar.gz"; - sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-amd64.tar.gz"; + sha256 = "1ixmsxawp0qbyjs37c74gcvj2icpbda6znl17yp9bhiyvnrdvxn7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-amd64.tar.gz"; @@ -81,8 +81,8 @@ sha256 = "0bp7ki3slszmy1vh4a5d4y4fhbvafrazj1cjf081xv91gi99xxz6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-linux-amd64.tar.gz"; - sha256 = "0ga794vwdggscl9lf57dg7cii91j4px0wyha4r43rhn0gbp1zk8y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-linux-amd64.tar.gz"; + sha256 = "1dznd4c8kpy6mwwb170nfl1m2dmrp6f4jalmk3bdfqscm4xhvk3q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-amd64.tar.gz"; @@ -107,8 +107,8 @@ sha256 = "1lisk9wr5p866x2hxvlz7nhz0xybhag7wgqk23x0lariln9z5na6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-darwin-amd64.tar.gz"; - sha256 = "0n5kgmcy4hsg4s4q7jd34z9hz6vcqs64j680jzsxw902cgrj5y9p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-darwin-amd64.tar.gz"; + sha256 = "103syjj8vla8lygyl5h7ilwm9kl6vxzyn6fdrkz0xcvlhqm1xr30"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-darwin-amd64.tar.gz"; @@ -119,8 +119,8 @@ sha256 = "1j7z5dbqzsdq1q8ks9g5pwzyc3ml6avhhp6xj94dzdhskl6pd8w5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-darwin-amd64.tar.gz"; - sha256 = "0sjh5wws6k90w2y5f5bm22c4qxamr658mww3zx11qakdygraijly"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-darwin-amd64.tar.gz"; + sha256 = "15c5rh0ix7zxn128kangd5x2x1n61xv9d443a7cbriibwvdkvv0j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-darwin-amd64.tar.gz"; @@ -135,12 +135,12 @@ sha256 = "0r2ykjwam5m2mfiibhq993s8n5pzmks837cwb57jwgwx8lc3ra4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-darwin-amd64.tar.gz"; - sha256 = "0vpkwlihq6pj554qd3csgf25id2q0pjx4mwkpfj74y08lv6d3v83"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-darwin-amd64.tar.gz"; + sha256 = "06lfimnlns1bfvks0kv5rjcnz6dvdk38npigyigsk9vqs0idcfi3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-amd64.tar.gz"; + sha256 = "1dy4n03xvirg6fihiid786d88qlkyqkvk4fq6ggnxc92620x7342"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-amd64.tar.gz"; @@ -179,8 +179,8 @@ sha256 = "1i73sxh6vf6adg6as1q1mab3fcjm7ma7gixj2b0y0d2a5d78lhpa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-darwin-amd64.tar.gz"; - sha256 = "19w0m6rxf0i996s9hdjym4f1k0jwf8hrlsr0m9x23xzz5r2simar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-darwin-amd64.tar.gz"; + sha256 = "1jxrz82cadmqkd1d26bj5r3bphvzz5z20shjai351hlh9aa3bv2h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-amd64.tar.gz"; @@ -205,8 +205,8 @@ sha256 = "041lmx5d1c8ls48mv56jchvk714rqw7jywywdgm6d6ipq7h5d67k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-linux-arm64.tar.gz"; - sha256 = "06hq79r35bcm7yn8qdvdiy19wsqq3ihbrmjakw2vf6xdglrxxxwr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-linux-arm64.tar.gz"; + sha256 = "0rijbqaw584b5c0kihrs80cv46s06yv3a68yz1dwa8sl7adi7n9p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-linux-arm64.tar.gz"; @@ -217,8 +217,8 @@ sha256 = "0mddv37k87wiygh6x9bnxpcr721qbmbqf6l5zk3xl61n56j8qyb1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-linux-arm64.tar.gz"; - sha256 = "1zlkij96vr3vf071gwdqcwfxlkfvcnkj4q220l3gxzliix0zvfi4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-linux-arm64.tar.gz"; + sha256 = "19aiksm4d4jxs9gw7rdr77ag58fy1v7gkk6r730imgq0d8vsacm1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-linux-arm64.tar.gz"; @@ -233,12 +233,12 @@ sha256 = "1sc8rf930cz6nkyhqn6p0h7450iqzdsrlw2smhp8yyjjvcjmsksf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-linux-arm64.tar.gz"; - sha256 = "0j8dgbfdscp29zj0vd3ial1g87n72jj07afj5lxzgsh8jay1iz2r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-linux-arm64.tar.gz"; + sha256 = "1bvzazdis423vb1r30q15q1irh07kgymv5ikzmvrygf4hm3aph06"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-arm64.tar.gz"; - sha256 = "0y7wysd4j1dp73hrbydzj2bfvpgv8vxiza5m6dbg7nl66w9ng0rc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-arm64.tar.gz"; + sha256 = "12iv8vjnal2ym70rxmdnvi02x6md7fxi8jbzhzfw526pzqs1dc47"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-arm64.tar.gz"; @@ -274,8 +274,8 @@ sha256 = "0mwpbvv62k8fg07447wwfigs4li4n78fswpzwi4alsjrkqlmw9dj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-linux-arm64.tar.gz"; - sha256 = "0kp13hk57apvqmsn1zw1k7r395wdk1308m0kwx4hmcjy6dzifjsq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-linux-arm64.tar.gz"; + sha256 = "1b8fi56wkk753w6ip1nkrksyk8qd5ypdbaq668pk60l3jb0c9mad"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-arm64.tar.gz"; @@ -300,8 +300,8 @@ sha256 = "06qc42gb2w2qjy2mz5shh082607395jq0js34wlqq61jgjzpca5l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-darwin-arm64.tar.gz"; - sha256 = "0nwqrg5in05vvj7ln7gi50vp3bnhkwar8fifpi87b134hl50q935"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-darwin-arm64.tar.gz"; + sha256 = "1wqkm32lkwff5gwn7dbznzx5rcbcysj2mx4ip77whba59ikfchsj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-darwin-arm64.tar.gz"; @@ -312,8 +312,8 @@ sha256 = "0fj1ai1kv8xgmsvfbmy5gsinxag70rx9a9gkifqgcpn3r9mj48ks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-darwin-arm64.tar.gz"; - sha256 = "0nj8gin7ys63v235x8nywmx0vv2bdcqdmmp7z3lxlxp2hk4nm84g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-darwin-arm64.tar.gz"; + sha256 = "09v28dgrs5a4w8qn4v4zwrn7n7cn2475a2jh9qz3g2ljaj0086fd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-darwin-arm64.tar.gz"; @@ -328,12 +328,12 @@ sha256 = "1c3pchbnk6dsnxsl02ypq7s4mmkxdgxszdhql1klpx5js7i1lv8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-darwin-arm64.tar.gz"; - sha256 = "08gcvlfy7kmcx02nf3n4chf6g5lasr2g8gr20gndk0rvihqiwhjz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-darwin-arm64.tar.gz"; + sha256 = "0fafl5zpnzkncvi52qw6f4898yia8p0whvr41m3g8cxcp6nyr0ij"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "0waf4apw5bzn276s34yaxvm3xyk5333l3zcz2j52c56wkadzxvpg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-arm64.tar.gz"; + sha256 = "0jrihnwfh5wvc95nipqv7ak77kq9xj0pk5hlapv9w2ls5pwykv0r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-arm64.tar.gz"; @@ -369,8 +369,8 @@ sha256 = "1hzhlxbwji4p8apx4rnqllsgf1k11w49rplz0syzmzb2fxpkif75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-darwin-arm64.tar.gz"; - sha256 = "038nk93mq59d8ynp1ggmhvmgnilrgqzcbg4hapb9pk7hpbwb269c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-darwin-arm64.tar.gz"; + sha256 = "0nh8305b6qlqr63xaacxs3v804dhrwdz179xlzdgzf9550zdqb39"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 96f9262427b0..7f892a44da5d 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional postPatch = '' sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits + # Avoid writing timestamps into compressed manpages + # to maintain determinism. + substituteInPlace install.sh --replace 'gzip' 'gzip -n' chmod +x install.sh # I think this is a typo and should be CXX? Either way let's kill it diff --git a/pkgs/tools/archivers/xtrt/default.nix b/pkgs/tools/archivers/xtrt/default.nix index 175494057e0a..1d01935f9688 100644 --- a/pkgs/tools/archivers/xtrt/default.nix +++ b/pkgs/tools/archivers/xtrt/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/figsoda/xtrt"; license = licenses.unlicense; maintainers = with maintainers; [ figsoda ]; + mainProgram = "xtrt"; }; } diff --git a/pkgs/tools/audio/botamusique/node-packages.nix b/pkgs/tools/audio/botamusique/node-packages.nix index c9bdb6f00971..89c7d8d98036 100644 --- a/pkgs/tools/audio/botamusique/node-packages.nix +++ b/pkgs/tools/audio/botamusique/node-packages.nix @@ -4527,7 +4527,7 @@ let name = "botamusique"; packageName = "botamusique"; version = "0.0.0"; - src = ../../../../../../../../../tmp/tmp.UAoivnXH3n; + src = ../../../../../../../../../tmp/tmp.IOzfGq3zuo; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.7" diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/tools/audio/botamusique/src.json index d1337f5ae68a..ab5c4819ecbe 100644 --- a/pkgs/tools/audio/botamusique/src.json +++ b/pkgs/tools/audio/botamusique/src.json @@ -1,9 +1,10 @@ { "url": "https://github.com/azlux/botamusique", - "rev": "ba02cdebf2e175dc371995361eafcb88ad2c1b52", - "date": "2021-06-01T23:39:44+02:00", - "path": "/nix/store/dp5vnj7zqv1sp1ab5xycvvqdpia9xb71-botamusique", - "sha256": "01d51y6h38hs4ynjgz050ryy14sp5y2c3n7f80mcv0a4ls8413qp", + "rev": "3733353170e1d24b5f3ce2a21643c27ca2a39835", + "date": "2021-09-01T12:19:37+02:00", + "path": "/nix/store/07vl4lhi6dshh4n7pcyrxvy9m028rrbr-botamusique", + "sha256": "0cggan70zymbh9iwggq9a04zkky86k9cncprxb9nnr35gp4l4992", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/tools/audio/soco-cli/default.nix b/pkgs/tools/audio/soco-cli/default.nix new file mode 100644 index 000000000000..52614a8dc220 --- /dev/null +++ b/pkgs/tools/audio/soco-cli/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "soco-cli"; + version = "0.4.21"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub rec { + owner = "avantrec"; + repo = pname; + rev = "v${version}"; + sha256 = "1kz2zx59gjfs01jiyzmps8j6yca06yqn6wkidvdk4s3izdm0rarw"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + fastapi + rangehttpserver + soco + tabulate + uvicorn + ]; + + # Tests wants to communicate with hardware + doCheck = false; + + pythonImportsCheck = [ + "soco_cli" + ]; + + meta = with lib; { + description = "Command-line interface to control Sonos sound systems"; + homepage = "https://github.com/avantrec/soco-cli"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 12308b240450..69f745ecc1bd 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,13 +1,29 @@ -{ lib, stdenv, fetchurl, bash, btrfs-progs, openssh, perl, perlPackages -, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper, nixosTests }: +{ lib +, stdenv +, fetchurl +, bash +, btrfs-progs +, openssh +, perl +, perlPackages +, util-linux +, asciidoc +, asciidoctor +, mbuffer +, makeWrapper +, genericUpdater +, curl +, writeShellScript +, nixosTests +}: stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.29.1"; + version = "0.31.3"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "153inyvvnl17hq1w3nsa783havznaykdam2yrj775bmi2wg6fvwn"; + sha256 = "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2"; }; nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ]; @@ -22,7 +38,9 @@ stdenv.mkDerivation rec { done # Tainted Mode disables PERL5LIB - substituteInPlace btrbk --replace "perl -T" "perl" + substituteInPlace btrbk \ + --replace "perl -T" "perl" \ + --replace "\$0" "\$ENV{'program_name'}" # Fix SSH filter script sed -i '/^export PATH/d' ssh_filter_btrbk.sh @@ -30,17 +48,26 @@ stdenv.mkDerivation rec { ''; preFixup = '' - wrapProgram $out/sbin/btrbk \ + wrapProgram $out/bin/btrbk \ --set PERL5LIB $PERL5LIB \ + --run 'export program_name=$0' \ --prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}" ''; passthru.tests.btrbk = nixosTests.btrbk; + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = writeShellScript "btrbk-versionLister" '' + echo "# Versions for $1:" >> "$2" + ${curl}/bin/curl -s https://digint.ch/download/btrbk/releases/ | ${perl}/bin/perl -lne 'print $1 if /btrbk-([0-9.]*)\.tar/' + ''; + }; + meta = with lib; { description = "A backup tool for btrfs subvolumes"; homepage = "https://digint.ch/btrbk"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ asymmetric ]; }; diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index fe7b041b1533..38dfd55783de 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, autoPatchelfHook -, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert +{ lib +, stdenv +, buildDotnetModule +, fetchFromGitHub +, autoPatchelfHook +, dotnetCorePackages }: -let - projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; -in -stdenv.mkDerivation rec { +buildDotnetModule rec { pname = "discordchatexporter-cli"; version = "2.30.1"; @@ -16,66 +17,13 @@ stdenv.mkDerivation rec { sha256 = "JSYIhd+DNVOKseHtWNNChECR5hKr+ntu1Yyqtnlg8rM="; }; - nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ]; + projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; + dotnet-runtime = dotnetCorePackages.runtime_3_1; + nugetDeps = ./deps.nix; + + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; - nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { - fetchNuGet = { name, version, sha256 }: fetchurl { - name = "nuget-${name}-${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${name}/${version}"; - inherit sha256; - }; - }); - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - - nuget sources Add -Name nixos -Source "$PWD/nixos" - nuget init "$nugetDeps" "$PWD/nixos" - - # FIXME: https://github.com/NuGet/Home/issues/4413 - mkdir -p $HOME/.nuget/NuGet - cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - - dotnet restore --source "$PWD/nixos" ${projectFile} - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - dotnet build ${projectFile} \ - --no-restore \ - --configuration Release \ - -p:Version=${version} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - dotnet publish ${projectFile} \ - --no-build \ - --configuration Release \ - --no-self-contained \ - --output $out/lib/${pname} - shopt -s extglob - - makeWrapper $out/lib/${pname}/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli \ - --set DOTNET_ROOT "${dotnetCorePackages.sdk_3_1}" - - runHook postInstall - ''; - - # Strip breaks the executable. - dontStrip = true; - meta = with lib; { description = "A tool to export Discord chat logs to a file"; homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index bd8af80193f6..cbbd86e01675 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -140,7 +140,6 @@ pythonPackages.buildPythonApplication rec { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "https://www.nongnu.org/duplicity"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index ad113ed615ef..ee9739bfac28 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.8.4"; + version = "0.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Or6RL6yT/X3rVIySqt5lWbXbI25f8HNLBpY3cOhMC0g="; + sha256 = "sha256-C1KLwl+hwyoRUK4GrDhj1Wwx4Fut+QuhgTFagyQeldc="; }; - vendorSha256 = "sha256-1FK5IIvm2iyzGqj8IPL3/qvxFj0dC37aycQQ5MO0mBI="; + vendorSha256 = "sha256-v81YkImg8GdI5locfsU4dg2JyO7XB24mfHRIZ+k8QBA="; doCheck = false; diff --git a/pkgs/tools/compression/crabz/default.nix b/pkgs/tools/compression/crabz/default.nix new file mode 100644 index 000000000000..ab5cc94b43a1 --- /dev/null +++ b/pkgs/tools/compression/crabz/default.nix @@ -0,0 +1,39 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, stdenv +, libiconv +, CoreFoundation +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "crabz"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "sstadick"; + repo = pname; + rev = "v${version}"; + sha256 = "0ch9cqarsakihg9ymbdm0ka6wz77z84n4g6cdlcskczc5g3b9gp9"; + }; + + cargoSha256 = "sha256-nrCYlhq/f8gk3NmltAg+xppRJ533ooEpetWvaF2vmP0="; + + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + CoreFoundation + Security + ]; + + meta = with lib; { + description = "A cross platform, fast, compression and decompression tool"; + homepage = "https://github.com/sstadick/crabz"; + changelog = "https://github.com/sstadick/crabz/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ unlicense /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/compression/hacpack/default.nix b/pkgs/tools/compression/hacpack/default.nix index e60d483574bd..34722d52ccfd 100644 --- a/pkgs/tools/compression/hacpack/default.nix +++ b/pkgs/tools/compression/hacpack/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { mv config.mk.template config.mk ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + enableParallelBuilding = true; + installPhase = '' mkdir -p $out/bin cp ./hacpack $out/bin diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index c6e0a3a2851b..2e6e7437fff2 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -11,11 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d"; }; + patches = [ ./musl-compat.patch ]; + preBuild = '' mv config.mk.template config.mk ''; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + enableParallelBuilding = true; installPhase = '' install -D hactool $out/bin/hactool diff --git a/pkgs/tools/compression/hactool/musl-compat.patch b/pkgs/tools/compression/hactool/musl-compat.patch new file mode 100644 index 000000000000..37d596f183fb --- /dev/null +++ b/pkgs/tools/compression/hactool/musl-compat.patch @@ -0,0 +1,13 @@ +diff --git a/main.c b/main.c +index 07f53cb..f2265df 100644 +--- a/main.c ++++ b/main.c +@@ -369,7 +369,7 @@ int main(int argc, char **argv) { + return EXIT_FAILURE; + } + nca_ctx.tool_ctx->base_file_type = BASEFILE_FAKE; +- nca_ctx.tool_ctx->base_file++; /* Guarantees base_file != NULL. I'm so sorry. */ ++ if (!nca_ctx.tool_ctx->base_file) nca_ctx.tool_ctx->base_file = (FILE*) 1; + break; + case 32: + tool_ctx.action |= ACTION_ONLYUPDATEDROMFS; diff --git a/pkgs/tools/compression/ncompress/builder.sh b/pkgs/tools/compression/ncompress/builder.sh deleted file mode 100644 index 7a3f34aae469..000000000000 --- a/pkgs/tools/compression/ncompress/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup -installFlags="PREFIX=$out" - -preBuild() { - cp Makefile.def Makefile - sed -i GNUmakefile -e 's/compress %/%/g' -} - -postInstall() { - rm $out/bin/uncompress* $out/bin/zcat* - ln -s compress $out/bin/uncompress - ln -s compress $out/bin/zcat -} - -genericBuild diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index f580709495ed..c4678cd96021 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,20 +1,27 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ncompress"; version = "5.0"; - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://sourceforge/project/ncompress/${pname}-${version}.tar.gz"; - sha256 = "004r086c11sw9vg2j3srgxpz98w8pycjl33bk3pgqnd0s92igrn4"; + src = fetchFromGitHub { + owner = "vapier"; + repo = "ncompress"; + rev = "v${version}"; + sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0="; }; - meta = { + makeFlags = [ "PREFIX=$(out)" ]; + installTargets = "install_core"; + + postInstall = '' + mv $out/bin/uncompress $out/bin/uncompress-ncompress + ''; + + meta = with lib; { homepage = "http://ncompress.sourceforge.net/"; - license = lib.licenses.publicDomain; + license = licenses.publicDomain; description = "A fast, simple LZW file compressor"; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index ac2f856c3c0c..7bd6265851c4 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "03yf9sjqdg3xcbvkn1591zxd2d0r8wz1b749zrn55k3a03c7jzf5"; + sha256 = "1mzhfcf67dc5m0i9b216m58qg36g63if6273ch5bsckd0yrwdk8x"; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/pkgs/tools/filesystems/lfs/default.nix b/pkgs/tools/filesystems/lfs/default.nix new file mode 100644 index 000000000000..d1988183bf19 --- /dev/null +++ b/pkgs/tools/filesystems/lfs/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "lfs"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = pname; + rev = "v${version}"; + sha256 = "gez5q1niIhzWJpsEkbVRuQFILo3tTO8aJq7ewZArJ5M="; + }; + + cargoSha256 = "2U1xDG4bTimtmjwZ1z9ErlaOcBNJdRcHlEWVaiGg01M="; + + meta = with lib; { + description = "Get information on your mounted disks"; + homepage = "https://github.com/Canop/lfs"; + license = licenses.mit; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 30a3b9cc98f9..657d215147ce 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for programming graphics intended to replace Metapost"; license = licenses.gpl3Plus; - maintainers = [ maintainers.raskin maintainers.peti ]; + maintainers = [ maintainers.raskin ]; broken = stdenv.isDarwin; # https://github.com/vectorgraphics/asymptote/issues/69 platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix index 6bab32ff27fa..5baedaab11ee 100644 --- a/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "directx-shader-compiler"; - version = "1.5.2010"; + version = "1.6.2106"; # Put headers in dev, there are lot of them which aren't necessary for # using the compiler binary. @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "microsoft"; repo = "DirectXShaderCompiler"; rev = "v${version}"; - sha256 = "0ccfy1bfp0cm0pq63ri4yl1sr3fdn1a526bsnakg4bl6z4fwrnnj"; + sha256 = "6kQgAESYiQ06LkiGTfDBYwd/ORLSm1W+BcO+OUp4yXY="; # We rely on the side effect of leaving the .git directory here for the # version-grabbing functionality of the build system. fetchSubmodules = true; diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/tools/graphics/hobbits/default.nix new file mode 100644 index 000000000000..477c6bea249a --- /dev/null +++ b/pkgs/tools/graphics/hobbits/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, mkDerivation, fetchFromGitHub +, cmake, pkg-config, fftw, libpcap, libusb1, python3 +}: + +mkDerivation rec { + pname = "hobbits"; + version = "0.52.0"; + + src = fetchFromGitHub { + owner = "Mahlet-Inc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-GZHBkBRt1ySItV+h5rdvey7KwdUWh5+rgztXh6HW3Js="; + }; + + postPatch = '' + substituteInPlace src/hobbits-core/settingsdata.cpp \ + --replace "pythonHome = \"/usr\"" "pythonHome = \"${python3}\"" + substituteInPlace cmake/gitversion.cmake \ + --replace "[Mystery Build]" "${version}" + ''; + + buildInputs = [ fftw libpcap libusb1 python3 ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + meta = with lib; { + description = "A multi-platform GUI for bit-based analysis, processing, and visualization"; + homepage = "https://github.com/Mahlet-Inc/hobbits"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 6749a193c00e..7eb1d6cce818 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix index b8e91a741978..8afd4804e0ed 100644 --- a/pkgs/tools/inputmethods/evscript/default.nix +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "evscript"; - version = "git-${builtins.substring 0 7 src.rev}"; + version = "unstable-2021-06-16"; src = fetchFromGitHub { - owner = "myfreeweb"; + owner = "unrelentingtech"; repo = pname; - rev = "47f86f0d15add2af785ea1ff47f24d130026d1b4"; - sha256 = "1xm8297k0d8d0aq7fxgmibr4qva4d02cb6gnnlzq77jcmnknxv14"; + rev = "25912c0b6446f31b0f64485af3fa4aa8a93b33df"; + sha256 = "sha256-apq3kHipEX6zOTNwqpIQR46JqmeE7EKVSOGrNNSkyu8="; }; - cargoSha256 = "1z0xxbjnhhzn1fnc3zhvy727l88qyyfqdayj5yvf3nh23m7sr87l"; + cargoSha256 = "sha256-1aR9/fhJQ+keRIxSG2cpY1HTalE6nM+MTb1Za3Tot28="; meta = with lib; { - homepage = "https://github.com/myfreeweb/${pname}"; + homepage = "https://github.com/unrelentingtech/evscript"; description = "A tiny sandboxed Dyon scripting environment for evdev input devices"; license = licenses.unlicense; maintainers = with maintainers; [ milesbreslin ]; diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix index 8a07b2c6c9cb..90af547f6811 100644 --- a/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "adafruit-ampy"; - version = "1.0.7"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1dz5sksalccv4c3bzk3c1jxpg3s28lwlw8hfwc9dfxhw3a1np3fd"; + sha256 = "f4cba36f564096f2aafd173f7fbabb845365cc3bb3f41c37541edf98b58d3976"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index a50bc311f247..ef1b6a5a4ca5 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,14 +1,22 @@ -{ lib, stdenv, fetchzip -, boost, clasp, cmake, gringo, re2c +{ lib +, stdenv +, fetchFromGitHub +, boost +, clasp +, cmake +, gringo +, re2c }: stdenv.mkDerivation rec { version = "1.9.5"; pname = "aspcud"; - src = fetchzip { - url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; - sha256 = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; + src = fetchFromGitHub { + owner = "potassco"; + repo = "aspcud"; + rev = "v${version}"; + hash = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 710382fe8267..5eef6a517f3a 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "bandwidth"; - version = "1.10.1"; + version = "1.10.4"; src = fetchurl { url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; - sha256 = "sha256-trya+/cBNIittQAc5tcykZbImeISqIolO/Y8uOI0jGk="; + sha256 = "sha256-e/eP2rA7ElFrh2Z4qTzRGR/cxY1UI6s+LQ9Og1x46/I="; }; postPatch = '' diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix index 37a65d8c0718..e2b99da82db0 100644 --- a/pkgs/tools/misc/bunnyfetch/default.nix +++ b/pkgs/tools/misc/bunnyfetch/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ devins2518 ]; platforms = platforms.linux; + mainProgram = "bunnyfetch"; }; } diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix index 348cbb1f529c..4946fd64d89d 100644 --- a/pkgs/tools/misc/ccze/default.nix +++ b/pkgs/tools/misc/ccze/default.nix @@ -1,17 +1,24 @@ -{ lib, stdenv, fetchurl, autoconf, ncurses, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, ncurses, pcre }: stdenv.mkDerivation rec { pname = "ccze"; version = "0.2.1-2"; - src = fetchurl { - url = "https://github.com/madhouse/ccze/archive/ccze-${version}.tar.gz"; - sha256 = "1amavfvyls4v0gnikk43n2rpciaspxifgrmvi99qj6imv3mfg66n"; + src = fetchFromGitHub { + owner = "madhouse"; + repo = "ccze"; + rev = "ccze-${version}"; + hash = "sha256-LVwmbrq78mZcAEuAqjXTqLE5we83H9mcMPtxQx2Tn/c="; }; - buildInputs = [ autoconf ncurses pcre ]; + nativeBuildInputs = [ autoconf ]; - preConfigure = "autoheader && autoconf "; + buildInputs = [ ncurses pcre ]; + + preConfigure = '' + autoheader + autoconf + ''; meta = with lib; { description = "Fast, modular log colorizer"; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 998fcf366520..e2672ab7bb0d 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { license = licenses.mit; maintainers = with maintainers; [ fgaz evanjs ]; homepage = "https://github.com/chubin/cheat.sh"; + mainProgram = "cht.sh"; }; } diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/tools/misc/colorpicker/default.nix index d2d0915a46fe..07d15469383d 100644 --- a/pkgs/tools/misc/colorpicker/default.nix +++ b/pkgs/tools/misc/colorpicker/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Ancurio/colorpicker"; maintainers = with maintainers; [ jb55 ]; license = licenses.mit; + mainProgram = "colorpicker"; }; } diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 7b652f36a19f..08ba484f51ee 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }: +{ lib, stdenv, fetchFromGitHub, xcbuildHook, Foundation, AddressBook }: stdenv.mkDerivation { version = "1.1a-3"; pname = "contacts"; - src = fetchurl { - url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz"; - sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3"; + src = fetchFromGitHub { + owner = "dhess"; + repo = "contacts"; + rev = "4092a3c6615d7a22852a3bafc44e4aeeb698aa8f"; + hash = "sha256-Li/c5uf9rfpuU+hduuSm7EmhVwIIkS72dqzmN+0cE3A="; }; nativeBuildInputs = [ xcbuildHook ]; @@ -19,10 +21,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Access contacts from the Mac address book from command-line"; - homepage = "http://www.gnufoo.org/contacts/contacts.html"; - license = licenses.gpl2; + homepage = "http://www.gnufoo.org/contacts/contacts.html"; + license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; - platforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.darwin; + platforms = platforms.darwin; + hydraPlatforms = platforms.darwin; }; } diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix index 384234f1f9c2..4a3c623bff18 100644 --- a/pkgs/tools/misc/depotdownloader/default.nix +++ b/pkgs/tools/misc/depotdownloader/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "depotdownloader"; - version = "2.4.1"; + version = "2.4.5"; src = fetchFromGitHub { owner = "SteamRE"; repo = "DepotDownloader"; rev = "DepotDownloader_${version}"; - sha256 = "1ldwda7wyvzqvqv1wshvqvqaimlm0rcdzhy9yn5hvxyswc0jxirr"; + sha256 = "0i5qgjnliji1g408ks1034r69vqdmfnzanb0qm7jmyzwww7vwpnh"; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/tools/misc/depotdownloader/deps.nix b/pkgs/tools/misc/depotdownloader/deps.nix index 6f061186f826..307ad7fa3b1f 100644 --- a/pkgs/tools/misc/depotdownloader/deps.nix +++ b/pkgs/tools/misc/depotdownloader/deps.nix @@ -7,8 +7,8 @@ fetchNuGet: }) (fetchNuGet { name = "SteamKit2"; - version = "2.4.0-Alpha.2"; - sha256 = "1r6chqdp912pr8f8d7px2vp4y1ydx0kida7d5a1hbf6b7acnsg7d"; + version = "2.4.0-Alpha.3"; + sha256 = "0n48yjkyzj49kv89jbkwdq6nm9w9ng6cjhvdv0chpryx9zgasgvv"; }) (fetchNuGet { name = "protobuf-net.Core"; diff --git a/pkgs/tools/misc/dialogbox/default.nix b/pkgs/tools/misc/dialogbox/default.nix new file mode 100644 index 000000000000..c18a336bc696 --- /dev/null +++ b/pkgs/tools/misc/dialogbox/default.nix @@ -0,0 +1,45 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +}: + +mkDerivation rec { + pname = "dialogbox"; + version = "1.0+unstable=2020-11-16"; + + src = fetchFromGitHub { + owner = "martynets"; + repo = pname; + rev = "6989740746f376becc989ab2698e77d14186a0f9"; + hash = "sha256-paTas3KbV4yZ0ePnrOH1S3bLLHDddFml1h6b6azK4RQ="; + }; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtbase + ]; + + installPhase = '' + runHook preInstall + + install -d $out/{bin,share/doc/dialogbox} + install dist/dialogbox $out/bin + install README.md $out/share/doc/dialogbox/ + cp -r demos $out/share/doc/dialogbox/demos + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/martynets/dialogbox/"; + description = "Qt-based scriptable engine providing GUI dialog boxes"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index db3998001657..37ea9ebd026c 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "186"; + version = "187"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-lOVKhpzDkm7NM9Ti0AAQ3CRpdQ3DTJElQWx7eXP7E3o="; + sha256 = "sha256-oXWdXJhf8OOxBcLumjeWW0Xev0LjcTScAw9baDOs6ls="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index 8bb2c287268b..9c397bb9be0c 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.1"; src = fetchurl { - url = "https://fedorahosted.org/released/ding-libs/ding-libs-${version}.tar.gz"; + url = "https://releases.pagure.org/SSSD/${pname}/${pname}-${version}.tar.gz"; sha256 = "1h97mx2jdv4caiz4r7y8rxfsq78fx0k4jjnfp7x2s7xqvqks66d3"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "'D is not GLib' utility libraries"; - homepage = "https://fedorahosted.org/sssd/"; + homepage = "https://pagure.io/SSSD/ding-libs"; platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [ e-user ]; license = [ lib.licenses.gpl3 lib.licenses.lgpl3 ]; diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 7e50c3e75513..76c7731e27f2 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { PREFIX=$out make install ''; - meta = { - homepage = "https://github.com/clvv/${pname}"; + meta = with lib; { + homepage = "https://github.com/clvv/fasd"; description = "Quick command-line access to files and directories for POSIX shells"; - license = lib.licenses.mit; + license = licenses.mit; longDescription = '' Fasd is a command-line productivity booster. @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { command line. ''; - platforms = lib.platforms.all; + platforms = platforms.all; + maintainers = with maintainers; [ ]; + mainProgram = "fasd"; }; } diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 489c6fc01beb..7e993c35c46e 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , libiconv , rustPlatform @@ -7,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BoCbN7EY7SmBYCS3OLFrQ1j1MUvZ+/oQAdoHCw9kCQE="; + sha256 = "sha256-7rwiqjjXB1+R+/kauGjiJOX/UtMmQW3U3xGL/rsSiQ0="; }; - cargoSha256 = "sha256-pAYPfRm7QN4mKwnYUMq5Td+bF1tmy3oGObWvMabmnpw="; + cargoSha256 = "sha256-g4z+05jiVaH3KCPVwJmvQbi0OCYtuafyZyVZDRRyPRA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix index e9286e6a11e9..689eb0395f40 100644 --- a/pkgs/tools/misc/fet-sh/default.nix +++ b/pkgs/tools/misc/fet-sh/default.nix @@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ elkowar ]; + mainProgram = "fet.sh"; }; - } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index e4e4868e4d9f..03465d593ff4 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,16 +1,16 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config +{ fetchurl +, gcc9Stdenv +, installShellFiles +, lib , libftdi1 +, libjaylink , libusb1 , pciutils -, installShellFiles +, pkg-config +, jlinkSupport ? false }: -stdenv.mkDerivation rec { +gcc9Stdenv.mkDerivation rec { pname = "flashrom"; version = "1.2"; @@ -19,29 +19,30 @@ stdenv.mkDerivation rec { sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"; }; + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ libftdi1 libusb1 ] + # https://github.com/flashrom/flashrom/issues/125 + ++ lib.optional (!gcc9Stdenv.isAarch64) pciutils + ++ lib.optional jlinkSupport libjaylink; + postPatch = '' substituteInPlace util/z60_flashrom.rules \ --replace "plugdev" "flashrom" ''; - # Meson build doesn't build and install manpage. Only Makefile can. - # Build manpage from source directory. Here we're inside the ./build subdirectory + makeFlags = [ "PREFIX=$(out)" "libinstall" ] + ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes"; + postInstall = '' - make flashrom.8 -C .. - installManPage ../flashrom.8 - install -Dm644 ../util/z60_flashrom.rules $out/etc/udev/rules.d/flashrom.rules + install -Dm644 util/z60_flashrom.rules $out/lib/udev/rules.d/flashrom.rules ''; - mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ]; - nativeBuildInputs = [ meson pkg-config ninja installShellFiles ]; - buildInputs = [ libftdi1 libusb1 pciutils ]; - meta = with lib; { - homepage = "http://www.flashrom.org"; + homepage = "https://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz felixsinger ]; platforms = platforms.all; - broken = stdenv.isDarwin; # requires DirectHW + broken = gcc9Stdenv.isDarwin; # requires DirectHW }; } diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/tools/misc/flitter/default.nix new file mode 100644 index 000000000000..49903559c136 --- /dev/null +++ b/pkgs/tools/misc/flitter/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, ocamlPackages +, fetchFromGitHub +, makeWrapper +, python3 +}: + +ocamlPackages.buildDunePackage rec { + pname = "flitter"; + # request to tag releases: https://github.com/alexozer/flitter/issues/34 + version = "unstable-2020-10-05"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "alexozer"; + repo = "flitter"; + rev = "666c5483bc93efa6d01e0b7a927461269f8e14de"; + sha256 = "1k3m7bjq5yrrq7vhnbdykni65dsqhq6knnv9wvwq3svb3n07z4w3"; + }; + + # https://github.com/alexozer/flitter/issues/28 + postPatch = '' + for f in src/colors.ml src/duration.ml src/event_loop.ml src/splits.ml; do + substituteInPlace "$f" \ + --replace 'Unix.gettimeofday' 'Caml_unix.gettimeofday' + done + ''; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = with ocamlPackages; [ + core + lwt_ppx + sexp_pretty + color + notty + ]; + + postInstall = '' + wrapProgram $out/bin/flitter \ + --prefix PATH : "${python3.withPackages (pp: [ pp.pynput ])}/bin" + ''; + + meta = with lib; { + description = "A Livesplit-inspired speedrunning split timer for Linux/macOS terminal"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://github.com/alexozer/flitter"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix index e2782ef652be..7027a6da0fab 100644 --- a/pkgs/tools/misc/fsearch/default.nix +++ b/pkgs/tools/misc/fsearch/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ artturin ]; platforms = platforms.unix; + mainProgram = "fsearch"; }; } diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d38a0ad71377..e56a61338aaa 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-JWTyZRZrW1mFy91D+eZL6iYV0CcNxJUT4JA0hrBKZZU="; + sha256 = "sha256-uVGU8tOHHJYBoWTwx9ilnOKo49R0QHdCABKfGoL7Dkk="; }; - vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw="; + vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0="; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix index 32d7a169d72e..bc7e9f4840b7 100644 --- a/pkgs/tools/misc/git-fire/default.nix +++ b/pkgs/tools/misc/git-fire/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { homepage = "https://github.com/qw3rtman/git-fire"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.swflint ]; + maintainers = with maintainers; [ swflint ]; + mainProgram = "git-fire"; }; } diff --git a/pkgs/tools/misc/gitlint/default.nix b/pkgs/tools/misc/gitlint/default.nix index 267cdee72338..23420a654a1c 100644 --- a/pkgs/tools/misc/gitlint/default.nix +++ b/pkgs/tools/misc/gitlint/default.nix @@ -10,28 +10,21 @@ let packageOverrides = self: super: { click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "7.1.2"; + version = "8.0.1"; src = oldAttrs.src.override { inherit version; - sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"; + sha256 = "0ymdyf37acq4qxh038q0xx44qgj6y2kf0jd0ivvix6qij88w214c"; }; }); arrow = super.arrow.overridePythonAttrs (oldAttrs: rec { - version = "1.0.3"; + version = "1.2.0"; src = oldAttrs.src.override { inherit version; - sha256 = "0793badh4hgbk2c5g70hmbl7n3d4g5d87bcflld0w9rjwy59r71r"; + sha256 = "0x70a057dqki2z1ny491ixbg980hg4lihc7g1zmy69g4v6xjkz0n"; }; }); - sh = super.sh.overridePythonAttrs (oldAttrs: rec { - version = "1.14.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "13hxgifab9ichla13qaa7sh8r0il7vs1r21js72s0n355zr9mair"; - }; - }); }; }; in @@ -39,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "gitlint"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "jorisroovers"; repo = "gitlint"; rev = "v${version}"; - sha256 = "sha256-CqmE4V+svSuQAsoX0I3NpUqPU5CQf3fyCHJPrjUjHF4="; + sha256 = "1j6gfgqin5dmqd2qq0vib55d2r07s9sy4hwrvwlichxx5jjwncly"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 99acda6b7883..98cd0cfbdee3 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -7,7 +7,8 @@ , uselibtirpc ? stdenv.isLinux , libtirpc , zlib -, szip ? null +, szipSupport ? false +, szip , javaSupport ? false , jdk }: @@ -55,10 +56,10 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg - szip zlib ] ++ lib.optional javaSupport jdk + ++ lib.optional szipSupport szip ++ lib.optional uselibtirpc libtirpc; preConfigure = lib.optionalString uselibtirpc '' @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { substituteInPlace config/cmake/FindXDR.cmake \ --replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)' - '' + lib.optionalString (szip != null) '' + '' + lib.optionalString szipSupport '' export SZIP_INSTALL=${szip} ''; @@ -85,7 +86,7 @@ stdenv.mkDerivation rec { "-DJAVA_HOME=${jdk}" "-DJAVA_AWT_LIBRARY=${javabase}/libawt.so" "-DJAVA_JVM_LIBRARY=${javabase}/server/libjvm.so" - ] ++ lib.optionals (szip != null) [ + ] ++ lib.optionals szipSupport [ "-DHDF4_ENABLE_SZIP_ENCODING=ON" "-DHDF4_ENABLE_SZIP_SUPPORT=ON" ]; @@ -119,6 +120,17 @@ stdenv.mkDerivation rec { moveToOutput bin "$bin" ''; + passthru = { + inherit + uselibtirpc + libtirpc + szipSupport + szip + javaSupport + jdk + ; + }; + meta = with lib; { description = "Data model, library, and file format for storing and managing data"; homepage = "https://support.hdfgroup.org/products/hdf4/"; diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 4e57a1c8e48a..74d8fce599a8 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -1,7 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , removeReferencesTo -, zlib ? null +, zlibSupport ? true +, zlib , enableShared ? !stdenv.hostPlatform.isStatic , javaSupport ? false , jdk @@ -24,10 +26,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ removeReferencesTo ]; - propagatedBuildInputs = optional (zlib != null) zlib; + propagatedBuildInputs = optional zlibSupport zlib; - configureFlags = [] - ++ optional enableShared "--enable-shared" + configureFlags = optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java"; patches = [ diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index c5485a5b3fb1..43c156de419e 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , removeReferencesTo -, cpp ? false -, gfortran ? null -, zlib ? null -, szip ? null +, cppSupport ? false +, fortranSupport ? false +, fortran +, zlibSupport ? true +, zlib +, szipSupport ? false +, szip , mpiSupport ? false , mpi , enableShared ? !stdenv.hostPlatform.isStatic @@ -15,7 +19,7 @@ # cpp and mpi options are mutually exclusive # (--enable-unsupported could be used to force the build) -assert !cpp || !mpiSupport; +assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in @@ -28,28 +32,35 @@ stdenv.mkDerivation rec { }; passthru = { - inherit mpiSupport; - inherit mpi; + inherit + cppSupport + fortranSupport + fortran + zlibSupport + zlib + szipSupport + szip + mpiSupport + mpi + ; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ removeReferencesTo ] - ++ optional (gfortran != null) gfortran; + ++ optional fortranSupport fortran; - buildInputs = [] - ++ optional (szip != null) szip + buildInputs = optional fortranSupport fortran + ++ optional szipSupport szip ++ optional javaSupport jdk; - propagatedBuildInputs = [] - ++ optional (zlib != null) zlib + propagatedBuildInputs = optional zlibSupport zlib ++ optional mpiSupport mpi; - configureFlags = [] - ++ optional cpp "--enable-cxx" - ++ optional (gfortran != null) "--enable-fortran" - ++ optional (szip != null) "--with-szlib=${szip}" - ++ optionals mpiSupport ["--enable-parallel" "CC=${mpi}/bin/mpicc"] + configureFlags = optional cppSupport "--enable-cxx" + ++ optional fortranSupport "--enable-fortran" + ++ optional szipSupport "--with-szlib=${szip}" + ++ optionals mpiSupport [ "--enable-parallel" "CC=${mpi}/bin/mpicc" ] ++ optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java" ++ optional usev110Api "--with-default-api-version=v110"; diff --git a/pkgs/tools/misc/hdl-dump/default.nix b/pkgs/tools/misc/hdl-dump/default.nix index e5f3afb03d57..0d2dfbc504ac 100644 --- a/pkgs/tools/misc/hdl-dump/default.nix +++ b/pkgs/tools/misc/hdl-dump/default.nix @@ -1,23 +1,19 @@ { lib , stdenv , fetchFromGitHub -, upx }: stdenv.mkDerivation rec { pname = "hdl-dump"; - version = "20202807"; + version = "unstable-2021-08-20"; - # Using AkuHAK's repo because playstation2's repo is outdated src = fetchFromGitHub { - owner = "AKuHAK"; + owner = "ps2homebrew"; repo = pname; - rev = "0c98b235c83c0fca1da93648f05ea5f940a4aee0"; - sha256 = "1s3wflqjjlcslpa9n5chr8dbamhmfk88885dzw68apz4vf6g27iq"; + rev = "1e760d7672dc12a36c09690b8c9b20d6642a2926"; + sha256 = "sha256-NMExi2pUyj8vRn9beT2YvnEogRw/xzgqE+roaZ/vNZs="; }; - buildInputs = [ upx ]; - makeFlags = [ "RELEASE=yes" ]; installPhase = '' @@ -25,10 +21,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/AKuHAK/hdl-dump"; + homepage = "https://github.com/ps2homebrew/hdl-dump"; description = "PlayStation 2 HDLoader image dump/install utility"; platforms = platforms.linux; license = licenses.gpl2Only; maintainers = with maintainers; [ makefu ]; + mainProgram = "hdl_dump"; }; } diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index 5c8a13e3c202..8977f9013959 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -1,11 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses }: +{ lib, stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses, bash }: stdenv.mkDerivation rec { pname = "lesspipe"; version = "1.85"; - buildInputs = [ perl ]; - preConfigure = "patchShebangs ."; + nativeBuildInputs = [ perl ]; + buildInputs = [ perl bash ]; + strictDeps = true; + preConfigure = '' + patchShebangs --build configure + ''; + configureFlags = [ "--shell=${bash}/bin/bash" "--yes" ]; + configurePlatforms = []; + dontBuild = true; src = fetchFromGitHub { owner = "wofr06"; @@ -20,6 +27,7 @@ stdenv.mkDerivation rec { file = "${file}/bin/file"; tput = "${ncurses}/bin/tput"; }) + ./override-shell-detection.patch ]; meta = with lib; { diff --git a/pkgs/tools/misc/lesspipe/override-shell-detection.patch b/pkgs/tools/misc/lesspipe/override-shell-detection.patch new file mode 100644 index 000000000000..08ef7e07b7cd --- /dev/null +++ b/pkgs/tools/misc/lesspipe/override-shell-detection.patch @@ -0,0 +1,12 @@ +--- a/configure ++++ b/configure +@@ -101,7 +101,8 @@ + open OUT, ">lesspipe.sh.tmp"; + my $in = 1; + my $anyin; +-my $shell = check_shell_vers(); ++my $shell = $opt_shell; ++print OUT "#!$shell\n"; + # ask if syntax highlighting should be included + $ifsyntax = ''; + if ($opt_yes) { diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b135ed061dee..5d812f5867cc 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lf"; - version = "24"; + version = "25"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0nc7vfkaxxl2a201wnbz74an3siz8cjwrfylx17v6al5n93vxip0"; + sha256 = "sha256-5/OfEWgtB9R3XRJ16ponf+bBVGAXkqPq8IlB8+zyjAQ="; }; vendorSha256 = "sha256-ujQh4aE++K/fn3PJqkAbTtwRyJPSI9TJQ1DvwLF9etU="; diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index 6cf31c7835c1..93983c8fe40b 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/raftario/licensor"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "licensor"; }; } diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index 17491b645d4b..6fa819cd8366 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/Miserlou/Loop"; maintainers = with maintainers; [ koral ]; license = licenses.mit; + mainProgram = "loop"; }; } diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/tools/misc/mapcidr/default.nix new file mode 100644 index 000000000000..2c8a80b28d0c --- /dev/null +++ b/pkgs/tools/misc/mapcidr/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "mapcidr"; + version = "0.0.8"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hlMIgSsSqvMx6Y7JnR7L9muTLWPfxDN5raJRezt99G0="; + }; + + vendorSha256 = "sha256-zp+XaSZgSMwJK+EEiTaJKBTPiKYaYpTtArnGBmHUGzE="; + + modRoot = "."; + subPackages = [ + "cmd/mapcidr" + ]; + + meta = with lib; { + description = "Small utility program to perform multiple operations for a given subnet/CIDR ranges"; + longDescription = '' + mapCIDR is developed to ease load distribution for mass scanning + operations, it can be used both as a library and as independent CLI tool. + ''; + homepage = "https://github.com/projectdiscovery/mapcidr"; + license = licenses.mit; + maintainers = with maintainers; [ hanemile ]; + }; +} diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/tools/misc/mmv-go/default.nix index efca64bdc44a..8f6550d0592c 100644 --- a/pkgs/tools/misc/mmv-go/default.nix +++ b/pkgs/tools/misc/mmv-go/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "Rename multiple files using your $EDITOR"; license = licenses.mit; maintainers = with maintainers; [ zowoq ]; + mainProgram = "mmv"; }; } diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix index bc8ac50d1aeb..c142c1f29036 100644 --- a/pkgs/tools/misc/mtm/default.nix +++ b/pkgs/tools/misc/mtm/default.nix @@ -2,28 +2,29 @@ stdenv.mkDerivation rec { pname = "mtm"; - version = "1.2.0"; + version = "1.2.1"; + + outputs = [ "out" "terminfo" ]; src = fetchFromGitHub { owner = "deadpixi"; repo = pname; rev = version; - sha256 = "0b2arkmbmabxmrqxlpvvvhll2qx0xgj7r4r6p0ymnm9p70idris4"; + sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv"; }; buildInputs = [ ncurses ]; - preBuild = '' - substituteInPlace Makefile --replace "strip -s mtm" "" + makeFlags = [ "DESTDIR=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" ]; + + preInstall = '' + mkdir -p $out/bin/ $out/share/man/man1 ''; - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin mtm - install -Dm644 -t $out/share/man/man1 mtm.1 - - runHook postInstall + postInstall = '' + mkdir -p $terminfo/share/terminfo $out/nix-support + tic -x -o $terminfo/share/terminfo mtm.ti + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages ''; meta = with lib; { diff --git a/pkgs/tools/misc/parallel/wrapper.nix b/pkgs/tools/misc/parallel/wrapper.nix index b85dfc56f3d6..0240f1ac9e9e 100644 --- a/pkgs/tools/misc/parallel/wrapper.nix +++ b/pkgs/tools/misc/parallel/wrapper.nix @@ -1,13 +1,10 @@ -{ parallel, makeWrapper , runCommand -, perlPackages -, extraPerlPackages ? - with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] -}: +{ lib, runCommand, makeWrapper, parallel, perlPackages +, extraPerlPackages ? with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] +, willCite ? false }: -runCommand "parallel-full" { - nativeBuildInputs = [ makeWrapper ]; - } '' - mkdir -p $out/bin - makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ - --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" - '' +runCommand "parallel-full" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ + --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" \ + ${lib.optionalString willCite "--add-flags --will-cite"} +'' diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 304649a86bee..14b9733bf69b 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.9"; + version = "1.2021.12"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-ezyQGrJwMl2Tqv14GSQzApdDqg1RV8OWdnp4K8a1A5k="; + sha256 = "sha256-t9IQ1D2QJHrQmt/0EWofrqSf6o2YMUdpxFILsV5muog="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 004bebaebbea..85d9ed59ff43 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; + mainProgram = "powerline-go"; }; } diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index d0bd0c76a839..4cca88a9b40a 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, util-linux, coreutils}: +{ lib, stdenv, fetchFromGitHub, util-linux, coreutils }: stdenv.mkDerivation rec { - version = "6.44"; pname = "profile-sync-daemon"; + version = "6.44"; - src = fetchurl { - url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "sha256-+iQr7T99X/jYYgq0xNHLPCJG5mZU/6dN76Z1FB51Z54="; + src = fetchFromGitHub { + owner = "graysky2"; + repo = "profile-sync-daemon"; + rev = "v${version}"; + hash = "sha256-7sEC2b4mzgbDTFgpH5abZ/kiwEmGdbKkTLiD73Efdls="; }; installPhase = '' @@ -21,8 +23,6 @@ stdenv.mkDerivation rec { --replace "sudo " "/run/wrappers/bin/sudo " ''; - preferLocalBuild = true; - meta = with lib; { description = "Syncs browser profile dirs to RAM"; longDescription = '' diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix new file mode 100644 index 000000000000..989a9e6734ac --- /dev/null +++ b/pkgs/tools/misc/rates/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "rates"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "lunush"; + repo = pname; + rev = version; + sha256 = "077qxs4kwfprsai07dninkhmj3ihnghdxan98iv8gmsl3pijbgwh"; + }; + + cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w"; + + meta = with lib; { + description = "CLI tool that brings currency exchange rates right into your terminal"; + homepage = "https://github.com/lunush/rates"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index d6a5b517a84e..1501f8edda1f 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,36 +1,42 @@ -{ fetchurl, lib, stdenv, emacs, curl, check, bc }: +{ lib +, stdenv +, fetchurl +, bc +, check +, curl +}: stdenv.mkDerivation rec { pname = "recutils"; version = "1.8"; src = fetchurl { - url = "mirror://gnu/recutils/recutils-${version}.tar.gz"; - sha256 = "14xiln4immfsw8isnvwvq0h23f6z0wilpgsc4qzabnrzb5lsx3nz"; + url = "mirror://gnu/recutils/${pname}-${version}.tar.gz"; + hash = "sha256-346uaVk/26U+Jky/SyMH37ghIMCbb6sj4trVGomlsZM="; }; hardeningDisable = [ "format" ]; - buildInputs = [ curl emacs ]; + buildInputs = [ + curl + ]; - checkInputs = [ check bc ]; + checkInputs = [ + check + bc + ]; doCheck = true; - meta = { - description = "Tools and libraries to access human-editable, text-based databases"; - - longDescription = - '' GNU Recutils is a set of tools and libraries to access - human-editable, text-based databases called recfiles. The data is - stored as a sequence of records, each record containing an arbitrary - number of named fields. - ''; - + meta = with lib; { homepage = "https://www.gnu.org/software/recutils/"; - - license = lib.licenses.gpl3Plus; - - platforms = lib.platforms.all; - maintainers = [ ]; + description = "Tools and libraries to access human-editable, text-based databases"; + longDescription = '' + GNU Recutils is a set of tools and libraries to access human-editable, + text-based databases called recfiles. The data is stored as a sequence of + records, each record containing an arbitrary number of named fields. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 70a959578555..d1e02e8b9a36 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; - maintainers = with maintainers; [ peti vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; } diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 69c9d726713b..abc046bb6d02 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + stdenv.mkDerivation rec { pname = "sdate"; version = "0.7"; - src = fetchurl { - url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; - sha256 = "1lfnsb8prac8rspnxcawd138jyhyivwf35rrmfvwq6dhsx23c6vy"; + + src = fetchFromGitHub { + owner = "ChristophBerg"; + repo = "sdate"; + rev = version; + hash = "sha256-jkwe+bSBa0p1Xzfetsdpw0RYw/gSRxnY2jBOzC5HtJ8="; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with lib; { homepage = "https://www.df7cb.de/projects/sdate"; description = "Eternal september version of the date program"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ edef ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ edef ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/tools/misc/sta/default.nix index 809287edcf62..6056fcfa49c3 100644 --- a/pkgs/tools/misc/sta/default.nix +++ b/pkgs/tools/misc/sta/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ infinisil ]; platforms = platforms.all; badPlatforms = platforms.darwin; + mainProgram = "sta"; }; } diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix new file mode 100644 index 000000000000..691351c89b08 --- /dev/null +++ b/pkgs/tools/misc/steampipe/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "steampipe"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "turbot"; + repo = "steampipe"; + rev = "v${version}"; + sha256 = "sha256-3vetSUJwCeaBzKj+635siskfcDPs/kkgCH954cg/REA="; + }; + + vendorSha256 = "sha256-TGDFNHWWbEy1cD7b2yPqAN7rRrLvL0ZX/R3BWGRWjjw="; + + # tests are failing for no obvious reasons + doCheck = false; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + ]; + + postInstall = '' + INSTALL_DIR=$(mktemp -d) + installShellCompletion --cmd steampipe \ + --bash <($out/bin/steampipe --install-dir $INSTALL_DIR completion bash) \ + --fish <($out/bin/steampipe --install-dir $INSTALL_DIR completion fish) \ + --zsh <($out/bin/steampipe --install-dir $INSTALL_DIR completion zsh) + ''; + + meta = with lib; { + homepage = "https://steampipe.io/"; + description = "select * from cloud;"; + license = licenses.agpl3; + maintainers = with maintainers; [ hardselius ]; + }; +} diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix new file mode 100644 index 000000000000..0249491fbde6 --- /dev/null +++ b/pkgs/tools/misc/synth/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "synth"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "getsynth"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-i5X2HUOCgY2znH4rDzhFpsPXsFeM7GR4soAO/rFDjjo="; + }; + + cargoSha256 = "sha256-47i46Y6JjTGWC7mfMd2x2k8v0SY1o2UHdEU4rF0VrsY="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + + # requires unstable rust features + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "A tool for generating realistic data using a declarative data model"; + homepage = "https://github.com/getsynth/synth"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index 1782e327f8a6..3b463f22df07 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/austinjones/tab-rs"; license = licenses.mit; maintainers = with maintainers; [ bbigras ]; + mainProgram = "tab"; }; } diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index a25b821c7e3d..9b8e76f10c43 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchzip, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "tio"; version = "1.32"; - src = fetchzip { - url = "https://github.com/tio/tio/archive/v${version}.tar.gz"; - sha256 = "0lwqdm73kshi9qs8pks1b4by6yb9jf3bbyw3bv52xmggnr5s1hcv"; + src = fetchFromGitHub { + owner = "tio"; + repo = "tio"; + rev = "v${version}"; + hash = "sha256-m8GgS7bv1S7KXoP7tYaTaXnjF1lBz4s0ThHqOU5tmFM="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index a615330a4a8f..84c927260c06 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -13,6 +13,7 @@ , makeWrapper , pciutils , perl +, perlcritic , shellcheck , smartmontools , systemd @@ -23,17 +24,20 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5"; + sha256 = "sha256-Blwj4cqrrYXohnGyJYe+1NYifxqfS4DoVUHmxFf62i4="; }; # XXX: See patch files for relevant explanations. - patches = [ ./patches/fix-makefile-sed.patch ./patches/tlp-sleep-service.patch ]; + patches = [ + ./patches/0001-makefile-correctly-sed-paths.patch + ./patches/0002-tlp-sleep.service-reintroduce.patch + ]; buildInputs = [ perl ]; nativeBuildInputs = [ makeWrapper gnused ]; @@ -52,8 +56,10 @@ "TLP_WITH_ELOGIND=0" "TLP_WITH_SYSTEMD=1" + "TLP_BATD=/share/tlp/bat.d" "TLP_BIN=/bin" "TLP_CONFDEF=/share/tlp/defaults.conf" + "TLP_CONFREN=/share/tlp/rename.conf" "TLP_FLIB=/share/tlp/func.d" "TLP_MAN=/share/man" "TLP_META=/share/metainfo" @@ -65,12 +71,11 @@ installTargets = [ "install-tlp" "install-man" ] ++ lib.optionals enableRDW [ "install-rdw" "install-man-rdw" ]; - # XXX: This is disabled because it's basically just noise since upstream - # itself does not seem to care about the zillion shellcheck errors. - doCheck = false; - checkInputs = [ checkbashisms shellcheck ]; + doCheck = true; + checkInputs = [ checkbashisms perlcritic shellcheck ]; checkTarget = [ "checkall" ]; + # TODO: Consider using resholve here postInstall = let paths = lib.makeBinPath ( [ @@ -107,12 +112,16 @@ $out/etc/NetworkManager/dispatcher.d/* $out/lib/udev/tlp-* $out/sbin/* + $out/share/tlp/bat.d/* $out/share/tlp/func.d/* $out/share/tlp/tlp-func-base ) for f in "''${fixup_bash[@]}"; do sed -i '2iexport PATH=${paths}:$PATH' "$f" done + + rm -rf $out/var + rm -rf $out/share/metainfo ''; meta = with lib; { diff --git a/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch b/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch new file mode 100644 index 000000000000..be8afc0667fa --- /dev/null +++ b/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch @@ -0,0 +1,56 @@ +From 5c5d878bf49bae5920c330482217477819ba9bc2 Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer +Date: Fri, 15 Oct 2021 23:22:50 -0700 +Subject: [PATCH 1/2] makefile: correctly sed paths + +The default Makefile for tlp makes a mess with catenating `DESTDIR` to +everything, but then not actualy using the catenated (_ prefixed) +variables to sed it's `.in` files. + +This patch makes sure that it correctly sets the paths, taking `DESTDIR` +in account where it makes sense (e.g. /bin where we want $out/bin) but +not where it doesn't (/etc/tlp.conf should be just that). + +The reason DESTDIR is used at all, as opposed to the more appropriate +PREFIX, is covered in the nix formula, and is (also) due to the Makefile +being a bit "different." +--- + Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index e9bbab4..ab05720 100644 +--- a/Makefile ++++ b/Makefile +@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) + + SED = sed \ + -e "s|@TLPVER@|$(TLPVER)|g" \ +- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \ +- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ +- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ +- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ +- -e "s|@TLP_BATD@|$(TLP_BATD)|g" \ ++ -e "s|@TLP_SBIN@|$(_SBIN)|g" \ ++ -e "s|@TLP_TLIB@|$(_TLIB)|g" \ ++ -e "s|@TLP_FLIB@|$(_FLIB)|g" \ ++ -e "s|@TLP_ULIB@|$(_ULIB)|g" \ ++ -e "s|@TLP_BATD@|$(_BATD)|g" \ + -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ + -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ +- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ +- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \ +- -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ ++ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ ++ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \ ++ -e "s|@TLP_CONF@|$(_CONF)|g" \ + -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ + -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ +- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" ++ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" + + INFILES = \ + tlp \ +-- +2.33.0 + diff --git a/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch b/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch similarity index 56% rename from pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch rename to pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch index b37c7280e382..40d89e207dc4 100644 --- a/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch +++ b/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch @@ -1,23 +1,29 @@ -commit ca94cd56210067e2a55c1f413bd7713f7d338f9f -Author: Bernardo Meurer -Date: Wed Feb 26 10:46:23 2020 -0800 +From a3506c9bc8929645b7b08859e47039b8cc830d22 Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer +Date: Fri, 15 Oct 2021 23:07:40 -0700 +Subject: [PATCH 2/2] tlp-sleep.service: reintroduce - tlp-sleep.service: reintroduce - - This patch reintroduces tlp-sleep as a systemd unit as opposed to a - systemd system-sleep hook script. This is due to the recommendation by - systemd itself to not use the hook scripts. As per the manual: - - > Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/ - > are intended for local use only and should be considered hacks. If - > applications want to react to system suspend/hibernation and resume, - > they should rather use the Inhibitor interface[1]. +This patch reintroduces tlp-sleep as a systemd unit as opposed to a +systemd system-sleep hook script. This is due to the recommendation by +systemd itself to not use the hook scripts. As per the manual: + +> Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/ +> are intended for local use only and should be considered hacks. If +> applications want to react to system suspend/hibernation and resume, +> they should rather use the Inhibitor interface[1]. +--- + Makefile | 6 +++--- + tlp-sleep | 11 ----------- + tlp-sleep.service.in | 19 +++++++++++++++++++ + 3 files changed, 22 insertions(+), 14 deletions(-) + delete mode 100644 tlp-sleep + create mode 100644 tlp-sleep.service.in diff --git a/Makefile b/Makefile -index 95122df..0e9230a 100644 +index ab05720..075b42f 100644 --- a/Makefile +++ b/Makefile -@@ -70,6 +70,7 @@ INFILES = \ +@@ -76,6 +76,7 @@ INFILES = \ tlp.rules \ tlp-readconfs \ tlp-run-on \ @@ -25,7 +31,7 @@ index 95122df..0e9230a 100644 tlp.service \ tlp-stat \ tlp.upstart \ -@@ -99,7 +100,6 @@ SHFILES = \ +@@ -106,7 +107,6 @@ SHFILES = \ tlp-rdw-udev.in \ tlp-rf.in \ tlp-run-on.in \ @@ -33,7 +39,7 @@ index 95122df..0e9230a 100644 tlp-sleep.elogind \ tlp-stat.in \ tlp-usb-udev.in -@@ -147,7 +147,7 @@ ifneq ($(TLP_NO_INIT),1) +@@ -159,7 +159,7 @@ ifneq ($(TLP_NO_INIT),1) endif ifneq ($(TLP_WITH_SYSTEMD),0) install -D -m 644 tlp.service $(_SYSD)/tlp.service @@ -42,7 +48,7 @@ index 95122df..0e9230a 100644 endif ifneq ($(TLP_WITH_ELOGIND),0) install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep -@@ -204,7 +204,7 @@ uninstall-tlp: +@@ -216,7 +216,7 @@ uninstall-tlp: rm $(_ULIB)/rules.d/85-tlp.rules rm -f $(_SYSV)/tlp rm -f $(_SYSD)/tlp.service @@ -53,7 +59,7 @@ index 95122df..0e9230a 100644 rm -f $(_SHCPL)/bluetooth diff --git a/tlp-sleep b/tlp-sleep deleted file mode 100644 -index 3de85ce..0000000 +index e548d55..0000000 --- a/tlp-sleep +++ /dev/null @@ -1,11 +0,0 @@ @@ -61,7 +67,7 @@ index 3de85ce..0000000 - -# tlp - systemd suspend/resume hook -# --# Copyright (c) 2020 Thomas Koch and others. +-# Copyright (c) 2021 Thomas Koch and others. -# This software is licensed under the GPL v2 or later. - -case $1 in @@ -70,13 +76,13 @@ index 3de85ce..0000000 -esac diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in new file mode 100644 -index 0000000..4ac17bd +index 0000000..79c202c --- /dev/null +++ b/tlp-sleep.service.in @@ -0,0 +1,19 @@ +# tlp - systemd suspend/resume service +# -+# Copyright (c) 2020 Thomas Koch and others. ++# Copyright (c) 2021 Thomas Koch and others. +# This software is licensed under the GPL v2 or later. + +[Unit] @@ -93,3 +99,6 @@ index 0000000..4ac17bd + +[Install] +WantedBy=sleep.target +-- +2.33.0 + diff --git a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch deleted file mode 100644 index 942c9a579f6f..000000000000 --- a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit c44347b3b813e209fff537b4d46d23430727a5e2 -Author: Bernardo Meurer -Date: Tue Feb 25 21:27:39 2020 -0800 - - makefile: correctly sed paths - - The default Makefile for tlp makes a mess with catenating `DESTDIR` to - everything, but then not actualy using the catenated (_ prefixed) - variables to sed it's `.in` files. - - This patch makes sure that it correctly sets the paths, taking `DESTDIR` - in account where it makes sense (e.g. /bin where we want $out/bin) but - not where it doesn't (/etc/tlp.conf should be just that). - - The reason DESTDIR is used at all, as opposed to the more appropriate - PREFIX, is covered in the nix formula, and is (also) due to the Makefile - being a bit "different." - -diff --git a/Makefile b/Makefile -index b5af74e..95122df 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,17 +47,17 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) - - SED = sed \ - -e "s|@TLPVER@|$(TLPVER)|g" \ -- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \ -- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ -- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ -- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ -+ -e "s|@TLP_SBIN@|$(_SBIN)|g" \ -+ -e "s|@TLP_TLIB@|$(_TLIB)|g" \ -+ -e "s|@TLP_FLIB@|$(_FLIB)|g" \ -+ -e "s|@TLP_ULIB@|$(_ULIB)|g" \ - -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ - -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ -- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ -+ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ - -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ - -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ - -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ -- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" -+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" - - INFILES = \ - tlp \ diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 7389e0c4c593..9d9bb853f2f9 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { version = "2.11"; src = fetchurl { - url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-${version}.tar.bz2"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; configureFlags = [ "--with-fuser=${psmisc}/bin/fuser" ]; meta = with lib; { - homepage = "https://fedorahosted.org/tmpwatch/"; + homepage = "https://pagure.io/tmpwatch"; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; license = licenses.gpl2; maintainers = with maintainers; [ vlstill ]; diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 5f6acfd9696f..c88fca0aebcb 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tremor"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-runtime"; rev = "v${version}"; - sha256 = "sha256-fE0f0tCI2V+HqHZwn9cO+xs0o3o6w0nrJg9Et0zJMOE="; + sha256 = "1ldqa4q7q9afrbjh7adinav21zsh26pqqvrd6q9542r90mxnygmx"; }; - cargoHash = "sha256-dky9ejzMgKXlzpg+9bmkd7th+EHBpNmZJkgYt2pjuuI="; + cargoSha256 = "0ivxd5mhvcpzv9wf859vwyiq1s0bbd9vdk6fy6m81bn5ykihx7ar"; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index 27ff219a6e13..a6ebcb288216 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,27 +1,29 @@ -{ lib, stdenv, fetchurl, coreutils, gawk }: +{ lib, stdenv, fetchFromGitHub, coreutils, gawk }: stdenv.mkDerivation rec { pname = "txt2man"; version = "1.7.1"; - src = fetchurl { - url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; - sha256 = "0ka3krmblsprv0v6h6wnm8lv08w30z0ynfnbwns6alks5gx1p6sd"; + src = fetchFromGitHub { + owner = "mvertes"; + repo = "txt2man"; + rev = "${pname}-${version}"; + hash = "sha256-Aqi5PNNaaM/tr9A/7vKeafYKYIs/kHbwHzE7+R/9r9s="; }; - preConfigure = '' - makeFlags=prefix="$out" - ''; + makeFlags = [ + "prefix=${placeholder "out"}" + ]; - patchPhase = '' + postPatch = '' for f in bookman src2man txt2man; do - substituteInPlace $f --replace "gawk" "${gawk}/bin/gawk" - - substituteInPlace $f --replace "(date" "(${coreutils}/bin/date" - substituteInPlace $f --replace "=cat" "=${coreutils}/bin/cat" - substituteInPlace $f --replace "cat <<" "${coreutils}/bin/cat <<" - substituteInPlace $f --replace "expand" "${coreutils}/bin/expand" - substituteInPlace $f --replace "(uname" "(${coreutils}/bin/uname" + substituteInPlace $f \ + --replace "gawk" "${gawk}/bin/gawk" \ + --replace "(date" "(${coreutils}/bin/date" \ + --replace "=cat" "=${coreutils}/bin/cat" \ + --replace "cat <<" "${coreutils}/bin/cat <<" \ + --replace "expand" "${coreutils}/bin/expand" \ + --replace "(uname" "(${coreutils}/bin/uname" done ''; @@ -33,11 +35,11 @@ stdenv.mkDerivation rec { sh -c 'unset PATH; printf hello | ./txt2man' ''; - meta = { + meta = with lib; { description = "Convert flat ASCII text to man page format"; homepage = "http://mvertes.free.fr/"; - license = lib.licenses.gpl2; - platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ bjornfor ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/tools/misc/uwufetch/default.nix new file mode 100644 index 000000000000..c728a0c8dbee --- /dev/null +++ b/pkgs/tools/misc/uwufetch/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, viu }: + +stdenv.mkDerivation rec { + pname = "uwufetch"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "TheDarkBug"; + repo = pname; + rev = version; + hash = "sha256-6yfRWFKdg7wM18hD2Bn095HzpnURhZJtx+SYx8SVBLA="; + }; + + patches = [ + # cannot find images in /usr + ./fix-paths.patch + # https://github.com/TheDarkBug/uwufetch/pull/150 + (fetchpatch { + url = "https://github.com/lourkeur/uwufetch/commit/de561649145b57d8750843555e4ffbc1cbcb01f0.patch"; + sha256 = "sha256-KR81zxGlmthcadYBdsiVwxa5+lZUtqP7w0O4uFuputE="; + }) + ]; + + nativeBuildInputs = [ makeWrapper ]; + + installFlags = [ + "PREFIX=${placeholder "out"}/bin" + "LIBDIR=${placeholder "out"}/lib" + "MANDIR=${placeholder "out"}/share/man/man1" + ]; + + postPatch = '' + substituteAllInPlace uwufetch.c + ''; + + postFixup = '' + wrapProgram $out/bin/uwufetch \ + --prefix PATH ":" ${lib.makeBinPath [ viu ]} + ''; + + meta = with lib; { + description = "A meme system info tool for Linux"; + homepage = "https://github.com/TheDarkBug/uwufetch"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lourkeur ]; + }; +} diff --git a/pkgs/tools/misc/uwufetch/fix-paths.patch b/pkgs/tools/misc/uwufetch/fix-paths.patch new file mode 100644 index 000000000000..e79c2a1fb9d0 --- /dev/null +++ b/pkgs/tools/misc/uwufetch/fix-paths.patch @@ -0,0 +1,22 @@ +diff --git a/uwufetch.c b/uwufetch.c +index 75863a2..ab31dda 100644 +--- a/uwufetch.c ++++ b/uwufetch.c +@@ -921,7 +921,7 @@ void print_ascii() + } + else + { +- sprintf(ascii_file, "/usr/lib/uwufetch/ascii/%s.txt", version_name); ++ sprintf(ascii_file, "@out@/lib/uwufetch/ascii/%s.txt", version_name); + } + file = fopen(ascii_file, "r"); + if (!file) +@@ -1220,7 +1220,7 @@ void print_image() + if (strcmp(version_name, "android") == 0) + sprintf(command, "viu -t -w 18 -h 8 /data/data/com.termux/files/usr/lib/uwufetch/%s.png 2> /dev/null", version_name); + else +- sprintf(command, "viu -t -w 18 -h 8 /usr/lib/uwufetch/%s.png 2> /dev/null", version_name); ++ sprintf(command, "viu -t -w 18 -h 8 @out@/lib/uwufetch/%s.png 2> /dev/null", version_name); + } + printf("\n"); + if (system(command) != 0) diff --git a/pkgs/tools/misc/vimv/default.nix b/pkgs/tools/misc/vimv/default.nix index a36c9548462d..46753688ec73 100644 --- a/pkgs/tools/misc/vimv/default.nix +++ b/pkgs/tools/misc/vimv/default.nix @@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation { description = "Batch-rename files using Vim"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.kmein ]; + maintainers = with maintainers; [ kmein ]; + mainProgram = "vimv"; }; } diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/tools/misc/xstow/default.nix new file mode 100644 index 000000000000..a605dcf911b2 --- /dev/null +++ b/pkgs/tools/misc/xstow/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, ncurses }: +stdenv.mkDerivation rec { + pname = "xstow"; + version = "1.0.2"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/sourceforge/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "6f041f19a5d71667f6a9436d56f5a50646b6b8c055ef5ae0813dcecb35a3c6ef"; + }; + + buildInputs = [ + ncurses + ]; + + meta = with lib; { + description = "A replacement of GNU Stow written in C++"; + homepage = "http://xstow.sourceforge.net"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ nzbr ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 2820958443ed..e3454538bf84 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,24 +1,27 @@ -{ lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: +{ lib, stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation rec { - pname = "xtitle"; - version = "0.4.4"; + pname = "xtitle"; + version = "0.4.4"; - src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/${version}.tar.gz"; - sha256 = "0w490a6ki90si1ri48jzhma473a598l1b12j8dp4ckici41z9yy2"; - }; + src = fetchFromGitHub { + owner = "baskerville"; + repo = "xtitle"; + rev = version; + hash = "sha256-SVfM2vCCacgchXj0c0sPk3VR6DUI4R0ofFnxJSY4oDg="; + }; + postPatch = '' + sed -i "s|/usr/local|$out|" Makefile + ''; - buildInputs = [ libxcb git xcbutil xcbutilwm ]; + buildInputs = [ libxcb git xcbutil xcbutilwm ]; - prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; - - meta = { - description = "Outputs X window titles"; - homepage = "https://github.com/baskerville/xtitle"; - maintainers = [ lib.maintainers.meisternu ]; - license = "Custom"; - platforms = lib.platforms.linux; - }; + meta = with lib; { + description = "Outputs X window titles"; + homepage = "https://github.com/baskerville/xtitle"; + maintainers = with maintainers; [ meisternu ]; + license = "Custom"; + platforms = platforms.linux; + }; } diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 581e36ecd741..c5ae63527253 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -5,7 +5,7 @@ , rtmpdump , phantomjs2 , atomicparsley -, pycryptodome +, pycryptodomex , websockets , mutagen , ffmpegSupport ? true @@ -20,16 +20,16 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.9.25"; + version = "2021.10.10"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "e7b8dd0ee9498abbd80eb38d9753696d6ca3d02f64980322ab3bf39ba1bc31ee"; + sha256 = "sha256-zJYhHo5V67tI0uZgnA0JQlB+tUcbLOdOOPe5X41wpOc="; }; propagatedBuildInputs = [ websockets mutagen ] - ++ lib.optional hlsEncryptedSupport pycryptodome; + ++ lib.optional hlsEncryptedSupport pycryptodomex; # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index c2eba8c01b46..5fa6e849ac1e 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.7.5"; + version = "0.7.7"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-DcfWNp9fELRzLfNAU2qGXfLDkSbWGrsfW/Wy0t2ISXU="; + sha256 = "18sm7smp0r7rmbq6ajl905947l5vni7hb4dfd0hhnrqjxwlkynds"; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-O2IPmb9LH0ct0O2kR581Hfxl1sdb8himfq5U733JwGk="; + cargoSha256 = "0km4bgdl03m5ri4wzy0fsvvwlifx99m9x2j599x58ryq6lx2kkyc"; postInstall = '' installManPage man/* diff --git a/pkgs/tools/misc/zthrottle/default.nix b/pkgs/tools/misc/zthrottle/default.nix index 66209ead6fa7..2743dbf76bbb 100644 --- a/pkgs/tools/misc/zthrottle/default.nix +++ b/pkgs/tools/misc/zthrottle/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "A program that throttles a pipeline, only letting a line through at most every $1 seconds."; homepage = "https://github.com/anko/zthrottle"; license = licenses.unlicense; - maintainers = [ maintainers.ronthecookie ]; + maintainers = [ maintainers.ckie ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix index 662f909b6245..535e8d6bdfbf 100644 --- a/pkgs/tools/networking/gvproxy/default.nix +++ b/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - sha256 = "sha256-cXaX7A8Wgq/PEHnFrparZjOKdENX3pWWXYfrEuFLDx0="; + sha256 = "sha256-iRFjELJCgxPvqkhBvJqCFapQrHLL3uRpKsJ/DaXSKnw="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index e81706a34359..8e289b7bab11 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "httpie"; repo = "httpie"; rev = version; - sha256 = "sha256-GwwZLXf9CH024gKfWsYPnr/oqQcxR/lQIToFRh59B+E="; + sha256 = "1y77dg27dn6bajwp3w6qvw1ls5wfhd1j1788l3fjhxg7j4qjki4g"; }; nativeBuildInputs = [ @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + charset-normalizer defusedxml pygments requests @@ -59,6 +60,8 @@ python3Packages.buildPythonApplication rec { "test_verbose_chunked" "test_multipart_chunked" "test_request_body_from_file_by_path_chunked" + # Part of doctest + "httpie.encoding.detect_encoding" ]; pythonImportsCheck = [ "httpie" ]; diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index 1bd64250ae25..0843ba3a756a 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/tools/networking/hurl/default.nix @@ -3,6 +3,8 @@ , rustPlatform , fetchFromGitHub , pkg-config +, python3 +, installShellFiles , libxml2 , openssl , curl @@ -21,6 +23,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config + python3 + installShellFiles ]; buildInputs = [ @@ -35,9 +39,16 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-tAg3xwmh7SjJsm9r5TnhXHIDLpUQpz3YDS6gWxFgps4="; + postInstall = '' + python ci/gen_manpage.py docs/hurl.md > hurl.1 + python ci/gen_manpage.py docs/hurlfmt.md > hurlfmt.1 + installManPage hurl.1 hurlfmt.1 + ''; + meta = with lib; { description = "Command line tool that performs HTTP requests defined in a simple plain text format."; homepage = "https://hurl.dev/"; + changelog = "https://github.com/Orange-OpenSource/hurl/raw/${version}/CHANGELOG.md"; maintainers = with maintainers; [ eonpatapon ]; license = licenses.asl20; }; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 48fe72d42967..22606ec78b69 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,25 +1,30 @@ { lib, stdenv, fetchFromGitHub, nixosTests -, libnfnetlink, libnl, net-snmp, openssl -, pkg-config, autoreconfHook }: +, file, libmnl, libnftnl, libnl +, net-snmp, openssl, pkg-config +, autoreconfHook }: stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "sha256-qugEEbOQ4bemzelIOaNFvo3piMZpKUZGjR+4XF8aLHw="; + sha256 = "sha256-WXKu+cabMmXNHiLwXrQqS8GQHIWYkee7vPddyGURWic="; }; buildInputs = [ - libnfnetlink + file + libmnl + libnftnl libnl net-snmp openssl ]; + enableParallelBuilding = true; + passthru.tests.keepalived = nixosTests.keepalived; nativeBuildInputs = [ pkg-config autoreconfHook ]; @@ -32,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://keepalived.org"; description = "Routing software written in C"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 3f3a9b2b7235..95c2f970999a 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { homepage = "http://nbd.sourceforge.net"; description = "Map arbitrary files as block devices over the network"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index 06df79e47052..ca5ec7abffa5 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -3,13 +3,13 @@ let pname = "NetworkManager-openvpn"; - version = "1.8.12"; + version = "1.8.16"; in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"; + sha256 = "iSDeCceuXx9SDIP4REVduPrsMUJzUCaP4t2VuGD5H7U="; }; patches = [ diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 185176440c1b..4f59810a7623 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "v${version}"; - sha256 = "0vx8ki0wi9xil2iksvxzh8mhx4c5ikkhdcnc8mcwqn14cvjkggja"; + sha256 = "sha256-/gcNVTfLJKA5qzRgAqFSlSI618QBsJTxFE1doOKR7e8="; }; - cargoSha256 = "1nx2lvbjflsjma5q9ck6vq499hf75w91i4h8wlzr83wqk37i7rhc"; + cargoSha256 = "sha256-o5VKj69Wp7zLR3TS+wNA0D8nP6Cynlr4KtW4JSUm0VE="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 861e9c0383bb..b06e4558fbbf 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, flex, cmake, libpcap }: stdenv.mkDerivation rec { pname = "packetdrill"; version = "unstable-2020-08-22"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { rev = "68a34fa73cf221e5f52d6fa4f203bcd93062be1b"; sha256 = "0djkwb6l2959f44d98vwb092rghf0qmii8391vrpxqb99j6pv4h6"; }; + patches = [ + # Upstream fix for -fno-common toolchains + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/google/packetdrill/commit/c08292838de81a71ee477d5bf9d95b1130a1292b.patch"; + sha256 = "1irbar1zkydmgqb12r3xd80dwj2jfxnxayxpb4nmbma8xm7knb10"; + stripLen = 3; + }) + ]; + setSourceRoot = '' export sourceRoot=$(realpath */gtests/net/packetdrill) ''; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index d7ac9ad54e6f..531dfeeb4c45 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index ff69dbc75445..601446abb95c 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -46,6 +46,13 @@ stdenv.mkDerivation rec { url = "https://patch-diff.githubusercontent.com/raw/strongswan/strongswan/pull/150.patch"; sha256 = "1irfxb99blb8v3hs0kmlhzkkwbmds1p0gq319z8lmacz36cgyj2c"; }) + + # fix build with -fno-common tollchain + (fetchpatch { + name = "fno-common.patch"; + url = "https://git.strongswan.org/?p=strongswan.git;a=patch;h=91c6387e69c09beaa9b9ca1e28471751a834fc24"; + sha256 = "0jp9walxwffp5cl7q0hb80h3s2gdj1nn3n8bvnbmwgh2s6pi148f"; + }) ]; postPatch = optionalString stdenv.isLinux '' diff --git a/pkgs/tools/networking/suckit/default.nix b/pkgs/tools/networking/suckit/default.nix new file mode 100644 index 000000000000..568e344065e4 --- /dev/null +++ b/pkgs/tools/networking/suckit/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "suckit"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "skallwar"; + repo = pname; + rev = "v${version}"; + sha256 = "0wr03yvrqa9p6m127fl4hcf9057i11zld898qz4kbdyiynpi0166"; + }; + + cargoSha256 = "sha256-6otIWAAf9pI4A8kxK3dyOVpkw+SJ3/YAvTahDSXMWNc="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + + # requires internet access + checkFlags = [ "--skip=test_download_url" ]; + + meta = with lib; { + description = "Recursively visit and download a website's content to your disk"; + homepage = "https://github.com/skallwar/suckit"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix deleted file mode 100644 index 6751b1cf5eb8..000000000000 --- a/pkgs/tools/networking/swec/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ fetchurl, lib, stdenv, makeWrapper, perlPackages }: - -stdenv.mkDerivation rec { - pname = "swec"; - version = "0.4"; - - src = fetchurl { - url = "http://files.zerodogg.org/swec/swec-${version}.tar.bz2"; - sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perlPackages.perl perlPackages.LWP perlPackages.URI perlPackages.HTMLParser ]; - checkInputs = [ perlPackages.HTTPServerSimple perlPackages.Parent ]; - - configurePhase = '' - for i in swec tests/{runTests,testServer} - do - sed -i "$i" -e's|/usr/bin/perl|${perlPackages.perl}/bin/perl|g' - done - ''; - - dontBuild = true; - - installPhase = '' - make install prefix="$out" - - mkdir -p "$out/share/swec-${version}" - cp -v default.sdf "$out/share/swec-${version}" - sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/swec-${version}/swec'|g" - - wrapProgram "$out/bin/swec" \ - --prefix PERL5LIB : ${with perlPackages; makePerlPath [ LWP URI HTMLParser ]} - ''; - - doCheck = true; - checkPhase = "make test"; - - meta = { - homepage = "https://random.zerodogg.org/swec/"; - - description = "Simple Web Error Checker (SWEC)"; - - longDescription = - '' SWEC (Simple Web Error Checker) is a program that automates testing - of dynamic websites. It parses each HTML file it finds for links, - and if those links are within the site specified (ie. local, not - external), it will check that page as well. In this respect it - works a lot like a crawler, in that it'll click on any link it finds - (more notes about this later). - - In addition to parsing and locating links, it will also parse the - pages looking for known errors and report those (such as Mason or - PHP errors), and will report if a page can not be read (by either - returning a 404, 500 or similar). - - Since you may often want SWEC to be logged in on your site, you have - to be careful. When logged in, SWEC will still click on all links - it finds, including things like 'join group' or 'delete account' - (though it has some magic trying to avoid the latter). Therefore it - is highly recommended that when you run SWEC as a logged-in user on - a site, use a test server, not the live one. - - Running SWEC on a live site without being logged in as a user is - perfectly fine, it won't do anything a normal crawler wouldn't do - (well, not exactly true, SWEC will ignore robots.txt). - ''; - - license = lib.licenses.gpl3Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/tools/networking/tnat64/default.nix b/pkgs/tools/networking/tnat64/default.nix index 9b1c2c3aec11..d22f2b98efd6 100644 --- a/pkgs/tools/networking/tnat64/default.nix +++ b/pkgs/tools/networking/tnat64/default.nix @@ -2,20 +2,15 @@ stdenv.mkDerivation rec { pname = "tnat64"; - version = "0.05"; + version = "0.06"; src = fetchFromGitHub { owner = "andrewshadura"; repo = pname; rev = "${pname}-${version}"; - sha256 = "07lmzidbrd3aahk2jvv93cic9gf36pwmgfd63gmy6hjkxf9a6fw9"; + sha256 = "191j1fpr3bw6fk48npl99z7iq6m1g33f15xk5cay1gnk5f46i2j6"; }; - postPatch = '' - # Fix usage of deprecated sys_errlist - substituteInPlace tnat64.c --replace 'sys_errlist[errno]' 'strerror(errno)' - ''; - configureFlags = [ "--libdir=$(out)/lib" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index a24ac1f38888..393756a9b2ab 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -5,9 +5,13 @@ , nettle , expat , libevent +, libsodium +, protobufc +, hiredis , dns-root-data , pkg-config , makeWrapper +, symlinkJoin # # By default unbound will not be built with systemd support. Unbound is a very # commmon dependency. The transitive dependency closure of systemd also @@ -21,6 +25,11 @@ , systemd ? null # optionally support DNS-over-HTTPS as a server , withDoH ? false +, withECS ? false +, withDNSCrypt ? false +, withDNSTAP ? false +, withTFO ? false +, withRedis ? false , libnghttp2 }: @@ -57,8 +66,24 @@ stdenv.mkDerivation rec { "--enable-systemd" ] ++ lib.optionals withDoH [ "--with-libnghttp2=${libnghttp2.dev}" + ] ++ lib.optionals withECS [ + "--enable-subnet" + ] ++ lib.optionals withDNSCrypt [ + "--enable-dnscrypt" + "--with-libsodium=${symlinkJoin { name = "libsodium-full"; paths = [ libsodium.dev libsodium.out ]; }}" + ] ++ lib.optionals withDNSTAP [ + "--enable-dnstap" + "--with-protobuf-c=${protobufc}" + ] ++ lib.optionals withTFO [ + "--enable-tfo-client" + "--enable-tfo-server" + ] ++ lib.optionals withRedis [ + "--enable-cachedb" + "--with-libhiredis=${hiredis}" ]; + PROTOC_C = if withDNSTAP then "${protobufc}/bin/protoc-c" else null; + # Remove references to compile-time dependencies that are included in the configure flags postConfigure = let inherit (builtins) storeDir; diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix new file mode 100644 index 000000000000..b90f405ec684 --- /dev/null +++ b/pkgs/tools/networking/vopono/default.nix @@ -0,0 +1,24 @@ +{ lib +, fetchCrate +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "vopono"; + version = "0.8.6"; + + src = fetchCrate { + inherit pname version; + sha256 = "0dsyav755mggnsybj7iwvdqbqzz0gfd3j9vh0hmg5b7pbffanzvy"; + }; + + cargoHash = "sha256:187mi36dgr2f1klqclci175zqgyrm0b6awrcnav63vira7hqz076"; + + meta = with lib; { + description = "Run applications through VPN connections in network namespaces"; + homepage = "https://github.com/jamesmcm/vopono"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 874205f592bd..bb17691cbad4 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -13,14 +13,12 @@ buildGoModule rec { vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc="; - doCheck = false; - # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to # be granted write permission to /run. patches = [ ./change-runtime-dir.patch ]; - subPackages = [ "cmd/yggdrasil" "cmd/yggdrasilctl" ]; + subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; ldflags = [ "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index d645a4cdb066..1c83acc2a186 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.4.2"; + version = "2.5.1"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "013dhw7kn1s3r6w7kfvhqh0l74kgijfni47l71p7wicg3hzhm3mr"; + sha256 = "1w2frcy51kwsvd486awhpl5kkm11zj1nw3nnv9337316gfs213nw"; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix new file mode 100644 index 000000000000..0407ad4528de --- /dev/null +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -0,0 +1,41 @@ +{ lib +, boost +, cmake +, fetchFromGitHub +, meson +, ninja +, nixUnstable +, nlohmann_json +, pkg-config +, stdenv +}: +stdenv.mkDerivation rec { + pname = "nix-eval-jobs"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LTMW4356f8pvIyfYdOyZbF9yzU8MH9mryQgB4LrwZMI="; + }; + buildInputs = [ + boost + nixUnstable + nlohmann_json + ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + # nlohmann_json can be only discovered via cmake files + cmake + ]; + + meta = { + description = "Hydra's builtin hydra-eval-jobs as a standalone"; + homepage = "https://github.com/nix-community/nix-eval-jobs"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ adisbladis mic92 ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix index 060961f3a367..fcc63e6f772f 100644 --- a/pkgs/tools/security/agebox/default.nix +++ b/pkgs/tools/security/agebox/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "agebox"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "slok"; repo = pname; rev = "v${version}"; - sha256 = "1mg16xxvsbm5jxlkdjyi3nsvzj37858d9ksh1wsa9ycxj2qipgw2"; + sha256 = "1gi6lj3dpckhsx6hdpdnr8rclqgfkbdmkzx966nlxyi52bjfzbsv"; }; vendorSha256 = "1gw83bd14ig18y8si3f94iivx2ir1vw4b5b95fp6r7qhfp0rgbih"; diff --git a/pkgs/tools/security/cameradar/default.nix b/pkgs/tools/security/cameradar/default.nix new file mode 100644 index 000000000000..569be38ee28a --- /dev/null +++ b/pkgs/tools/security/cameradar/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, curl +, fetchFromGitHub +, pkg-config +}: + +buildGoModule rec { + pname = "cameradar"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "Ullaakut"; + repo = pname; + rev = "v${version}"; + sha256 = "03nm03cqhq04ixw4rssfkgrin918pa0v7ai26v4h99gz7j8hs7ll"; + }; + + vendorSha256 = "099np130dn51nb4lcyrrm46fihfipxrw0vpqs2jh5g4c6pnbk200"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + curl + ]; + + subPackages = [ + "cmd/cameradar" + ]; + # At least one test is outdated + #doCheck = false; + + meta = with lib; { + description = "RTSP stream access tool"; + homepage = "https://github.com/Ullaakut/cameradar"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/cdk-go/default.nix b/pkgs/tools/security/cdk-go/default.nix new file mode 100644 index 000000000000..465b987ec74f --- /dev/null +++ b/pkgs/tools/security/cdk-go/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "cdk-go"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "cdk-team"; + repo = "CDK"; + rev = "v${version}"; + sha256 = "1zz9jaz5nlvs52nqlaisivrnz7lz8g48qii0n2s1783a5jpkk9ml"; + }; + + vendorSha256 = "0sn709mbhfymwwfdqc5xpdz2lgimqx3xycfmq24vbfmlh8wqcs7l"; + + # At least one test is outdated + doCheck = false; + + meta = with lib; { + description = "Container penetration toolkit"; + homepage = "https://github.com/cdk-team/CDK"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + mainProgram = "cdk"; + }; +} diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 832051ebc562..7d2793647d85 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-10-06"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-MTV6rDgy6FxmdQHoBnDNBwiKEiGj9THqoHJCwUoAoB8="; + sha256 = "sha256-kzMMcipE9AKOWka2yAuljwNG/g+8fF2rYehTtxdQY+k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 25dc64e6184a..83b04a9fe790 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { frontend applications and libraries are available. Version 2 of GnuPG also provides support for S/MIME. ''; - maintainers = with maintainers; [ peti fpletz vrthra ]; + maintainers = with maintainers; [ fpletz vrthra ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index dde9da346efc..b4be43311f83 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.19.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xSjmwD0V4+LKfLwknQU8PAFOG3zpJ87ghHdA2c+nYQM="; + sha256 = "sha256-5TOfy7eapkvXwVC4TcSo3mWSAkLqBeVco7SG2H21lRo="; }; - vendorSha256 = "sha256-mlsKB/WOiQ2Ud9C19rsQhVtJfblh0CGd8tDs+3SSfcg="; + vendorSha256 = "sha256-pgasbJdyTBIYIeaidKYFLy0LqmCTKE7IUkFqddJtcR0="; propagatedBuildInputs = [ docker ]; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 08f4929bd240..07becc2c3488 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-8PX1jUbS5qf5KqeZXv3oijtZCPo5LsabqHSA3rsd3tQ="; + sha256 = "sha256-sB/z7Z35SQt2D6YHgSJjXS/O9qbkqVrcl/OB+YhGhwQ="; }; - vendorSha256 = "sha256-bkk/gXMLiZGHebrIeDsj3OyiEcH4hriI4TFNdoh3SBk="; + vendorSha256 = "sha256-/GC81ukWpC7h86noPv6zayS9fxWhJpWGXPM8u56F5c4="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/pkgs/tools/security/ike-scan/default.nix b/pkgs/tools/security/ike-scan/default.nix index 5d54e36585d0..15d201fa3270 100644 --- a/pkgs/tools/security/ike-scan/default.nix +++ b/pkgs/tools/security/ike-scan/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ike-scan"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "royhills"; repo = pname; rev = version; - sha256 = "01a39bk9ma2lm59q320m9g11909if5gc3qynd8pzn6slqiq5r8kw"; + sha256 = "sha256-mbfg8p3y4aKoXpmLuF9GXAMPEqV5CsvetwGCRDJ9UNY="; }; nativeBuildInputs = [ @@ -33,11 +33,6 @@ stdenv.mkDerivation rec { url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch"; sha256 = "0wbrq89dl8js7cdivd0c45hckmflan33cpgc3qm5s3az6r4mjljm"; }) - (fetchpatch { - # Unknown vendor IDs, https://github.com/royhills/ike-scan/pull/18, was merged but not released - url = "https://github.com/royhills/ike-scan/pull/18/commits/e065ddbe471880275dc7975e7da235e7a2097c22.patch"; - sha256 = "13ly01c96nnd5yh7rxrhv636csm264m5xf2a1inprrzxkkri5sls"; - }) ]; meta = with lib; { diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index 8189145846b3..eedd436dc2df 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "5.1.0"; + version = "5.2.0"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = version; - sha256 = "sha256-4W6/omGPmQFuZ/2AVNgCs2q0ti/P8OY4o7b4/g9q+Rc="; + sha256 = "sha256-QPOIpgJt+09zRvSavRxuVEN+GGk4Z1CYCXti37YaO7o="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 43046ab90378..612e14b52498 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.88"; + version = "1.0.123"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ITN/HsXZWH1v23R5TSEd8vq/DkhiCypJM+hg879ZWlc="; + sha256 = "sha256-mrpQXIcV1KxOLDhWAS9Og76k18jsey7vPAcbhGe+cN4="; }; - vendorSha256 = "18mvv70g65pq1c7nn752j26d0vasx6cl2rqp5g1hg3cb61hjbn0n"; + vendorSha256 = "sha256-4v/7JrSGZKOyLwU6U3+hc9P+kzxGGj4aXG/wXmNdo+M="; # One test is failing, disabling for now doCheck = false; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 0871a51b6d33..1ea4f8b05191 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.8" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.10" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 3b799b4f9ea0..1eaf6d48a38c 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: d50b53eafca062b7270a91894e4e9de7a526aa10 - ref: refs/tags/6.1.8 + revision: 822dd1ef2b1a1171d62803add58ee2afce30ea06 + ref: refs/tags/6.1.10 specs: - metasploit-framework (6.1.8) + metasploit-framework (6.1.10) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -87,6 +87,7 @@ GIT tzinfo-data unix-crypt warden + win32api windows_error winrm xdr @@ -127,19 +128,19 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.510.0) + aws-partitions (1.516.0) aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.265.0) + aws-sdk-ec2 (1.270.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.61.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.48.0) + aws-sdk-kms (1.49.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.103.0) @@ -219,7 +220,7 @@ GEM jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.5.1) + json (2.6.0) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -295,7 +296,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.5.0) + puma (5.5.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -404,7 +405,7 @@ GEM ttfunk (1.7.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - tzinfo-data (1.2021.2) + tzinfo-data (1.2021.3) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -416,6 +417,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) + win32api (0.1.0) windows_error (0.1.2) winrm (2.3.6) builder (>= 2.1.2) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 9d0728b0303b..91b2bd60a318 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -14,13 +14,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.8"; + version = "6.1.10"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-KDexgv5rsaOyAJhaiLiU1z0st7ncwIayoqn+fvJnSng="; + sha256 = "sha256-VdnczTauHKYexXZs6U5F5v4DP8lJb8wCDy6yiPdEavI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/rapid7/metasploit-framework/wiki"; platforms = platforms.unix; license = licenses.bsd3; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ fab makefu ]; mainProgram = "msfconsole"; }; } diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index d529c58ef58c..8ba307e2b5a0 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lszcza7k1jc57pivjajz1bdgsg3bxfp60phsidv729yhjw3yzwv"; + sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; type = "gem"; }; - version = "1.510.0"; + version = "1.516.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ymrwsc1caf9rfl5613w1xpckzx7v9l4y20dpmzzq72ih0y6lijn"; + sha256 = "1m46n4fn505l0qqwamc5gk88h6aqvjqc7j0pkrcngxcgh5r7hcvf"; type = "gem"; }; - version = "1.265.0"; + version = "1.270.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -144,10 +144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aa7n3bad4h8sipzb31inc0q2r5k2nviaihmhqdv7mqnpylvcgia"; + sha256 = "15iar7b74lnvw1cafacp8vc63xy3zxa8zxmranfssa37mhk53byi"; type = "gem"; }; - version = "1.48.0"; + version = "1.49.0"; }; aws-sdk-s3 = { groups = ["default"]; @@ -594,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry"; type = "gem"; }; - version = "2.5.1"; + version = "2.6.0"; }; little-plugger = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "d50b53eafca062b7270a91894e4e9de7a526aa10"; - sha256 = "0y2aczr7xzm9lar8dh6wp6vjqgfpjjw8hnlq02ra7cbbzs1b2dr8"; + rev = "822dd1ef2b1a1171d62803add58ee2afce30ea06"; + sha256 = "1wka8kvqicif1w1cqvs9r4zh7zp68m7fjv3nqlgac75f6v6xrnam"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.8"; + version = "6.1.10"; }; metasploit-model = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ahk9a2a05985m0037gqlpha5vdkvmwhyk8v1shkbnwkkm30k0mq"; + sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; type = "gem"; }; - version = "5.5.0"; + version = "5.5.2"; }; racc = { groups = ["default"]; @@ -1477,10 +1477,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a0d3smxpdn6i5vjc616wnva8c9nvh8mvsjyvwcxlsj1qsih2l21"; + sha256 = "1f9wlg8p1p1wa86hcskiy58abbdysdqwr4pv2dmkhkfbi94f1lmr"; type = "gem"; }; - version = "1.2021.2"; + version = "1.2021.3"; }; unf = { groups = ["default"]; @@ -1552,6 +1552,16 @@ }; version = "0.1.5"; }; + win32api = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1liryy0pz0gpw5sadbb9xwaflay272b8bwv4pclh6wkhldnh7wg7"; + type = "gem"; + }; + version = "0.1.0"; + }; windows_error = { groups = ["default"]; platforms = []; diff --git a/pkgs/tools/security/mongoaudit/default.nix b/pkgs/tools/security/mongoaudit/default.nix new file mode 100644 index 000000000000..4c15d1cfe948 --- /dev/null +++ b/pkgs/tools/security/mongoaudit/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mongoaudit"; + version = "0.1.1"; + + disabled = python3.pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "stampery"; + repo = pname; + rev = version; + sha256 = "17k4vw5d3kr961axl49ywid4cf3n7zxvm885c4lv15w7s2al1425"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + pymongo + setuptools + urwid + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mongoaudit" + ]; + + meta = with lib; { + description = "MongoDB auditing and pentesting tool"; + homepage = "https://github.com/stampery/mongoaudit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index da59867e1b62..83bb83e4e2c0 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -1,27 +1,31 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib , libpcap }: buildGoModule rec { pname = "naabu"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "v${version}"; - sha256 = "sha256-t5Ij3UeH3z8obOH90cnmwcX9iC97sH7VIKvannSZ+MM="; + sha256 = "0kbpfb1ryfqy8a54ksm7zm8pqy8f4adh06jc1ccpdxks3k0rygid"; }; - vendorSha256 = "sha256-veOIt3hELk3smrGlTyldtdaz5uI4U8/2SeD0UNykB8A="; + vendorSha256 = "0kkkx8p0r04gg3pp0qy835afaxnqxjggnr7q7l6azdvg8qvgxfms"; - buildInputs = [ libpcap ]; + buildInputs = [ + libpcap + ]; - preBuild = '' - mv v2/* . - ''; + modRoot = "./v2"; + + subPackages = [ + "cmd/naabu/" + ]; meta = with lib; { description = "Fast SYN/CONNECT port scanner"; diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index c77abfe2ad7d..00e495f718d9 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "21.8.1"; + version = "21.10.2"; disabled = python3.pythonOlder "3.6"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ksmzwji4c98pnqns780n5rdm5r1zx7sc40w8qipk2nf6jncwv6p"; + sha256 = "0992wsy3plxpcqmq8cnnl0by1vkmkfb4lq2vb5rsj89wj900ci2n"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index d0908c359502..0cc94c63c9f0 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -1,16 +1,33 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchgit, installShellFiles }: buildGoModule rec { pname = "scorecard"; - version = "2.2.8"; + version = "3.0.1"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U29NCZFXOhu0xLfDlJ1Q7m8TbAm+C6+ecYFhcI5gg6s="; + sha256 = "sha256-19XDAgv9ARCZ7eNlWUPcsbGNyKA9vYFry8m6D3+vQP8="; + # populate values otherwise taken care of by goreleaser, + # unfortunately these require us to use git. By doing + # this in postFetch we can delete .git afterwards and + # maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + + commit="$(git rev-parse HEAD)" + source_date_epoch=$(git log --date=iso8601-strict -1 --pretty=%ct) + + substituteInPlace "$out/pkg/scorecard_version.go" \ + --replace 'gitCommit = "unknown"' "gitCommit = \"$commit\"" \ + --replace 'buildDate = "unknown"' "buildDate = \"$source_date_epoch\"" + + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; - vendorSha256 = "sha256-hOATCXjBE0doHnY2BaRKZocQ6SIigL0q4m9eEJGKh6Q="; + vendorSha256 = "sha256-ucF26pTEvG8tkzsyC9WNbvl8QCeetKBvBIcQL2NTfjo="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; @@ -20,8 +37,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/ossf/scorecard/v2/pkg.gitVersion=v${version}" - "-X github.com/ossf/scorecard/v2/pkg.gitTreeState=clean" + "-X github.com/ossf/scorecard/v${lib.versions.major version}/pkg.gitVersion=v${version}" + "-X github.com/ossf/scorecard/v${lib.versions.major version}/pkg.gitTreeState=clean" ]; preCheck = '' diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index daceff1486e3..fa2d774e1174 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -42,8 +42,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cuse" + "--localstatedir=/var" ]; + prePatch = '' + # Makefile tries to create the directory /var/lib/swtpm-localcafor, which fails + substituteInPlace samples/Makefile.am \ + --replace 'install-data-local:' 'do-not-execute:' + + # Use the correct path to the certtool binary + # instead of relying on it being in the environment + substituteInPlace samples/swtpm_localca.c --replace \ + '# define CERTTOOL_NAME "certtool"' \ + '# define CERTTOOL_NAME "${gnutls}/bin/certtool"' + ''; + enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 9c5d44c6d607..86051c51dece 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tboot"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz"; - sha256 = "18bnkwnlk16cc20nysqfcjx006idi7jmmhahk8vk09w458bhaajg"; + sha256 = "sha256-Lheco7ULg87lbC8qXkCWwG3R8jiPdQgznDkPBPy6sRE="; }; buildInputs = [ openssl trousers zlib ]; diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index eb5320d250fc..0308bc5d35bc 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IF5BDe6XnOR7F/ajYBbMuFpIxUawgd/Oo2AthL5aeWE="; + sha256 = "sha256-vKKBbTculy/r1l3lHnHiBZLAwhw/61kDAsypa0o2VXQ="; }; - vendorSha256 = "sha256-PZM8OWvjj8681/CWVE896f3vRHnkNeJj2w/aoOFZ9P0="; + vendorSha256 = "0vx406y3kj1qmgr1y9vg3rprwjpm5g8p9shmhq28gp7sxz3j82ry"; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index c269da48273e..1c8682e93bc0 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-7jJMF8pNCKkiOAY9sZEK0lOqP2/yBVqS3FaKOOz74XI="; + sha256 = "sha256-t/BQu6nq0FcmqTc/vo3bTUbVNDqzePqlOMFkl4pD598="; }; - vendorSha256 = "sha256-j+07Q5dpt8I0sf5B3AVw4343EMWyJDqrzFrdDrBp0DY="; + vendorSha256 = "sha256-9eXDcuVm+N4nenotUtCvyp2qB5uPDwzGHk43Y4uTT14="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 9758b6fbda8e..b67d63938c95 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.3"; + version = "1.8.4"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-x1ZHemRyblfMgmG2zx3AnZmhn2Q952v3nzi3HEvlmE8="; + sha256 = "sha256-zrCRnIScIWJ8ocrgYPNhtvuX3PBLF9HX0dyZU/zY4yk="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1141zjf56fz76ka7bim9qkdk46pa3kk39swxza17g3qxpj21w0jp"; + sha256 = "0sh9q29b0bi5ap6nvll0ykxd5vf4wliksj31cmm4gw5vp90irvl3"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "06bkka2k09alhps5h2dk0dgczgnnd6g4npjp9j103lvzi935zjsy"; + sha256 = "09nhfdw20g46fnrn82my7a59pfa81dxncxhiswmha3cdy8n0p6wb"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1z9pv46pgqnn34mc624x9z41kvr4hrjjdp6y9zv033h0cpxbd0y7"; + sha256 = "01ra0xrgivf01ff87p0gqmi1flnac9y02x7jpv5j6a9czr1sqw1j"; }; }; diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix index 427fe12267ec..b72ee7a6911f 100644 --- a/pkgs/tools/system/auto-cpufreq/default.nix +++ b/pkgs/tools/system/auto-cpufreq/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.6.9"; + version = "1.7.1"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "1pri182cgbrhr0adq2784gpv6q8c8kjr0jsh8wpvd1wvfsbqywrm"; + sha256 = "1r27ydv258c6pc82za0wq8q8fj0j3r50c8wxc6r7dwr6wx8q3asx"; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; diff --git a/pkgs/tools/system/battop/battery.patch b/pkgs/tools/system/battop/battery.patch deleted file mode 100644 index 218359d904fe..000000000000 --- a/pkgs/tools/system/battop/battery.patch +++ /dev/null @@ -1,588 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 57ee609..d156cd2 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,430 +1,429 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 3 -+ - [[package]] - name = "autocfg" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" - - [[package]] - name = "battery" --version = "0.7.4" -+version = "0.7.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4b624268937c0e0a3edb7c27843f9e547c320d730c610d3b8e6e8e95b2026e4" - dependencies = [ -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "core-foundation", -+ "lazycell", -+ "libc", -+ "mach", -+ "nix", -+ "num-traits", -+ "uom", -+ "winapi", - ] - - [[package]] - name = "battop" - version = "0.2.4" - dependencies = [ -- "battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "battery", -+ "humantime", -+ "itertools", -+ "log", -+ "stderrlog", -+ "structopt", -+ "termion", -+ "tui", - ] - - [[package]] - name = "bitflags" --version = "1.0.4" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - - [[package]] - name = "cassowary" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - - [[package]] - name = "cc" - version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" - - [[package]] - name = "cfg-if" - version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "chrono" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" - dependencies = [ -- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer", -+ "num-traits", -+ "time", - ] - - [[package]] - name = "clap" - version = "2.33.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "textwrap", -+ "unicode-width", - ] - - [[package]] - name = "core-foundation" --version = "0.6.4" -+version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" - dependencies = [ -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys", -+ "libc", - ] - - [[package]] - name = "core-foundation-sys" --version = "0.6.2" -+version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - - [[package]] - name = "either" - version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" - - [[package]] - name = "heck" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" - dependencies = [ -- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-segmentation", - ] - - [[package]] - name = "humantime" - version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" - dependencies = [ -- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quick-error", - ] - - [[package]] - name = "itertools" - version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" - dependencies = [ -- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either", - ] - - [[package]] - name = "lazy_static" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" - - [[package]] - name = "lazycell" --version = "1.2.1" -+version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - - [[package]] - name = "libc" --version = "0.2.58" -+version = "0.2.98" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" - - [[package]] - name = "log" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" - dependencies = [ -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.9", - ] - - [[package]] - name = "mach" --version = "0.2.3" -+version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "nix" --version = "0.14.0" -+version = "0.19.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "cc", -+ "cfg-if 1.0.0", -+ "libc", - ] - - [[package]] - name = "num-integer" - version = "0.1.41" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" - dependencies = [ -- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg", -+ "num-traits", - ] - - [[package]] - name = "num-traits" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" - dependencies = [ -- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg", - ] - - [[package]] - name = "numtoa" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" - - [[package]] - name = "proc-macro2" - version = "0.4.30" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" - dependencies = [ -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid", - ] - - [[package]] - name = "quick-error" - version = "1.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" - - [[package]] - name = "quote" - version = "0.6.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", - ] - - [[package]] - name = "redox_syscall" - version = "0.1.54" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" - - [[package]] - name = "redox_termios" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" - dependencies = [ -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall", - ] - - [[package]] - name = "stderrlog" - version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" - dependencies = [ -- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono", -+ "log", -+ "termcolor", -+ "thread_local", - ] - - [[package]] - name = "structopt" - version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" - dependencies = [ -- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap", -+ "structopt-derive", - ] - - [[package]] - name = "structopt-derive" - version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" - dependencies = [ -- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", - ] - - [[package]] - name = "syn" - version = "0.15.34" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", -+ "quote", -+ "unicode-xid", - ] - - [[package]] - name = "termcolor" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" - dependencies = [ -- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wincolor", - ] - - [[package]] - name = "termion" - version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "numtoa", -+ "redox_syscall", -+ "redox_termios", - ] - - [[package]] - name = "textwrap" - version = "0.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" - dependencies = [ -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width", - ] - - [[package]] - name = "thread_local" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" - dependencies = [ -- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static", - ] - - [[package]] - name = "time" - version = "0.1.42" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "redox_syscall", -+ "winapi", - ] - - [[package]] - name = "tui" - version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "cassowary", -+ "either", -+ "itertools", -+ "log", -+ "termion", -+ "unicode-segmentation", -+ "unicode-width", - ] - - [[package]] - name = "typenum" - version = "1.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" - - [[package]] - name = "unicode-segmentation" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" - - [[package]] - name = "unicode-width" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" - - [[package]] - name = "unicode-xid" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - - [[package]] - name = "uom" --version = "0.23.1" -+version = "0.30.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" - dependencies = [ -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits", -+ "typenum", - ] - --[[package]] --name = "void" --version = "1.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" -- - [[package]] - name = "winapi" - version = "0.3.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" - dependencies = [ -- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", - ] - - [[package]] - name = "winapi-i686-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - - [[package]] - name = "winapi-x86_64-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "wincolor" - version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" - dependencies = [ -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi", - ] -- --[metadata] --"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" --"checksum battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6d6fe5630049e900227cd89afce4c1204b88ec8e61a2581bb96fcce26f047b" --"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" --"checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" --"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" --"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" --"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" --"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" --"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" --"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" --"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" --"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" --"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" --"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" --"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" --"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" --"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" --"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" --"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" --"checksum nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d10caafde29a846a82ae0af70414e4643e072993441033b2c93217957e2f867" --"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" --"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" --"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" --"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" --"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" --"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" --"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" --"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" --"checksum stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" --"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" --"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" --"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" --"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" --"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" --"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" --"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" --"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" --"checksum tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" --"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" --"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" --"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" --"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" --"checksum uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef5bbe8385736e498dbb0033361f764ab43a435192513861447b9f7714b3fec" --"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" --"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" --"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" --"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" --"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" -diff --git a/Cargo.toml b/Cargo.toml -index 3d3df77..34b9bc5 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -17,7 +17,7 @@ travis-ci = { repository = "svartalf/rust-battop", branch = "master" } - maintenance = { status = "actively-developed" } - - [dependencies] --battery = "^0.7" -+battery = "^0.7.7" - structopt = { version = "0.2", default-features = false } - log = "0.4.6" - stderrlog = "0.4.1" diff --git a/pkgs/tools/system/battop/default.nix b/pkgs/tools/system/battop/default.nix deleted file mode 100644 index e28789b835ec..000000000000 --- a/pkgs/tools/system/battop/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "battop"; - version = "0.2.4"; - - src = fetchFromGitHub { - owner = "svartalf"; - repo = "rust-battop"; - rev = "v${version}"; - sha256 = "0p53jl3r2p1w9m2fvhzzrj8d9gwpzs22df5sbm7wwja4pxn7ay1w"; - }; - - # https://github.com/svartalf/rust-battop/issues/11 - cargoPatches = [ ./battery.patch ]; - - cargoSha256 = "0ipmnrn6lmf6rqzsqmaxzy9lblrxyrxzkji968356nxxmwzfbfvh"; - - meta = with lib; { - description = "is an interactive battery viewer"; - homepage = "https://github.com/svartalf/rust-battop"; - license = licenses.asl20; - maintainers = with maintainers; [ hdhog ]; - }; -} diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 51dad59e819a..99d1d0bfa970 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.0.13"; + version = "1.0.16"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Znap1MSWEdKtb9G7+DmfYAhq3q2NfGu1v2cjbYuvUmE="; + sha256 = "sha256-navmEd77+LOvCpjPe6dReOYGO1wGRO3OGIv8mC05Kec="; }; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 3d5dac7faa8c..72e6f5ec71be 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ popt ] ++ lib.optionals aclSupport [ acl ]; meta = with lib; { - homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; + homepage = "https://github.com/logrotate/logrotate"; description = "Rotates and compresses system logs"; license = licenses.gpl2Plus; maintainers = [ maintainers.viric ]; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 1658b4ea4df8..e72d7ff5e1c2 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Tools for monitoring the health of hard drives"; homepage = "https://www.smartmontools.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti Frostman ]; + maintainers = with maintainers; [ Frostman ]; platforms = with platforms; linux ++ darwin; mainProgram = "smartctl"; }; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index ab76de74762c..acf0813b3ac2 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -52,6 +52,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.all; - maintainers = [lib.maintainers.peti]; }; } diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix index 80aa9f654a6a..6b16f01f2fa1 100644 --- a/pkgs/tools/text/gnused/422.nix +++ b/pkgs/tools/text/gnused/422.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { platforms = lib.platforms.all; maintainers = [ ]; + mainProgram = "sed"; }; } diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 23b2794bf13f..32f6f30cb1ac 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ mic92 ]; + mainProgram = "sed"; }; } diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index f44ddc9d0e91..82d5eab5086f 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -20,7 +20,12 @@ let buildInputs = [ getopt lua boost ]; - prePatch = lib.optionalString stdenv.cc.isClang '' + prePatch = '' + substituteInPlace src/makefile \ + --replace "shell pkg-config" "shell $PKG_CONFIG" + substituteInPlace makefile \ + --replace 'gzip' 'gzip -n' + '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace src/makefile \ --replace 'CXX=g++' 'CXX=clang++' ''; diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix new file mode 100644 index 000000000000..d8412605dcbe --- /dev/null +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, graphviz }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-graphviz"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "dylanowen"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-wIgWaCjJrrajvUZbJjpx9P4urN2/eVo3+Za2NjTKWvM="; + }; + + cargoSha256 = "sha256-F8JuEk0ztB7jfcPNjU9vGsr3HLEJ2DmWGWxvdbLuyvQ="; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + checkInputs = [ graphviz ]; + + meta = with lib; { + description = "A preprocessor for mdbook, rendering Graphviz graphs to HTML at build time."; + homepage = "https://github.com/dylanowen/mdbook-graphviz"; + license = [ licenses.mpl20 ]; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix new file mode 100644 index 000000000000..a97e7ca89483 --- /dev/null +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-katex"; + version = "0.2.10"; + + src = fetchFromGitHub { + owner = "lzanini"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5PzXX7icRxcHpzjp3x/9ssn2o0444uHrzBn1Ds1DEPM="; + }; + + cargoSha256 = "sha256-tqdpIBlKiyYSWFPYTnzVeDML2GM+mukbOHS3sNYUgdc="; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + meta = with lib; { + description = "A preprocessor for mdbook, rendering LaTeX equations to HTML at build time."; + homepage = "https://github.com/lzanini/${pname}"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/tools/text/tidy-viewer/default.nix new file mode 100644 index 000000000000..4cb99ca26cea --- /dev/null +++ b/pkgs/tools/text/tidy-viewer/default.nix @@ -0,0 +1,29 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "tidy-viewer"; + version = "0.0.22"; + + src = fetchFromGitHub { + owner = "alexhallam"; + repo = "tv"; + rev = version; + sha256 = "sha256-OuNpp9EKiU+fQSZZO7zpI36nCiZBXK6OznJGY4KMftU="; + }; + + cargoSha256 = "sha256-LRoNGDOrbCjmZJRe+EUKxkDJjC92bQRRwP48jqDp9PU="; + + # this test parses command line arguments + # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context + checkFlags = [ + "--skip=build_reader_can_create_reader_without_file_specified" + ]; + + meta = with lib; { + description = "A cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment"; + homepage = "https://github.com/alexhallam/tv"; + changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md"; + license = licenses.unlicense; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 25a98d299a75..fc350162845a 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "vale"; - version = "2.10.6"; + version = "2.11.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; src = fetchFromGitHub { - owner = "errata-ai"; - repo = "vale"; - rev = "v${version}"; - sha256 = "sha256-exBrs/MQhfqCxAJrnxECdKnxvsK9LvXIqpnYkR5h7uA="; + owner = "errata-ai"; + repo = "vale"; + rev = "v${version}"; + sha256 = "1g8k9723d1xmx918f60lpla52ly90rz6z0ffzwsb2rh62r3h80h5"; }; - vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc="; + vendorSha256 = "0czxigagjbqdzzgmh1iw3q0d4sj6635384lnn1w5smws8nsqr9ia"; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/tools/typesetting/coq2html/default.nix similarity index 91% rename from pkgs/applications/science/logic/coq2html/default.nix rename to pkgs/tools/typesetting/coq2html/default.nix index 393b84640805..924eea3c0a86 100644 --- a/pkgs/applications/science/logic/coq2html/default.nix +++ b/pkgs/tools/typesetting/coq2html/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "coq2html"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "xavierleroy"; repo = "coq2html"; rev = "v${version}"; - sha256 = "sha256-ty/6A3wivjDCrmlZAcZyaIwQQ+vPBJm9MhtW6nZcV3s="; + sha256 = "sha256:1ad825yifn518wk1c2y2ji10q3m468r8ajjgw2nzzy7d608nx7yq"; }; nativeBuildInputs = [ ocaml ]; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index bbdb9c9b14f2..32907ea3fb75 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.9.0"; + version = "0.9.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "0v3l70c9mal67i369bk3q67qyn07kmclybcd5lj5ibdrrccq1jzsxn2sy39ziy77in7cygcb1lgf9vzacx9rscw94i6259fy0dpnf0h"; + sha512 = "2dnjyx3q46n7v1wl46vfgs9rhb3kvhijsd3ydq6amdf6vlf4mf1zsiakd5iycdh0i799zq61yspsibc87mcrs8l289lnwl955avs068"; }; nativeBuildInputs = [ which ] diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 9cbf9ac7e2f9..bfd0bfb64bf1 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "sha256-CMvT9DouwERhDtBsLDesxN/QgEEfXLgtJaQLjq+SzOI="; + sha256 = "1x6pxzl2fxv0ldfdlgm5x2pcbkny8cf2b4gpk8yj8hhnn1ypim1w"; }; - cargoSha256 = "sha256-zGsb49yt6SRFfvNHZY+RpjihGpV9ziLsg9BII7WTX2Y="; + cargoSha256 = "0v5jc26icz83ssky85c8l92jcmglq9f2jbihfh4yqanpmwbpp5fl"; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 73007b137199..4b64c8e97783 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl2Plus; - homepage = "https://fedorahosted.org/xmlto/"; + homepage = "https://pagure.io/xmlto/"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/virtualization/linode-cli/update.sh b/pkgs/tools/virtualization/linode-cli/update.sh index b31aa9574234..dd37e41c5373 100755 --- a/pkgs/tools/virtualization/linode-cli/update.sh +++ b/pkgs/tools/virtualization/linode-cli/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq yq-go -set -eu -o pipefail +set -x -eu -o pipefail cd $(dirname "${BASH_SOURCE[0]}") @@ -21,7 +21,7 @@ VERSION=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/${VERSION}.tar.gz) setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix } setKV specVersion ${SPEC_VERSION} diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index 78ddc8e6dfd5..ccc79d36c8f6 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -1,15 +1,15 @@ { stdenv, lib, fetchFromGitHub , which -, python +, python3 , help2man }: let - pyEnv = python.withPackages(ps: [ ps.setuptools ]); + pyEnv = python3.withPackages(ps: [ ps.setuptools ]); in stdenv.mkDerivation rec { pname = "mininet"; - version = "2.3.0d6"; + version = "2.3.0"; outputs = [ "out" "py" ]; @@ -17,14 +17,16 @@ stdenv.mkDerivation rec { owner = "mininet"; repo = "mininet"; rev = version; - sha256 = "0wc6gni9dxj9jjnw66a28jdvcfm8bxv1i776m5dh002bn5wjcl6x"; + sha256 = "sha256-bCppmeB+zQMKTptnzhsXtl72XJXU3USo7cQgP1Z6SrY="; }; buildFlags = [ "mnexec" ]; makeFlags = [ "PREFIX=$(out)" ]; - pythonPath = [ python.pkgs.setuptools ]; - buildInputs = [ python which help2man ]; + pythonPath = [ python3.pkgs.setuptools ]; + nativeBuildInputs = [ help2man ]; + + propagatedBuildInputs = [ python3 which ]; installTargets = [ "install-mnexec" "install-manpages" ]; @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Emulator for rapid prototyping of Software Defined Networks"; license = { - fullName = "Mininet 2.3.0d6 License"; + fullName = "Mininet 2.3.0 License"; }; platforms = platforms.linux; homepage = "https://github.com/mininet/mininet"; diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/tools/wayland/sirula/default.nix index b58f37368f03..c95cbd00c5d5 100644 --- a/pkgs/tools/wayland/sirula/default.nix +++ b/pkgs/tools/wayland/sirula/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sirula"; - version = "unstable-2021-07-11"; + version = "unstable-2021-10-12"; src = fetchFromGitHub { owner = "DorianRudolph"; repo = "sirula"; - rev = "574725bc307fc704c42380cd0fa50b0b80c4764d"; - sha256 = "1m58j1hymjw4l2z1jdfirw1vb3rblc1qffpvc2lqy99frfz0dlvp"; + rev = "b300cabde03ec4d8c28ed84e318166b675fb4a77"; + sha256 = "0pxdgjpqaf1bq1y1flafg0ksk8548rif6pfbw0lp31p655pq95c8"; }; - cargoSha256 = "0wk90p20qkbpr866h8cvdshr8cl2kmc3dh2zxws5mlsh3sx2ld4w"; + cargoSha256 = "175rl09jmnj8pd5isyp2chnn66vdz1c16fgqhnjsxvbcasmn8vdj"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/tools/wayland/swaycwd/default.nix index 401144f74d2a..d8fec3fd15c6 100644 --- a/pkgs/tools/wayland/swaycwd/default.nix +++ b/pkgs/tools/wayland/swaycwd/default.nix @@ -1,36 +1,38 @@ -{ lib, nimPackages, fetchFromGitLab +{ lib +, nimPackages +, fetchFromGitLab , enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ] }: +nimPackages.buildNimPackage rec{ -nimPackages.buildNimPackage { - name = "swaycwd"; - version = "0.0.1"; + name = "swaycwd"; + version = "0.0.2"; - src = fetchFromGitLab { - owner = "cab404"; - repo = "swaycwd"; - rev = "aca81695ec2102b9bca6f5bae364f69a8b9d399f"; - hash = "sha256-MkyY3wWByQo0l0J28xKDfGtxfazVPRyZHCObl9Fszh4="; - }; + src = fetchFromGitLab { + owner = "cab404"; + repo = name; + rev = "v${version}"; + hash = "sha256-OZWOPtOqcX+fVQCxWntrn98EzFu70WH55rfYCPDMSKk="; + }; - preConfigure = '' - { - echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}' - echo 'export enabledShells' - } > shells.nim - cat << EOF > swaycwd.nimble - srcDir = "." - bin = "swaycwd" - EOF - ''; + preConfigure = '' + { + echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}' + echo 'export enabledShells' + } > shells.nim + cat << EOF > swaycwd.nimble + srcDir = "." + bin = "swaycwd" + EOF + ''; - nimFlags = [ "--opt:speed" ]; + nimFlags = [ "--opt:speed" ]; - meta = with lib; { - homepage = "https://gitlab.com/cab404/swaycwd"; - description = "Returns cwd for shell in currently focused sway window, or home directory if cannot find shell"; - maintainers = with maintainers; [ cab404 ]; - platforms = platforms.linux; - license = licenses.gpl3Only; - }; + meta = with lib; { + homepage = "https://gitlab.com/cab404/swaycwd"; + description = "Returns cwd for shell in currently focused sway window, or home directory if cannot find shell"; + maintainers = with maintainers; [ cab404 ]; + platforms = platforms.linux; + license = licenses.gpl3Only; + }; } diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index e38819cfcb02..18c32b9a9d92 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -13,7 +13,10 @@ let lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); - agda = withPackages [] // { inherit withPackages; }; + agda = withPackages [] // { + inherit withPackages; + passthru.tests.allPackages = withPackages (lib.filter (pkg: self.lib.isUnbrokenAgdaPackage pkg) (lib.attrValues self)); + }; standard-library = callPackage ../development/libraries/agda/standard-library { inherit (pkgs.haskellPackages) ghcWithPackages; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8e9edb67edbe..128ee0312cd2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -204,6 +204,7 @@ mapAliases ({ dnnl = oneDNN; # added 2020-04-22 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25 + dotnet-netcore = dotnet-runtime; # added 2021-10-07 double_conversion = double-conversion; # 2017-11-22 docker_compose = docker-compose; # 2018-11-10 draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 @@ -333,6 +334,8 @@ mapAliases ({ google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 + graalvm8 = graalvm8-ce; + graalvm11 = graalvm11-ce; gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 gtk_doc = gtk-doc; # added 2018-02-25 guileCairo = guile-cairo; # added 2017-09-24 @@ -374,6 +377,7 @@ mapAliases ({ jbuilder = dune_1; # added 2018-09-09 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 + jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 json_glib = json-glib; # added 2018-02-25 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 @@ -539,11 +543,13 @@ mapAliases ({ mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 + minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 - mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 - mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 + mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # added 2021-10-18 mesa_noglu = mesa; # added 2019-05-28 # NOTE: 2018-07-12: legacy alias: # grsecurity business is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ @@ -568,6 +574,7 @@ mapAliases ({ mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 + mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 mysqlWorkbench = mysql-workbench; # added 2017-01-19 nagiosPluginsOfficial = monitoring-plugins; @@ -615,6 +622,8 @@ mapAliases ({ osquery = throw "osquery has been removed."; # added 2019-11-24 osxfuse = macfuse-stubs; # added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 + OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16 + OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16 owncloudclient = owncloud-client; # added 2016-08 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 p11_kit = p11-kit; # added 2018-02-25 @@ -896,6 +905,7 @@ mapAliases ({ stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09 surf-webkit2 = surf; # added 2017-04-02 sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; + swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14 swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 swtpm-tpm2 = swtpm; # added 2021-02-26 syncthing-cli = syncthing; # added 2021-04-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20960558ccec..48c6f235c119 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -405,17 +405,13 @@ with pkgs; dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); - dotnet-sdk = dotnetCorePackages.sdk_2_1; - dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; - dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; - dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; - dotnet-netcore = dotnetCorePackages.netcore_2_1; - - dotnet-aspnetcore = dotnetCorePackages.aspnetcore_2_1; + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-runtime = dotnetCorePackages.runtime_5_0; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; dumb-init = callPackage ../applications/virtualization/dumb-init {}; @@ -520,6 +516,8 @@ with pkgs; tests = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; }; + fetchNextcloudApp = callPackage ../build-support/fetchnextcloudapp {}; + # `fetchurl' downloads a file from the network. fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform then buildPackages.fetchurl # No need to do special overrides twice, @@ -605,6 +603,7 @@ with pkgs; fetchNuGet = callPackage ../build-support/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; + buildDotnetModule = callPackage ../build-support/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; fetchgx = callPackage ../build-support/fetchgx { }; @@ -892,7 +891,7 @@ with pkgs; airfield = callPackage ../tools/networking/airfield { }; - apache-airflow = with python37.pkgs; toPythonApplication apache-airflow; + apache-airflow = with python3.pkgs; toPythonApplication apache-airflow; airsonic = callPackage ../servers/misc/airsonic { }; @@ -963,6 +962,8 @@ with pkgs; ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; + vopono = callPackage ../tools/networking/vopono { }; + xcd = callPackage ../tools/misc/xcd { }; xtrt = callPackage ../tools/archivers/xtrt { }; @@ -996,6 +997,8 @@ with pkgs; inherit (lxqt) qtermwidget; }; + ctx = callPackage ../applications/terminal-emulators/ctx { }; + darktile = callPackage ../applications/terminal-emulators/darktile { }; eterm = callPackage ../applications/terminal-emulators/eterm { }; @@ -1264,6 +1267,8 @@ with pkgs; ashuffle = callPackage ../applications/audio/ashuffle {}; + ashpd-demo = callPackage ../development/tools/ashpd-demo {}; + asls = callPackage ../development/tools/misc/asls { }; astc-encoder = callPackage ../tools/graphics/astc-encoder { }; @@ -1373,6 +1378,8 @@ with pkgs; ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { }; + ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { }; + ec2-utils = callPackage ../tools/virtualization/ec2-utils { }; exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; @@ -1607,6 +1614,8 @@ with pkgs; esbuild = callPackage ../development/tools/esbuild { }; + esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { }; + essentia-extractor = callPackage ../tools/audio/essentia-extractor { }; esh = callPackage ../tools/text/esh { }; @@ -1655,6 +1664,8 @@ with pkgs; git-fire = callPackage ../tools/misc/git-fire { }; + git-privacy = callPackage ../development/tools/git-privacy { }; + git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; git-revise = with python3Packages; toPythonApplication git-revise; @@ -2279,6 +2290,8 @@ with pkgs; calendar-cli = callPackage ../tools/networking/calendar-cli { }; + cameradar = callPackage ../tools/security/cameradar { }; + candle = libsForQt5.callPackage ../applications/misc/candle { }; capstone = callPackage ../development/libraries/capstone { }; @@ -2539,6 +2552,8 @@ with pkgs; dale = callPackage ../development/compilers/dale { }; + damon = callPackage ../tools/admin/damon { }; + dante = callPackage ../servers/dante { }; dapr-cli = callPackage ../development/tools/dapr/cli {}; @@ -2599,6 +2614,8 @@ with pkgs; dialog = callPackage ../tools/misc/dialog { }; + dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { }; + dibbler = callPackage ../tools/networking/dibbler { }; diesel-cli = callPackage ../development/tools/diesel-cli { @@ -2730,6 +2747,8 @@ with pkgs; eggdrop = callPackage ../tools/networking/eggdrop { }; + ekam = callPackage ../development/tools/build-managers/ekam { }; + eksctl = callPackage ../tools/admin/eksctl { }; electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; @@ -2832,6 +2851,8 @@ with pkgs; fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; + flitter = callPackage ../tools/misc/flitter { }; + frangipanni = callPackage ../tools/text/frangipanni { }; fselect = callPackage ../tools/misc/fselect { }; @@ -3149,6 +3170,8 @@ with pkgs; lynis = callPackage ../tools/security/lynis { }; + mapcidr = callPackage ../tools/misc/mapcidr { }; + mapproxy = callPackage ../applications/misc/mapproxy { }; marl = callPackage ../development/libraries/marl {}; @@ -3427,6 +3450,8 @@ with pkgs; statserial = callPackage ../tools/misc/statserial { }; + steampipe = callPackage ../tools/misc/steampipe { }; + step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; }; @@ -3447,6 +3472,10 @@ with pkgs; sydbox = callPackage ../os-specific/linux/sydbox { }; + synth = callPackage ../tools/misc/synth { + inherit (darwin.apple_sdk.frameworks) Security; + }; + syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; syslogng = callPackage ../tools/system/syslog-ng { }; @@ -3520,6 +3549,8 @@ with pkgs; mcrypt = callPackage ../tools/misc/mcrypt { }; + mongoaudit = callPackage ../tools/security/mongoaudit { }; + mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; @@ -3534,6 +3565,8 @@ with pkgs; mslink = callPackage ../tools/misc/mslink { }; + mceinject = callPackage ../os-specific/linux/mceinject { }; + mcelog = callPackage ../os-specific/linux/mcelog { util-linux = util-linuxMinimal; }; @@ -3912,6 +3945,10 @@ with pkgs; cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; + crabz = callPackage ../tools/compression/crabz { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + cryptpad = callPackage ../servers/web-apps/cryptpad { nodejs = nodejs-12_x; }; @@ -5430,7 +5467,7 @@ with pkgs; git-fame = callPackage ../applications/version-management/git-and-tools/git-fame {}; - git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { mercurial = mercurial_4; }; + git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { }; git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo { pythonPackages = python3Packages; @@ -5621,6 +5658,16 @@ with pkgs; gnuapl = callPackage ../development/interpreters/gnu-apl { }; + dapl = callPackage ../development/interpreters/dzaima-apl { + buildNativeImage = false; + stdenv = stdenvNoCC; + jdk = jre; + }; + dapl-native = callPackage ../development/interpreters/dzaima-apl { + buildNativeImage = true; + jdk = graalvm11-ce; + }; + gnucap = callPackage ../applications/science/electronics/gnucap { }; gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; @@ -5953,7 +6000,9 @@ with pkgs; pixz = callPackage ../tools/compression/pixz { }; - plplot = callPackage ../development/libraries/plplot { }; + plplot = callPackage ../development/libraries/plplot { + inherit (xorg) libX11; + }; pxattr = callPackage ../tools/archivers/pxattr { }; @@ -6020,28 +6069,25 @@ with pkgs; hddtemp = callPackage ../tools/misc/hddtemp { }; - hdf4 = callPackage ../tools/misc/hdf4 { - szip = null; - }; + hdf4 = callPackage ../tools/misc/hdf4 { }; hdf5 = callPackage ../tools/misc/hdf5 { - gfortran = null; - szip = null; + fortranSupport = false; + fortran = gfortran; }; hdf5_1_10 = callPackage ../tools/misc/hdf5/1.10.nix { }; hdf5-mpi = appendToName "mpi" (hdf5.override { - szip = null; mpiSupport = true; }); hdf5-cpp = appendToName "cpp" (hdf5.override { - cpp = true; + cppSupport = true; }); hdf5-fortran = appendToName "fortran" (hdf5.override { - inherit gfortran; + fortranSupport = true; }); hdf5-threadsafe = appendToName "threadsafe" (hdf5.overrideAttrs (oldAttrs: { @@ -6084,6 +6130,8 @@ with pkgs; hivemind = callPackage ../applications/misc/hivemind { }; + hobbits = libsForQt5.callPackage ../tools/graphics/hobbits { }; + hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; highlight = callPackage ../tools/text/highlight ({ @@ -6242,6 +6290,8 @@ with pkgs; imgurbash2 = callPackage ../tools/graphics/imgurbash2 { }; + in-formant = callPackage ../applications/audio/in-formant { }; + inadyn = callPackage ../tools/networking/inadyn { }; incron = callPackage ../tools/system/incron { }; @@ -6618,6 +6668,8 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; + ligo = callPackage ../development/compilers/ligo { }; + ldgallery = callPackage ../tools/graphics/ldgallery { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -6658,6 +6710,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + libshumate = callPackage ../development/libraries/libshumate { }; + libsmartcols = callPackage ../development/libraries/libsmartcols { }; libsmi = callPackage ../development/libraries/libsmi { }; @@ -6672,6 +6726,8 @@ with pkgs; ffmpeg = ffmpeg-full; }; + lfs = callPackage ../tools/filesystems/lfs { }; + lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; lldpd = callPackage ../tools/networking/lldpd { }; @@ -6790,6 +6846,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + + mdbook-katex = callPackage ../tools/text/mdbook-katex { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -7355,8 +7419,6 @@ with pkgs; mimetic = callPackage ../development/libraries/mimetic { }; - minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { }; minio-certgen = callPackage ../tools/security/minio-certgen { }; @@ -7595,7 +7657,7 @@ with pkgs; netkittftp = callPackage ../tools/networking/netkit/tftp { }; - netlify-cli = nodePackages.netlify-cli; + netlify-cli = callPackage ../development/web/netlify-cli { }; netpbm = callPackage ../tools/graphics/netpbm { }; @@ -7952,7 +8014,9 @@ with pkgs; opendbx = callPackage ../development/libraries/opendbx { }; - opendht = callPackage ../development/libraries/opendht {}; + opendht = callPackage ../development/libraries/opendht { + inherit (darwin.apple_sdk.frameworks) Security; + }; opendkim = callPackage ../development/libraries/opendkim { }; @@ -8413,7 +8477,10 @@ with pkgs; podiff = callPackage ../tools/text/podiff { }; - podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman = if stdenv.isDarwin then + callPackage ../applications/virtualization/podman { } + else + callPackage ../applications/virtualization/podman/wrapper.nix { }; podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -8615,6 +8682,8 @@ with pkgs; openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {}); + prowlarr = callPackage ../servers/prowlarr { }; + qarte = libsForQt5.callPackage ../applications/video/qarte { }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; @@ -8929,6 +8998,8 @@ with pkgs; runelite = callPackage ../games/runelite { }; + runescape = callPackage ../games/runescape-launcher { }; + runningx = callPackage ../tools/X11/runningx { }; rund = callPackage ../development/tools/rund { }; @@ -9496,6 +9567,7 @@ with pkgs; storeBackup = callPackage ../tools/backup/store-backup { }; stow = callPackage ../tools/misc/stow { }; + xstow = callPackage ../tools/misc/xstow { }; stun = callPackage ../tools/networking/stun { }; @@ -9519,6 +9591,10 @@ with pkgs; subfinder = callPackage ../tools/networking/subfinder { }; + suckit = callPackage ../tools/networking/suckit { + inherit (darwin.apple_sdk.frameworks) Security; + }; + surfraw = callPackage ../tools/networking/surfraw { }; swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; @@ -9527,8 +9603,6 @@ with pkgs; swapview = callPackage ../os-specific/linux/swapview/default.nix { }; - swec = callPackage ../tools/networking/swec { }; - swtpm = callPackage ../tools/security/swtpm { }; svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { @@ -9643,7 +9717,7 @@ with pkgs; ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; @@ -9707,6 +9781,8 @@ with pkgs; thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { }; + tidy-viewer = callPackage ../tools/text/tidy-viewer { }; + tiled = libsForQt5.callPackage ../applications/editors/tiled { }; tiledb = callPackage ../development/libraries/tiledb { }; @@ -10049,6 +10125,8 @@ with pkgs; uwsgi = callPackage ../servers/uwsgi { }; + uwufetch = callPackage ../tools/misc/uwufetch { }; + v2ray = callPackage ../tools/networking/v2ray { }; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; @@ -10239,6 +10317,7 @@ with pkgs; wasm-bindgen-cli = callPackage ../development/tools/wasm-bindgen-cli { inherit (darwin.apple_sdk.frameworks) Security; + nodejs = nodejs_latest; }; welkin = callPackage ../tools/graphics/welkin {}; @@ -10389,6 +10468,11 @@ with pkgs; unbound-full = unbound.override { withSystemd = true; withDoH = true; + withECS = true; + withDNSCrypt = true; + withDNSTAP = true; + withTFO = true; + withRedis = true; }; unicorn = callPackage ../development/libraries/unicorn { }; @@ -10821,6 +10905,8 @@ with pkgs; zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; + zsh-autocomplete = callPackage ../shells/zsh/zsh-autocomplete { }; + zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { }; zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { }; @@ -11218,8 +11304,9 @@ with pkgs; inherit (callPackages ../development/compilers/crystal { llvmPackages = llvmPackages_10; }) - crystal_0_36 crystal_1_0 + crystal_1_1 + crystal_1_2 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; @@ -12018,14 +12105,6 @@ with pkgs; openjdk = openjdk16; openjdk_headless = openjdk16_headless; - inherit (callPackages ../development/compilers/graalvm { - gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; - inherit (darwin.apple_sdk.frameworks) - CoreFoundation Foundation JavaNativeFoundation - JavaVM JavaRuntimeSupport Cocoa; - inherit (darwin) libiconv libobjc libresolv; - }) mx jvmci8 graalvm8; - graalvmCEPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { inherit (darwin.apple_sdk.frameworks) Foundation; @@ -12190,7 +12269,10 @@ with pkgs; /**/ if platform.isDarwin then (if platform.isAarch64 then 11 else 7) else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 - else if platform.isLinux then (if platform.isRiscV then 11 else 7) + else if platform.isLinux then + /**/ if platform.isRiscV then 11 + else if platform.isMusl then 11 + else 7 else if platform.isWasm then 8 else latest_version; # We take the "max of the mins". Why? Since those are lower bounds of the @@ -12323,7 +12405,7 @@ with pkgs; roslyn = callPackage ../development/compilers/roslyn { }; - msbuild = callPackage ../development/tools/build-managers/msbuild { dotnet-sdk = dotnet-sdk_5; }; + msbuild = callPackage ../development/tools/build-managers/msbuild { }; mosml = callPackage ../development/compilers/mosml { }; @@ -12576,7 +12658,7 @@ with pkgs; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { - inherit (darwin.apple_sdk.frameworks) Security AppKit; + inherit (darwin.apple_sdk.frameworks) AppKit; }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; @@ -12636,6 +12718,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + devserver = callPackage ../development/tools/rust/devserver { }; + maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12754,6 +12838,8 @@ with pkgs; svd2rust = callPackage ../development/tools/rust/svd2rust { }; + svdtools = with python3Packages; toPythonApplication svdtools; + swift = callPackage ../development/compilers/swift { }; swiProlog = callPackage ../development/compilers/swi-prolog { @@ -12807,6 +12893,7 @@ with pkgs; vala_0_48 vala_0_50 vala_0_52 + vala_0_54 vala; vyper = with python3Packages; toPythonApplication vyper; @@ -13007,6 +13094,12 @@ with pkgs; inherit (beam.packages.erlangR21) lfe lfe_1_3; + gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { + inherit (llvmPackages) openmp; + # MPICH currently build on Darwin + mpi = mpich; + }; + groovy = callPackage ../development/interpreters/groovy { }; inherit (callPackages ../applications/networking/cluster/hadoop { @@ -14883,6 +14976,7 @@ with pkgs; inherit (callPackage ../development/tools/build-managers/shards { }) shards_0_15 + shards_0_16 shards; shellcheck = callPackage ../development/tools/shellcheck {}; @@ -15050,6 +15144,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; + time-ghc-modules = callPackage ../development/tools/time-ghc-modules { }; + tflint = callPackage ../development/tools/analysis/tflint { }; tfsec = callPackage ../development/tools/analysis/tfsec { }; @@ -15316,20 +15412,32 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; + aws-c-auth = callPackage ../development/libraries/aws-c-auth { }; + aws-c-cal = callPackage ../development/libraries/aws-c-cal { inherit (darwin.apple_sdk.frameworks) Security; }; aws-c-common = callPackage ../development/libraries/aws-c-common { }; + aws-c-compression = callPackage ../development/libraries/aws-c-compression { }; + aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; + aws-c-http = callPackage ../development/libraries/aws-c-http { }; + aws-c-io = callPackage ../development/libraries/aws-c-io { inherit (darwin.apple_sdk.frameworks) Security; }; + aws-c-mqtt = callPackage ../development/libraries/aws-c-mqtt { }; + + aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { }; + aws-checksums = callPackage ../development/libraries/aws-checksums { }; + aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { }; + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; @@ -15443,6 +15551,8 @@ with pkgs; hci = callPackage ../development/tools/continuous-integration/hci { }; + isa-l = callPackage ../development/libraries/isa-l { }; + niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv); ormolu = haskellPackages.ormolu.bin; @@ -15459,6 +15569,8 @@ with pkgs; cdk = callPackage ../development/libraries/cdk {}; + cdk-go = callPackage ../tools/security/cdk-go {}; + cdo = callPackage ../development/libraries/cdo { }; cimg = callPackage ../development/libraries/cimg { }; @@ -16342,6 +16454,8 @@ with pkgs; atkmm = callPackage ../development/libraries/atkmm { }; + atkmm_2_36 = callPackage ../development/libraries/atkmm/2.36.nix { }; + pixman = callPackage ../development/libraries/pixman { }; cairo = callPackage ../development/libraries/cairo { }; @@ -17818,6 +17932,8 @@ with pkgs; libsoup = callPackage ../development/libraries/libsoup { }; + libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { }; + libspectrum = callPackage ../development/libraries/libspectrum { }; libspiro = callPackage ../development/libraries/libspiro {}; @@ -17944,6 +18060,8 @@ with pkgs; liburcu = callPackage ../development/libraries/liburcu { }; + libjaylink = callPackage ../development/libraries/libjaylink { }; + libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix {}; libusb1 = callPackage ../development/libraries/libusb1 { @@ -18093,17 +18211,12 @@ with pkgs; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { }; + libcyaml = callPackage ../development/libraries/libcyaml { }; rang = callPackage ../development/libraries/rang { }; - libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { - src = pkgs.fetchurl { - url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; - sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; - }; - }); - libykclient = callPackage ../development/libraries/libykclient { }; libykneomgr = callPackage ../development/libraries/libykneomgr { }; @@ -18424,6 +18537,7 @@ with pkgs; nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; nv-codec-headers-10 = callPackage ../development/libraries/nv-codec-headers/10_x.nix { }; + nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { }; mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: let @@ -18580,11 +18694,12 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_2; + libressl_3_2 + libressl_3_4; # Please keep this pointed to the latest version. See also # https://discourse.nixos.org/t/nixpkgs-policy-regarding-libraries-available-in-multiple-versions/7026/2 - libressl = libressl_3_2; + libressl = libressl_3_4; boringssl = callPackage ../development/libraries/boringssl { }; @@ -19216,6 +19331,8 @@ with pkgs; socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; + soco-cli = callPackage ../tools/audio/soco-cli { }; + sofia_sip = callPackage ../development/libraries/sofia-sip { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -19656,6 +19773,10 @@ with pkgs; inherit (darwin) apple_sdk; }; + webkitgtk_4_1 = webkitgtk.override { + libsoup = libsoup_3; + }; + websocketpp = callPackage ../development/libraries/websocket++ { }; webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { }; @@ -20535,6 +20656,8 @@ with pkgs; mumsi = callPackage ../servers/mumsi { }; + mycorrhiza = callPackage ../servers/mycorrhiza { }; + myserver = callPackage ../servers/http/myserver { }; nas = callPackage ../servers/nas { }; @@ -20864,8 +20987,12 @@ with pkgs; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; OVMF = callPackage ../applications/virtualization/OVMF { }; - OVMF-CSM = OVMF.override { csmSupport = true; }; - OVMF-secureBoot = OVMF.override { secureBoot = true; }; + OVMFFull = callPackage ../applications/virtualization/OVMF { + secureBoot = true; + csmSupport = true; + httpSupport = true; + tpmSupport = true; + }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -22745,6 +22872,8 @@ with pkgs; ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { }; + i-dot-ming = callPackage ../data/fonts/i-dot-ming { }; + ibm-plex = callPackage ../data/fonts/ibm-plex { }; iconpack-jade = callPackage ../data/icons/iconpack-jade { }; @@ -23287,6 +23416,8 @@ with pkgs; ucs-fonts = callPackage ../data/fonts/ucs-fonts { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + bront_fonts = callPackage ../data/fonts/bront { }; + ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; ultralist = callPackage ../applications/misc/ultralist { }; @@ -23548,6 +23679,8 @@ with pkgs; av-98 = callPackage ../applications/networking/browsers/av-98 { }; + avizo = callPackage ../applications/misc/avizo { }; + avocode = callPackage ../applications/graphics/avocode {}; azpainter = callPackage ../applications/graphics/azpainter { }; @@ -23920,9 +24053,7 @@ with pkgs; csa = callPackage ../applications/audio/csa { }; - csound = callPackage ../applications/audio/csound { - fluidsynth = fluidsynth_1; - }; + csound = callPackage ../applications/audio/csound { }; csound-manual = callPackage ../applications/audio/csound/csound-manual { python = python27; @@ -24105,6 +24236,7 @@ with pkgs; afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; + docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { }; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -25237,6 +25369,8 @@ with pkgs; go-org = callPackage ../applications/misc/go-org { }; + hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { }; + hydrogen = qt5.callPackage ../applications/audio/hydrogen { }; hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit. @@ -25722,6 +25856,8 @@ with pkgs; kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; + kn = callPackage ../applications/networking/cluster/kn { }; + kodestudio = callPackage ../applications/editors/kodestudio { }; kondo = callPackage ../applications/misc/kondo { }; @@ -25737,6 +25873,7 @@ with pkgs; krane = callPackage ../applications/networking/cluster/krane { }; krita = libsForQt5.callPackage ../applications/graphics/krita { }; + krita-beta = libsForQt5.callPackage ../applications/graphics/krita/beta.nix { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -26131,9 +26268,6 @@ with pkgs; inherit (xorg) libX11 libXrandr; }; - mercurial_4 = callPackage ../applications/version-management/mercurial/4.9.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -26801,10 +26935,7 @@ with pkgs; libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; })).callPackage ../applications/graphics/opentoonz { }; - opentabletdriver = callPackage ../tools/X11/opentabletdriver { - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-netcore = dotnetCorePackages.net_5_0; - }; + opentabletdriver = callPackage ../tools/X11/opentabletdriver { }; opentx = libsForQt5.callPackage ../applications/misc/opentx { }; @@ -27100,6 +27231,7 @@ with pkgs; procmail = callPackage ../applications/misc/procmail { }; profanity = callPackage ../applications/networking/instant-messengers/profanity ({ + gtk = gtk3; python = python3; } // (config.profanity or {})); @@ -27383,6 +27515,8 @@ with pkgs; rkdeveloptool = callPackage ../misc/rkdeveloptool { }; + rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; + rofi-unwrapped = callPackage ../applications/misc/rofi { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -27405,9 +27539,7 @@ with pkgs; rsclock = callPackage ../applications/misc/rsclock { }; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { - boost = boost166; - llvmPackages = llvmPackages_7; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); @@ -27925,6 +28057,8 @@ with pkgs; tev = callPackage ../applications/graphics/tev { }; + themechanger = callPackage ../applications/misc/themechanger { }; + thinkingRock = callPackage ../applications/misc/thinking-rock { }; thonny = callPackage ../applications/editors/thonny { }; @@ -28738,6 +28872,8 @@ with pkgs; xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; + xdg-desktop-portal-gnome = callPackage ../development/libraries/xdg-desktop-portal-gnome { }; + xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; @@ -29440,6 +29576,8 @@ with pkgs; inherit (import ../games/deliantra pkgs) deliantra-server deliantra-arch deliantra-maps deliantra-data; + ddnet = callPackage ../games/ddnet { }; + devilutionx = callPackage ../games/devilutionx {}; dhewm3 = callPackage ../games/dhewm3 {}; @@ -29609,6 +29747,10 @@ with pkgs; gltron = callPackage ../games/gltron { }; + gl-gsync-demo = callPackage ../games/gl-gsync-demo { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; + gmad = callPackage ../games/gmad { }; gnonograms = callPackage ../games/gnonograms { }; @@ -30979,10 +31121,11 @@ with pkgs; coqPackages_8_11 coq_8_11 coqPackages_8_12 coq_8_12 coqPackages_8_13 coq_8_13 + coqPackages_8_14 coq_8_14 coqPackages coq ; - coq2html = callPackage ../applications/science/logic/coq2html { }; + coq2html = callPackage ../tools/typesetting/coq2html { }; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; @@ -31058,7 +31201,7 @@ with pkgs; mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 - { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; }; + { inherit (ocaml-ng.ocamlPackages_4_05) ocaml camlp4; }; leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {}; @@ -31318,9 +31461,7 @@ with pkgs; scotch = callPackage ../applications/science/math/scotch { }; - mininet = callPackage ../tools/virtualization/mininet { - python = python3; - }; + mininet = callPackage ../tools/virtualization/mininet { }; msieve = callPackage ../applications/science/math/msieve { }; @@ -32024,6 +32165,8 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; + nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; + nix-doc = callPackage ../tools/package-management/nix-doc { }; nix-bundle = callPackage ../tools/package-management/nix-bundle { }; @@ -32238,6 +32381,8 @@ with pkgs; qdl = callPackage ../tools/misc/qdl { }; + rates = callPackage ../tools/misc/rates { }; + rargs = callPackage ../tools/misc/rargs { }; rancher = callPackage ../applications/networking/cluster/rancher { }; @@ -32614,6 +32759,7 @@ with pkgs; wasm-pack = callPackage ../development/tools/wasm-pack { inherit (darwin.apple_sdk.frameworks) Security; + libressl = libressl_3_2; }; wavegain = callPackage ../applications/audio/wavegain { }; @@ -32961,7 +33107,16 @@ with pkgs; python = python3; }; - phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; + phonetisaurus = callPackage ../development/libraries/phonetisaurus { + # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 + openfst = openfst.overrideAttrs (_: rec { + version = "1.7.9"; + src = fetchurl { + url = "http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-${version}.tar.gz"; + sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck"; + }; + }); + }; duti = callPackage ../os-specific/darwin/duti { inherit (darwin.apple_sdk.frameworks) ApplicationServices; @@ -33055,7 +33210,7 @@ with pkgs; stdenv = crossLibcStdenv; }; - omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { dotnet-sdk = dotnet-sdk_5; }; + omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; wasmtime = callPackage ../development/interpreters/wasmtime {}; @@ -33165,6 +33320,8 @@ with pkgs; xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; + zesarux = callPackage ../misc/emulators/zesarux { }; + zthrottle = callPackage ../tools/misc/zthrottle { }; zktree = callPackage ../applications/misc/zktree {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index c785d6c16cf5..dc657ab1df5b 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -131,6 +131,7 @@ in rec { coq_8_11 = mkCoq "8.11"; coq_8_12 = mkCoq "8.12"; coq_8_13 = mkCoq "8.13"; + coq_8_14 = mkCoq "8.14"; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; @@ -141,6 +142,7 @@ in rec { coqPackages_8_11 = mkCoqPackages coq_8_11; coqPackages_8_12 = mkCoqPackages coq_8_12; coqPackages_8_13 = mkCoqPackages coq_8_13; + coqPackages_8_14 = mkCoqPackages coq_8_14; coqPackages = recurseIntoAttrs coqPackages_8_13; coq = coqPackages.coq; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e1387e42b785..efaf06d30a22 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -67,6 +67,10 @@ in inherit lua lib; }; + luarocks-3_7 = callPackage ../development/tools/misc/luarocks/3.7.nix { + inherit lua lib; + }; + # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c9ab3fc2ab85..417ce76331f9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -79,6 +79,8 @@ let bitv = callPackage ../development/ocaml-modules/bitv { }; bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; + bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { }; + bls12-381-unix = callPackage ../development/ocaml-modules/bls12-381/unix.nix { }; bolt = callPackage ../development/ocaml-modules/bolt { }; @@ -181,6 +183,8 @@ let cohttp-mirage = callPackage ../development/ocaml-modules/cohttp/mirage.nix { }; + color = callPackage ../development/ocaml-modules/color { }; + conduit = callPackage ../development/ocaml-modules/conduit { }; conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; @@ -378,6 +382,8 @@ let fdkaac = callPackage ../development/ocaml-modules/fdkaac { }; ff = callPackage ../development/ocaml-modules/ff { }; + ff-pbt = callPackage ../development/ocaml-modules/ff/pbt.nix { }; + ff-sig = callPackage ../development/ocaml-modules/ff/sig.nix { }; fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; @@ -407,6 +413,8 @@ let genspio = callPackage ../development/ocaml-modules/genspio { }; + getopt = callPackage ../development/ocaml-modules/getopt { }; + gmap = callPackage ../development/ocaml-modules/gmap { }; gnuplot = callPackage ../development/ocaml-modules/gnuplot { @@ -426,6 +434,8 @@ let hacl-star = callPackage ../development/ocaml-modules/hacl-star { }; hacl-star-raw = callPackage ../development/ocaml-modules/hacl-star/raw.nix { }; + hashcons = callPackage ../development/ocaml-modules/hashcons { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; hidapi = callPackage ../development/ocaml-modules/hidapi { }; @@ -645,6 +655,8 @@ let lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { }; + lwt-exit = callPackage ../development/ocaml-modules/lwt-exit { }; + lwt-watcher = callPackage ../development/ocaml-modules/lwt-watcher { }; lwt_log = callPackage ../development/ocaml-modules/lwt_log { }; @@ -1068,6 +1080,10 @@ let spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; + tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix { }; + + tar = callPackage ../development/ocaml-modules/tar { }; + tcpip = callPackage ../development/ocaml-modules/tcpip { }; tsort = callPackage ../development/ocaml-modules/tsort { }; @@ -1140,6 +1156,8 @@ let ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; + ppx_deriving_yaml = callPackage ../development/ocaml-modules/ppx_deriving_yaml {}; + ppx_deriving_cmdliner = callPackage ../development/ocaml-modules/ppx_deriving_cmdliner {}; ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {}; @@ -1174,6 +1192,8 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; + pyml = callPackage ../development/ocaml-modules/pyml { }; + qcheck-alcotest = callPackage ../development/ocaml-modules/qcheck/alcotest.nix { }; qcheck-core = callPackage ../development/ocaml-modules/qcheck/core.nix { }; @@ -1263,31 +1283,53 @@ let terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; + tezos-010-PtGRANAD-test-helpers = callPackage ../development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix { }; tezos-base = callPackage ../development/ocaml-modules/tezos/base.nix { }; tezos-clic = callPackage ../development/ocaml-modules/tezos/clic.nix { }; + tezos-client-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/client-010-PtGRANAD.nix { }; + tezos-client-base = callPackage ../development/ocaml-modules/tezos/client-base.nix { }; + tezos-context = callPackage ../development/ocaml-modules/tezos/context.nix { }; tezos-crypto = callPackage ../development/ocaml-modules/tezos/crypto.nix { }; + tezos-embedded-protocol-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix { }; tezos-error-monad = callPackage ../development/ocaml-modules/tezos/error-monad.nix { }; tezos-event-logging = callPackage ../development/ocaml-modules/tezos/event-logging.nix { }; + tezos-legacy-store = callPackage ../development/ocaml-modules/tezos/legacy-store.nix { }; tezos-lmdb = callPackage ../development/ocaml-modules/tezos/lmdb.nix { }; + tezos-hacl-glue = callPackage ../development/ocaml-modules/tezos/hacl-glue.nix { }; + tezos-hacl-glue-unix = callPackage ../development/ocaml-modules/tezos/hacl-glue-unix.nix { }; tezos-lwt-result-stdlib = callPackage ../development/ocaml-modules/tezos/lwt-result-stdlib.nix { }; tezos-micheline = callPackage ../development/ocaml-modules/tezos/micheline.nix { }; + tezos-mockup-proxy = callPackage ../development/ocaml-modules/tezos/mockup-proxy.nix { }; + tezos-mockup-registration = callPackage ../development/ocaml-modules/tezos/mockup-registration.nix { }; tezos-p2p-services = callPackage ../development/ocaml-modules/tezos/p2p-services.nix { }; tezos-p2p = callPackage ../development/ocaml-modules/tezos/p2p.nix { }; - tezos-protocol-008-PtEdo2Zk-parameters = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix { }; - tezos-protocol-008-PtEdo2Zk = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix { }; + tezos-protocol-010-PtGRANAD-parameters = callPackage ../development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix { }; + tezos-protocol-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix { }; tezos-protocol-compiler = callPackage ../development/ocaml-modules/tezos/protocol-compiler.nix { }; - tezos-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/protocol-demo-noops.nix { }; tezos-protocol-environment-packer = callPackage ../development/ocaml-modules/tezos/protocol-environment-packer.nix { }; tezos-protocol-environment-sigs = callPackage ../development/ocaml-modules/tezos/protocol-environment-sigs.nix { }; tezos-protocol-environment-structs = callPackage ../development/ocaml-modules/tezos/protocol-environment-structs.nix { }; tezos-protocol-environment = callPackage ../development/ocaml-modules/tezos/protocol-environment.nix { }; + tezos-protocol-plugin-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix { }; + tezos-protocol-updater = callPackage ../development/ocaml-modules/tezos/protocol-updater.nix { }; + tezos-proxy = callPackage ../development/ocaml-modules/tezos/proxy.nix { }; tezos-requester = callPackage ../development/ocaml-modules/tezos/requester.nix { }; + tezos-rpc-http-client-unix = callPackage ../development/ocaml-modules/tezos/rpc-http-client-unix.nix { }; + tezos-rpc-http-client = callPackage ../development/ocaml-modules/tezos/rpc-http-client.nix { }; + tezos-rpc-http = callPackage ../development/ocaml-modules/tezos/rpc-http.nix { }; tezos-rpc = callPackage ../development/ocaml-modules/tezos/rpc.nix { }; tezos-sapling = callPackage ../development/ocaml-modules/tezos/sapling.nix { }; + tezos-shell-context = callPackage ../development/ocaml-modules/tezos/shell-context.nix { }; tezos-shell-services = callPackage ../development/ocaml-modules/tezos/shell-services.nix { }; + tezos-shell = callPackage ../development/ocaml-modules/tezos/shell.nix { }; + tezos-signer-backends = callPackage ../development/ocaml-modules/tezos/signer-backends.nix { }; + tezos-signer-services = callPackage ../development/ocaml-modules/tezos/signer-services.nix { }; tezos-stdlib-unix = callPackage ../development/ocaml-modules/tezos/stdlib-unix.nix { }; tezos-stdlib = callPackage ../development/ocaml-modules/tezos/stdlib.nix { }; + tezos-test-helpers = callPackage ../development/ocaml-modules/tezos/test-helpers.nix { }; + tezos-store = callPackage ../development/ocaml-modules/tezos/store.nix { }; tezos-test-services = callPackage ../development/ocaml-modules/tezos/test-services.nix { }; + tezos-validation = callPackage ../development/ocaml-modules/tezos/validation.nix { }; tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { }; tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { }; @@ -1368,6 +1410,8 @@ let yaml = callPackage ../development/ocaml-modules/yaml { }; + yaml-sexp = callPackage ../development/ocaml-modules/yaml/yaml-sexp.nix { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; z3 = callPackage ../development/ocaml-modules/z3 { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a40d9b754ef..96203b0be038 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -118,6 +118,36 @@ let }; }; + ActionCircuitBreaker = buildPerlPackage { + pname = "Action-CircuitBreaker"; + version = "0.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HANGY/Action-CircuitBreaker-0.1.tar.gz"; + sha256 = "3f8f5d726fae537ab336e00a6819ae4a8596e4c5f243e772a536ef2eb6e606b1"; + }; + buildInputs = [ ActionRetry TryTiny ]; + propagatedBuildInputs = [ Moo ]; + meta = { + homepage = "https://github.com/hangy/Action-CircuitBreaker"; + description = "Module to try to perform an action, with an option to suspend execution after a number of failures"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ActionRetry = buildPerlPackage { + pname = "Action-Retry"; + version = "0.24"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAMS/Action-Retry-0.24.tar.gz"; + sha256 = "a3759742c5bef2d1975ab73d35499d8113324919b24936130255cff07d0294f7"; + }; + propagatedBuildInputs = [ MathFibonacci ModuleRuntime Moo ]; + meta = { + description = "Module to try to perform an action, with various ways of retrying and sleeping between retries"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlgorithmAnnotate = buildPerlPackage { pname = "Algorithm-Annotate"; version = "0.10"; @@ -141,6 +171,20 @@ let }; }; + AlgorithmCheckDigits = buildPerlModule { + pname = "Algorithm-CheckDigits"; + version = "1.3.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-v1.3.5.tar.gz"; + sha256 = "a956d0517180d6d9042f47d73aa6a2728b75fcbd546940d2dbe0a7e7cf428f73"; + }; + buildInputs = [ ProbePerl ]; + meta = { + description = "Perl extension to generate and test check digits"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlgorithmDiff = buildPerlPackage { pname = "Algorithm-Diff"; version = "1.1903"; @@ -510,6 +554,19 @@ let }; }; + URIEscapeXS = buildPerlPackage { + pname = "URI-Escape-XS"; + version = "0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/URI-Escape-XS-0.14.tar.gz"; + sha256 = "c39ac50c6c2b831ae4bf08692e6ca5d4a3f9c57dc4d7f9c4cb0663e2c86c2759"; + }; + meta = { + description = "Drop-In replacement for URI::Escape"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; version = "3.30"; @@ -531,6 +588,19 @@ let }; }; + ApacheDB = buildPerlPackage { + pname = "Apache-DB"; + version = "0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LZ/LZE/Apache-DB-0.18.tar.gz"; + sha256 = "6527f4f1598270bea07bec787b71bdf0ec2b572548be7438cf74f2b9a600bfed"; + }; + meta = { + description = "Run the interactive Perl debugger under mod_perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ApacheLogFormatCompiler = buildPerlModule { pname = "Apache-LogFormat-Compiler"; version = "0.36"; @@ -1497,6 +1567,38 @@ let }; }; + BSON = buildPerlPackage { + pname = "BSON"; + version = "1.12.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-v1.12.2.tar.gz"; + sha256 = "f4612c0c354310741b99ab6d26451226823150ca27109b1b391232d5cfdda6db"; + }; + buildInputs = [ JSONMaybeXS PathTiny TestDeep TestFatal ]; + propagatedBuildInputs = [ CryptURandom Moo TieIxHash boolean namespaceclean ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-bson"; + description = "BSON serialization and deserialization (EOL)"; + license = lib.licenses.asl20; + }; + }; + + BSONXS = buildPerlPackage { + pname = "BSON-XS"; + version = "0.8.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-XS-v0.8.4.tar.gz"; + sha256 = "28f7d338fd78b6f9c9a6080be9de3f5cb23d888b96ebf6fcbface9f2966aebf9"; + }; + buildInputs = [ ConfigAutoConf JSONMaybeXS PathTiny TestDeep TestFatal TieIxHash ]; + propagatedBuildInputs = [ BSON boolean JSONXS JSONPP CpanelJSONXS ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-bson-xs"; + description = "XS implementation of MongoDB's BSON serialization (EOL)"; + license = lib.licenses.asl20; + }; + }; + BUtils = buildPerlPackage { pname = "B-Utils"; version = "0.27"; @@ -3205,6 +3307,23 @@ let }; }; + CLDRNumber = buildPerlModule { + pname = "CLDR-Number"; + version = "0.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PA/PATCH/CLDR-Number-0.19.tar.gz"; + sha256 = "c6716488e65fe779ff79a83f0f2036ad94463efe3d0f349c6b99112975bd85fc"; + }; + buildInputs = [ SoftwareLicense TestDifferences TestException TestWarn ]; + propagatedBuildInputs = + [ ClassMethodModifiers MathRound Moo namespaceclean ]; + meta = { + homepage = "https://github.com/patch/cldr-number-pm5"; + description = "Localized number formatters using the Unicode CLDR"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CLIHelpers = buildPerlPackage { pname = "CLI-Helpers"; version = "1.8"; @@ -3310,6 +3429,21 @@ let }; }; + ColorLibrary = buildPerlPackage { + pname = "Color-Library"; + version = "0.021"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz"; + sha256 = "58cbf7e333d3a4a40297abc43412b321da449c6816020e4fa6625ab079fc90a5"; + }; + buildInputs = [ TestMost TestWarn TestException TestDeep TestDifferences ModulePluggable ]; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable ]; + meta = { + description = "An easy-to-use and comprehensive named-color library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CommandRunner = buildPerlModule { pname = "Command-Runner"; version = "0.103"; @@ -4841,6 +4975,21 @@ let }; }; + DataDumperAutoEncode = buildPerlModule { + pname = "Data-Dumper-AutoEncode"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BA/BAYASHI/Data-Dumper-AutoEncode-1.00.tar.gz"; + sha256 = "2d9a0262ad443d321dc489ef6dfa7b3eed11a2708a75d397d371bb2585e5eca1"; + }; + buildInputs = [ ModuleBuildPluggable ModuleBuildPluggableCPANfile ]; + propagatedBuildInputs = [ IOInteractiveTiny ]; + meta = { + description = "Dump with recursive encoding"; + license = lib.licenses.artistic2; + }; + }; + DataDumperConcise = buildPerlPackage { pname = "Data-Dumper-Concise"; version = "2.023"; @@ -6470,6 +6619,18 @@ let }; }; + DevelSize = buildPerlPackage { + pname = "Devel-Size"; + version = "0.83"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.83.tar.gz"; + sha256 = "757a67e0aa59ae103ea5ca092cbecc025644ebdc326731688ffab6f8823ef4b3"; + }; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelStackTraceAsHTML = buildPerlPackage { pname = "Devel-StackTrace-AsHTML"; version = "0.15"; @@ -7441,6 +7602,22 @@ let }; }; + EncodePunycode = buildPerlPackage { + pname = "Encode-Punycode"; + version = "1.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Encode-Punycode-1.002.tar.gz"; + sha256 = "ca3aceecdb80b5d45aa10e1cde8fec4e90b4f8c9189c7504dd8658f071f77194"; + }; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ NetIDNEncode ]; + meta = { + homepage = "http://search.cpan.org/dist/Encode-Punycode"; + description = "Encode plugin for Punycode (RFC 3492)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + enum = buildPerlPackage { pname = "enum"; version = "1.11"; @@ -7526,6 +7703,21 @@ let }; }; + ExcelWriterXLSX = buildPerlPackage { + pname = "Excel-Writer-XLSX"; + version = "1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-1.09.tar.gz"; + sha256 = "d679c6ac19e93c32ab77594c793e41b948c7bb3873b600e70ad637d093dca187"; + }; + propagatedBuildInputs = [ ArchiveZip ]; + meta = { + homepage = "http://jmcnamara.github.com/excel-writer-xlsx/"; + description = "Create a new file in the Excel 2007+ XLSX format"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ExceptionBase = buildPerlModule { pname = "Exception-Base"; version = "0.2501"; @@ -8022,6 +8214,35 @@ let }; }; + Filechmod = buildPerlPackage { + pname = "File-chmod"; + version = "0.42"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.42.tar.gz"; + sha256 = "6cafafff68bc84215168b55ede0d191dcb57f9a3201b51d61edb2858a2407795"; + }; + meta = { + homepage = "https://metacpan.org/dist/File-chmod"; + description = "Implements symbolic and ls chmod modes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + FilechmodRecursive = buildPerlPackage { + pname = "File-chmod-Recursive"; + version = "1.0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MITHUN/File-chmod-Recursive-v1.0.3.tar.gz"; + sha256 = "9348ca5c5b88deadcc483b9399ef7c2e0fc2504f9058db65f3c3c53c41139aa7"; + }; + propagatedBuildInputs = [ Filechmod ]; + meta = { + homepage = "https://github.com/mithun/perl-file-chmod-recursive"; + description = "Run chmod recursively against directories"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileCopyRecursive = buildPerlPackage { pname = "File-Copy-Recursive"; version = "0.45"; @@ -9260,6 +9481,22 @@ let }; }; + GraphicsColor = buildPerlPackage { + pname = "Graphics-Color"; + version = "0.31"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GP/GPHAT/Graphics-Color-0.31.tar.gz"; + sha256 = "faa8fed5b2d80e5160af976e5db2242c0b3555542ce1042575ff6b694587a33d"; + }; + buildInputs = [ TestNumberDelta ModulePluggable ]; + propagatedBuildInputs = [ ColorLibrary Moose MooseXAliases MooseXClone MooseXStorage MooseXTypes ]; + meta = { + homepage = "https://github.com/gphat/graphics-color"; + description = "Device and library agnostic color spaces"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GraphicsTIFF = buildPerlPackage { pname = "Graphics-TIFF"; version = "16"; @@ -10556,6 +10793,29 @@ let }; }; + ImageOCRTesseract = buildPerlPackage { + pname = "Image-OCR-Tesseract"; + version = "1.26"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/Image-OCR-Tesseract-1.26.tar.gz"; + sha256 = "98d904266a7062f09c9b46f77c4e94529e1fe99339e3f83fda1f92013f007cea"; + }; + nativeBuildInputs = [ pkgs.which pkgs.makeWrapper pkgs.tesseract pkgs.imagemagick ]; + propagatedBuildInputs = [ FileFindRule FileWhich LEOCHARRECLI StringShellQuote ]; + postPatch = '' + substituteInPlace lib/Image/OCR/Tesseract.pm \ + --replace "which('tesseract')" "\"${pkgs.tesseract}/bin/tesseract\"" \ + --replace "which('convert')" "\"${pkgs.imagemagick}/bin/convert"\" + ''; + postInstall = '' + wrapProgram $out/bin/ocr --prefix PATH : ${lib.makeBinPath [ pkgs.tesseract pkgs.imagemagick ]} + ''; + meta = { + description = "Read an image with tesseract ocr and get output"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IMAPClient = buildPerlPackage { pname = "IMAP-Client"; version = "0.13"; @@ -10763,6 +11023,19 @@ let }; }; + IOInteractiveTiny = buildPerlPackage { + pname = "IO-Interactive-Tiny"; + version = "0.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DM/DMUEY/IO-Interactive-Tiny-0.2.tar.gz"; + sha256 = "45c0696505c7e4347845f5cd2512b7b1bc78fbce4cbed2b58008283fc95ea5f9"; + }; + meta = { + description = "Is_interactive() without large deps"; + license = lib.licenses.artistic2; + }; + }; + IOLockedFile = buildPerlPackage { pname = "IO-LockedFile"; version = "0.23"; @@ -11232,6 +11505,20 @@ let buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; }; + JSONCreate = buildPerlPackage { + pname = "JSON-Create"; + version = "0.35"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Create-0.35.tar.gz"; + sha256 = "5faefe0d833b8132568865308f3239d3cdaa1b8a1ecc9b5624dcf1efbe10683e"; + }; + propagatedBuildInputs = [ JSONParse UnicodeUTF8 ]; + meta = { + description = "Create JSON"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + JSONMaybeXS = buildPerlPackage { pname = "JSON-MaybeXS"; version = "1.004003"; @@ -11274,10 +11561,10 @@ let JSONParse = buildPerlPackage { pname = "JSON-Parse"; - version = "0.57"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.57.tar.gz"; - sha256 = "1rqaqpgh068kqj11srw874m5ph5qkaz77ib5fi4hrc402d2qxa45"; + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.61.tar.gz"; + sha256 = "ce8e55e70bef9bcbba2e96af631d10a605900961a22cad977e71aab56c3f2806"; }; meta = { description = "Read JSON into a Perl variable"; @@ -11358,11 +11645,16 @@ let url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; sha256 = "1ccvdq7asxq6iw8x8ihwf5xs2mp7fkwm467xy7g8spkznr8wcacm"; }; + patches = [ + (fetchpatch { + # https://github.com/brucemiller/LaTeXML/issues/1669 + name = "downgrade-security-FileTemp.patch"; + url = "https://github.com/brucemiller/LaTeXML/commit/c3d6b9b88f9eafce6eee52b1634ea33085ba9ec6.patch"; + sha256 = "12w6nfv0bkj2mr4xwcqzkdngrpbq4fn52n85r9njdg913cvfirm7"; + }) + ]; outputs = [ "out" "tex" ]; propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageMagick ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; - preCheck = '' - rm t/931_epub.t # https://github.com/brucemiller/LaTeXML/issues/1669 - ''; nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; makeMakerFlags = "TEXMF=\${tex} NOMKTEXLSR"; # shebangs need to be patched before executables are copied to $out @@ -11391,6 +11683,33 @@ let }; }; + LEOCHARRECLI = buildPerlPackage { + pname = "LEOCHARRE-CLI"; + version = "1.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/LEOCHARRE-CLI-1.19.tar.gz"; + sha256 = "37835f11ee35326241b4d30368ae1bc195a50414b3662db3e13b865bd52fcde9"; + }; + propagatedBuildInputs = [ FileWhich Filechmod LEOCHARREDebug Linuxusermod YAML ]; + meta = { + description = "Useful subs for coding cli scripts"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LEOCHARREDebug = buildPerlPackage { + pname = "LEOCHARRE-Debug"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/LEOCHARRE-Debug-1.03.tar.gz"; + sha256 = "c1665aa3abd457cc8624b8c418c6f8bdf58fb3a686f8eed515cf7e93514df192"; + }; + meta = { + description = "Debug sub"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + libapreq2 = buildPerlPackage { pname = "libapreq2"; version = "2.16"; @@ -11765,6 +12084,20 @@ let }; }; + Linuxusermod = buildPerlPackage { + pname = "Linux-usermod"; + version = "0.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIDUL/Linux-usermod-0.69.tar.gz"; + sha256 = "97ca186a3c416bf69ed62da046f1a60d88d89b8e6ed25008b2f96e787dee9d60"; + }; + meta = { + description = "This module adds, removes and modify user and group accounts according to the passwd and shadow files syntax"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.linux; + }; + }; + ListAllUtils = buildPerlPackage { pname = "List-AllUtils"; version = "0.18"; @@ -11883,6 +12216,20 @@ let LANG="C"; }; + LocaleMaketextLexiconGetcontext = buildPerlPackage { + pname = "Locale-Maketext-Lexicon-Getcontext"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SAPER/Locale-Maketext-Lexicon-Getcontext-0.05.tar.gz"; + sha256 = "75cb33df9472a5962de54082f42c6a76b260fc405ba10ca53246fb1f82c09208"; + }; + propagatedBuildInputs = [ LocaleMaketextLexicon ]; + meta = { + description = "PO file parser for Maketext"; + license = lib.licenses.mit; + }; + }; + LocaleMOFile = buildPerlPackage { pname = "Locale-MO-File"; version = "0.09"; @@ -12079,6 +12426,21 @@ let }; }; + LogAnyAdapterTAP = buildPerlPackage { + pname = "Log-Any-Adapter-TAP"; + version = "0.003003"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NERDVANA/Log-Any-Adapter-TAP-0.003003.tar.gz"; + sha256 = "131f0689b2b42b1b31449714c6eda8f811dd96a7c86748f1e03b239cfd0121c0"; + }; + propagatedBuildInputs = [ LogAny TryTiny ]; + meta = { + homepage = "https://github.com/silverdirk/perl-Log-Any-Adapter-TAP"; + description = "Logger suitable for use with TAP test files"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LogContextual = buildPerlPackage { pname = "Log-Contextual"; version = "0.008001"; @@ -12793,6 +13155,19 @@ let }; }; + MathFibonacci = buildPerlPackage { + pname = "Math-Fibonacci"; + version = "1.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIPUL/Math-Fibonacci-1.5.tar.gz"; + sha256 = "70a8286e94558df99dc92f52d83e1e20a7b8f7852bcc3a1de7d9e338260b99ba"; + }; + meta = { + description = "This module provides a few functions related to Fibonacci numbers"; + license = lib.licenses.artistic2; + }; + }; + MathGMP = buildPerlPackage { pname = "Math-GMP"; version = "2.20"; @@ -13502,6 +13877,22 @@ let buildInputs = [ TestSharedFork ]; }; + ModuleBuildPluggableCPANfile = buildPerlModule { + pname = "Module-Build-Pluggable-CPANfile"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Module-Build-Pluggable-CPANfile-0.05.tar.gz"; + sha256 = "4aec6cba240cb6e78016406b6a3a875634cc2aec08ffc5f1572da1cdc40e1e7c"; + }; + buildInputs = [ CaptureTiny TestRequires TestSharedFork ]; + propagatedBuildInputs = [ ModuleBuildPluggable ModuleCPANfile ]; + meta = { + homepage = "https://github.com/kazeburo/Module-Build-Pluggable-CPANfile"; + description = "Include cpanfile"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleBuildPluggablePPPort = buildPerlModule { pname = "Module-Build-Pluggable-PPPort"; version = "0.04"; @@ -14270,6 +14661,22 @@ let }; }; + MongoDB = buildPerlPackage { + pname = "MongoDB"; + version = "2.2.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/MongoDB-v2.2.2.tar.gz"; + sha256 = "201935f92dac94f39c35de73661e8b252439e496f228657db85ff93257c3268f"; + }; + buildInputs = [ JSONMaybeXS PathTiny TestDeep TestFatal TimeMoment ]; + propagatedBuildInputs = [ AuthenSASLSASLprep AuthenSCRAM BSON IOSocketSSL NetSSLeay ClassXSAccessor BSONXS TypeTinyXS MozillaCA Moo NetDNS SafeIsa SubQuote TieIxHash TypeTiny UUIDURandom boolean namespaceclean ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-driver"; + description = "Official MongoDB Driver for Perl (EOL)"; + license = lib.licenses.asl20; + }; + }; + MonitoringPlugin = buildPerlPackage { pname = "Monitoring-Plugin"; version = "0.40"; @@ -14522,6 +14929,22 @@ let }; }; + MooseXStorageFormatJSONpm = buildPerlPackage { + pname = "MooseX-Storage-Format-JSONpm"; + version = "0.093093"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Storage-Format-JSONpm-0.093093.tar.gz"; + sha256 = "ebe0407a7eb1870270e0e2579f097dfd7df2aea3307fb71f324fb69e242cc58f"; + }; + buildInputs = [ Moose TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; + propagatedBuildInputs = [ JSON MooseXRoleParameterized MooseXStorage namespaceautoclean ]; + meta = { + homepage = "https://github.com/rjbs/MooseX-Storage-Format-JSONpm"; + description = "A format role for MooseX::Storage using JSON.pm"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooX = buildPerlPackage { pname = "MooX"; version = "0.101"; @@ -15014,6 +15437,22 @@ let propagatedBuildInputs = [ Moose ]; }; + MooseXStorage = buildPerlPackage { + pname = "MooseX-Storage"; + version = "0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Storage-0.53.tar.gz"; + sha256 = "8704bfe505f66b340f62e85c9ff319c19e9670b26d4b012c91f4e103b1daace0"; + }; + buildInputs = [ TestDeep TestDeepType TestFatal TestNeeds TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; + propagatedBuildInputs = [ ModuleRuntime Moose MooseXRoleParameterized PodCoverage StringRewritePrefix namespaceautoclean IOStringy JSON JSONXS JSONMaybeXS CpanelJSONXS YAML YAMLOld YAMLTiny YAMLLibYAML YAMLSyck ]; + meta = { + homepage = "https://github.com/moose/MooseX-Storage"; + description = "A serialization framework for Moose classes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooseXStrictConstructor = buildPerlPackage { pname = "MooseX-StrictConstructor"; version = "0.21"; @@ -19117,6 +19556,21 @@ let }; }; + SpreadsheetCSV = buildPerlPackage { + pname = "Spreadsheet-CSV"; + version = "0.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DD/DDICK/Spreadsheet-CSV-0.20.tar.gz"; + sha256 = "070bb252a8fe8b938a1ce4fc90525f833d4e619b6d4673b0ae0a23408d514ab6"; + }; + nativeBuildInputs = [ CGI ]; + propagatedBuildInputs = [ ArchiveZip SpreadsheetParseExcel TextCSV_XS XMLParser ]; + meta = { + description = "Drop-in replacement for Text::CSV_XS with spreadsheet support"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SpreadsheetParseExcel = buildPerlPackage { pname = "Spreadsheet-ParseExcel"; version = "0.65"; @@ -20136,12 +20590,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "7.7.0"; + version = "7.8.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; - rev = "v7.7.0"; - sha256 = "sha256-rcokZm4pKZrLlkpAZCpECCepNWm+UyXemJGklokiSzM="; + rev = "v7.8.0"; + sha256 = "sha256-D/sVIKMWy3WnDM97+ofG3ClgGhJJuK2a6NJLC03S4LI="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -20930,6 +21384,38 @@ let }; }; + TestDeepJSON = buildPerlModule { + pname = "Test-Deep-JSON"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MOTEMEN/Test-Deep-JSON-0.05.tar.gz"; + sha256 = "aec8571b9e31b7301e26132c132c6800952dc089c645d76954a3ad1a6b350858"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ ExporterLite JSONMaybeXS TestDeep ]; + meta = { + homepage = "https://github.com/motemen/perl5-Test-Deep-JSON"; + description = "Compare JSON with Test::Deep"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + TestDeepType = buildPerlPackage { + pname = "Test-Deep-Type"; + version = "0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Deep-Type-0.008.tar.gz"; + sha256 = "6e7bea1a2f1e75319a22d1c51996ebac50ca5e3663d1bc223130887e62e959f1"; + }; + buildInputs = [ TestFatal TestNeeds ]; + propagatedBuildInputs = [ TestDeep TryTiny ]; + meta = { + homepage = "https://github.com/karenetheridge/Test-Deep-Type"; + description = "A Test::Deep plugin for validating type constraints"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestDir = buildPerlPackage { pname = "Test-Dir"; version = "1.16"; @@ -22371,6 +22857,19 @@ let }; }; + TextFuzzy = buildPerlPackage { + pname = "Text-Fuzzy"; + version = "0.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/Text-Fuzzy-0.29.tar.gz"; + sha256 = "3df5cfd2ca1a4c5ca7ff7bab3cc8d53ad2064e134cbf11004f3cf8c4b9055bff"; + }; + meta = { + description = "Partial string matching using edit distances"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextGerman = buildPerlPackage { pname = "Text-German"; version = "0.06"; @@ -23149,6 +23648,20 @@ let }; }; + TimeMoment = buildPerlPackage { + pname = "Time-Moment"; + version = "0.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Time-Moment-0.44.tar.gz"; + sha256 = "64acfa042f634fcef8dadf55e7f42ba4eaab8aaeb7d5212eb89815a31f78f6fd"; + }; + buildInputs = [ TestFatal TestNumberDelta TestRequires ]; + meta = { + description = "Represents a date and time of day with an offset from UTC"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TimeOut = buildPerlPackage { pname = "Time-Out"; version = "0.11"; @@ -23349,6 +23862,20 @@ let buildInputs = [ TestMemoryCycle ]; }; + TypeTinyXS = buildPerlPackage { + pname = "Type-Tiny-XS"; + version = "0.022"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.022.tar.gz"; + sha256 = "bcc34a31f7dc1d30cc803889b5c8f90e4773b73b5becbdb3860f5abe7e22ff00"; + }; + meta = { + homepage = "https://metacpan.org/release/Type-Tiny-XS"; + description = "Provides an XS boost for some of Type::Tiny's built-in type constraints"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TypesSerialiser = buildPerlPackage { pname = "Types-Serialiser"; version = "1.01"; @@ -23665,6 +24192,21 @@ let }; }; + UUIDURandom = buildPerlPackage { + pname = "UUID-URandom"; + version = "0.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/UUID-URandom-0.001.tar.gz"; + sha256 = "3f13631b13b9604fb489e2989490c99f103743a837239bdafae9d6baf55f8f46"; + }; + propagatedBuildInputs = [ CryptURandom ]; + meta = { + homepage = "https://github.com/dagolden/UUID-URandom"; + description = "UUIDs based on /dev/urandom or the Windows Crypto API"; + license = lib.licenses.asl20; + }; + }; + VariableMagic = buildPerlPackage { pname = "Variable-Magic"; version = "0.62"; @@ -24011,6 +24553,20 @@ let }; }; + XMLEncoding = buildPerlPackage { + pname = "XML-Encoding"; + version = "2.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHAY/XML-Encoding-2.11.tar.gz"; + sha256 = "a50e41af0a79b882d48816b95681f38a55af1e6a88828dcd96374a8bde2305a1"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = "A perl module for parsing XML encoding maps"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLDOM = buildPerlPackage { pname = "XML-DOM"; version = "1.46"; @@ -24258,6 +24814,21 @@ let }; }; + XMLRules = buildPerlModule { + pname = "XML-Rules"; + version = "1.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JE/JENDA/XML-Rules-1.16.tar.gz"; + sha256 = "3788255c07afe4195a0de72ce050652320d817528ff2d10c611f6e392043868b"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = + "Parse XML and specify what and how to keep/process for individual tags"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLSAX = buildPerlPackage { pname = "XML-SAX"; version = "1.02"; @@ -24479,6 +25050,21 @@ let }; }; + YAMLOld = buildPerlPackage { + pname = "YAML-Old"; + version = "1.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/YAML-Old-1.23.tar.gz"; + sha256 = "fa546fcd9acc5a39bc8871902f7fc1eba50e7dc781c5cd5c0abf1aece6d17ecd"; + }; + buildInputs = [ TestYAML TestBase ]; + meta = { + homepage = "https://github.com/ingydotnet/yaml-old-pm"; + description = "Old YAML.pm Legacy Code"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + YAMLSyck = buildPerlPackage { pname = "YAML-Syck"; version = "1.34"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3ceaf784af3b..afcee93c3b21 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -159,6 +159,8 @@ lib.makeScope pkgs.newScope (self: with self; { # or php.withExtensions to extend the functionality of the PHP # interpreter. extensions = { + amqp = callPackage ../development/php-packages/amqp { }; + apcu = callPackage ../development/php-packages/apcu { }; apcu_bc = callPackage ../development/php-packages/apcu_bc { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8488698b855c..7e6f3a160700 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -365,6 +365,8 @@ in { aioresponses = callPackage ../development/python-modules/aioresponses { }; + aioridwell = callPackage ../development/python-modules/aioridwell { }; + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; aiorun = callPackage ../development/python-modules/aiorun { }; @@ -403,7 +405,7 @@ in { airly = callPackage ../development/python-modules/airly { }; - airthings = callPackage ../development/python-modules/airthings { }; + airthings-cloud = callPackage ../development/python-modules/airthings-cloud { }; ajpy = callPackage ../development/python-modules/ajpy { }; @@ -1236,6 +1238,8 @@ in { bpython = callPackage ../development/python-modules/bpython { }; + braceexpand = callPackage ../development/python-modules/braceexpand { }; + bracex = callPackage ../development/python-modules/bracex { }; braintree = callPackage ../development/python-modules/braintree { }; @@ -1751,6 +1755,14 @@ in { croniter = callPackage ../development/python-modules/croniter { }; + crownstone-cloud = callPackage ../development/python-modules/crownstone-cloud { }; + + crownstone-core = callPackage ../development/python-modules/crownstone-core { }; + + crownstone-sse = callPackage ../development/python-modules/crownstone-sse { }; + + crownstone-uart = callPackage ../development/python-modules/crownstone-uart { }; + cryptacular = callPackage ../development/python-modules/cryptacular { }; cryptography = callPackage ../development/python-modules/cryptography { @@ -2253,6 +2265,8 @@ in { dpkt = callPackage ../development/python-modules/dpkt { }; + dragonfly = callPackage ../development/python-modules/dragonfly { }; + drf-jwt = callPackage ../development/python-modules/drf-jwt { }; drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; @@ -2404,6 +2418,8 @@ in { environmental-override = callPackage ../development/python-modules/environmental-override { }; + environs = callPackage ../development/python-modules/environs { }; + envisage = callPackage ../development/python-modules/envisage { }; envs = callPackage ../development/python-modules/envs { }; @@ -3011,6 +3027,8 @@ in { git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { }; + git-filter-repo = callPackage ../development/python-modules/git-filter-repo { }; + gitdb = callPackage ../development/python-modules/gitdb { }; github3_py = callPackage ../development/python-modules/github3_py { }; @@ -4005,6 +4023,8 @@ in { Kajiki = callPackage ../development/python-modules/kajiki { }; + kaldi-active-grammar = callPackage ../development/python-modules/kaldi-active-grammar { }; + kaptan = callPackage ../development/python-modules/kaptan { }; karton-asciimagic = callPackage ../development/python-modules/karton-asciimagic { }; @@ -4315,6 +4335,8 @@ in { lima = callPackage ../development/python-modules/lima { }; + limiter= callPackage ../development/python-modules/limiter { }; + limitlessled = callPackage ../development/python-modules/limitlessled { }; limits = callPackage ../development/python-modules/limits { }; @@ -4654,7 +4676,7 @@ in { minimock = callPackage ../development/python-modules/minimock { }; mininet-python = (toPythonModule (pkgs.mininet.override { - inherit python; + python3 = python; })).py; minio = callPackage ../development/python-modules/minio { }; @@ -5085,6 +5107,8 @@ in { Nuitka = callPackage ../development/python-modules/nuitka { }; + nulltype = callPackage ../development/python-modules/nulltype { }; + num2words = callPackage ../development/python-modules/num2words { }; numba = callPackage ../development/python-modules/numba { }; @@ -5156,6 +5180,8 @@ in { ondilo = callPackage ../development/python-modules/ondilo { }; + onetimepass = callPackage ../development/python-modules/onetimepass { }; + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; @@ -5338,6 +5364,8 @@ in { param = callPackage ../development/python-modules/param { }; + parameter-expansion-patched = callPackage ../development/python-modules/parameter-expansion-patched { }; + parameterized = callPackage ../development/python-modules/parameterized { }; paramiko = callPackage ../development/python-modules/paramiko { }; @@ -5846,6 +5874,8 @@ in { prison = callPackage ../development/python-modules/prison { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea-ldap-proxy { }; + pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { }; proboscis = callPackage ../development/python-modules/proboscis { }; @@ -6324,6 +6354,8 @@ in { pygls = callPackage ../development/python-modules/pygls { }; + pygmars = callPackage ../development/python-modules/pygmars { }; + pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; pygments = callPackage ../development/python-modules/Pygments { }; @@ -7035,6 +7067,8 @@ in { pytankerkoenig = callPackage ../development/python-modules/pytankerkoenig { }; + pytautulli = callPackage ../development/python-modules/pytautulli { }; + pyte = callPackage ../development/python-modules/pyte { }; pytenable = callPackage ../development/python-modules/pytenable { }; @@ -7778,6 +7812,8 @@ in { qtpy = callPackage ../development/python-modules/qtpy { }; + qualysclient = callPackage ../development/python-modules/qualysclient { }; + quamash = callPackage ../development/python-modules/quamash { }; quandl = callPackage ../development/python-modules/quandl { }; @@ -7815,6 +7851,8 @@ in { random2 = callPackage ../development/python-modules/random2 { }; + rangehttpserver = callPackage ../development/python-modules/rangehttpserver { }; + rapidfuzz = callPackage ../development/python-modules/rapidfuzz { }; rarfile = callPackage ../development/python-modules/rarfile { @@ -8457,6 +8495,8 @@ in { smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; + smbus2 = callPackage ../development/python-modules/smbus2 { }; + smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { }; smhi-pkg = callPackage ../development/python-modules/smhi-pkg { }; @@ -8667,6 +8707,8 @@ in { spyder-kernels = callPackage ../development/python-modules/spyder-kernels { }; + spyse-python = callPackage ../development/python-modules/spyse-python { }; + sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; @@ -8829,6 +8871,8 @@ in { suseapi = callPackage ../development/python-modules/suseapi { }; + svdtools = callPackage ../development/python-modules/svdtools { }; + svg2tikz = callPackage ../development/python-modules/svg2tikz { }; svglib = callPackage ../development/python-modules/svglib { }; @@ -9080,6 +9124,8 @@ in { timeago = callPackage ../development/python-modules/timeago { }; + timecop = callPackage ../development/python-modules/timecop { }; + timelib = callPackage ../development/python-modules/timelib { }; time-machine = callPackage ../development/python-modules/time-machine { }; @@ -9450,6 +9496,8 @@ in { userpath = callPackage ../development/python-modules/userpath { }; + ush = callPackage ../development/python-modules/ush { }; + utils = callPackage ../development/python-modules/utils { }; uuid = callPackage ../development/python-modules/uuid { }; @@ -9496,6 +9544,8 @@ in { versioneer = callPackage ../development/python-modules/versioneer { }; + versionfinder = callPackage ../development/python-modules/versionfinder { }; + versiontag = callPackage ../development/python-modules/versiontag { }; versiontools = callPackage ../development/python-modules/versiontools { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 99189a534df5..033bc4dc7c0d 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -407,8 +407,6 @@ with self; with super; { prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; - ldaptor = callPackage ../development/python-modules/ldaptor/19.nix { }; progressbar231 = callPackage ../development/python-modules/progressbar231 { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index a5adec5d78f6..21d11d339f3a 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -174,6 +174,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qcoro = callPackage ../development/libraries/qcoro { }; + qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; qmltermwidget = callPackage ../development/libraries/qmltermwidget { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0d7ef5628ee4..0cd73d68518a 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -48,7 +48,7 @@ let compilerNames = lib.mapAttrs (name: _: name) pkgs.haskell.packages; # list of all compilers to test specific packages on - all = with compilerNames; [ + released = with compilerNames; [ ghc884 ghc8107 ghc901 @@ -304,18 +304,19 @@ let # and to confirm that critical packages for the # package sets (like Cabal, jailbreak-cabal) are # working as expected. - cabal-install = all; - Cabal_3_6_1_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ]; - cabal2nix-unstable = all; - funcmp = all; - haskell-language-server = all; - hoogle = all; - hsdns = all; - jailbreak-cabal = all; - language-nix = all; - nix-paths = all; - titlecase = all; - ghc-api-compat = all; + cabal-install = released ++ [ compilerNames.ghc921 ]; + Cabal_3_6_2_0 = released ++ [ compilerNames.ghc921 ]; + cabal2nix = released ++ [ compilerNames.ghc921 ]; + cabal2nix-unstable = released ++ [ compilerNames.ghc921 ]; + funcmp = released ++ [ compilerNames.ghc921 ]; + haskell-language-server = released; + hoogle = released; + hsdns = released ++ [ compilerNames.ghc921 ]; + jailbreak-cabal = released ++ [ compilerNames.ghc921 ]; + language-nix = released ++ [ compilerNames.ghc921 ]; + nix-paths = released ++ [ compilerNames.ghc921 ]; + titlecase = released ++ [ compilerNames.ghc921 ]; + ghc-api-compat = released; }) { mergeable = pkgs.releaseTools.aggregate {