diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 4911509212e6..8e4826232e1a 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -263,6 +263,8 @@ Sometimes plugins require an override that must be changed when the plugin is up To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running. +Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of Language Server Protocol integration with vim/neovim. + ## Important repositories - [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository diff --git a/lib/strings.nix b/lib/strings.nix index 0baa942355c0..9fa9f023561e 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -689,14 +689,15 @@ rec { "/prefix/nix-profiles-library-paths.patch" "/prefix/compose-search-path.patch" ] */ - readPathsFromFile = rootPath: file: - let - lines = lib.splitString "\n" (builtins.readFile file); - removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); - relativePaths = removeComments lines; - absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; - in - absolutePaths; + readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead" + (rootPath: file: + let + lines = lib.splitString "\n" (builtins.readFile file); + removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); + relativePaths = removeComments lines; + absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; + in + absolutePaths); /* Read the contents of a file removing the trailing \n diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ce51646edb9..a35b7956d3ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4098,6 +4098,12 @@ githubId = 1918771; name = "Joe Doyle"; }; + jperras = { + email = "joel@nerderati.com"; + github = "jperras"; + githubId = 20675; + name = "Joël Perras"; + }; jpierre03 = { email = "nix@prunetwork.fr"; github = "jpierre03"; diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index 8abc66dfec19..cd68a428a6fb 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -8,24 +8,26 @@ Release process - Going through an example of releasing NixOS 17.09: + Going through an example of releasing NixOS 19.09:
One month before the beta - + - Send an email to the nix-devel mailinglist as a warning about upcoming - beta "feature freeze" in a month. + Create an announcement on Discourse as a warning about upcoming beta feature freeze in a month. See this post as an example. - Discuss with Eelco Dolstra and the community (via IRC, ML) about what - will reach the deadline. Any issue or Pull Request targeting the release - should be included in the release milestone. + Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline. Any issue or Pull Request targeting the release should be included in the release milestone. + + + + + Remove attributes that we know we will not be able to support, especially if there is a stable alternative. E.g. Check that our Linux kernels’ projected end-of-life are after our release projected end-of-life. @@ -34,113 +36,113 @@
At beta release time - + - Create - an issue for tracking Zero Hydra Failures progress. ZHF is an effort to - get build failures down to zero. + From the master branch run: + + +git checkout -b release-19.09 + + + + + Bump the system.defaultChannel attribute in nixos/modules/misc/version.nix - git tag -a -s -m "Release 17.09-beta" 17.09-beta - && git push origin 17.09-beta + Update versionSuffix in nixos/release.nix + + + + To get the commit count, use the following command: + + + +git rev-list --count release-19.09 + + + - From the master branch run git checkout -b - release-17.09. + Edit changelog at nixos/doc/manual/release-notes/rl-1909.xml. - - - - - Make sure a channel is created at https://nixos.org/channels/. - - - - - - Bump the system.defaultChannel attribute in - nixos/modules/misc/version.nix - - - - - - Update versionSuffix in - nixos/release.nix, use - git rev-list --count 17.09-beta - to get the commit count. - - - - - echo -n "18.03" > .version on master. - - - - - - Pick a new name for the unstable branch. - - - - - Create a new release notes file for the upcoming release + 1, in this - case rl-1803.xml. - - - - - Create two Hydra jobsets: release-17.09 and release-17.09-small with - stableBranch set to false. - - - - - Remove attributes that we know we will not be able to support, - especially if there is a stable alternative. E.g. Check that our - Linux kernels' - - projected end-of-life are after our release projected - end-of-life - - - - - Edit changelog at - nixos/doc/manual/release-notes/rl-1709.xml (double - check desktop versions are noted) - - + - Get all new NixOS modules git diff - release-17.03..release-17.09 nixos/modules/module-list.nix|grep - ^+ + Get all new NixOS modules: + +git diff release-19.03..release-19.09 nixos/modules/module-list.nix | grep ^+ + - Note systemd, kernel, glibc and Nix upgrades. + Note systemd, kernel, glibc, desktop environment, and Nix upgrades. - + + + Tag the release: + + +git tag --annotate --message="Release 19.09-beta" 19.09-beta +git push upstream 19.09-beta + + + + + On the master branch, increment the .version file + + +echo -n "20.03" > .version + + + + + Update codeName in lib/trivial.nix This will be the name for the next release. + + + + + Create a new release notes file for the upcoming release + 1, in our case this is rl-2003.xml. + + + + + Contact the infrastructure team to create the necessary Hydra Jobsets. + + + + + Create a channel at https://nixos.org/channels by creating a PR to nixos-org-configurations, changing channels.nix + + + + + Get all Hydra jobsets for the release to have their first evaluation. + + + + + Create an issue for tracking Zero Hydra Failures progress. ZHF is an effort to get build failures down to zero. + + +
During Beta - + - Monitor the master branch for bugfixes and minor updates and cherry-pick - them to the release branch. + Monitor the master branch for bugfixes and minor updates and cherry-pick them to the release branch. @@ -149,7 +151,7 @@
Before the final release - + Re-check that the release notes are complete. @@ -157,21 +159,17 @@ - Release Nix (currently only Eelco Dolstra can do that). - - Make sure fallback is updated. + Release Nix (currently only Eelco Dolstra can do that). Make sure fallback is updated. - - Update README.md with new stable NixOS version information. + Update README.md with new stable NixOS version information. - Change stableBranch to true in Hydra and wait for - the channel to update. + Change stableBranch to true in Hydra and wait for the channel to update. @@ -180,76 +178,143 @@
At final release time - + - git tag -s -a -m "Release 15.09" 15.09 + Update section of the manual to match new stable release version. - Update "Chapter 4. Upgrading NixOS" section of the manual to match - new stable release version. + Update rl-1909.xml with the release date. - Update the - NIXOS_SERIES - in the - nixos-homepage - repository. + Tag the final release + +git tag --annotate --message="Release 19.09" 19.09 +git push upstream 19.09 + - Get number of commits for the release: git log - release-14.04..release-14.12 --format=%an|wc -l + Update nixos-homepage for the release. + + + + Update NIXOS_SERIES in the Makefile. + + + + + Update nixos-release.tt with the new NixOS version. + + + + + Update the flake.nix input released-nixpkgs to 19.09. + + + + + Run ./update.sh (this updates flake.lock to updated channel). + + + + + Add a compressed version of the NixOS logo for 19.09. + + + + + Compose a news item for the website RSS feed. + + + - Commits by contributor: git log release-14.04..release-14.12 - --format=%an|sort|uniq -c|sort -rn + Create a new topic on the Discourse instance to announce the release. + + + + You should include the following information: + + + + + + Number of commits for the release: + + +bash git log release-19.03..release-19.09 --format=%an | wc -l + + - Create a new topic on the - Discourse instance to announce the release with the above information. - Best to check how previous email was formulated to see what needs to be - included. + Commits by contributor: + +git shortlog --summary --numbered release-19.03..release-19.09 + + + + Best to check how the previous post was formulated to see what needs to be included. +
-
+
Release Management Team + - For each release there are two release managers. After each release the - release manager having managed two releases steps down and the release - management team of the last release appoints a new release manager. + For each release there are two release managers. After each release the release manager having managed two releases steps down and the release management team of the last release appoints a new release manager. + - This makes sure a release management team always consists of one release - manager who already has managed one release and one release manager being - introduced to their role, making it easier to pass on knowledge and - experience. + This makes sure a release management team always consists of one release manager who already has managed one release and one release manager being introduced to their role, making it easier to pass on knowledge and experience. + - Release managers for the current NixOS release are tracked by GitHub team - @NixOS/nixos-release-managers. + Release managers for the current NixOS release are tracked by GitHub team @NixOS/nixos-release-managers. + - A release manager's role and responsibilities are: + A release manager’s role and responsibilities are: + - manage the release process - start discussions about features and changes for a given release - create a roadmap - release in cooperation with Eelco Dolstra - decide which bug fixes, features, etc... get backported after a release + + + manage the release process + + + + + start discussions about features and changes for a given release + + + + + create a roadmap + + + + + release in cooperation with Eelco Dolstra + + + + + decide which bug fixes, features, etc… get backported after a release + +
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c936ae946adb..0a76bffd5c98 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -777,6 +777,11 @@ CREATE ROLE postgres LOGIN SUPERUSER; PR #63103. + + + config.systemd.services.${name}.path now returns a list of paths instead of a colon-separated string. + +
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index ac6fed440a26..5addc6f9ca44 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -234,7 +234,6 @@ in rec { path = mkOption { default = []; type = with types; listOf (oneOf [ package str ]); - apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}"; description = '' Packages added to the service's PATH environment variable. Both the bin diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index f6c23c9b900e..74d6957678f5 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -257,7 +257,7 @@ let pkgs.gnused systemd ]; - environment.PATH = config.path; + environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}"; } (mkIf (config.preStart != "") { serviceConfig.ExecStartPre = diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index c74c0ca4eff0..a26431a82edf 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -1,8 +1,6 @@ { mkDerivation , stdenv , fetchFromGitHub -, fetchpatch -, installShellFiles , qmake , qtbase , qtmultimedia @@ -21,26 +19,18 @@ let in mkDerivation rec { pname = "bambootracker"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rerrahkr"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0gq40qmsdavsyl2d6a71rwp4mjlwvp1c8bry32srn4hliwfnvqa6"; + sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc"; }; - # Fix macOS build until new release - patches = [ - (fetchpatch { - url = "https://github.com/rerrahkr/BambooTracker/commit/45346ed99559d44c2e32a5c6138a0835b212e875.patch"; - sha256 = "1xkiqira1kpcqkacycy0y7qm1brhf89amliv42byijl4palmykh2"; - }) - ]; + sourceRoot = "source/BambooTracker"; - preConfigure = "cd BambooTracker"; - - nativeBuildInputs = [ qmake qttools installShellFiles ]; + nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase qtmultimedia ] ++ optional alsaSupport alsaLib @@ -51,17 +41,6 @@ mkDerivation rec { ++ optional pulseSupport "CONFIG+=use_pulse" ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ]; - postInstall = '' - install -Dm644 ../BambooTracker.desktop $out/share/applications/BambooTracker.desktop - installManPage ../BambooTracker*.1 - - cp -r ../{demos,licenses,skins,LICENSE} $out/share/BambooTracker/ - - for size in 16x16 256x256; do - install -Dm644 res/icon/icon_$size.png $out/share/icons/hicolor/$size/apps/BambooTracker.png - done - ''; - meta = with stdenv.lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; homepage = "https://github.com/rerrahkr/BambooTracker"; diff --git a/pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix index 5943642ad614..e959eca48aeb 100644 --- a/pkgs/applications/blockchains/dcrd.nix +++ b/pkgs/applications/blockchains/dcrd.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dcrd"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "decred"; repo = "dcrd"; rev = "refs/tags/release-v${version}"; - sha256 = "1ggw289y1f4dqvj3w60q9bahq8bblbfjymn5xy04ldylr3qlxm9x"; + sha256 = "14pxajc8si90hnddilfm09kmljwxq6i6p53fk0g09jp000cbklkl"; }; vendorSha256 = "03aw6mcvp1vr01ppxy673jf5hdryd5032cxndlkaiwg005mxp1dy"; diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 9a19fb787e12..71bb472d0973 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -42,7 +42,7 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; let in stdenv.mkDerivation { - inherit pname version; + inherit pname version patches; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 2c163445d5b0..7bb4e9217942 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, shared-mime-info, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index f0ce412cff11..90e1cf43f6b1 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.0/src) +WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.1/src) diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 0e815127fa1d..6204919a3285 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, }: diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix index a9b906b7b238..57c02ea4e84c 100644 --- a/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison, diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 27ca6ff9aaf4..e0a5d43e654f 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 78674306e2fa..5bcb48acc181 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1731 +4,1731 @@ { akonadi = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akonadi-20.08.0.tar.xz"; - sha256 = "a18ce2d8c9e9fc7f195a7546ee5b7c2541e37ceb7afa0aa25e9ade4f54de2813"; - name = "akonadi-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-20.08.1.tar.xz"; + sha256 = "f930de5fae376f138e87c6d67357ab799a3397d865b55c50f771b4427d85f495"; + name = "akonadi-20.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-20.08.0.tar.xz"; - sha256 = "4664e2dc6bc0762d999662188c64410fa70be2cef1be221569ec3b9270f80fd8"; - name = "akonadi-calendar-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-20.08.1.tar.xz"; + sha256 = "896ec2523203022bf70e23897d59b64c8bfffad4ead5b6756555ab34a4047ef5"; + name = "akonadi-calendar-20.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-tools-20.08.0.tar.xz"; - sha256 = "f994db29d374b0fbfd3328fc618df44680b0dfaec1cf9f842a7a9c6ecbb841fa"; - name = "akonadi-calendar-tools-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-tools-20.08.1.tar.xz"; + sha256 = "21ccc2e1090eeda1eba0c29ab51c3bae1e8f57aedead569c4ed7995f5ad6cffc"; + name = "akonadi-calendar-tools-20.08.1.tar.xz"; }; }; akonadiconsole = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akonadiconsole-20.08.0.tar.xz"; - sha256 = "a43c6b756a69301f7756464deea58c72aaefaa1b47f1136959588e8f41b7b91b"; - name = "akonadiconsole-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadiconsole-20.08.1.tar.xz"; + sha256 = "077ee646babbc4ca4075505d3dd830f4f5b8b1253617228e96f565fe23bcaad9"; + name = "akonadiconsole-20.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akonadi-contacts-20.08.0.tar.xz"; - sha256 = "206f0704768a789201ead784e78d7138aba6b50b8f3880369df8799730fca8b4"; - name = "akonadi-contacts-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-contacts-20.08.1.tar.xz"; + sha256 = "eee775960345ec0ca13b0550bb56fb6875867921fa7b9412a2c4b0dfb8ab4366"; + name = "akonadi-contacts-20.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akonadi-import-wizard-20.08.0.tar.xz"; - sha256 = "d742ced3b498f39edff33f7fc73db1e882bf4b1e17b35d5f734f8732cb1e7bde"; - name = "akonadi-import-wizard-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-import-wizard-20.08.1.tar.xz"; + sha256 = "d895c866a05f0a55ca8f2d852ed0ae3fdc13aa160cbcbaf9f1017443458d9526"; + name = "akonadi-import-wizard-20.08.1.tar.xz"; }; }; akonadi-mime = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akonadi-mime-20.08.0.tar.xz"; - sha256 = "c0a709e25fef86f778ef21adbf78c6beab203f4f4a8d9f5e17a4d3175fe01d33"; - name = "akonadi-mime-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-mime-20.08.1.tar.xz"; + sha256 = "3c7a57f798a7db1e1aebc3162c20f58a0fb9ed9e703078344ef1de215c73ff0b"; + name = "akonadi-mime-20.08.1.tar.xz"; }; }; akonadi-notes = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akonadi-notes-20.08.0.tar.xz"; - sha256 = "aeb348d6af30e8775d60cab0894634c6e5ac95a3baf97f69407602dea5944525"; - name = "akonadi-notes-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-notes-20.08.1.tar.xz"; + sha256 = "afc0cdba349f0b2edece44221a7c3c532d07251ec51f05994e83a1d79c4f50fc"; + name = "akonadi-notes-20.08.1.tar.xz"; }; }; akonadi-search = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akonadi-search-20.08.0.tar.xz"; - sha256 = "06974398ddd6cbd42d0cb9dc3cac4b6ad6bdc8062d1f94523a973ed702b40e2f"; - name = "akonadi-search-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-search-20.08.1.tar.xz"; + sha256 = "db305bfc55535d8812d84a119e4dcf04e7b87c345e7ac3a884469cbf55abca83"; + name = "akonadi-search-20.08.1.tar.xz"; }; }; akregator = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/akregator-20.08.0.tar.xz"; - sha256 = "e8dbef1b8e8c165e824f108a33f9d2a6a0ea8668299f808fcc2ce2b4d398dcf5"; - name = "akregator-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akregator-20.08.1.tar.xz"; + sha256 = "21751a5a14b188649caeeb19cbcef877dd00548a29c073f8694e227d951c7a00"; + name = "akregator-20.08.1.tar.xz"; }; }; analitza = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/analitza-20.08.0.tar.xz"; - sha256 = "51bc5ecd31e557fcf5660e57458aa866ee44e386550bb2c37c22fae252405aa1"; - name = "analitza-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/analitza-20.08.1.tar.xz"; + sha256 = "91c691df8be52255db9387549c6392ad2c5358c12e805f3a96520e2aa0c147de"; + name = "analitza-20.08.1.tar.xz"; }; }; ark = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ark-20.08.0.tar.xz"; - sha256 = "7627ffa17466d31dfdedabaa07b491ce14b46041d04f8b20316a0fa731fab098"; - name = "ark-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ark-20.08.1.tar.xz"; + sha256 = "32e8546b186b88efc9d4688e02def0b6225d921f9b92cfcd328417f09ec0f725"; + name = "ark-20.08.1.tar.xz"; }; }; artikulate = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/artikulate-20.08.0.tar.xz"; - sha256 = "30ef4eedabebccfb600eec1ba7bc691e8ad4e0de8d7fdcf56a630714d6b9848b"; - name = "artikulate-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/artikulate-20.08.1.tar.xz"; + sha256 = "b626a6a38f6eb50d64607032d5b100351c4242e40a4a13cdce4769e188ee361a"; + name = "artikulate-20.08.1.tar.xz"; }; }; audiocd-kio = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/audiocd-kio-20.08.0.tar.xz"; - sha256 = "7a01d5b89f5271ee1eba203e15c46b146879e4651643ec6348e1033c0ffdc8c7"; - name = "audiocd-kio-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/audiocd-kio-20.08.1.tar.xz"; + sha256 = "7662849929c96d1745ce4ac7ddc931be2eff5e3cc755f2cd959b4d3f4b20b9b0"; + name = "audiocd-kio-20.08.1.tar.xz"; }; }; baloo-widgets = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/baloo-widgets-20.08.0.tar.xz"; - sha256 = "37800c3cde7e2a9cfbab2e11f21dd1ae76b2a31b687802bc45027966a8734985"; - name = "baloo-widgets-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/baloo-widgets-20.08.1.tar.xz"; + sha256 = "9f48cb2f1b45e46828b1656abaeb60e836650015c07277ec52bea053d0058958"; + name = "baloo-widgets-20.08.1.tar.xz"; }; }; blinken = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/blinken-20.08.0.tar.xz"; - sha256 = "0a08f5fc8e0c100956bb99910265d9630191e462f8f812842e79b64e76055c1c"; - name = "blinken-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/blinken-20.08.1.tar.xz"; + sha256 = "53b30435ea0d83f713ecb53219173aa55c0d11194830972734a4acc9a5a28c5a"; + name = "blinken-20.08.1.tar.xz"; }; }; bomber = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/bomber-20.08.0.tar.xz"; - sha256 = "91b4ff0e0615cd42e36c6755d30ee62b74d6c5ae309512b9f8f347c34786ec47"; - name = "bomber-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/bomber-20.08.1.tar.xz"; + sha256 = "a4b2f5dcce7e125da30bef6bcc9746b67f8451d2040696714686dd618d80a96c"; + name = "bomber-20.08.1.tar.xz"; }; }; bovo = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/bovo-20.08.0.tar.xz"; - sha256 = "f66997324d596095b30442b2446a3c581834ad60d1a27fd7f7f394549f2418a8"; - name = "bovo-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/bovo-20.08.1.tar.xz"; + sha256 = "5d5ee817a73de0deef6b7c35a798bda02c6d15e9dd0e7379a13c23c0832fe0d1"; + name = "bovo-20.08.1.tar.xz"; }; }; calendarsupport = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/calendarsupport-20.08.0.tar.xz"; - sha256 = "1c1682d46f248b092062a461cdefec9da3733cb0ee1a590b7c48c4977028e977"; - name = "calendarsupport-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/calendarsupport-20.08.1.tar.xz"; + sha256 = "38d6e695725c8484e1492d431144a0ecd1b66535bc07ac77e1f0eb1499d8fc32"; + name = "calendarsupport-20.08.1.tar.xz"; }; }; cantor = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/cantor-20.08.0.tar.xz"; - sha256 = "1d4babf783f53929f0ea42380dacdb7ab989b66383dd3c37ab22787a26715082"; - name = "cantor-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/cantor-20.08.1.tar.xz"; + sha256 = "c44b96ac861302589923d144bf7b5d529b6eb2f91cea2d014944a0516de31a05"; + name = "cantor-20.08.1.tar.xz"; }; }; cervisia = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/cervisia-20.08.0.tar.xz"; - sha256 = "6e10acc196661b7d1873e370eb67486386e25e4d6b7946ade8479b70fba34d66"; - name = "cervisia-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/cervisia-20.08.1.tar.xz"; + sha256 = "eedd3b3f00b97d513437fdbd2eeaa28cd6db29512983b82196bdededd8b701f2"; + name = "cervisia-20.08.1.tar.xz"; }; }; dolphin = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/dolphin-20.08.0.tar.xz"; - sha256 = "fe5a68d9afd0771ba9ffc2d5d79e7bc43da85fd3ee3c2493a9a2d5c359c3cd6f"; - name = "dolphin-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/dolphin-20.08.1.tar.xz"; + sha256 = "7d6ef04b866366a0ff3b199aac082ade41b3748b225ef7675ea42ccf48cbdc24"; + name = "dolphin-20.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/dolphin-plugins-20.08.0.tar.xz"; - sha256 = "a8a0c35f75eb8e63ee90f44ce930babceff86676b8bba213c82b7ffb29e526bb"; - name = "dolphin-plugins-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz"; + sha256 = "a00cab6b30c9b5a4c0164704c9eab2cbb661928e775f83acb3691af77bf17427"; + name = "dolphin-plugins-20.08.1.tar.xz"; }; }; dragon = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/dragon-20.08.0.tar.xz"; - sha256 = "0e3a540b3f93118a9a17f2c6f675d0f007b123266c6e71a27b5ddb6b9a7e14a8"; - name = "dragon-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/dragon-20.08.1.tar.xz"; + sha256 = "691bc338ca25e70e9a43cbcdf50f2e0aa92643bdad0329bdc3e09373ac287040"; + name = "dragon-20.08.1.tar.xz"; }; }; elisa = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/elisa-20.08.0.tar.xz"; - sha256 = "acbff9f3c3d26c2a2c249974ccd8ff0bdeb22148a8a5b72e1199f1ec2f9d712e"; - name = "elisa-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/elisa-20.08.1.tar.xz"; + sha256 = "1a0234a074a70bfcd4b2ccc14664b2cc7f88d2ccfd33c1716d35c27a31e258c0"; + name = "elisa-20.08.1.tar.xz"; }; }; eventviews = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/eventviews-20.08.0.tar.xz"; - sha256 = "205607d89d739f1efa4472303206647d04fba4e9d80610800a4a229676ede732"; - name = "eventviews-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/eventviews-20.08.1.tar.xz"; + sha256 = "b46e6ad32a503ce1dc1e5ade71e79f44011362fe569836ca1f2cd11c560a5a73"; + name = "eventviews-20.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ffmpegthumbs-20.08.0.tar.xz"; - sha256 = "84c3a8f064423d7e51a57b9ed32a9f4fdbca73f7fa7e47a6289d9b516f1ba9ff"; - name = "ffmpegthumbs-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ffmpegthumbs-20.08.1.tar.xz"; + sha256 = "8b7cd6bd27b29977d0406b08c2cf33988c651a2f59392be47f076e49eea5673b"; + name = "ffmpegthumbs-20.08.1.tar.xz"; }; }; filelight = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/filelight-20.08.0.tar.xz"; - sha256 = "29ea650f7b0f1863ea6caeca39362eff652edee755963967eb4653665a2499b4"; - name = "filelight-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/filelight-20.08.1.tar.xz"; + sha256 = "9677038781a1d66238da0e54f967c9c97cb44d593dbe164b8e26f38d0ac75330"; + name = "filelight-20.08.1.tar.xz"; }; }; granatier = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/granatier-20.08.0.tar.xz"; - sha256 = "9fd034875c2ac80a089145c47f36b3b97ed69eaa1693aa83bc5bd76561096efd"; - name = "granatier-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/granatier-20.08.1.tar.xz"; + sha256 = "7b0d53fd50fdb56270f8fd53d45478c0f1be10bb67b901db08b0f413c4baeb3e"; + name = "granatier-20.08.1.tar.xz"; }; }; grantlee-editor = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/grantlee-editor-20.08.0.tar.xz"; - sha256 = "08aeac1c6bacabdeb4e4273efc5c5f4995454c45bd51069b3ef6105237b84afa"; - name = "grantlee-editor-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/grantlee-editor-20.08.1.tar.xz"; + sha256 = "edeb994eab7001bcf8462834a61ae1a045e9122ae104d31bdeed2ac7497b6306"; + name = "grantlee-editor-20.08.1.tar.xz"; }; }; grantleetheme = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/grantleetheme-20.08.0.tar.xz"; - sha256 = "7e86d2f9f5a725f988211f676da2c4191ed6df55418135f3a54da5d687d63e8e"; - name = "grantleetheme-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/grantleetheme-20.08.1.tar.xz"; + sha256 = "9a8f91ce63a3b143d47d8e3fbd1378732639cd3daf5b5789989164d8225fe54f"; + name = "grantleetheme-20.08.1.tar.xz"; }; }; gwenview = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/gwenview-20.08.0.tar.xz"; - sha256 = "e7a6d96801bfc41156292faac915691b929d4da641cf04839c74a68debc95c44"; - name = "gwenview-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/gwenview-20.08.1.tar.xz"; + sha256 = "df1c45317aff9aece8b023cd87aab62c9cd222520795922564e89fdc9df48995"; + name = "gwenview-20.08.1.tar.xz"; }; }; incidenceeditor = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/incidenceeditor-20.08.0.tar.xz"; - sha256 = "5f23343959cd672570a4a3439be0e8b27c413b9747a17bd04138359c43dac678"; - name = "incidenceeditor-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/incidenceeditor-20.08.1.tar.xz"; + sha256 = "eecc51eb405c473eb20449842dcdb3dac96712bbcf7aeedaa06614e1da3e0bbe"; + name = "incidenceeditor-20.08.1.tar.xz"; }; }; juk = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/juk-20.08.0.tar.xz"; - sha256 = "ec00ef054768efc64b5b0da69fba90104689b314a064f52989d1c6dbd73dad1b"; - name = "juk-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/juk-20.08.1.tar.xz"; + sha256 = "aa9a93a0befacf401cf41d8358b4987d8b370b4c153f3b66e05e922472e004a8"; + name = "juk-20.08.1.tar.xz"; }; }; k3b = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/k3b-20.08.0.tar.xz"; - sha256 = "d10ac6bfa89744ec857ce7c65d5d7eae5f26ce151341d6f393b9a141cc05540a"; - name = "k3b-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/k3b-20.08.1.tar.xz"; + sha256 = "66fad59f4e35c24dc8868c46ff45ffa66048501e0a6ac0c23a8b9e957033e50f"; + name = "k3b-20.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-integration-20.08.0.tar.xz"; - sha256 = "b1d0912ec7771be6c04f4cf635d9196acee1c63f47fe1814a5da2002196125a0"; - name = "kaccounts-integration-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-integration-20.08.1.tar.xz"; + sha256 = "b65ec11be0c2b612222de382d24345f19be0cd264243f0d954da8a81b80034bc"; + name = "kaccounts-integration-20.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-providers-20.08.0.tar.xz"; - sha256 = "5a2293e124839dec3ca5cbe72548ff01ce3c0f7edc5c6dd78ca4d8a27054f574"; - name = "kaccounts-providers-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-providers-20.08.1.tar.xz"; + sha256 = "481a2e2708773197b63937233ade6380c0b64e13a1610f27aa2751b6ee3624a4"; + name = "kaccounts-providers-20.08.1.tar.xz"; }; }; kaddressbook = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kaddressbook-20.08.0.tar.xz"; - sha256 = "e34b4515a5721b9dd1d9d391acb81905bc2b6a0d219347c7dac87ebbb5b7b921"; - name = "kaddressbook-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kaddressbook-20.08.1.tar.xz"; + sha256 = "f7fb72cbff43ae6dfb222e5b1c49947602086412b97634484eb3cc86ab773aa2"; + name = "kaddressbook-20.08.1.tar.xz"; }; }; kajongg = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kajongg-20.08.0.tar.xz"; - sha256 = "1813ff2d960f96d63c5680b4a7e7dca6249146876c7a6d203eb0f9768eca244b"; - name = "kajongg-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kajongg-20.08.1.tar.xz"; + sha256 = "801c0cc63767809ea4909ceb66dbbbb3e8ad400db7a24c80dc6ae8f3f5c9a6b9"; + name = "kajongg-20.08.1.tar.xz"; }; }; kalarm = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kalarm-20.08.0.tar.xz"; - sha256 = "02c1a62f603cc6917d0f95eff4aaa23cf808395bed9b1dad21817f6c32256748"; - name = "kalarm-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kalarm-20.08.1.tar.xz"; + sha256 = "22fea5be32c8db6b0903f216307f20dafc2ac69c620d9b4512e1034c0294c207"; + name = "kalarm-20.08.1.tar.xz"; }; }; kalarmcal = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kalarmcal-20.08.0.tar.xz"; - sha256 = "bd4f048a976829ee5768b9d26aebe4efbbfa0a2991486c8f57f250fe4198532c"; - name = "kalarmcal-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kalarmcal-20.08.1.tar.xz"; + sha256 = "745515662c23154480e73f4a8d6e9ec760d01770383c1dd7f31d3f1463be7602"; + name = "kalarmcal-20.08.1.tar.xz"; }; }; kalgebra = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kalgebra-20.08.0.tar.xz"; - sha256 = "658fd3eae218b6b73dbf3ff2edb59c511bfb11d549b7e41a5224c62b4bfedc2c"; - name = "kalgebra-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kalgebra-20.08.1.tar.xz"; + sha256 = "a5ab916eba3bfd7535408768e6530e993bc1097ef1a2a0af5aa804aa1f713caf"; + name = "kalgebra-20.08.1.tar.xz"; }; }; kalzium = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kalzium-20.08.0.tar.xz"; - sha256 = "e9b402ea91ac87a19cef6e686bfb8507f6afac0d19c5dc7de777475d5db1b06f"; - name = "kalzium-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kalzium-20.08.1.tar.xz"; + sha256 = "c2c4a823525ab5927c39f29e2150f34fc03947fb852aea1bdb73390c5a709188"; + name = "kalzium-20.08.1.tar.xz"; }; }; kamera = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kamera-20.08.0.tar.xz"; - sha256 = "ca4194b99703a1908d4991538419c49fc28f5df8cb32f7c07a20454f4918f12a"; - name = "kamera-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kamera-20.08.1.tar.xz"; + sha256 = "f5b04ca46313de1bb0a57253650d1d1578f45796035888b759ad224b5866ee96"; + name = "kamera-20.08.1.tar.xz"; }; }; kamoso = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kamoso-20.08.0.tar.xz"; - sha256 = "c27ea592a70d7634740973e860acdf8cda49c0880a13f623c315fbc02cc3d592"; - name = "kamoso-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kamoso-20.08.1.tar.xz"; + sha256 = "ed8fa6a6127a8bea5294534aa2552526af101f981de58512fbb9f7dfd78e8984"; + name = "kamoso-20.08.1.tar.xz"; }; }; kanagram = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kanagram-20.08.0.tar.xz"; - sha256 = "d7fc300883bb5420ce1f9bc2ec52324a74b775a8ecea12b904afedc0a6af6ca3"; - name = "kanagram-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kanagram-20.08.1.tar.xz"; + sha256 = "c810db58884e80d95baef149b8ced8fff7c5e48d6057478e81a5c8895ae67b42"; + name = "kanagram-20.08.1.tar.xz"; }; }; kapman = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kapman-20.08.0.tar.xz"; - sha256 = "24ad6ae146c0770fe4498983604b25ced25eab98b4a94898311553f7e4a97475"; - name = "kapman-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kapman-20.08.1.tar.xz"; + sha256 = "934da85c5d9c99a0ed658fe4d99df258246716e04e13ceb3e18b11cc035c4f4c"; + name = "kapman-20.08.1.tar.xz"; }; }; kapptemplate = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kapptemplate-20.08.0.tar.xz"; - sha256 = "ef92d56a155f1218d28a63167e67f4fc7bbdf9ba63344bef9512b2e1435f322d"; - name = "kapptemplate-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kapptemplate-20.08.1.tar.xz"; + sha256 = "7b350467e14bc310a695ffa3481afa7857de2f6ec714915ee2d8a25a6511909b"; + name = "kapptemplate-20.08.1.tar.xz"; }; }; kate = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kate-20.08.0.tar.xz"; - sha256 = "aa0695f40cf9d491a08338f1c9b4331dfbb63cb311cf815ed0499b38940fa0db"; - name = "kate-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kate-20.08.1.tar.xz"; + sha256 = "44607f6a1d5ca8bb7173bedbeabef65bb98dde0fd009987bd8139fbb53959146"; + name = "kate-20.08.1.tar.xz"; }; }; katomic = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/katomic-20.08.0.tar.xz"; - sha256 = "006c55f3f688f70b51cf89589843037f09d30e826cf1a30ec441e84724ad27ab"; - name = "katomic-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/katomic-20.08.1.tar.xz"; + sha256 = "1aa655857bb1708880b6fbf4e54acdfe1cb7f47a9494249978251d870b86f13a"; + name = "katomic-20.08.1.tar.xz"; }; }; kbackup = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kbackup-20.08.0.tar.xz"; - sha256 = "5d5882df3dfa6a078940ea6e292fd1c1aba7c016426e36d87f0d7f8c149bcd59"; - name = "kbackup-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kbackup-20.08.1.tar.xz"; + sha256 = "08b0c43fca2dba65e1173841343daf8e6e37e11101be7315011e8345ba9b1e72"; + name = "kbackup-20.08.1.tar.xz"; }; }; kblackbox = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kblackbox-20.08.0.tar.xz"; - sha256 = "0f6d0341e5bbc16d2d0ec9dc14027ebc91fdda2b9eb2ac6061055a60541db358"; - name = "kblackbox-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kblackbox-20.08.1.tar.xz"; + sha256 = "3f09d483fa3a3013e685df9efd9cee8d9d1b9f0e017cc97d92636bae89fc469c"; + name = "kblackbox-20.08.1.tar.xz"; }; }; kblocks = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kblocks-20.08.0.tar.xz"; - sha256 = "041904451ce1aec7da113ed4fb442abd92083b8d7522b1c91e05933d574fba8e"; - name = "kblocks-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kblocks-20.08.1.tar.xz"; + sha256 = "e2b6e5b0727ca45d6b0f0e8b9f0aa029a0acb9bdebeac5bfd849455e560977ed"; + name = "kblocks-20.08.1.tar.xz"; }; }; kbounce = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kbounce-20.08.0.tar.xz"; - sha256 = "7949b9ea43ca93b13378c018d8a532c200233f5f3d2acaba3c74d90f3ed79ccb"; - name = "kbounce-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kbounce-20.08.1.tar.xz"; + sha256 = "99af3bd297fcbecb9eaa4222bbb5122144beff9cb999420bf45339d61375f2a4"; + name = "kbounce-20.08.1.tar.xz"; }; }; kbreakout = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kbreakout-20.08.0.tar.xz"; - sha256 = "0aa63a16d45ca432065777352f69a7fc0993fd0077f14e05cb89b06a1b69ad69"; - name = "kbreakout-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kbreakout-20.08.1.tar.xz"; + sha256 = "0d57c105f2778b68c0b5ff8cb3e02d5c7ea2956b90d48d126ff1118b94d5f2fa"; + name = "kbreakout-20.08.1.tar.xz"; }; }; kbruch = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kbruch-20.08.0.tar.xz"; - sha256 = "9e0c51ec0e32a8b46b567c7d275acb3845e09aef446c27324d872fc3a096113e"; - name = "kbruch-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kbruch-20.08.1.tar.xz"; + sha256 = "f04bf902a31b68d18c69afff511a591817a35f5ad866de4f84aa1b664b35a41e"; + name = "kbruch-20.08.1.tar.xz"; }; }; kcachegrind = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kcachegrind-20.08.0.tar.xz"; - sha256 = "94b3963e9eebc0bf67644de1666cf019649f5eaf924ac01c1af6e48619a11f87"; - name = "kcachegrind-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcachegrind-20.08.1.tar.xz"; + sha256 = "59c43296aaa7d8a5dbf782ba9248ee8bb6308e7bd7bdfc0b99e1c912529337f2"; + name = "kcachegrind-20.08.1.tar.xz"; }; }; kcalc = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kcalc-20.08.0.tar.xz"; - sha256 = "3b6dee02e43ddb85ae6748cd8aefb422112be411e778c56372e97de0046bfca2"; - name = "kcalc-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcalc-20.08.1.tar.xz"; + sha256 = "46702fe8eca8b604e15f3f2eb4d1f17b8601b6ad0b03bb9cd0a0dd7ed7a13c49"; + name = "kcalc-20.08.1.tar.xz"; }; }; kcalutils = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kcalutils-20.08.0.tar.xz"; - sha256 = "82504223fe3a0f6149204aa5f3b38dc7fb05a25048e4a0159ba6e1923c24c1f8"; - name = "kcalutils-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcalutils-20.08.1.tar.xz"; + sha256 = "ae6a8ca02722f8f593a8d248ab3d043cc68be23d18f820e150af000a902601c2"; + name = "kcalutils-20.08.1.tar.xz"; }; }; kcharselect = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kcharselect-20.08.0.tar.xz"; - sha256 = "91b17c42286c3a715dcde764057364bada6d07ae163f9b5cdc7daec338ee3a72"; - name = "kcharselect-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcharselect-20.08.1.tar.xz"; + sha256 = "36575e9fd0a93fb3ddaf6a75a213786351bdd3ab8c167dc1a3e2824a23a6655b"; + name = "kcharselect-20.08.1.tar.xz"; }; }; kcolorchooser = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kcolorchooser-20.08.0.tar.xz"; - sha256 = "df1bfd346bfcdea7a585f489f62ab2f76993ce07f83c47cb8202be981b8a3829"; - name = "kcolorchooser-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcolorchooser-20.08.1.tar.xz"; + sha256 = "20cae01bd5e8c824f8e7900badd0d66464c363a749a1ce9fe6fe3a1e31c99ade"; + name = "kcolorchooser-20.08.1.tar.xz"; }; }; kcron = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kcron-20.08.0.tar.xz"; - sha256 = "e45d06ed0665d8f1cad3d44cc43035d50fc533bf9ab6e10fe53ab23f2ed5e708"; - name = "kcron-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcron-20.08.1.tar.xz"; + sha256 = "24ee9aee48bef951d6ac1fff32271417c4eb2239f0ec1de8388f2bae55ce83f5"; + name = "kcron-20.08.1.tar.xz"; }; }; kdebugsettings = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdebugsettings-20.08.0.tar.xz"; - sha256 = "21914b67dfc654ed525118afeda74e6a0539af9a0f3be05c490e9edbf13b2328"; - name = "kdebugsettings-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdebugsettings-20.08.1.tar.xz"; + sha256 = "cac50d34c8a31805924aa75755475a754109fc643e95fe50188477522d113a55"; + name = "kdebugsettings-20.08.1.tar.xz"; }; }; kdeconnect-kde = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdeconnect-kde-20.08.0.tar.xz"; - sha256 = "3de16bf165b68635919e68fa2460a5d14139cd9a63cb27573a7b2b2a5b0044a1"; - name = "kdeconnect-kde-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdeconnect-kde-20.08.1.tar.xz"; + sha256 = "8ebfe36b4d08b36881082a3748f63a7c645b51e8f3b094607512817e9f6ce668"; + name = "kdeconnect-kde-20.08.1.tar.xz"; }; }; kde-dev-scripts = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-scripts-20.08.0.tar.xz"; - sha256 = "2c3120e63ebcd41e30acfd53063bad659e1982f79b81429e0541b0100bc25ad3"; - name = "kde-dev-scripts-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-scripts-20.08.1.tar.xz"; + sha256 = "f7f99a199fea69019738e6d2147e5f6e4419835aa2c39e6d60f4d2e5d629ba96"; + name = "kde-dev-scripts-20.08.1.tar.xz"; }; }; kde-dev-utils = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-utils-20.08.0.tar.xz"; - sha256 = "7998afa4ac1b293eb3ba8f48ea77cd0bc22d2c2eda84e291d8c9cf2a5e719547"; - name = "kde-dev-utils-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-utils-20.08.1.tar.xz"; + sha256 = "8105a5b911643dca1f0c476c9247282f80e4ea17bae06dcca63ba9638bf5d21d"; + name = "kde-dev-utils-20.08.1.tar.xz"; }; }; kdeedu-data = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdeedu-data-20.08.0.tar.xz"; - sha256 = "c863f72c8dacb47dc8c82f966f4b70d33f75c2b9f6d63c174e9f3a2c73241943"; - name = "kdeedu-data-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdeedu-data-20.08.1.tar.xz"; + sha256 = "d9c10c849f94b8cff7f79747a0594b8050f19d5477799b03f803c4241a9d12b6"; + name = "kdeedu-data-20.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-mobipocket-20.08.0.tar.xz"; - sha256 = "2c11b6efe2c5f7725341c861dd9ba8e919ba3734866e808225c13bb2f2d90a2d"; - name = "kdegraphics-mobipocket-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-mobipocket-20.08.1.tar.xz"; + sha256 = "9974c36d90fc23d9a3a7172cf1526dc3671bf90f01f608effe92f64fce53c372"; + name = "kdegraphics-mobipocket-20.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-thumbnailers-20.08.0.tar.xz"; - sha256 = "d466c08b4a5e4ccc36907dd38e82019f9060c2ea1931f336f9fbb2f79036566e"; - name = "kdegraphics-thumbnailers-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-thumbnailers-20.08.1.tar.xz"; + sha256 = "8303231f2fc44c071b3f6a477ae5335f2657dbfaba52362529aaba20973a5995"; + name = "kdegraphics-thumbnailers-20.08.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdenetwork-filesharing-20.08.0.tar.xz"; - sha256 = "8fabf6b5eae8c32bf75db911ae76d35aa9fee66355964cf0ad8150f960b83256"; - name = "kdenetwork-filesharing-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdenetwork-filesharing-20.08.1.tar.xz"; + sha256 = "e88f4a2f6d7b8a61ebd491eb112f51d50f9949d729022fab01223d6ea36b8a01"; + name = "kdenetwork-filesharing-20.08.1.tar.xz"; }; }; kdenlive = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdenlive-20.08.0.tar.xz"; - sha256 = "89914ee37f5bbdd16051b0db4a6cfb6f8c3d748f47c9e28e5349920ca133c0bd"; - name = "kdenlive-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdenlive-20.08.1.tar.xz"; + sha256 = "f99e3f22c3d5e41a3ca251299d010ac2bc44933091c25d360104d562a1090873"; + name = "kdenlive-20.08.1.tar.xz"; }; }; kdepim-addons = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdepim-addons-20.08.0.tar.xz"; - sha256 = "4045f7879cc47829a82a4ada18a35cb3bdf89a489a15cd0bd48441c305b3cb06"; - name = "kdepim-addons-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdepim-addons-20.08.1.tar.xz"; + sha256 = "a0bddcbe8f8f6d8c878a6b5634578522a8d485e424cf37d35bc17df9a1ffc7c2"; + name = "kdepim-addons-20.08.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdepim-apps-libs-20.08.0.tar.xz"; - sha256 = "bf7ac0af294510e4127808f3f2c1e25368c97b78ff0a5405219abb67173598a0"; - name = "kdepim-apps-libs-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdepim-apps-libs-20.08.1.tar.xz"; + sha256 = "a0664933b3b5ff20747bf2adec9fbbecf22935129349208430d53e8c9bf5b5bb"; + name = "kdepim-apps-libs-20.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdepim-runtime-20.08.0.tar.xz"; - sha256 = "f6e4ff70b9cb85e8590ab8d7432abe1b6a2daa14d09a2974f8902b882b16409d"; - name = "kdepim-runtime-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdepim-runtime-20.08.1.tar.xz"; + sha256 = "27a4c04dcf2eac4108a43acbdd57e3a8aa1da92443a3e7977329d0218da05c24"; + name = "kdepim-runtime-20.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-kioslaves-20.08.0.tar.xz"; - sha256 = "0ab8188c1746ec5786d94e5988487b766a04a9df1c275b25778ab2948e302776"; - name = "kdesdk-kioslaves-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-kioslaves-20.08.1.tar.xz"; + sha256 = "528cce0ea4c7c9fd53a604591eae4a70d39421ebbe62ed59bcbc80072f95c19f"; + name = "kdesdk-kioslaves-20.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-thumbnailers-20.08.0.tar.xz"; - sha256 = "8f2adb38ca24b82119eb52ef879f5fd6a5d48b9c012956a518cefefd86fbd6d3"; - name = "kdesdk-thumbnailers-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-thumbnailers-20.08.1.tar.xz"; + sha256 = "5b189182f2a734f82e67e23d3293e694c51f97c0a9acd1ec5498442a3d2a3804"; + name = "kdesdk-thumbnailers-20.08.1.tar.xz"; }; }; kdf = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdf-20.08.0.tar.xz"; - sha256 = "2f5fddbaf09d3cfdfb3e18b0a9292ecb6bcf14969e4d031a4215f22fecda0892"; - name = "kdf-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdf-20.08.1.tar.xz"; + sha256 = "c100c87e9dbfcf7c12ce78d743f4ce3a2ec2bf3c1b0d969af1285255071195a5"; + name = "kdf-20.08.1.tar.xz"; }; }; kdialog = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdialog-20.08.0.tar.xz"; - sha256 = "669da86bebf2cfac4cda7c873bb57417aac8d293cee8c5950968495520954ed5"; - name = "kdialog-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdialog-20.08.1.tar.xz"; + sha256 = "089e8a8e85a9021b830e9b8a19ecb1999781915a716c9c2b3c99894a5d1c8dcf"; + name = "kdialog-20.08.1.tar.xz"; }; }; kdiamond = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kdiamond-20.08.0.tar.xz"; - sha256 = "56efcb8b2bf81d62324911f404e918f7bcd62f6fa2ee9d4e513df54e37631889"; - name = "kdiamond-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdiamond-20.08.1.tar.xz"; + sha256 = "1629dc6f70873b42081bd75dbf858da56d380c32925ddd49bd2110d458cb4b23"; + name = "kdiamond-20.08.1.tar.xz"; }; }; keditbookmarks = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/keditbookmarks-20.08.0.tar.xz"; - sha256 = "7fab031ae4d62e3c9d37dce671af4580afe01e6e3411ef199115568e893b7df5"; - name = "keditbookmarks-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/keditbookmarks-20.08.1.tar.xz"; + sha256 = "8bfedffae0332dbfb611d25f3178ab7babe374155cce7c44e1aaa841934c3123"; + name = "keditbookmarks-20.08.1.tar.xz"; }; }; kfind = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kfind-20.08.0.tar.xz"; - sha256 = "f47f1ee0dc1c75b90d70027eb0ce2b470912aff9db2c18a0380eb65b16e6c842"; - name = "kfind-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kfind-20.08.1.tar.xz"; + sha256 = "e49412d0eae6f77369b96ee7fa5902252294d03da1e8782460d4bba5be6bb149"; + name = "kfind-20.08.1.tar.xz"; }; }; kfloppy = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kfloppy-20.08.0.tar.xz"; - sha256 = "85732b804ee19c1a1db82845d7ab8c1ba1872d8d40737ee5b6beef8798c457f3"; - name = "kfloppy-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kfloppy-20.08.1.tar.xz"; + sha256 = "cfbe396c252acc23a929d05fe1a71099bc19ee3ab55f4f40e47780cf871852c5"; + name = "kfloppy-20.08.1.tar.xz"; }; }; kfourinline = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kfourinline-20.08.0.tar.xz"; - sha256 = "9b1d520d61ddd98ce629a50355a190bded41d6abea100d87f3650e15e0c358b6"; - name = "kfourinline-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kfourinline-20.08.1.tar.xz"; + sha256 = "2c65dcc685d7e46da73e53ac3ab250ef4d1738bb85aa6f1b09160ff2ece364a2"; + name = "kfourinline-20.08.1.tar.xz"; }; }; kgeography = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kgeography-20.08.0.tar.xz"; - sha256 = "7fd2b7449309d6c42e01038c93ce8dda9c7a8acb806b27b9ff58d4556711ff5e"; - name = "kgeography-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kgeography-20.08.1.tar.xz"; + sha256 = "f7ce4c6a00f18558aa04f4af0b71e45efc10c67f0b3454c5f0b2527a43133d30"; + name = "kgeography-20.08.1.tar.xz"; }; }; kget = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kget-20.08.0.tar.xz"; - sha256 = "de46cbe0a53c7246d1aeb4f15d24b90633eaf37e236d67882e1454b61fea1a09"; - name = "kget-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kget-20.08.1.tar.xz"; + sha256 = "efbfc08a5a4ed3974bbdab20c5eae07cdb70f7f42e9de1c75651a57511d7e576"; + name = "kget-20.08.1.tar.xz"; }; }; kgoldrunner = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kgoldrunner-20.08.0.tar.xz"; - sha256 = "29caf1637daea69013061d170a749411b18f543af7e2f8a0f295f1eb5cb62586"; - name = "kgoldrunner-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kgoldrunner-20.08.1.tar.xz"; + sha256 = "40380c0d3b65e06cdb9d9ca3791c10e0d2d300856cc49a7b3da0145b7651274b"; + name = "kgoldrunner-20.08.1.tar.xz"; }; }; kgpg = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kgpg-20.08.0.tar.xz"; - sha256 = "102cc0d44b7621ebad1d5914bbb44a598689ebb95093e4a76713679996c2af0c"; - name = "kgpg-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kgpg-20.08.1.tar.xz"; + sha256 = "6b926c2adf896c3f68402ec10faf8db1e5f7c7b9fa8c1c26f9021d1fb0c975b0"; + name = "kgpg-20.08.1.tar.xz"; }; }; khangman = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/khangman-20.08.0.tar.xz"; - sha256 = "11f442e24f0a428c0338000f66687bc021f4290bcd8cc0acc3fd882ce3cf4b0b"; - name = "khangman-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/khangman-20.08.1.tar.xz"; + sha256 = "fe94116ea833295a46c59a7420676925bb1038e7da86f6369d452087add40868"; + name = "khangman-20.08.1.tar.xz"; }; }; khelpcenter = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/khelpcenter-20.08.0.tar.xz"; - sha256 = "2c45fb76c5503441dcf9ab1cae386dd2e10a2ad1af08f60090d362e82364e98c"; - name = "khelpcenter-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/khelpcenter-20.08.1.tar.xz"; + sha256 = "217b433c1a5da966ad5dab1e89e2e719632f1e035ab92cce094c5f0848bb6e39"; + name = "khelpcenter-20.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kidentitymanagement-20.08.0.tar.xz"; - sha256 = "4c7dca3e27f87203b27af219ebe07701e641a56dd7a8c1d7a3fa7cef2fe1c5af"; - name = "kidentitymanagement-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kidentitymanagement-20.08.1.tar.xz"; + sha256 = "3b34e029e99647d6742825633682ab8a5eecbe102e34ea2472cb53afb853840d"; + name = "kidentitymanagement-20.08.1.tar.xz"; }; }; kig = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kig-20.08.0.tar.xz"; - sha256 = "fa9754f5a67e35fdfd8b836d423001fc48fe5c41fadbfceece834fb3f5b6cccd"; - name = "kig-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kig-20.08.1.tar.xz"; + sha256 = "f318d346cd152e62ae892ade31a784f0b7b823c56fdfd64e05a330072ad95745"; + name = "kig-20.08.1.tar.xz"; }; }; kigo = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kigo-20.08.0.tar.xz"; - sha256 = "5e787cad2370b479feeae3be81b0972314429e0e896b9943445653731c9c6040"; - name = "kigo-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kigo-20.08.1.tar.xz"; + sha256 = "58fa166a487c855d300c8a33758928131fc4db80cbda19a08e3de918335d2bdb"; + name = "kigo-20.08.1.tar.xz"; }; }; killbots = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/killbots-20.08.0.tar.xz"; - sha256 = "3b647fd8af007619acdfc7c72d572a3184a8e8c5ecbeb472559c5e40e9d53257"; - name = "killbots-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/killbots-20.08.1.tar.xz"; + sha256 = "252636f4df2af0e087f4d604f76c5d8702c38392d821281a0f6283be4e429af9"; + name = "killbots-20.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kimagemapeditor-20.08.0.tar.xz"; - sha256 = "17d3ccfc35aecd802729da6c78a78cb358cf68bd5079bcae6d83af0874e86a00"; - name = "kimagemapeditor-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kimagemapeditor-20.08.1.tar.xz"; + sha256 = "bf391d0812e0f2dce6a11481972cf9d04f14d0bf92cad7210fa35a1fa0edf230"; + name = "kimagemapeditor-20.08.1.tar.xz"; }; }; kimap = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kimap-20.08.0.tar.xz"; - sha256 = "4ebb75312aac29274d8faa68f885c78a77c1173fc0200c08825670ac263cbec6"; - name = "kimap-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kimap-20.08.1.tar.xz"; + sha256 = "eae645ae2535c2612556e8938011cc478054c032126bb55683b95127d1b94741"; + name = "kimap-20.08.1.tar.xz"; }; }; kio-extras = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kio-extras-20.08.0.tar.xz"; - sha256 = "6bfbb92dd56755ec0b2dee0cd889d6081ae00df339c05b4cb7a173a463275e2d"; - name = "kio-extras-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kio-extras-20.08.1.tar.xz"; + sha256 = "1122635926052f34fd35d8aeef9c3c1d892690d8372f2b7d902e6449cdab988a"; + name = "kio-extras-20.08.1.tar.xz"; }; }; kio-gdrive = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kio-gdrive-20.08.0.tar.xz"; - sha256 = "c08f809d575a24887aacd1a046b01cf2c3df7b77813fecf89cb6cdbec13ab299"; - name = "kio-gdrive-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kio-gdrive-20.08.1.tar.xz"; + sha256 = "5104136948ee60cd527109bb9e8830e6a12f6062a29f34bc995b2625b0280825"; + name = "kio-gdrive-20.08.1.tar.xz"; }; }; kipi-plugins = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kipi-plugins-20.08.0.tar.xz"; - sha256 = "f8f03a9797b4855839693ffca93245460e78fd2f6eeb763d16dd159711f40683"; - name = "kipi-plugins-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kipi-plugins-20.08.1.tar.xz"; + sha256 = "b7d8f1aa087006a48d9bd7ec036ab4779e898e3b02692c91342439747cad6c5c"; + name = "kipi-plugins-20.08.1.tar.xz"; }; }; kirigami-gallery = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kirigami-gallery-20.08.0.tar.xz"; - sha256 = "8cabcee747152b41b558c0a9eb1fd0d55fb155b3b807a57d2176023806a59f2b"; - name = "kirigami-gallery-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kirigami-gallery-20.08.1.tar.xz"; + sha256 = "497886cc5a8483f068a642ce19df19f69fd105a4fb583f1a9898c885659c9df5"; + name = "kirigami-gallery-20.08.1.tar.xz"; }; }; kiriki = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kiriki-20.08.0.tar.xz"; - sha256 = "56db705674a43c249f2374eb1ce2c20e4b3e22223348959b3f5db67c0f52db4f"; - name = "kiriki-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kiriki-20.08.1.tar.xz"; + sha256 = "51e77cbbf6a0c60487d72b03b28c08409d0b6134c983d9e420fbc4d7f73223e8"; + name = "kiriki-20.08.1.tar.xz"; }; }; kiten = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kiten-20.08.0.tar.xz"; - sha256 = "17cb8344d679040b5c7be99049f73b88517cf127e3d045d469cdae9602945263"; - name = "kiten-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kiten-20.08.1.tar.xz"; + sha256 = "f3764d090db8027746e83c326e833680fd669dca66dd6af095ba120e66de2901"; + name = "kiten-20.08.1.tar.xz"; }; }; kitinerary = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kitinerary-20.08.0.tar.xz"; - sha256 = "a87ce5dd8e978dad8bcac7d92d89c4a5eeaa847e8819c2aa84ebce51dfe95f50"; - name = "kitinerary-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kitinerary-20.08.1.tar.xz"; + sha256 = "d3e0b6130b5c603bc1494404fa91ed1995e9142d66e4c3ddd5d2c79fdea856e4"; + name = "kitinerary-20.08.1.tar.xz"; }; }; kjumpingcube = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kjumpingcube-20.08.0.tar.xz"; - sha256 = "5ea4187326a0ff0a77c0aef774d9ba9c3c20b438def85abe9e4b0822a8350a70"; - name = "kjumpingcube-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kjumpingcube-20.08.1.tar.xz"; + sha256 = "226424cd21f75c499eedd15460a466988b179312467ed16437df87be494d9fbc"; + name = "kjumpingcube-20.08.1.tar.xz"; }; }; kldap = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kldap-20.08.0.tar.xz"; - sha256 = "db358a6ec50f5d3988583096ccc5fe1389999b4dd3a3c787d7797f6e0b32ee53"; - name = "kldap-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kldap-20.08.1.tar.xz"; + sha256 = "098fb07b280ef25dcf04b18f627223014257f6c0874b2959f2a8e68cacdb74a7"; + name = "kldap-20.08.1.tar.xz"; }; }; kleopatra = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kleopatra-20.08.0.tar.xz"; - sha256 = "776fbb8d06edc83834745a8af05b23297aeba89b8dce3410a2d48f37a91b5a87"; - name = "kleopatra-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kleopatra-20.08.1.tar.xz"; + sha256 = "e7bc3ce03ad5431e4289360ba6b701e38d53b60de58fd1ed358480cec48657a6"; + name = "kleopatra-20.08.1.tar.xz"; }; }; klettres = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/klettres-20.08.0.tar.xz"; - sha256 = "55748999e29ecec5fb3ce206c74bc44f7e83f4f239edd61c161e4df4e597bca2"; - name = "klettres-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/klettres-20.08.1.tar.xz"; + sha256 = "f29d6df1de3562731f246a892caaa493b9bccc9d1317a948e03ad12cb8c80c06"; + name = "klettres-20.08.1.tar.xz"; }; }; klickety = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/klickety-20.08.0.tar.xz"; - sha256 = "0b6d71d54a5521ae8cc66eca1d397289a35733af2fc686b82bc01dd6777fa926"; - name = "klickety-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/klickety-20.08.1.tar.xz"; + sha256 = "a9b63b3e944faba25498e981c06981dc354f9acd34b77f46fe2bebef388bf2cb"; + name = "klickety-20.08.1.tar.xz"; }; }; klines = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/klines-20.08.0.tar.xz"; - sha256 = "778928fc55fe551eb836beba3f74b0f20602a0fae7366c71fa84a95ad6ca803a"; - name = "klines-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/klines-20.08.1.tar.xz"; + sha256 = "d16650d7d44f48f47700dcb8fe97519dd28fe7213052636363d281c24f46a2b9"; + name = "klines-20.08.1.tar.xz"; }; }; kmag = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmag-20.08.0.tar.xz"; - sha256 = "b1a8fe75a03dbeac8f2080808f580bea588bf39c97534ddfa0cbf7d0de20efb7"; - name = "kmag-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmag-20.08.1.tar.xz"; + sha256 = "0aaaf19af2c943ae460dbcc1984bae167b79be287802e8a6faa6aaaed11718f3"; + name = "kmag-20.08.1.tar.xz"; }; }; kmahjongg = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmahjongg-20.08.0.tar.xz"; - sha256 = "05538c97613d6e3547161136b9d7aec9bb2918c9f4033a084e1576041b83d4e6"; - name = "kmahjongg-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmahjongg-20.08.1.tar.xz"; + sha256 = "842b3d2e9c60b6a8e6bb6d09f26db49d988889ec3962ac40aea0e79434c2eb43"; + name = "kmahjongg-20.08.1.tar.xz"; }; }; kmail = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmail-20.08.0.tar.xz"; - sha256 = "0432ec1fd68868e9385dd3f6b9e2429feb5b5057317ef3940eb0e67a63e0c0f0"; - name = "kmail-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmail-20.08.1.tar.xz"; + sha256 = "7ba5854e36e2ed752baa3a1ac15d1a6227699da6f5bdca3c250f22226b4d902b"; + name = "kmail-20.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmail-account-wizard-20.08.0.tar.xz"; - sha256 = "9f4eac46049acbc7452bbbf84569031d91f86c2577beecacb3a6200deefcc253"; - name = "kmail-account-wizard-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmail-account-wizard-20.08.1.tar.xz"; + sha256 = "7a1dc9ad542c0e54b80e955a162888c7d4b6bababcf02681d54af4480c03bd8d"; + name = "kmail-account-wizard-20.08.1.tar.xz"; }; }; kmailtransport = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmailtransport-20.08.0.tar.xz"; - sha256 = "af337017b884519065fea520fd66a8fc2e553d84ca3d8afc35739c18e67b4d73"; - name = "kmailtransport-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmailtransport-20.08.1.tar.xz"; + sha256 = "4cabad74e141891546b0f47f44030eeb59fb63257a5c0d1c12124815ebf710c1"; + name = "kmailtransport-20.08.1.tar.xz"; }; }; kmbox = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmbox-20.08.0.tar.xz"; - sha256 = "58a2ecc7222a8ee5697102ca2bc871e7e30c823dcd906ac4160323fd1ba14d85"; - name = "kmbox-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmbox-20.08.1.tar.xz"; + sha256 = "df77b2bf448d1ce21ff4a816f1164297519b48cd60200cea0edae6e72a81a19b"; + name = "kmbox-20.08.1.tar.xz"; }; }; kmime = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmime-20.08.0.tar.xz"; - sha256 = "55f2160fa78202cf45a4b08b9bb2fec1bc54a3700f6c9aceeec8d7fc3a64a317"; - name = "kmime-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmime-20.08.1.tar.xz"; + sha256 = "cd0beaa46040d571b505d07853be76f099289e22d99ce4884695d4d645dfbe8c"; + name = "kmime-20.08.1.tar.xz"; }; }; kmines = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmines-20.08.0.tar.xz"; - sha256 = "d8d0f1a82fe279ed208a9005e8ffbe1277e25b33e9e0a1301013820e559ba750"; - name = "kmines-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmines-20.08.1.tar.xz"; + sha256 = "eeb58941c94330f3ffdca60c0ca84d8ebcc9c6c355737217b521c54e50c650cd"; + name = "kmines-20.08.1.tar.xz"; }; }; kmix = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmix-20.08.0.tar.xz"; - sha256 = "4553362d4d14fdaf019b1fc55b98aac16c2db56542996a3c2f87603c41bc2859"; - name = "kmix-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmix-20.08.1.tar.xz"; + sha256 = "012d14adbb200a7e66ddbc9ebc8e18c4e5082ae24dea6ab22284b6c730a1b472"; + name = "kmix-20.08.1.tar.xz"; }; }; kmousetool = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmousetool-20.08.0.tar.xz"; - sha256 = "285d947548ee863de6274888b097e19aff39ed2bb8cdd33e37707c39c8417863"; - name = "kmousetool-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmousetool-20.08.1.tar.xz"; + sha256 = "c1d769efdd318eb1e29905122c579c72a41da74b45a076b79cf177b1800e1464"; + name = "kmousetool-20.08.1.tar.xz"; }; }; kmouth = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmouth-20.08.0.tar.xz"; - sha256 = "a783e73e8087d090cf4eba89fabcb9aee8c6b0858a6dea8a137323c1bbc110b1"; - name = "kmouth-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmouth-20.08.1.tar.xz"; + sha256 = "d87fb47fa00c54f13cdaef33d15cc74f31d7009d4a8d988902b62c698d1e2c2c"; + name = "kmouth-20.08.1.tar.xz"; }; }; kmplot = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kmplot-20.08.0.tar.xz"; - sha256 = "f2d31d8c9091c74c6d0e65a0cba77bac23eb6f78913b31d049a0e2c9ca4ec8c0"; - name = "kmplot-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmplot-20.08.1.tar.xz"; + sha256 = "6d294a89f9e0fc42262ada6d71ba5abaeb756beb194e71f1852e18ae2b85456e"; + name = "kmplot-20.08.1.tar.xz"; }; }; knavalbattle = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/knavalbattle-20.08.0.tar.xz"; - sha256 = "887d2f4e24d522ab66c2a4e183b9d5359213d67382fa2350f2edff6478666aa8"; - name = "knavalbattle-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/knavalbattle-20.08.1.tar.xz"; + sha256 = "e0cbffc5643aac302c53cfd957eefa7f89486fdd0d9c55b74f39d733a0ac3b65"; + name = "knavalbattle-20.08.1.tar.xz"; }; }; knetwalk = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/knetwalk-20.08.0.tar.xz"; - sha256 = "83fdf150c1c14f7c1807b73ce1d4bacfd10469f565541a379daa828755ddf5c6"; - name = "knetwalk-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/knetwalk-20.08.1.tar.xz"; + sha256 = "30cbf7bdf5f875ce172a382ef7da8e74803015017c6cd525cb6c288defac020d"; + name = "knetwalk-20.08.1.tar.xz"; }; }; knights = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/knights-20.08.0.tar.xz"; - sha256 = "b754af5da0ee922834644c578f2133695cc446dfb8ac327fae357e7a6c027bf7"; - name = "knights-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/knights-20.08.1.tar.xz"; + sha256 = "58518d8ecce5744fdf68c18e0803f48cb912fa29c5ea93ed6ccd2d4d320f722d"; + name = "knights-20.08.1.tar.xz"; }; }; knotes = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/knotes-20.08.0.tar.xz"; - sha256 = "35454e609c6ea2f805c8976d2897d2b2b9137a61ad8d396be2b510881bbd7cf3"; - name = "knotes-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/knotes-20.08.1.tar.xz"; + sha256 = "7d066a34d46684f258481466875d18f99a9000d66dec36f7dcab92790f6c57bb"; + name = "knotes-20.08.1.tar.xz"; }; }; kolf = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kolf-20.08.0.tar.xz"; - sha256 = "dbc0d129e1d1fc8c597979c5ec96d612014aa56b0b0825be653b410995987305"; - name = "kolf-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kolf-20.08.1.tar.xz"; + sha256 = "04d117895a6504d6138d1e3cd3157dd3318ba93eefd749182556344650f6a2f8"; + name = "kolf-20.08.1.tar.xz"; }; }; kollision = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kollision-20.08.0.tar.xz"; - sha256 = "a7d59d6f4132a669ce4fe74b3b58168ce6f2036a27d37cc6362b471b58a70fe4"; - name = "kollision-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kollision-20.08.1.tar.xz"; + sha256 = "858d69131951734181b449ce48498b3b843634eb8c069c932042b3c0f862f98c"; + name = "kollision-20.08.1.tar.xz"; }; }; kolourpaint = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kolourpaint-20.08.0.tar.xz"; - sha256 = "f2b5dee4e8c2b8245b2fd652c5ead015f637f62bc4b799735af255e2c5831629"; - name = "kolourpaint-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kolourpaint-20.08.1.tar.xz"; + sha256 = "7de98e081f13fb9f8a73932d5e8ce6f1cfd73e345fa28d03f515cad69f1b8bae"; + name = "kolourpaint-20.08.1.tar.xz"; }; }; kompare = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kompare-20.08.0.tar.xz"; - sha256 = "712d248edc6eae8dd94d41efccde94ccbc5753ecd01eb69cb3d80757a63805a3"; - name = "kompare-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kompare-20.08.1.tar.xz"; + sha256 = "6e9109f1b24b3d79dec3d70c75357a67d16ab35081bcf7e4b842981b84796aa2"; + name = "kompare-20.08.1.tar.xz"; }; }; konqueror = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/konqueror-20.08.0.tar.xz"; - sha256 = "4db172cff4bd3fd06ee1905dcf87013059e02902808e77acfc4bf2734d6ff73f"; - name = "konqueror-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/konqueror-20.08.1.tar.xz"; + sha256 = "e3aac062d9e431e63a861ecf5a1d577b11a154faaed5bd95ef6b69b4fc8a34e9"; + name = "konqueror-20.08.1.tar.xz"; }; }; konquest = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/konquest-20.08.0.tar.xz"; - sha256 = "e6938230c2fdd94903d13ed34f8d1e8db8221c9ceb571c5737f429291d4cca04"; - name = "konquest-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/konquest-20.08.1.tar.xz"; + sha256 = "cad87dd698bd1ebc0279216614f7fa7c3d3f36d545683a69f1ceafe9e279bbfe"; + name = "konquest-20.08.1.tar.xz"; }; }; konsole = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/konsole-20.08.0.tar.xz"; - sha256 = "b641bc2f66195887a25ec588b638a78a0d00e6d2d41c126bca9a45f30f70aee9"; - name = "konsole-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/konsole-20.08.1.tar.xz"; + sha256 = "bdd82f9104b2f76c53bdbdef613391719b70719a132d24f12e5f620e1c9313d1"; + name = "konsole-20.08.1.tar.xz"; }; }; kontact = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kontact-20.08.0.tar.xz"; - sha256 = "d759b475938079f87d5042d4fc6608c0263800cfc2156e83c874faa77c488646"; - name = "kontact-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kontact-20.08.1.tar.xz"; + sha256 = "36c33eb5685c22f94257e86ff760d1aa225ae6e2d69402a2b653c54627c7cbde"; + name = "kontact-20.08.1.tar.xz"; }; }; kontactinterface = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kontactinterface-20.08.0.tar.xz"; - sha256 = "6b20e160642063b966f359ecf2e1946db161728d42f4e6b15a77f6a19f151048"; - name = "kontactinterface-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kontactinterface-20.08.1.tar.xz"; + sha256 = "8272d0c17423a15e56e9e6d3979ee3017fd02ed996b8b6902c47312276ffeb51"; + name = "kontactinterface-20.08.1.tar.xz"; }; }; kopete = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kopete-20.08.0.tar.xz"; - sha256 = "44805238ed04620101d3921e3eab0bb89d329c4d216b9cb49589459a3e4ea7e6"; - name = "kopete-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kopete-20.08.1.tar.xz"; + sha256 = "9846baae28d723963927d231716e2a8bc19795bac920958b688b48394ef5bc05"; + name = "kopete-20.08.1.tar.xz"; }; }; korganizer = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/korganizer-20.08.0.tar.xz"; - sha256 = "c99470c92327e9e6c91276b4141bb36b08e3a9726e40edba6656d1014ee46b82"; - name = "korganizer-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/korganizer-20.08.1.tar.xz"; + sha256 = "e693d895b36575f2a73c36ceaafadf81465bbf9b03c74da27f5273a2e7e3670e"; + name = "korganizer-20.08.1.tar.xz"; }; }; kpat = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kpat-20.08.0.tar.xz"; - sha256 = "feaca3a018a8b2a94a183915b29ff671474911b1da3a149bf3ba70fdcd0a6f53"; - name = "kpat-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kpat-20.08.1.tar.xz"; + sha256 = "2c23ee028c03c5c210b110a2ad253aa7d91c5a0abcb101eb2b3f4c640092463c"; + name = "kpat-20.08.1.tar.xz"; }; }; kpimtextedit = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kpimtextedit-20.08.0.tar.xz"; - sha256 = "3ae3b9f8a980d10e366351efaf2b186fd911402da5b5ee634f4687d43586ce34"; - name = "kpimtextedit-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kpimtextedit-20.08.1.tar.xz"; + sha256 = "2664e6cbe520fa345e18db071dd5b8a5b4cf9b0fc7317eb04849005228666189"; + name = "kpimtextedit-20.08.1.tar.xz"; }; }; kpkpass = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kpkpass-20.08.0.tar.xz"; - sha256 = "553b841cf3fdf4809251941997f7dee8e09360a5b7df386e3540c73d176ba055"; - name = "kpkpass-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kpkpass-20.08.1.tar.xz"; + sha256 = "76012e5bdd4cc434313a0f311acec8f7c798542008cd8efa71fcdf04fb77e55b"; + name = "kpkpass-20.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kqtquickcharts-20.08.0.tar.xz"; - sha256 = "f17807dfa20de202615c56779ef6e4d355a275b576d6e0969357fdb359b1b235"; - name = "kqtquickcharts-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kqtquickcharts-20.08.1.tar.xz"; + sha256 = "ea931bfefcc04bee03bff2498b92ca1a390967bbc5366c739d1a7cde6bb75820"; + name = "kqtquickcharts-20.08.1.tar.xz"; }; }; krdc = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/krdc-20.08.0.tar.xz"; - sha256 = "96f4411dc80e746142796745c3b7fca4663aa37878391a00d1e70f2ba3be652c"; - name = "krdc-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/krdc-20.08.1.tar.xz"; + sha256 = "7b1fa57be31a3534099e7f203ef9afde23c86c4bbed1072a9d1164a3cf5e1e20"; + name = "krdc-20.08.1.tar.xz"; }; }; kreversi = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kreversi-20.08.0.tar.xz"; - sha256 = "341603d23ffaf94af6c246540bbe7ba86aca3e5afe3135a0511aca22cd6a4d7f"; - name = "kreversi-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kreversi-20.08.1.tar.xz"; + sha256 = "5da68ddd37f5dbd4e1c94d1641c69f0e9b4e99eff3cdafcdcbac1139ca517315"; + name = "kreversi-20.08.1.tar.xz"; }; }; krfb = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/krfb-20.08.0.tar.xz"; - sha256 = "f7ca46cc216ecd3790d045a36a642c834a9af4024409075e7a5bf8b498c67e4b"; - name = "krfb-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/krfb-20.08.1.tar.xz"; + sha256 = "a80b9bab47f2a7299e33b0e2a10b117605ec1cc572ca72e914c7f01dde383eda"; + name = "krfb-20.08.1.tar.xz"; }; }; kross-interpreters = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kross-interpreters-20.08.0.tar.xz"; - sha256 = "7a27547b150d686524578fc256e1282f64554513d2724994020caf89e7a60b10"; - name = "kross-interpreters-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kross-interpreters-20.08.1.tar.xz"; + sha256 = "1fb7d75d83e63d1a7147468dd25eeb6aeb06b4679f126c658a8b40ef257f9a4e"; + name = "kross-interpreters-20.08.1.tar.xz"; }; }; kruler = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kruler-20.08.0.tar.xz"; - sha256 = "71ca2308b8cee2fdd01faac526d20c813cab3664443b78e751f9d7d024e4e2c0"; - name = "kruler-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kruler-20.08.1.tar.xz"; + sha256 = "a9a1f3bd7b02416a393826f7bb810211ef2e14a3628706de735cb88e791d72d1"; + name = "kruler-20.08.1.tar.xz"; }; }; kshisen = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kshisen-20.08.0.tar.xz"; - sha256 = "5b3cc83d3cd427dcbaa98e2536f58deb36ee4eefe0a35e6d5c9613a64abad0d8"; - name = "kshisen-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kshisen-20.08.1.tar.xz"; + sha256 = "d53af415ed2f4d202f5a6f965408e39062e39f43acf83b9550b6cf2ecc1f7641"; + name = "kshisen-20.08.1.tar.xz"; }; }; ksirk = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ksirk-20.08.0.tar.xz"; - sha256 = "7e4acd8586a2c8619c3ca08138ca22cee46b4c46d5972a571665b09c6468cd06"; - name = "ksirk-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksirk-20.08.1.tar.xz"; + sha256 = "763d3a8f518365391d2a04943f6efa9c73c388b7701deff300e9e42e4efe848f"; + name = "ksirk-20.08.1.tar.xz"; }; }; ksmtp = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ksmtp-20.08.0.tar.xz"; - sha256 = "3fe08534bdb7037a8fd9a8c1a37456abe80252994232cfe31c368dcdc3c328c2"; - name = "ksmtp-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksmtp-20.08.1.tar.xz"; + sha256 = "608d395cd1a046810ebd00f990d6f7c63d66677e7293ef06948ab9d336d2f08f"; + name = "ksmtp-20.08.1.tar.xz"; }; }; ksnakeduel = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ksnakeduel-20.08.0.tar.xz"; - sha256 = "ebc5353ea2e5d16f2d966859b0ea081c81ed7d10c1975054e441545b79f60e5e"; - name = "ksnakeduel-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksnakeduel-20.08.1.tar.xz"; + sha256 = "25bb5cfe2ed480b8ee31d9fe2e62272d77e7b8667748eb4f2c855901f718784f"; + name = "ksnakeduel-20.08.1.tar.xz"; }; }; kspaceduel = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kspaceduel-20.08.0.tar.xz"; - sha256 = "6cd633521091ac8a1eed28b234657ba2db287c3b29ee2d071005f3438bbb1b07"; - name = "kspaceduel-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kspaceduel-20.08.1.tar.xz"; + sha256 = "382def18d1ce6a4333fb47bcd87aed6837382a2b0da2cb8b835d0b34eaed9e38"; + name = "kspaceduel-20.08.1.tar.xz"; }; }; ksquares = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ksquares-20.08.0.tar.xz"; - sha256 = "84b459e6c1058f637b4894a4f97dfd95b0c9bb70954059d24538f80918b45ed3"; - name = "ksquares-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksquares-20.08.1.tar.xz"; + sha256 = "163c5c070643e31594ada4e812433eb5f615ef425dddafd515e6c445d821f319"; + name = "ksquares-20.08.1.tar.xz"; }; }; ksudoku = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ksudoku-20.08.0.tar.xz"; - sha256 = "0dbe6e03ca8b7203a307f97dad4a8035c20f3172d3e005b047557c2334c04a92"; - name = "ksudoku-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksudoku-20.08.1.tar.xz"; + sha256 = "e53b694b340f812cd3bdf5126a32a1e71efe0785897c5d15f9e28c68fd794840"; + name = "ksudoku-20.08.1.tar.xz"; }; }; ksystemlog = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ksystemlog-20.08.0.tar.xz"; - sha256 = "359eaa1cc34fa06b2ef3788c249c2b3355d6d39cddbf809df07179c10630e9a4"; - name = "ksystemlog-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksystemlog-20.08.1.tar.xz"; + sha256 = "e0e8bc1cf8ee229206c8a65e30979ba8b72426c8dc2f737f6fecb0dfb36ed21a"; + name = "ksystemlog-20.08.1.tar.xz"; }; }; kteatime = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kteatime-20.08.0.tar.xz"; - sha256 = "c7142cd0329cf23fdb79d3c2d508cb00cb70c517db1f832d2a39ba7c4e103fd3"; - name = "kteatime-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kteatime-20.08.1.tar.xz"; + sha256 = "23cc14f587e4ae4e3b56f1fb7a2093301df740328e35b25d7fca55d35f012ce5"; + name = "kteatime-20.08.1.tar.xz"; }; }; ktimer = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktimer-20.08.0.tar.xz"; - sha256 = "4a3722945f26df087158a5af69cc81ba10054a778f04fecd32ff816732dff0dd"; - name = "ktimer-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktimer-20.08.1.tar.xz"; + sha256 = "9c7062f9ee64ff49a7c7773fe41cee0899e30f1f47368af73da067e51db6714b"; + name = "ktimer-20.08.1.tar.xz"; }; }; ktnef = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktnef-20.08.0.tar.xz"; - sha256 = "69d18a052cc522161821f98fb4103d38e1ff566622915b7138866e7737ffa62f"; - name = "ktnef-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktnef-20.08.1.tar.xz"; + sha256 = "433b232a0c835e7f27c06e6d19856e4f8690c3e3b5c5d63f85172897b2448c81"; + name = "ktnef-20.08.1.tar.xz"; }; }; ktouch = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktouch-20.08.0.tar.xz"; - sha256 = "c4b218f672c0cb86930cdadf622d758a42b54732319e8ea86405b7f9b3281802"; - name = "ktouch-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktouch-20.08.1.tar.xz"; + sha256 = "e098ebbccca743f678103a9adf54fc388fa4379cc6f667e48259d0b50f56b5fb"; + name = "ktouch-20.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-accounts-kcm-20.08.0.tar.xz"; - sha256 = "912552aa0df62298323c5eaaf36975b71ef50be56a5b69ceddcd5f00d4acb4f9"; - name = "ktp-accounts-kcm-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-accounts-kcm-20.08.1.tar.xz"; + sha256 = "b71f2f654c3cf48e4b4b037a0ae8f6fef5bac9c3483458c0eadf7b3253577504"; + name = "ktp-accounts-kcm-20.08.1.tar.xz"; }; }; ktp-approver = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-approver-20.08.0.tar.xz"; - sha256 = "463a9009599b6e18b2e30793b6bce408e4c9a0edb2de458fb588204eb0aa2f3a"; - name = "ktp-approver-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-approver-20.08.1.tar.xz"; + sha256 = "51296f4d84585ba63d4c72cdbdee6e2b436a1aff8ce6b475a8c9a81766856b39"; + name = "ktp-approver-20.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-auth-handler-20.08.0.tar.xz"; - sha256 = "d2f1dd4c5f4043eebeb178dd20eedc95dea47a4c75f2df13cd1d9cd0288b699a"; - name = "ktp-auth-handler-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-auth-handler-20.08.1.tar.xz"; + sha256 = "6c1c006a3381caeebdfc37886b91b598153f3778567303d8a031e84599c9d582"; + name = "ktp-auth-handler-20.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-call-ui-20.08.0.tar.xz"; - sha256 = "2744e739456fd3aba322eb3c47be84511450dd713838e133be4f1957a3b9a0bf"; - name = "ktp-call-ui-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-call-ui-20.08.1.tar.xz"; + sha256 = "feb783be10b0792cb0c59456a00607b2d595e8bef90f0b4ec79dd070596d413c"; + name = "ktp-call-ui-20.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-common-internals-20.08.0.tar.xz"; - sha256 = "9ee962e2afd5db0fc23da69468f008ff239e97ef77d8930f7e5960d732d8a4b2"; - name = "ktp-common-internals-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-common-internals-20.08.1.tar.xz"; + sha256 = "5750bde4950fbe26f06a306aa642c9c501d4f0e1b41b57234d9e36b189a91d1b"; + name = "ktp-common-internals-20.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-list-20.08.0.tar.xz"; - sha256 = "ec00bf525450c972634e60dfb423f9cd2be7caa4181e84efa7d88fc6f079a995"; - name = "ktp-contact-list-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-list-20.08.1.tar.xz"; + sha256 = "809db5ff05c1ec632109be408cef987532193b1b0bea69d6a9286c12ccfe19a1"; + name = "ktp-contact-list-20.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-runner-20.08.0.tar.xz"; - sha256 = "1123adbdfdbdb8bb524ba39ab175f39964cef2ecf5eed9a0a1d0129d7ae8ecbc"; - name = "ktp-contact-runner-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-runner-20.08.1.tar.xz"; + sha256 = "a9e761fd35545cfffade088e33f4358e2743416f61e9ba490f21f3b04193158f"; + name = "ktp-contact-runner-20.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-desktop-applets-20.08.0.tar.xz"; - sha256 = "6a6eb5090f6273abb9ff1b70777c32bd4ba5fd0d270dfa0490ac370c31d0cab5"; - name = "ktp-desktop-applets-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-desktop-applets-20.08.1.tar.xz"; + sha256 = "d6ffd4b29c4fb977937cb47d55d023012be1a9b3602dd1f1628eba7d8c9167cd"; + name = "ktp-desktop-applets-20.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-filetransfer-handler-20.08.0.tar.xz"; - sha256 = "df16a920a233eaec25c73514e951f5f569a0f0f6d4ba46b60a0c2bc3da4ab6cd"; - name = "ktp-filetransfer-handler-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-filetransfer-handler-20.08.1.tar.xz"; + sha256 = "35495c1d18a7b65496fcf17cade4a81e4795b1603c380c036dda0a7626f66312"; + name = "ktp-filetransfer-handler-20.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-kded-module-20.08.0.tar.xz"; - sha256 = "f321a7db60b0fcd9dd207c38c8097e6cdb3a22aba6730bc03f9ea67bc8d9bb2e"; - name = "ktp-kded-module-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-kded-module-20.08.1.tar.xz"; + sha256 = "247e4047e3955e21066ec461a5374d1b3d925bb92b42adc46d3711e542ad7e04"; + name = "ktp-kded-module-20.08.1.tar.xz"; }; }; ktp-send-file = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-send-file-20.08.0.tar.xz"; - sha256 = "86d3ca20eb3c3fbfa169a355c0e64d1574433c6985d5188697ef18e521d82104"; - name = "ktp-send-file-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-send-file-20.08.1.tar.xz"; + sha256 = "b3786c6e6f09ea086c2d94d2a6dd653e45bab8f984c6287c39f5e0134d6ffee1"; + name = "ktp-send-file-20.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktp-text-ui-20.08.0.tar.xz"; - sha256 = "a1f5c4c98761f61abd62b6e788a8ec5c4e2b4020e92f3c0c75770c0f01386676"; - name = "ktp-text-ui-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-text-ui-20.08.1.tar.xz"; + sha256 = "5cdb88f55b6ca1a1053b8d5b2604eff681c5f3558f0c8037034c264793de8c02"; + name = "ktp-text-ui-20.08.1.tar.xz"; }; }; ktuberling = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/ktuberling-20.08.0.tar.xz"; - sha256 = "8d56e4330b68d8597d502db311282a9d59f8ad91f8acfa7f029d354ac399b702"; - name = "ktuberling-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktuberling-20.08.1.tar.xz"; + sha256 = "62d3d8db7b1db7f9d58df44acf61342ce42fb081038fc48f8f6e45d9167ceaa6"; + name = "ktuberling-20.08.1.tar.xz"; }; }; kturtle = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kturtle-20.08.0.tar.xz"; - sha256 = "9c086a0aec74d9d5aa5792f026e6b44b8fdc613cfdeba060fb4694fb3e9b27f9"; - name = "kturtle-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kturtle-20.08.1.tar.xz"; + sha256 = "c261fdf44b36aaa278b4b9752a0d989facec3768853606e5c0b8a86d9d01edb3"; + name = "kturtle-20.08.1.tar.xz"; }; }; kubrick = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kubrick-20.08.0.tar.xz"; - sha256 = "2cf725a96d52d7be157690fb9ce6fe0dcc2cb853fe6e1f9d56ae6c23c09974cc"; - name = "kubrick-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kubrick-20.08.1.tar.xz"; + sha256 = "c0c017f6913f94224e18df7d96ba9ad92f51522a331b77f5722f2d2c953c342c"; + name = "kubrick-20.08.1.tar.xz"; }; }; kwalletmanager = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kwalletmanager-20.08.0.tar.xz"; - sha256 = "4dea2e1b08cc996d6d4961393d9c8f24051b0a7f6373c4cf575ddf8324804b7a"; - name = "kwalletmanager-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kwalletmanager-20.08.1.tar.xz"; + sha256 = "b5a134db6b6bceb802c6c45915636bcd95fea5b6846cfd022917405f48cc92c5"; + name = "kwalletmanager-20.08.1.tar.xz"; }; }; kwave = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kwave-20.08.0.tar.xz"; - sha256 = "7291122e5112eea9b8026937682f77d78e43153c4dc38005ac31fd7235a18e69"; - name = "kwave-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kwave-20.08.1.tar.xz"; + sha256 = "3791f9401271c23d3ababd14e4c1e6acfe58df2100331e31ba61453feaf9fa32"; + name = "kwave-20.08.1.tar.xz"; }; }; kwordquiz = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/kwordquiz-20.08.0.tar.xz"; - sha256 = "c8350fcf5b4ed61a43d3d72aabfef645e7d1908ef753df36c0124601873b4951"; - name = "kwordquiz-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kwordquiz-20.08.1.tar.xz"; + sha256 = "77d2d30abcb37ee6a8e0b121ed1969f2fa61eb32814f49a0186043a4e8f1a71c"; + name = "kwordquiz-20.08.1.tar.xz"; }; }; libgravatar = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libgravatar-20.08.0.tar.xz"; - sha256 = "9faf1ab53cebf2f54fb851ec5bcffc65b18a846a50e3d890b66b947ab93d6397"; - name = "libgravatar-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libgravatar-20.08.1.tar.xz"; + sha256 = "dfe95055869944b79b1f4120f013b547225b02b69c7e410fd09d52469a892263"; + name = "libgravatar-20.08.1.tar.xz"; }; }; libkcddb = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkcddb-20.08.0.tar.xz"; - sha256 = "516723e29ae37c84865eaf86f82481c4275ea8507e172fc8a0279572705fbc6a"; - name = "libkcddb-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkcddb-20.08.1.tar.xz"; + sha256 = "1519c9248b46d95d8761a8ed22b0805964a5fef5aa665710b08851c753f70590"; + name = "libkcddb-20.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkcompactdisc-20.08.0.tar.xz"; - sha256 = "043a0ca6dd5d85b4313495d0ae530fe96448da2f472a8af2a633d646be0c065c"; - name = "libkcompactdisc-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkcompactdisc-20.08.1.tar.xz"; + sha256 = "f43b8129a0083686dbc939387931867d9d65e14936f2a86be0a7286e01cf1974"; + name = "libkcompactdisc-20.08.1.tar.xz"; }; }; libkdcraw = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkdcraw-20.08.0.tar.xz"; - sha256 = "8e2e1577a751eb0c570e5f6ad394d459ef3d127ee8950eee25a4ebf62a2eece7"; - name = "libkdcraw-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkdcraw-20.08.1.tar.xz"; + sha256 = "3431810972d886635ba6249ac86a9442a9c3a3333eb0b27533fc459e757e9eb1"; + name = "libkdcraw-20.08.1.tar.xz"; }; }; libkdegames = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkdegames-20.08.0.tar.xz"; - sha256 = "d77f5e2d913c68286014fe1438b9909826931aaa944a0ce1753d1a449766d99c"; - name = "libkdegames-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkdegames-20.08.1.tar.xz"; + sha256 = "6ab0b143dcba2d935dd0182c9154657ebbfb205c28bc86e2e13875b58e23737d"; + name = "libkdegames-20.08.1.tar.xz"; }; }; libkdepim = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkdepim-20.08.0.tar.xz"; - sha256 = "4f5f0688529d13c10c1c3509f64874a069a5d6cae84f81b258b1d081e86771e0"; - name = "libkdepim-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkdepim-20.08.1.tar.xz"; + sha256 = "a2fb769239283e7f536d4779089ad8664d1498cf7520f057589bf0285630fb4b"; + name = "libkdepim-20.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkeduvocdocument-20.08.0.tar.xz"; - sha256 = "21ee64628a012478eb8c53ce2374a57d587f6160f32f09231c78e9fac7600d5d"; - name = "libkeduvocdocument-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkeduvocdocument-20.08.1.tar.xz"; + sha256 = "ecd158beb7fcc1a5d540d956669c6fdce6172f4b282755170d2791076d75ad84"; + name = "libkeduvocdocument-20.08.1.tar.xz"; }; }; libkexiv2 = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkexiv2-20.08.0.tar.xz"; - sha256 = "d4e3fcdaf160c70165b1217931484d544d56ca7630d5f2c85484caebb2afe399"; - name = "libkexiv2-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkexiv2-20.08.1.tar.xz"; + sha256 = "67310ae90d89f26d2ae98ede8fa973e27ea1ce3d15c389954d391cd058543979"; + name = "libkexiv2-20.08.1.tar.xz"; }; }; libkgapi = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkgapi-20.08.0.tar.xz"; - sha256 = "215d21a89887522bbac09774723098dac1602bfc39e4ca23306d08b11d0cd89d"; - name = "libkgapi-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkgapi-20.08.1.tar.xz"; + sha256 = "dfa9003556a01ef19eda186973f87356d32ea8f82f8d653803b2cc935f077127"; + name = "libkgapi-20.08.1.tar.xz"; }; }; libkgeomap = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkgeomap-20.08.0.tar.xz"; - sha256 = "bf39da71ec7cc40e536bf071abda61569acec4ae027d896738ae1ace74eaddf7"; - name = "libkgeomap-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkgeomap-20.08.1.tar.xz"; + sha256 = "a210945b6807efca3390173233269aa31f27a23b5f36670b88f66b3b28df846f"; + name = "libkgeomap-20.08.1.tar.xz"; }; }; libkipi = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkipi-20.08.0.tar.xz"; - sha256 = "2a66512b9c840e7e19f943066197a4ef68aea8cd059427732dec9cf5de84294e"; - name = "libkipi-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkipi-20.08.1.tar.xz"; + sha256 = "4722ab563c1350042920d1937b84fdd38b5779449a2d9b689328cd82241cb5d2"; + name = "libkipi-20.08.1.tar.xz"; }; }; libkleo = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkleo-20.08.0.tar.xz"; - sha256 = "44100f7a001ca7eb8cc4b2b9eeab5e8806a5d4eb2a01a69eeaf1843f4e023f85"; - name = "libkleo-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkleo-20.08.1.tar.xz"; + sha256 = "78c1dc2e4d7177aaf37cb1c706d9c21b08fac7d130ac1da3d3f2a6f083117ffb"; + name = "libkleo-20.08.1.tar.xz"; }; }; libkmahjongg = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkmahjongg-20.08.0.tar.xz"; - sha256 = "1792a04f59fe188a7707c0f77e9ef598e9dfb6444c7aba574a4a46760aeaf63a"; - name = "libkmahjongg-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkmahjongg-20.08.1.tar.xz"; + sha256 = "5a8674921e39b38655d1f95340831b1bc746047cbad8501706436f5dacf47fc2"; + name = "libkmahjongg-20.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libkomparediff2-20.08.0.tar.xz"; - sha256 = "0571d016675496341d6e841d88b2ff8682b2958d91a38a69a6130a0766ff6a1b"; - name = "libkomparediff2-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkomparediff2-20.08.1.tar.xz"; + sha256 = "9d109dfea1433602cdabc89ffa5f522147befc9b1d6d9760549aba7db5dbd399"; + name = "libkomparediff2-20.08.1.tar.xz"; }; }; libksane = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libksane-20.08.0.tar.xz"; - sha256 = "536e0f914095ddfeee132e227d9d2a840186da512b82d95fc9a7262a3a912ea6"; - name = "libksane-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libksane-20.08.1.tar.xz"; + sha256 = "0d8717ad004a2480aea232d9a2317b4d1cc4678d53f0176bdaeb411eedd19dbe"; + name = "libksane-20.08.1.tar.xz"; }; }; libksieve = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/libksieve-20.08.0.tar.xz"; - sha256 = "af6b4a1b787efdf20792a8ded6ae4d8f49d4cef129b4b3fd7048441bb879b586"; - name = "libksieve-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libksieve-20.08.1.tar.xz"; + sha256 = "a1defe888c6c5a3c16ef6fad39d9eb94bc784031079763f004048951820acec0"; + name = "libksieve-20.08.1.tar.xz"; }; }; lokalize = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/lokalize-20.08.0.tar.xz"; - sha256 = "dd05509386b816aeb02797769c28e12cf8b3f38d88f722a699a77db94c9ab71e"; - name = "lokalize-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/lokalize-20.08.1.tar.xz"; + sha256 = "a4a3e5703d39ae8fe12d2ff832e99b3339ba1c8ec8d2439abeb348e687f1eae9"; + name = "lokalize-20.08.1.tar.xz"; }; }; lskat = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/lskat-20.08.0.tar.xz"; - sha256 = "9a6af851f0fb0b7e6f6d1983bf3c7f12a74022977e879a525424d2867762b471"; - name = "lskat-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/lskat-20.08.1.tar.xz"; + sha256 = "319d611468b969b3bb62731a0aa04c5672bb689c41adf5545dfa8b9742668775"; + name = "lskat-20.08.1.tar.xz"; }; }; mailcommon = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/mailcommon-20.08.0.tar.xz"; - sha256 = "fa110a41d5e4848d203d3c17fe18c584d892bf78f750c36a5e88a80c80dcd04a"; - name = "mailcommon-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/mailcommon-20.08.1.tar.xz"; + sha256 = "d4ee996f74a749ad626ca5029821546da82dbfc1c81864ff39b5f51d6dcf1d88"; + name = "mailcommon-20.08.1.tar.xz"; }; }; mailimporter = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/mailimporter-20.08.0.tar.xz"; - sha256 = "5263fdc50b772458cb584f799f80da765e0ac3c4f2e0fecee15305db829cd851"; - name = "mailimporter-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/mailimporter-20.08.1.tar.xz"; + sha256 = "dcf2b94d4f66be2b339b31dfebef7af373e0cf59f09e4cfb664eb828e1d4f73f"; + name = "mailimporter-20.08.1.tar.xz"; }; }; marble = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/marble-20.08.0.tar.xz"; - sha256 = "0f61c29acc3f88a0eeb0e0923f8c5138188712aad6aa4d9445add186d5962381"; - name = "marble-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/marble-20.08.1.tar.xz"; + sha256 = "96b019a41ae4e0aaab59950b6be040bd2145f130190b8c0dea436c791e3192ed"; + name = "marble-20.08.1.tar.xz"; }; }; mbox-importer = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/mbox-importer-20.08.0.tar.xz"; - sha256 = "075afd543bec9c8c2d056b96704fbfd2fbc4498b289596d4fbb0cd49ff5c720b"; - name = "mbox-importer-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/mbox-importer-20.08.1.tar.xz"; + sha256 = "262c8805539b7c766099c6287d1dbf88161afe6d32c1c6821ebe63cff4fe3b71"; + name = "mbox-importer-20.08.1.tar.xz"; }; }; messagelib = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/messagelib-20.08.0.tar.xz"; - sha256 = "13aa522b8ff8cf2d7ac7ca6ae4c92e1bd2379d13fc23cabaa36fd6d6bda261cd"; - name = "messagelib-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/messagelib-20.08.1.tar.xz"; + sha256 = "fc41124e905456a3c5227ca6154dc3e77620e307458fbb19f5421cbfb04523b3"; + name = "messagelib-20.08.1.tar.xz"; }; }; minuet = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/minuet-20.08.0.tar.xz"; - sha256 = "f3e57e225ec6a0515d39bf868cdd934a6823071527f6da9910b839abc96c8fdb"; - name = "minuet-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/minuet-20.08.1.tar.xz"; + sha256 = "a640025550337f415f7bfaaad7f6ef7de667dd054131be2c313d894c3f6703ea"; + name = "minuet-20.08.1.tar.xz"; }; }; okular = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/okular-20.08.0.tar.xz"; - sha256 = "8d775292cc6b2cb703e5ff716337a49352cd6d3faa90d6d7ac2f4e9d006a4047"; - name = "okular-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/okular-20.08.1.tar.xz"; + sha256 = "77b5d8e410a2a008ea63f60a561f99053ec07d92da6ee3afaeefd977aadebd83"; + name = "okular-20.08.1.tar.xz"; }; }; palapeli = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/palapeli-20.08.0.tar.xz"; - sha256 = "bbbf4d6c0a2048e2bb5e2483acf1970748d9f109e25f3c5cbf6f04709a61aeab"; - name = "palapeli-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/palapeli-20.08.1.tar.xz"; + sha256 = "31b847caa89b998dfa580553d96c656b05f2d85fdd88f0ba71e953762cefac90"; + name = "palapeli-20.08.1.tar.xz"; }; }; parley = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/parley-20.08.0.tar.xz"; - sha256 = "b1c8d5f39a563ddcc6a00a7e1008608bd58bdcdfc23c11c822b15625f5a48d60"; - name = "parley-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/parley-20.08.1.tar.xz"; + sha256 = "9617a90c2d4f9ab5d928febc6bcd10c9023dcc10e9f1202bfb97b77019948f0c"; + name = "parley-20.08.1.tar.xz"; }; }; picmi = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/picmi-20.08.0.tar.xz"; - sha256 = "5003bcf33c08eebe24fb689790aef56eb418990a7c6588e2bd1c94ec6f398a5a"; - name = "picmi-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/picmi-20.08.1.tar.xz"; + sha256 = "027e37a2c9dcf828684a0f8ffdcfc6451a2bd62976c10d990e471fa0f5ba97c3"; + name = "picmi-20.08.1.tar.xz"; }; }; pimcommon = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/pimcommon-20.08.0.tar.xz"; - sha256 = "4280d7116d392dff4febbadbca6fa20c38b787da7af537ce4e64af28509bd82e"; - name = "pimcommon-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/pimcommon-20.08.1.tar.xz"; + sha256 = "58a33349bf932076f6be343ae64e23f146e2a6a96e3af8ce68dbd752f2c80dd9"; + name = "pimcommon-20.08.1.tar.xz"; }; }; pim-data-exporter = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/pim-data-exporter-20.08.0.tar.xz"; - sha256 = "42f070d3aea3871004bea3fa712f01ef307ba12328495ded06d3115e7e8ed894"; - name = "pim-data-exporter-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/pim-data-exporter-20.08.1.tar.xz"; + sha256 = "54092763e4b951f4e90a217c876107900e0706da68ca5517184e5da258ae95ec"; + name = "pim-data-exporter-20.08.1.tar.xz"; }; }; pim-sieve-editor = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/pim-sieve-editor-20.08.0.tar.xz"; - sha256 = "65167f716ce2cc70a4ccbf7f9a5b2a873f36df54984dcc46af1d5694973e709a"; - name = "pim-sieve-editor-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/pim-sieve-editor-20.08.1.tar.xz"; + sha256 = "f788038796f226bfe426835fc6f186e23f2c7f9fda8316dfa6af307d6936d4ad"; + name = "pim-sieve-editor-20.08.1.tar.xz"; }; }; poxml = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/poxml-20.08.0.tar.xz"; - sha256 = "07f5e8f0b215d864d48523c9a1b689f7434dfc0a561d5cf253ad69698770e096"; - name = "poxml-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/poxml-20.08.1.tar.xz"; + sha256 = "9f4bcafc664532706fe634ce8b0f410619d5e3c285526a7b61969155d75bbad2"; + name = "poxml-20.08.1.tar.xz"; }; }; print-manager = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/print-manager-20.08.0.tar.xz"; - sha256 = "6fe74bc4555f92b7d372d01878cbf25b4339f3f0047b52bd0c92571a2b835271"; - name = "print-manager-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/print-manager-20.08.1.tar.xz"; + sha256 = "52d41ca3ae69e6e8e1eb4ddf1d516868dc436e81779053efdea5e3819545ca5b"; + name = "print-manager-20.08.1.tar.xz"; }; }; rocs = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/rocs-20.08.0.tar.xz"; - sha256 = "447fecd5e87171cae444e70146b5ce99ac94a558db5f7e1ff9053c31953ba48e"; - name = "rocs-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/rocs-20.08.1.tar.xz"; + sha256 = "3c5f764f06f6f5b7c68523be4fdd37e75b2249e0b15001bc39e55051d9e271ef"; + name = "rocs-20.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/signon-kwallet-extension-20.08.0.tar.xz"; - sha256 = "ec65a9b05dd014ec541ba87e39b6ae8a7af8bf4017f58c7b566960e452f99493"; - name = "signon-kwallet-extension-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/signon-kwallet-extension-20.08.1.tar.xz"; + sha256 = "10a0ea806dc63cbf6c6d4794fe596c68355bccb3e08370d70ce7a8e95af448a5"; + name = "signon-kwallet-extension-20.08.1.tar.xz"; }; }; spectacle = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/spectacle-20.08.0.tar.xz"; - sha256 = "8712c8fc19bc2cc39c5e51cf62dedfba423ad53225b629d667d7ffb8d3900692"; - name = "spectacle-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/spectacle-20.08.1.tar.xz"; + sha256 = "4a01b5ef41901ff2e83bb517c2e96a978188b98cb62243eb541a317f57a2bd69"; + name = "spectacle-20.08.1.tar.xz"; }; }; step = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/step-20.08.0.tar.xz"; - sha256 = "8415f807de351b85bc3c4feb9ac45b01300210b9517987c617cd49ba6d472418"; - name = "step-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/step-20.08.1.tar.xz"; + sha256 = "6e04930963676b1bfa55ee095914c7491a61bf3963c45ed4157f868175ee6605"; + name = "step-20.08.1.tar.xz"; }; }; svgpart = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/svgpart-20.08.0.tar.xz"; - sha256 = "3ebb9140ac13c7ece171622ead8c7fd1b1128cccde9635cbc912ca7f8da767a7"; - name = "svgpart-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/svgpart-20.08.1.tar.xz"; + sha256 = "206c3741464f959ffbaea09bc918fc3e88f32fcf12928cd8c399ab44d4b1f228"; + name = "svgpart-20.08.1.tar.xz"; }; }; sweeper = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/sweeper-20.08.0.tar.xz"; - sha256 = "b0d7b983a5bb8ceb2454863181c6a2d55c42114f58f66241f46c3365d90a52ec"; - name = "sweeper-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/sweeper-20.08.1.tar.xz"; + sha256 = "722c25de8cc74fe7e8310d47a7e794f32e935331f89d4f5249fd045a83ce0431"; + name = "sweeper-20.08.1.tar.xz"; }; }; umbrello = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/umbrello-20.08.0.tar.xz"; - sha256 = "49e9f7e0748b8f103f72bbc3fbe0ab7b3605646b5024512118dd9beafd64a041"; - name = "umbrello-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/umbrello-20.08.1.tar.xz"; + sha256 = "d980d67f8a878e01cd3af5499aa843df703f20cdecca8a14b59d87d13c747328"; + name = "umbrello-20.08.1.tar.xz"; }; }; yakuake = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/yakuake-20.08.0.tar.xz"; - sha256 = "1c13334e0e4c1a6a3f8e11ed6cd05b2cecdd0eb29201c41bd26ca62e22cc084a"; - name = "yakuake-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/yakuake-20.08.1.tar.xz"; + sha256 = "6768a360a3d79080e6e53821460ed27f6c2e47fa11077bbec3213d85385d6fac"; + name = "yakuake-20.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.08.0"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.0/src/zeroconf-ioslave-20.08.0.tar.xz"; - sha256 = "78bdd0b377132abf30f1ed40c15eae3f0726d7075b311c3b23c71ad59725dc22"; - name = "zeroconf-ioslave-20.08.0.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/zeroconf-ioslave-20.08.1.tar.xz"; + sha256 = "ca1685a22922057ba89510d71a11218bf47db0d0313aec2b55aca21932564866"; + name = "zeroconf-ioslave-20.08.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 1dbcdf31ed19..9f157798a7d2 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = "${version}"; - sha256 = "17ify6v4z8i8ps3s8qabnrqfkj0my4yzyqwk3q3nhrqilbnhr40x"; + sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ac296c1224ac..db6b6f2e1813 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -25,13 +25,7 @@ let # use the latest 1.x release instead py = python3.override { packageOverrides = self: super: { - dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec { - version = "1.16.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; - }; - }); + dnspython = super.dnspython_1; }; }; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index dff69130c18a..db3881063454 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 -, zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }: +, zlib, fontconfig, dpkg, libproxy, libxml2, gst_all_1, dbus }: let arch = @@ -33,7 +33,6 @@ let fontconfig libproxy libxml2 - gstreamer dbus gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -80,7 +79,7 @@ stdenv.mkDerivation rec { for a in $out/opt/google/earth/free/*.so* ; do patchelf --set-rpath "${fullPath}:\$ORIGIN" $a done - + # Add desktop config file and icons mkdir -p $out/share/{applications,icons/hicolor/{16x16,22x22,24x24,32x32,48x48,64x64,128x128,256x256}/apps,pixmaps} ln -s $out/opt/google/earth/free/google-earth.desktop $out/share/applications/google-earth.desktop diff --git a/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch b/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch new file mode 100644 index 000000000000..8f9271ac996b --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch @@ -0,0 +1,49 @@ +From 2629af4ed00d7ca65359178203d80fb146901cdb Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer +Date: Fri, 3 Jul 2020 21:00:45 -0700 +Subject: [PATCH 1/2] Fix CMakeLists + +--- + CMakeLists.txt | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e218279..4341de9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,6 +57,7 @@ endif(JPEG_FOUND) + include(FindJasper) + if(JASPER_FOUND) + set(HAVE_JASPER_LIB 1) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY}) + endif(JASPER_FOUND) + + # paths from willuslib/wgs.c +@@ -71,9 +72,12 @@ else() + message(STATUS "Could NOT find ghostscript executable") + endif(GHOSTSCRIPT_EXECUTABLE) + +-# willus.h +-# HAVE_GSL_LIB +- ++pkg_check_modules(GSL gsl) ++if(GSL_FOUND) ++ set(HAVE_GSL_LIB 1) ++ include_directories(SYSTEM ${GSL_INCLUDEDIR}) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) ++endif(GSL_FOUND) + + # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) + # MUPDF_STATIC_LDFLAGS misses mupdf-js-none, and doubles libs ... +@@ -85,7 +89,7 @@ if(MUPDF_FOUND) + include_directories(SYSTEM ${MUPDF_INCLUDEDIR}) + message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") + set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} +- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype ++ + ) + endif(MUPDF_FOUND) + +-- +2.27.0 + diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 8899654cc4c8..431426e55fbd 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig -, zlib, libpng +{ stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub +, cmake, pkgconfig, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf @@ -11,44 +11,132 @@ with stdenv.lib; -stdenv.mkDerivation rec { - pname = "k2pdfopt"; - version = "2.51a"; +# k2pdfopt is a pain to package. It requires modified versions of mupdf, +# leptonica, and tesseract. Instead of shipping patches for these upstream +# packages, k2pdfopt includes just the modified source files for these +# packages. The individual files from the {mupdf,leptonica,tesseract}_mod/ +# directories are intended to replace the corresponding source files in the +# upstream packages, for a particular version of that upstream package. +# +# There are a few ways we could approach packaging these modified versions of +# mupdf, leptonica, and mupdf: +# 1) Override the upstream source with a new derivation that involves copying +# the modified source files from k2pdfopt and replacing the corresponding +# source files in the upstream packages. Since the files are intended for a +# particular version of the upstream package, this would not allow us to easily +# use updates to those packages in nixpkgs. +# 2) Manually produce patches which can be applied against the upstream +# project, and have the same effect as replacing those files. This is what I +# believe k2pdfopt should do this for us anyway. The benefit of creating and +# applying patches in this way is that minor updates (esp. security fixes) to +# upstream packages might still allow these patches to apply successfully. +# 3) Automatically produce these patches inside a nix derivation. This is the +# approach taken here, using the "mkPatch" provided below. This has the +# benefit of easier review and should hopefully be simpler to update in the +# future. - src = (fetchzip { - url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51_src.zip"; - sha256 = "133l7xkvi67s6sfk8cfh7rmavbsf7ib5fyksk1ci6b6sch3z2sw9"; - }); +let + # Create a patch against src based on changes applied in patchCommands + mkPatch = { name, src, patchCommands }: runCommand "${name}-k2pdfopt.patch" { inherit src; } '' + source $stdenv/setup + unpackPhase - # Note: the v2.51a zip contains only files to be replaced in the v2.50 zip. - v251a_src = (fetchzip { - url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51a_src.zip"; - sha256 = "0vvwblii7kgdwfxw8dzk6jbmz4dv94d7rkv18i60y8wkayj6yhl6"; - }); + orig=$sourceRoot + new=$sourceRoot-modded + cp -r $orig/. $new/ - postUnpack = '' - cp -r ${v251a_src}/* $sourceRoot + pushd $new >/dev/null + ${patchCommands} + popd >/dev/null + + diff -Naur $orig $new > $out || true ''; - patches = [ ./k2pdfopt.patch ./k2pdfopt-mupdf-1.16.1.patch ]; + pname = "k2pdfopt"; + version = "2.53"; + k2pdfopt_src = fetchzip { + url = "http://www.willus.com/${pname}/src/${pname}_v${version}_src.zip"; + sha256 = "1fna8bg3pascjfc3hmc6xn0xi2yh7f1qp0d344mw9hqanbnykyy8"; + }; +in stdenv.mkDerivation rec { + inherit pname version; + src = k2pdfopt_src; - nativeBuildInputs = [ cmake pkgconfig ]; + patches = [ + ./0001-Fix-CMakeLists.patch + ]; + + postPatch = '' + substituteInPlace willuslib/bmpdjvu.c \ + --replace "" "" + ''; + + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = let - # The patches below were constructed by taking the files from k2pdfopt in - # the {mupdf,leptonica,tesseract}_mod/ directories, replacing the - # corresponding files in the respective source trees, resolving any errors - # with more recent versions of these depencencies, and running diff. - mupdf_modded = mupdf.overrideAttrs (attrs: { - patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.16.1 + # We use specific versions of these sources below to match the versions + # used in the k2pdfopt source. Note that this does _not_ need to match the + # version used elsewhere in nixpkgs, since it is only used to create the + # patch that can then be applied to the version in nixpkgs. + mupdf_patch = mkPatch { + name = "mupdf"; + src = fetchurl { + url = "https://mupdf.com/downloads/archive/mupdf-1.17.0-source.tar.gz"; + sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; + }; + patchCommands = '' + cp ${k2pdfopt_src}/mupdf_mod/{filter-basic,font,stext-device,string}.c ./source/fitz/ + cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/ + ''; + }; + mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ mupdf_patch ]; + # This function is missing in font.c, see font-win32.c + postPatch = '' + echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c + ''; }); - leptonica_modded = leptonica.overrideAttrs (attrs: { - patches = [ ./leptonica.patch ]; # Last verified with leptonica 1.78.0 + + leptonica_patch = mkPatch { + name = "leptonica"; + src = fetchurl { + url = "http://www.leptonica.org/source/leptonica-1.79.0.tar.gz"; + sha256 = "1n004gv1dj3pq1fcnfdclvvx5nang80336aa67nvs3nnqp4ncn84"; + }; + patchCommands = "cp -r ${k2pdfopt_src}/leptonica_mod/. ./src/"; + }; + leptonica_modded = leptonica.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ leptonica_patch ]; }); + + tesseract_patch = mkPatch { + name = "tesseract"; + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tesseract"; + rev = "4.1.1"; + sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn"; + }; + patchCommands = '' + cp ${k2pdfopt_src}/tesseract_mod/{baseapi,tesscapi,tesseract}.* src/api/ + cp ${k2pdfopt_src}/tesseract_mod/{tesscapi,tessedit,tesseract}.* src/ccmain/ + cp ${k2pdfopt_src}/tesseract_mod/dotproduct{avx,fma,sse}.* src/arch/ + cp ${k2pdfopt_src}/tesseract_mod/{intsimdmatrixsse,simddetect}.* src/arch/ + cp ${k2pdfopt_src}/tesseract_mod/{errcode,genericvector,mainblk,params,serialis,tessdatamanager,tess_version,tprintf,unicharset}.* src/ccutil/ + cp ${k2pdfopt_src}/tesseract_mod/{input,lstmrecognizer}.* src/lstm/ + cp ${k2pdfopt_src}/tesseract_mod/openclwrapper.* src/opencl/ + ''; + }; tesseract_modded = tesseract4.override { - tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: { - patches = [ ./tesseract.patch ]; # Last verified with tesseract 1.4 + tesseractBase = tesseract4.tesseractBase.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ tesseract_patch ]; + # Additional compilation fixes + postPatch = '' + echo libtesseract_api_la_SOURCES += tesscapi.cpp >> src/api/Makefile.am + substituteInPlace src/api/tesseract.h \ + --replace "#include " "//#include " + ''; }); }; in @@ -71,6 +159,10 @@ stdenv.mkDerivation rec { install -D -m 755 k2pdfopt $out/bin/k2pdfopt ''; + preFixup = optionalString enableTesseract '' + wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract4}/share/tessdata + ''; + meta = with stdenv.lib; { description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones"; homepage = "http://www.willus.com/k2pdfopt"; diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch deleted file mode 100644 index 3a9eca30e751..000000000000 --- a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/willuslib/wmupdf.c b/willuslib/wmupdf.c -index 81627ef..f14a96c 100644 ---- a/willuslib/wmupdf.c -+++ b/willuslib/wmupdf.c -@@ -189,8 +189,6 @@ int wmupdf_remake_pdf(char *infile,char *outfile,WPDFPAGEINFO *pageinfo,int use_ - pdf_write_opts.do_compress=1; - pdf_write_opts.do_linear=0; - pdf_write_opts.do_garbage=1; /* 2 and 3 don't work for this. */ -- pdf_write_opts.continue_on_error=0; -- pdf_write_opts.errors=NULL; - write_failed=0; - wpdfpageinfo_sort(pageinfo); - xref=NULL; -@@ -1687,8 +1685,8 @@ WPDFOUTLINE *wpdfoutline_read_from_pdf_file(char *filename) - /* Sumatra version of MuPDF v1.4 -- use locally installed fonts */ - pdf_install_load_system_font_funcs(ctx); - fz_try(ctx) { doc=fz_open_document(ctx,filename); } -- fz_catch(ctx) -- { -+ fz_catch(ctx) -+ { - fz_drop_context(ctx); - return(NULL); - } -@@ -1890,5 +1888,5 @@ static pdf_obj *pdf_new_string_utf8(fz_context *ctx,char *string) - willus_mem_free((double **)&utfbuf,funcname); - return(pdfobj); - } -- -+ - #endif /* HAVE_MUPDF_LIB */ -diff --git a/willuslib/wmupdfinfo.c b/willuslib/wmupdfinfo.c -index 5c7f38c..9b9e6fd 100644 ---- a/willuslib/wmupdfinfo.c -+++ b/willuslib/wmupdfinfo.c -@@ -237,23 +237,22 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) - pdf_obj *robj; - - robj=pdf_resolve_indirect(ctx,obj); -- n=pdf_sprint_obj(ctx,NULL,0,robj,1); -- buf=malloc(n+2); -+ buf=pdf_sprint_obj(ctx,NULL,0,&n,robj,1,0); - if (buf==NULL) - { - fz_write_printf(ctx,out,"Info object (%d %d R):\n",pdf_to_num(ctx,obj),pdf_to_gen(ctx,obj)); -- pdf_print_obj(ctx,out,robj,1); -+ pdf_print_obj(ctx,out,robj,1,0); - } - else - { -- pdf_sprint_obj(ctx,buf,n+2,robj,1); -+ pdf_sprint_obj(ctx,buf,n+2,&n,robj,1,0); - display_pdf_field(ctx,out,buf,"Title","TITLE"); - display_pdf_field(ctx,out,buf,"CreationDate","CREATED"); - display_pdf_field(ctx,out,buf,"ModDate","LAST MODIFIED"); - display_pdf_field(ctx,out,buf,"Producer","PDF PRODUCER"); - display_pdf_field(ctx,out,buf,"Creator","CREATOR"); - display_file_size(ctx,out,filename); -- free(buf); -+ fz_free(ctx,buf); - } - } - if (glo->dims==1) -@@ -275,7 +274,7 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) - if (obj) - { - fz_write_printf(ctx,out, "\nEncryption object (%d %d R):\n", pdf_to_num(ctx,obj), pdf_to_gen(ctx,obj)); -- pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1); -+ pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1, 0); - } - } - -@@ -396,7 +395,7 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ - if (j < glo->dims) - return; - -- glo->dim = fz_resize_array(ctx, glo->dim, glo->dims+1, sizeof(struct info)); -+ glo->dim = fz_realloc_array(ctx, glo->dim, glo->dims+1, struct info); - glo->dims++; - - glo->dim[glo->dims - 1].page = page; -@@ -441,7 +440,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * - if (k < glo->fonts) - continue; - -- glo->font = fz_resize_array(ctx, glo->font, glo->fonts+1, sizeof(struct info)); -+ glo->font = fz_realloc_array(ctx, glo->font, glo->fonts+1, struct info); - glo->fonts++; - - glo->font[glo->fonts - 1].page = page; -@@ -510,7 +509,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj - if (k < glo->images) - continue; - -- glo->image = fz_resize_array(ctx, glo->image, glo->images+1, sizeof(struct info)); -+ glo->image = fz_realloc_array(ctx, glo->image, glo->images+1, struct info); - glo->images++; - - glo->image[glo->images - 1].page = page; -@@ -568,7 +567,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * - if (k < glo->forms) - continue; - -- glo->form = fz_resize_array(ctx, glo->form, glo->forms+1, sizeof(struct info)); -+ glo->form = fz_realloc_array(ctx, glo->form, glo->forms+1, struct info); - glo->forms++; - - glo->form[glo->forms - 1].page = page; -@@ -613,7 +612,7 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj - if (k < glo->psobjs) - continue; - -- glo->psobj = fz_resize_array(ctx, glo->psobj, glo->psobjs+1, sizeof(struct info)); -+ glo->psobj = fz_realloc_array(ctx, glo->psobj, glo->psobjs+1, struct info); - glo->psobjs++; - - glo->psobj[glo->psobjs - 1].page = page; -@@ -656,7 +655,7 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob - if (k < glo->shadings) - continue; - -- glo->shading = fz_resize_array(ctx, glo->shading, glo->shadings+1, sizeof(struct info)); -+ glo->shading = fz_realloc_array(ctx, glo->shading, glo->shadings+1, struct info); - glo->shadings++; - - glo->shading[glo->shadings - 1].page = page; -@@ -724,7 +723,7 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob - if (k < glo->patterns) - continue; - -- glo->pattern = fz_resize_array(ctx, glo->pattern, glo->patterns+1, sizeof(struct info)); -+ glo->pattern = fz_realloc_array(ctx, glo->pattern, glo->patterns+1, struct info); - glo->patterns++; - - glo->pattern[glo->patterns - 1].page = page; -@@ -1216,7 +1215,7 @@ void wmupdfinfo_get(char *filename,int *pagelist,char **buf) - if (fout==NULL) - return; - */ -- -+ - ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED); - if (!ctx) - { -@@ -1307,5 +1306,5 @@ static void date_convert(char *dst,char *src) - else if (src[i]!='\0') - sprintf(&dst[strlen(dst)]," %s",&src[i]); - } -- -+ - #endif /* HAVE_MUPDF_LIB */ diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch deleted file mode 100644 index cf7e4896b803..000000000000 --- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4a2378b..502c477 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,6 +52,7 @@ endif(JPEG_FOUND) - include(FindJasper) - if(JASPER_FOUND) - set(HAVE_JASPER_LIB 1) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY}) - endif(JASPER_FOUND) - - # paths from willuslib/wgs.c -@@ -66,8 +67,12 @@ else() - message(STATUS "Could NOT find ghostscript executable") - endif(GHOSTSCRIPT_EXECUTABLE) - --# willus.h --# HAVE_GSL_LIB -+pkg_check_modules(GSL gsl) -+if(GSL_FOUND) -+ set(HAVE_GSL_LIB 1) -+ include_directories(SYSTEM ${GSL_INCLUDEDIR}) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) -+endif(GSL_FOUND) - - - # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) -@@ -80,7 +85,7 @@ if(MUPDF_FOUND) - include_directories(SYSTEM ${MUPDF_INCLUDEDIR}) - message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") - set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} -- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype -+ - ) - endif(MUPDF_FOUND) - -@@ -91,9 +96,25 @@ if(DJVU_FOUND) - set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${DJVU_LDFLAGS}) - endif(DJVU_FOUND) - --# HAVE_GOCR_LIB --# HAVE_LEPTONICA_LIB --# HAVE_TESSERACT_LIB -+find_library(GOCR_LIB NAMES Pgm2asc) -+if(GOCR_LIB) -+ set(HAVE_GOCR_LIB 1) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GOCR_LIB}) -+endif(GOCR_LIB) -+ -+pkg_check_modules(LEPTONICA lept) -+if(LEPTONICA_FOUND) -+ set(HAVE_LEPTONICA_LIB 1) -+ include_directories(SYSTEM ${LEPTONICA_INCLUDEDIR}) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${LEPTONICA_LDFLAGS}) -+endif(LEPTONICA_FOUND) -+ -+pkg_check_modules(TESSERACT tesseract) -+if(TESSERACT_FOUND) -+ set(HAVE_TESSERACT_LIB 1) -+ include_directories(SYSTEM ${TESSERACT_INCLUDEDIR}) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${TESSERACT_LDFLAGS}) -+endif(TESSERACT_FOUND) - - # ---- Describe project - -diff --git a/willuslib/CMakeLists.txt b/willuslib/CMakeLists.txt -index 463bbc9..8043db5 100644 ---- a/willuslib/CMakeLists.txt -+++ b/willuslib/CMakeLists.txt -@@ -6,7 +6,7 @@ include_directories(..) - set(WILLUSLIB_SRC - ansi.c array.c bmp.c bmpdjvu.c bmpmupdf.c dtcompress.c filelist.c - fontdata.c fontrender.c gslpolyfit.c linux.c math.c mem.c ocr.c -- ocrjocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c -+ ocrgocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c - token.c wfile.c wgs.c wgui.c willusversion.c win.c winbmp.c - wincomdlg.c winmbox.c winshell.c wmupdf.c wmupdfinfo.c wpdf.c wsys.c - wzfile.c wleptonica.c -diff --git a/willuslib/ocrgocr.c b/willuslib/ocrgocr.c -index 6027e9a..fbe10f0 100644 ---- a/willuslib/ocrgocr.c -+++ b/willuslib/ocrgocr.c -@@ -29,6 +29,8 @@ - #ifdef HAVE_GOCR_LIB - #include - -+job_t *OCR_JOB; -+ - /* - ** bmp8 must be grayscale - ** (x1,y1) and (x2,y2) from top left of bitmap -@@ -63,6 +65,7 @@ void gocr_single_word_from_bmp8(char *text,int maxlen,WILLUSBITMAP *bmp8, - h=y2-y1+1; - dh=h+bw*2; - job=&_job; -+ OCR_JOB=job; - job_init(job); - job_init_image(job); - // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10); diff --git a/pkgs/applications/misc/k2pdfopt/leptonica.patch b/pkgs/applications/misc/k2pdfopt/leptonica.patch deleted file mode 100644 index dfab99fd0130..000000000000 --- a/pkgs/applications/misc/k2pdfopt/leptonica.patch +++ /dev/null @@ -1,254 +0,0 @@ -From 8c11a20925686855023df90ed477957c7d7fe91e Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer -Date: Fri, 13 Sep 2019 15:54:21 -0400 -Subject: [PATCH] Willus mod for k2pdfopt - ---- - src/allheaders.h | 4 ++ - src/dewarp2.c | 106 ++++++++++++++++++++++++++++++++++++++++++----- - src/leptwin.c | 6 ++- - 3 files changed, 104 insertions(+), 12 deletions(-) - -diff --git a/src/allheaders.h b/src/allheaders.h -index e68eff1..b3cc729 100644 ---- a/src/allheaders.h -+++ b/src/allheaders.h -@@ -669,6 +669,10 @@ LEPT_DLL extern L_DEWARPA * dewarpaReadMem ( const l_uint8 *data, size_t size ); - LEPT_DLL extern l_ok dewarpaWrite ( const char *filename, L_DEWARPA *dewa ); - LEPT_DLL extern l_ok dewarpaWriteStream ( FILE *fp, L_DEWARPA *dewa ); - LEPT_DLL extern l_ok dewarpaWriteMem ( l_uint8 **pdata, size_t *psize, L_DEWARPA *dewa ); -+/* WILLUS MOD */ -+ LEPT_DLL extern l_int32 dewarpBuildPageModel_ex ( L_DEWARP *dew, const char *debugfile,l_int32 fit_order ); -+ LEPT_DLL extern l_int32 dewarpFindVertDisparity_ex ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag,l_int32 fit_order ); -+ LEPT_DLL extern l_int32 dewarpBuildLineModel_ex ( L_DEWARP *dew, l_int32 opensize, const char *debugfile,l_int32 fit_order ); - LEPT_DLL extern l_ok dewarpBuildPageModel ( L_DEWARP *dew, const char *debugfile ); - LEPT_DLL extern l_ok dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag ); - LEPT_DLL extern l_ok dewarpFindHorizDisparity ( L_DEWARP *dew, PTAA *ptaa ); -diff --git a/src/dewarp2.c b/src/dewarp2.c -index 220eec1..2e29500 100644 ---- a/src/dewarp2.c -+++ b/src/dewarp2.c -@@ -144,9 +144,17 @@ static const l_float32 L_ALLOWED_W_FRACT = 0.05; /* no bigger */ - * longest textlines. - * - */ -+/* WILLUS MOD */ - l_ok --dewarpBuildPageModel(L_DEWARP *dew, -- const char *debugfile) -+dewarpBuildPageModel(L_DEWARP *dew,const char *debugfile) -+{ -+return(dewarpBuildPageModel_ex(dew,debugfile,2)); -+} -+ -+l_ok -+dewarpBuildPageModel_ex(L_DEWARP *dew, -+ const char *debugfile, -+ l_int32 fit_order) - { - l_int32 linecount, topline, botline, ret; - PIX *pixs, *pix1, *pix2, *pix3; -@@ -225,7 +233,7 @@ PTAA *ptaa1, *ptaa2; - /* Get the sampled vertical disparity from the textline centers. - * The disparity array will push pixels vertically so that each - * textline is flat and centered at the y-position of the mid-point. */ -- if (dewarpFindVertDisparity(dew, ptaa2, 0) != 0) { -+ if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) { - L_WARNING("vertical disparity not built\n", procName); - ptaaDestroy(&ptaa2); - return 1; -@@ -290,13 +298,24 @@ PTAA *ptaa1, *ptaa2; - * a pdf. Non-pix debug output goes to /tmp. - * - */ -+/* WILLUS MOD */ - l_ok - dewarpFindVertDisparity(L_DEWARP *dew, - PTAA *ptaa, - l_int32 rotflag) - { -+return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2)); -+} -+/* WILLUS MOD -- add cubic and quartic fits and ..._ex functions */ -+l_int32 -+dewarpFindVertDisparity_ex(L_DEWARP *dew, -+ PTAA *ptaa, -+ l_int32 rotflag, -+ l_int32 fit_order) -+{ - l_int32 i, j, nlines, npts, nx, ny, sampling; --l_float32 c0, c1, c2, x, y, midy, val, medval, meddev, minval, maxval; -+/* WILLUS MOD */ -+l_float32 c0, c1, c2, c3, c4, x, y, midy, val, medval, meddev, minval, maxval; - l_float32 *famidys; - NUMA *nax, *nafit, *nacurve0, *nacurve1, *nacurves; - NUMA *namidy, *namidys, *namidysi; -@@ -304,11 +323,22 @@ PIX *pix1, *pix2, *pixcirc, *pixdb; - PTA *pta, *ptad, *ptacirc; - PTAA *ptaa0, *ptaa1, *ptaa2, *ptaa3, *ptaa4, *ptaa5, *ptaat; - FPIX *fpix; -+/* WILLUS MOD */ -+l_int32 fit_order1,fit_order2; - - PROCNAME("dewarpFindVertDisparity"); - - if (!dew) - return ERROR_INT("dew not defined", procName, 1); -+/* WILLUS MOD */ -+ if (fit_order < 10) -+ fit_order1 = fit_order2 = fit_order; -+ else -+ { -+ fit_order1=fit_order % 10; -+ fit_order2=fit_order / 10; -+ fit_order2=fit_order2 % 10; -+ } - dew->vsuccess = 0; - if (!ptaa) - return ERROR_INT("ptaa not defined", procName, 1); -@@ -331,12 +361,32 @@ FPIX *fpix; - pixdb = (rotflag) ? pixRotateOrth(dew->pixs, 1) : pixClone(dew->pixs); - for (i = 0; i < nlines; i++) { /* for each line */ - pta = ptaaGetPta(ptaa, i, L_CLONE); -- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); -- numaAddNumber(nacurve0, c2); -+/* WILLUS MOD */ -+if (fit_order1>3) -+ { -+ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); -+ numaAddNumber(nacurve0, c4); -+ } -+else if (fit_order1==3) -+ { -+ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); -+ numaAddNumber(nacurve0, c3); -+ } -+else -+ { -+ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); -+ numaAddNumber(nacurve0, c2); -+ } - ptad = ptaCreate(nx); - for (j = 0; j < nx; j++) { /* uniformly sampled in x */ - x = j * sampling; -- applyQuadraticFit(c2, c1, c0, x, &y); -+/* WILLUS MOD */ -+if (fit_order1>3) -+ applyQuarticFit(c4, c3, c2, c1, c0, x, &y); -+else if (fit_order1==3) -+ applyCubicFit(c3, c2, c1, c0, x, &y); -+else -+ applyQuadraticFit(c2, c1, c0, x, &y); - ptaAddPt(ptad, x, y); - } - ptaaAddPta(ptaa0, ptad, L_INSERT); -@@ -350,7 +400,13 @@ FPIX *fpix; - for (i = 0; i < nlines; i++) { - pta = ptaaGetPta(ptaa, i, L_CLONE); - ptaGetArrays(pta, &nax, NULL); -- ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); -+/* WILLUS MOD */ -+if (fit_order1>3) -+ptaGetQuarticLSF(pta, NULL, NULL, NULL, NULL, NULL, &nafit); -+else if (fit_order1==3) -+ptaGetCubicLSF(pta, NULL, NULL, NULL, NULL, &nafit); -+else -+ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); - ptad = ptaCreateFromNuma(nax, nafit); - ptaaAddPta(ptaat, ptad, L_INSERT); - ptaDestroy(&pta); -@@ -494,11 +550,24 @@ FPIX *fpix; - ptaa5 = ptaaCreate(nx); /* uniformly sampled across full height of image */ - for (j = 0; j < nx; j++) { /* for each column */ - pta = ptaaGetPta(ptaa4, j, L_CLONE); -- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); -+/* WILLUS MOD */ -+/* Order higher than 2 can cause a little craziness here. */ -+if (fit_order2>3) -+ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); -+else if (fit_order2==3) -+ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); -+else -+ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); - ptad = ptaCreate(ny); - for (i = 0; i < ny; i++) { /* uniformly sampled in y */ - y = i * sampling; -- applyQuadraticFit(c2, c1, c0, y, &val); -+/* WILLUS MOD */ -+if (fit_order2>3) -+ applyQuarticFit(c4, c3, c2, c1, c0, y, &val); -+else if (fit_order2==3) -+ applyCubicFit(c3, c2, c1, c0, y, &val); -+else -+ applyQuadraticFit(c2, c1, c0, y, &val); - ptaAddPt(ptad, y, val); - } - ptaaAddPta(ptaa5, ptad, L_INSERT); -@@ -1602,11 +1671,21 @@ FPIX *fpix; - * See notes there. - * - */ -+/* WILLUS MOD */ - l_ok - dewarpBuildLineModel(L_DEWARP *dew, - l_int32 opensize, - const char *debugfile) - { -+return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2)); -+} -+ -+l_int32 -+dewarpBuildLineModel_ex(L_DEWARP *dew, -+ l_int32 opensize, -+ const char *debugfile, -+ l_int32 fit_order) -+{ - char buf[64]; - l_int32 i, j, bx, by, ret, nlines; - BOXA *boxa; -@@ -1695,6 +1774,8 @@ PTAA *ptaa1, *ptaa2; - - /* Remove all lines that are not at least 0.75 times the length - * of the longest line. */ -+/* WILLUS MOD */ -+/* - ptaa2 = dewarpRemoveShortLines(pix, ptaa1, 0.75, DEBUG_SHORT_LINES); - if (debugfile) { - pix1 = pixConvertTo32(pix); -@@ -1704,6 +1785,8 @@ PTAA *ptaa1, *ptaa2; - pixDestroy(&pix1); - pixDestroy(&pix2); - } -+*/ -+ptaa2=ptaa1; - ptaaDestroy(&ptaa1); - nlines = ptaaGetCount(ptaa2); - if (nlines < dew->minlines) { -@@ -1717,7 +1800,8 @@ PTAA *ptaa1, *ptaa2; - * centers. The disparity array will push pixels vertically - * so that each line is flat and centered at the y-position - * of the mid-point. */ -- ret = dewarpFindVertDisparity(dew, ptaa2, 1 - i); -+/* WILLUS MOD */ -+ ret = dewarpFindVertDisparity_ex(dew, ptaa2, 1 - i, fit_order); - - /* If i == 0, move the result to the horizontal disparity, - * rotating it back by -90 degrees. */ -diff --git a/src/leptwin.c b/src/leptwin.c -index 72643a0..573d33e 100644 ---- a/src/leptwin.c -+++ b/src/leptwin.c -@@ -364,5 +364,9 @@ PIXCMAP *cmap; - - return hBitmap; - } -- -+#else -+/* willus mod: Avoid weird issue with OS/X library archiver when there are no symbols */ -+int leptwin_my_empty_func(void); -+int leptwin_my_empty_func(void) -+{return(0);} - #endif /* _WIN32 */ --- -2.22.0 - diff --git a/pkgs/applications/misc/k2pdfopt/mupdf.patch b/pkgs/applications/misc/k2pdfopt/mupdf.patch deleted file mode 100644 index 0c59a1d20163..000000000000 --- a/pkgs/applications/misc/k2pdfopt/mupdf.patch +++ /dev/null @@ -1,1060 +0,0 @@ -From d8927c969e3387ca2669a616c0ba53bce918a031 Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer -Date: Fri, 13 Sep 2019 15:11:45 -0400 -Subject: [PATCH] Willus mod for k2pdfopt - ---- - source/fitz/filter-basic.c | 3 + - source/fitz/font-win32.c | 866 +++++++++++++++++++++++++++++++++++++ - source/fitz/font.c | 3 + - source/fitz/stext-device.c | 5 + - source/fitz/string.c | 5 + - source/pdf/pdf-annot.c | 14 +- - source/pdf/pdf-link.c | 3 + - source/pdf/pdf-parse.c | 5 + - source/pdf/pdf-xref.c | 9 + - 9 files changed, 912 insertions(+), 1 deletion(-) - create mode 100644 source/fitz/font-win32.c - -diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c -index 0713a62e7..b8ef4d292 100644 ---- a/source/fitz/filter-basic.c -+++ b/source/fitz/filter-basic.c -@@ -259,7 +259,10 @@ look_for_endstream: - if (!state->warned) - { - state->warned = 1; -+/* willus mod -- no warning */ -+/* - fz_warn(ctx, "PDF stream Length incorrect"); -+*/ - } - return *stm->rp++; - } -diff --git a/source/fitz/font-win32.c b/source/fitz/font-win32.c -new file mode 100644 -index 000000000..45de8cfd3 ---- /dev/null -+++ b/source/fitz/font-win32.c -@@ -0,0 +1,866 @@ -+/* -+** Routines to access MS Windows system fonts. -+** From sumatra PDF distro. -+** Modified for MuPDF v1.9a by willus.com -+*/ -+#include "mupdf/pdf.h" -+ -+/* -+ Which fonts are embedded is based on a few preprocessor definitions. -+ -+ The base 14 fonts are always embedded. -+ For CJK font substitution we embed DroidSansFallback. -+ -+ Set NOCJK to skip all CJK support (this also omits embedding the CJK CMaps) -+ Set NOCJKFONT to skip the embedded CJK font. -+ Set NOCJKFULL to embed a smaller CJK font without CJK Extension A support. -+*/ -+ -+#ifdef NOCJK -+#define NOCJKFONT -+#endif -+ -+/* SumatraPDF: also load fonts included with Windows */ -+#ifdef _WIN32 -+ -+#ifndef UNICODE -+#define UNICODE -+#endif -+#ifndef _UNICODE -+#define _UNICODE -+#endif -+ -+#include -+ -+// TODO: Use more of FreeType for TTF parsing (for performance reasons, -+// the fonts can't be parsed completely, though) -+#include -+#include FT_TRUETYPE_IDS_H -+#include FT_TRUETYPE_TAGS_H -+ -+#define TTC_VERSION1 0x00010000 -+#define TTC_VERSION2 0x00020000 -+ -+#define MAX_FACENAME 128 -+ -+// Note: the font face must be the first field so that the structure -+// can be treated like a simple string for searching -+typedef struct pdf_fontmapMS_s -+{ -+ char fontface[MAX_FACENAME]; -+ char fontpath[MAX_PATH]; -+ int index; -+} pdf_fontmapMS; -+ -+typedef struct pdf_fontlistMS_s -+{ -+ pdf_fontmapMS *fontmap; -+ int len; -+ int cap; -+} pdf_fontlistMS; -+ -+typedef struct _tagTT_OFFSET_TABLE -+{ -+ ULONG uVersion; -+ USHORT uNumOfTables; -+ USHORT uSearchRange; -+ USHORT uEntrySelector; -+ USHORT uRangeShift; -+} TT_OFFSET_TABLE; -+ -+typedef struct _tagTT_TABLE_DIRECTORY -+{ -+ ULONG uTag; //table name -+ ULONG uCheckSum; //Check sum -+ ULONG uOffset; //Offset from beginning of file -+ ULONG uLength; //length of the table in bytes -+} TT_TABLE_DIRECTORY; -+ -+typedef struct _tagTT_NAME_TABLE_HEADER -+{ -+ USHORT uFSelector; //format selector. Always 0 -+ USHORT uNRCount; //Name Records count -+ USHORT uStorageOffset; //Offset for strings storage, from start of the table -+} TT_NAME_TABLE_HEADER; -+ -+typedef struct _tagTT_NAME_RECORD -+{ -+ USHORT uPlatformID; -+ USHORT uEncodingID; -+ USHORT uLanguageID; -+ USHORT uNameID; -+ USHORT uStringLength; -+ USHORT uStringOffset; //from start of storage area -+} TT_NAME_RECORD; -+ -+typedef struct _tagFONT_COLLECTION -+{ -+ ULONG Tag; -+ ULONG Version; -+ ULONG NumFonts; -+} FONT_COLLECTION; -+ -+static struct { -+ char *name; -+ char *pattern; -+} baseSubstitutes[] = { -+ { "Courier", "CourierNewPSMT" }, -+ { "Courier-Bold", "CourierNewPS-BoldMT" }, -+ { "Courier-Oblique", "CourierNewPS-ItalicMT" }, -+ { "Courier-BoldOblique", "CourierNewPS-BoldItalicMT" }, -+ { "Helvetica", "ArialMT" }, -+ { "Helvetica-Bold", "Arial-BoldMT" }, -+ { "Helvetica-Oblique", "Arial-ItalicMT" }, -+ { "Helvetica-BoldOblique", "Arial-BoldItalicMT" }, -+ { "Times-Roman", "TimesNewRomanPSMT" }, -+ { "Times-Bold", "TimesNewRomanPS-BoldMT" }, -+ { "Times-Italic", "TimesNewRomanPS-ItalicMT" }, -+ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT" }, -+ { "Symbol", "SymbolMT" }, -+}; -+static const char *base_font_names[][10] = -+{ -+ { "Courier", "CourierNew", "CourierNewPSMT", NULL }, -+ { "Courier-Bold", "CourierNew,Bold", "Courier,Bold", -+ "CourierNewPS-BoldMT", "CourierNew-Bold", NULL }, -+ { "Courier-Oblique", "CourierNew,Italic", "Courier,Italic", -+ "CourierNewPS-ItalicMT", "CourierNew-Italic", NULL }, -+ { "Courier-BoldOblique", "CourierNew,BoldItalic", "Courier,BoldItalic", -+ "CourierNewPS-BoldItalicMT", "CourierNew-BoldItalic", NULL }, -+ { "Helvetica", "ArialMT", "Arial", NULL }, -+ { "Helvetica-Bold", "Arial-BoldMT", "Arial,Bold", "Arial-Bold", -+ "Helvetica,Bold", NULL }, -+ { "Helvetica-Oblique", "Arial-ItalicMT", "Arial,Italic", "Arial-Italic", -+ "Helvetica,Italic", "Helvetica-Italic", NULL }, -+ { "Helvetica-BoldOblique", "Arial-BoldItalicMT", -+ "Arial,BoldItalic", "Arial-BoldItalic", -+ "Helvetica,BoldItalic", "Helvetica-BoldItalic", NULL }, -+ { "Times-Roman", "TimesNewRomanPSMT", "TimesNewRoman", -+ "TimesNewRomanPS", NULL }, -+ { "Times-Bold", "TimesNewRomanPS-BoldMT", "TimesNewRoman,Bold", -+ "TimesNewRomanPS-Bold", "TimesNewRoman-Bold", NULL }, -+ { "Times-Italic", "TimesNewRomanPS-ItalicMT", "TimesNewRoman,Italic", -+ "TimesNewRomanPS-Italic", "TimesNewRoman-Italic", NULL }, -+ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT", -+ "TimesNewRoman,BoldItalic", "TimesNewRomanPS-BoldItalic", -+ "TimesNewRoman-BoldItalic", NULL }, -+ { "Symbol", "Symbol,Italic", "Symbol,Bold", "Symbol,BoldItalic", -+ "SymbolMT", "SymbolMT,Italic", "SymbolMT,Bold", "SymbolMT,BoldItalic", NULL }, -+ { "ZapfDingbats", NULL } -+}; -+ -+static pdf_fontlistMS fontlistMS = -+{ -+ NULL, -+ 0, -+ 0, -+}; -+static int strcmp_ignore_space(const char *a, const char *b); -+static const char *clean_font_name(const char *fontname); -+static const char *pdf_clean_base14_name(const char *fontname); -+ -+static inline USHORT BEtoHs(USHORT x) -+{ -+ BYTE *data = (BYTE *)&x; -+ return (data[0] << 8) | data[1]; -+} -+ -+static inline ULONG BEtoHl(ULONG x) -+{ -+ BYTE *data = (BYTE *)&x; -+ return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3]; -+} -+ -+static int strcmp_ignore_space(const char *a, const char *b) -+{ -+ while (1) -+ { -+ while (*a == ' ') -+ a++; -+ while (*b == ' ') -+ b++; -+ if (*a != *b) -+ return 1; -+ if (*a == 0) -+ return *a != *b; -+ if (*b == 0) -+ return *a != *b; -+ a++; -+ b++; -+ } -+} -+ -+/* A little bit more sophisticated name matching so that e.g. "EurostileExtended" -+ matches "EurostileExtended-Roman" or "Tahoma-Bold,Bold" matches "Tahoma-Bold" */ -+static int -+lookup_compare(const void *elem1, const void *elem2) -+{ -+ const char *val1 = elem1; -+ const char *val2 = elem2; -+ int len1 = strlen(val1); -+ int len2 = strlen(val2); -+ -+ if (len1 != len2) -+ { -+ const char *rest = len1 > len2 ? val1 + len2 : val2 + len1; -+ if (',' == *rest || !_stricmp(rest, "-roman")) -+ return _strnicmp(val1, val2, fz_mini(len1, len2)); -+ } -+ -+ return _stricmp(val1, val2); -+} -+ -+static void -+remove_spaces(char *srcDest) -+{ -+ char *dest; -+ -+ for (dest = srcDest; *srcDest; srcDest++) -+ if (*srcDest != ' ') -+ *dest++ = *srcDest; -+ *dest = '\0'; -+} -+ -+static int -+str_ends_with(const char *str, const char *end) -+{ -+ size_t len1 = strlen(str); -+ size_t len2 = strlen(end); -+ -+ return len1 >= len2 && !strcmp(str + len1 - len2, end); -+} -+ -+static pdf_fontmapMS * -+pdf_find_windows_font_path(const char *fontname) -+{ -+ return bsearch(fontname, fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), lookup_compare); -+} -+ -+/* source and dest can be same */ -+static void -+decode_unicode_BE(fz_context *ctx, char *source, int sourcelen, char *dest, int destlen) -+{ -+ WCHAR *tmp; -+ int converted, i; -+ -+ if (sourcelen % 2 != 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); -+ -+ tmp = fz_malloc_array(ctx, sourcelen / 2 + 1, sizeof(WCHAR)); -+ for (i = 0; i < sourcelen / 2; i++) -+ tmp[i] = BEtoHs(((WCHAR *)source)[i]); -+ tmp[sourcelen / 2] = '\0'; -+ -+ converted = WideCharToMultiByte(CP_UTF8, 0, tmp, -1, dest, destlen, NULL, NULL); -+ fz_free(ctx, tmp); -+ if (!converted) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); -+} -+ -+static void -+decode_platform_string(fz_context *ctx, int platform, int enctype, char *source, int sourcelen, char *dest, int destlen) -+{ -+ switch (platform) -+ { -+ case TT_PLATFORM_APPLE_UNICODE: -+ switch (enctype) -+ { -+ case TT_APPLE_ID_DEFAULT: -+ case TT_APPLE_ID_UNICODE_2_0: -+ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); -+ return; -+ } -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ case TT_PLATFORM_MACINTOSH: -+ switch (enctype) -+ { -+ case TT_MAC_ID_ROMAN: -+ if (sourcelen + 1 > destlen) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : overlong fontname: %s", source); -+ // TODO: Convert to UTF-8 from what encoding? -+ memcpy(dest, source, sourcelen); -+ dest[sourcelen] = 0; -+ return; -+ } -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ case TT_PLATFORM_MICROSOFT: -+ switch (enctype) -+ { -+ case TT_MS_ID_SYMBOL_CS: -+ case TT_MS_ID_UNICODE_CS: -+ case TT_MS_ID_UCS_4: -+ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); -+ return; -+ } -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ default: -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ } -+} -+ -+static void -+grow_system_font_list(fz_context *ctx, pdf_fontlistMS *fl) -+{ -+ int newcap; -+ pdf_fontmapMS *newitems; -+ -+ if (fl->cap == 0) -+ newcap = 1024; -+ else -+ newcap = fl->cap * 2; -+ -+ // use realloc/free for the fontmap, since the list can -+ // remain in memory even with all fz_contexts destroyed -+ newitems = realloc(fl->fontmap, newcap * sizeof(pdf_fontmapMS)); -+ if (!newitems) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "OOM in grow_system_font_list"); -+ memset(newitems + fl->cap, 0, sizeof(pdf_fontmapMS) * (newcap - fl->cap)); -+ -+ fl->fontmap = newitems; -+ fl->cap = newcap; -+} -+ -+static void -+append_mapping(fz_context *ctx, pdf_fontlistMS *fl, const char *facename, const char *path, int index) -+{ -+ if (fl->len == fl->cap) -+ grow_system_font_list(ctx, fl); -+ -+ if (fl->len >= fl->cap) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : fontlist overflow"); -+ -+ fz_strlcpy(fl->fontmap[fl->len].fontface, facename, sizeof(fl->fontmap[0].fontface)); -+ fz_strlcpy(fl->fontmap[fl->len].fontpath, path, sizeof(fl->fontmap[0].fontpath)); -+ fl->fontmap[fl->len].index = index; -+ -+ ++fl->len; -+} -+ -+static void -+safe_read(fz_context *ctx, fz_stream *file, int offset, char *buf, int size) -+{ -+ int n; -+ fz_seek(ctx, file, offset, 0); -+ n = fz_read(ctx, file, (unsigned char *)buf, size); -+ if (n != size) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "safe_read: read %d, expected %d", n, size); -+} -+ -+static void -+read_ttf_string(fz_context *ctx, fz_stream *file, int offset, TT_NAME_RECORD *ttRecordBE, char *buf, int size) -+{ -+ char szTemp[MAX_FACENAME * 2]; -+ // ignore empty and overlong strings -+ int stringLength = BEtoHs(ttRecordBE->uStringLength); -+ if (stringLength == 0 || stringLength >= sizeof(szTemp)) -+ return; -+ -+ safe_read(ctx, file, offset + BEtoHs(ttRecordBE->uStringOffset), szTemp, stringLength); -+ decode_platform_string(ctx, BEtoHs(ttRecordBE->uPlatformID), -+ BEtoHs(ttRecordBE->uEncodingID), szTemp, stringLength, buf, size); -+} -+ -+static void -+makeFakePSName(char szName[MAX_FACENAME], const char *szStyle) -+{ -+ // append the font's subfamily, unless it's a Regular font -+ if (*szStyle && _stricmp(szStyle, "Regular") != 0) -+ { -+ fz_strlcat(szName, "-", MAX_FACENAME); -+ fz_strlcat(szName, szStyle, MAX_FACENAME); -+ } -+ remove_spaces(szName); -+} -+ -+static void -+parseTTF(fz_context *ctx, fz_stream *file, int offset, int index, const char *path) -+{ -+ TT_OFFSET_TABLE ttOffsetTableBE; -+ TT_TABLE_DIRECTORY tblDirBE; -+ TT_NAME_TABLE_HEADER ttNTHeaderBE; -+ TT_NAME_RECORD ttRecordBE; -+ -+ char szPSName[MAX_FACENAME] = { 0 }; -+ char szTTName[MAX_FACENAME] = { 0 }; -+ char szStyle[MAX_FACENAME] = { 0 }; -+ char szCJKName[MAX_FACENAME] = { 0 }; -+ int i, count, tblOffset; -+ -+ safe_read(ctx, file, offset, (char *)&ttOffsetTableBE, sizeof(TT_OFFSET_TABLE)); -+ -+ // check if this is a TrueType font of version 1.0 or an OpenType font -+ if (BEtoHl(ttOffsetTableBE.uVersion) != TTC_VERSION1 && -+ BEtoHl(ttOffsetTableBE.uVersion) != TTAG_OTTO) -+ { -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid font version %x", (unsigned int)BEtoHl(ttOffsetTableBE.uVersion)); -+ } -+ -+ // determine the name table's offset by iterating through the offset table -+ count = BEtoHs(ttOffsetTableBE.uNumOfTables); -+ for (i = 0; i < count; i++) -+ { -+ int entryOffset = offset + sizeof(TT_OFFSET_TABLE) + i * sizeof(TT_TABLE_DIRECTORY); -+ safe_read(ctx, file, entryOffset, (char *)&tblDirBE, sizeof(TT_TABLE_DIRECTORY)); -+ if (!BEtoHl(tblDirBE.uTag) || BEtoHl(tblDirBE.uTag) == TTAG_name) -+ break; -+ } -+ if (count == i || !BEtoHl(tblDirBE.uTag)) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : nameless font"); -+ tblOffset = BEtoHl(tblDirBE.uOffset); -+ -+ // read the 'name' table for record count and offsets -+ safe_read(ctx, file, tblOffset, (char *)&ttNTHeaderBE, sizeof(TT_NAME_TABLE_HEADER)); -+ offset = tblOffset + sizeof(TT_NAME_TABLE_HEADER); -+ tblOffset += BEtoHs(ttNTHeaderBE.uStorageOffset); -+ -+ // read through the strings for PostScript name and font family -+ count = BEtoHs(ttNTHeaderBE.uNRCount); -+ for (i = 0; i < count; i++) -+ { -+ short langId, nameId; -+ BOOL isCJKName; -+ -+ safe_read(ctx, file, offset + i * sizeof(TT_NAME_RECORD), (char *)&ttRecordBE, sizeof(TT_NAME_RECORD)); -+ -+ langId = BEtoHs(ttRecordBE.uLanguageID); -+ nameId = BEtoHs(ttRecordBE.uNameID); -+ isCJKName = TT_NAME_ID_FONT_FAMILY == nameId && LANG_CHINESE == PRIMARYLANGID(langId); -+ -+ // ignore non-English strings (except for Chinese font names) -+ if (langId && langId != TT_MS_LANGID_ENGLISH_UNITED_STATES && !isCJKName) -+ continue; -+ // ignore names other than font (sub)family and PostScript name -+ fz_try(ctx) -+ { -+ if (isCJKName) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szCJKName, sizeof(szCJKName)); -+ else if (TT_NAME_ID_FONT_FAMILY == nameId) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szTTName, sizeof(szTTName)); -+ else if (TT_NAME_ID_FONT_SUBFAMILY == nameId) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szStyle, sizeof(szStyle)); -+ else if (TT_NAME_ID_PS_NAME == nameId) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szPSName, sizeof(szPSName)); -+ } -+ fz_catch(ctx) -+ { -+ fz_warn(ctx, "ignoring face name decoding fonterror"); -+ } -+ } -+ -+ // try to prevent non-Arial fonts from accidentally substituting Arial -+ if (!strcmp(szPSName, "ArialMT")) -+ { -+ // cf. https://code.google.com/p/sumatrapdf/issues/detail?id=2471 -+ if (strcmp(szTTName, "Arial") != 0) -+ szPSName[0] = '\0'; -+ // TODO: is there a better way to distinguish Arial Caps from Arial proper? -+ // cf. http://code.google.com/p/sumatrapdf/issues/detail?id=1290 -+ else if (strstr(path, "caps") || strstr(path, "Caps")) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "ignore %s, as it can't be distinguished from Arial,Regular", path); -+ } -+ -+ if (szPSName[0]) -+ append_mapping(ctx, &fontlistMS, szPSName, path, index); -+ if (szTTName[0]) -+ { -+ // derive a PostScript-like name and add it, if it's different from the font's -+ // included PostScript name; cf. http://code.google.com/p/sumatrapdf/issues/detail?id=376 -+ makeFakePSName(szTTName, szStyle); -+ // compare the two names before adding this one -+ if (lookup_compare(szTTName, szPSName)) -+ append_mapping(ctx, &fontlistMS, szTTName, path, index); -+ } -+ if (szCJKName[0]) -+ { -+ makeFakePSName(szCJKName, szStyle); -+ if (lookup_compare(szCJKName, szPSName) && lookup_compare(szCJKName, szTTName)) -+ append_mapping(ctx, &fontlistMS, szCJKName, path, index); -+ } -+} -+ -+static void -+parseTTFs(fz_context *ctx, const char *path) -+{ -+ fz_stream *file = fz_open_file(ctx, path); -+ /* "fonterror : %s not found", path */ -+ fz_try(ctx) -+ { -+ parseTTF(ctx, file, 0, 0, path); -+ } -+ fz_always(ctx) -+ { -+ fz_drop_stream(ctx,file); -+ } -+ fz_catch(ctx) -+ { -+ fz_rethrow(ctx); -+ } -+} -+ -+static void -+parseTTCs(fz_context *ctx, const char *path) -+{ -+ FONT_COLLECTION fontcollectionBE; -+ ULONG i, numFonts, *offsettableBE = NULL; -+ -+ fz_stream *file = fz_open_file(ctx, path); -+ /* "fonterror : %s not found", path */ -+ -+ fz_var(offsettableBE); -+ -+ fz_try(ctx) -+ { -+ safe_read(ctx, file, 0, (char *)&fontcollectionBE, sizeof(FONT_COLLECTION)); -+ if (BEtoHl(fontcollectionBE.Tag) != TTAG_ttcf) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : wrong format %x", (unsigned int)BEtoHl(fontcollectionBE.Tag)); -+ if (BEtoHl(fontcollectionBE.Version) != TTC_VERSION1 && -+ BEtoHl(fontcollectionBE.Version) != TTC_VERSION2) -+ { -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid version %x", (unsigned int)BEtoHl(fontcollectionBE.Version)); -+ } -+ -+ numFonts = BEtoHl(fontcollectionBE.NumFonts); -+ offsettableBE = fz_malloc_array(ctx, numFonts, sizeof(ULONG)); -+ -+ safe_read(ctx, file, sizeof(FONT_COLLECTION), (char *)offsettableBE, numFonts * sizeof(ULONG)); -+ for (i = 0; i < numFonts; i++) -+ parseTTF(ctx, file, BEtoHl(offsettableBE[i]), i, path); -+ } -+ fz_always(ctx) -+ { -+ fz_free(ctx, offsettableBE); -+ fz_drop_stream(ctx,file); -+ } -+ fz_catch(ctx) -+ { -+ fz_rethrow(ctx); -+ } -+} -+ -+static void -+extend_system_font_list(fz_context *ctx, const WCHAR *path) -+{ -+ WCHAR szPath[MAX_PATH], *lpFileName; -+ WIN32_FIND_DATA FileData; -+ HANDLE hList; -+ -+ GetFullPathName(path, nelem(szPath), szPath, &lpFileName); -+ -+ hList = FindFirstFile(szPath, &FileData); -+ if (hList == INVALID_HANDLE_VALUE) -+ { -+ // Don't complain about missing directories -+ if (GetLastError() == ERROR_FILE_NOT_FOUND) -+ return; -+ fz_throw(ctx, FZ_ERROR_GENERIC, "extend_system_font_list: unknown error %d", (int)GetLastError()); -+ } -+ do -+ { -+ if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) -+ { -+ char szPathUtf8[MAX_PATH], *fileExt; -+ int res; -+ lstrcpyn(lpFileName, FileData.cFileName, szPath + MAX_PATH - lpFileName); -+ res = WideCharToMultiByte(CP_UTF8, 0, szPath, -1, szPathUtf8, sizeof(szPathUtf8), NULL, NULL); -+ if (!res) -+ { -+ fz_warn(ctx, "WideCharToMultiByte failed for %S", szPath); -+ continue; -+ } -+ fileExt = szPathUtf8 + strlen(szPathUtf8) - 4; -+ fz_try(ctx) -+ { -+ if (!_stricmp(fileExt, ".ttc")) -+ parseTTCs(ctx, szPathUtf8); -+ else if (!_stricmp(fileExt, ".ttf") || !_stricmp(fileExt, ".otf")) -+ parseTTFs(ctx, szPathUtf8); -+ } -+ fz_catch(ctx) -+ { -+ // ignore errors occurring while parsing a given font file -+ } -+ } -+ } while (FindNextFile(hList, &FileData)); -+ FindClose(hList); -+} -+ -+static void -+destroy_system_font_list(void) -+{ -+ free(fontlistMS.fontmap); -+ memset(&fontlistMS, 0, sizeof(fontlistMS)); -+} -+ -+static void -+create_system_font_list(fz_context *ctx) -+{ -+ WCHAR szFontDir[MAX_PATH]; -+ UINT cch; -+ -+ cch = GetWindowsDirectory(szFontDir, nelem(szFontDir) - 12); -+ if (0 < cch && cch < nelem(szFontDir) - 12) -+ { -+ /* willus.com edit--Win XP default MSVCRT.DLL doesn't have wcscat_s */ -+#ifdef _WIN64 -+ wcscat_s(szFontDir, MAX_PATH, L"\\Fonts\\*.?t?"); -+#else -+ wcscat(szFontDir,L"\\Fonts\\*.?t?"); -+#endif -+ extend_system_font_list(ctx, szFontDir); -+ } -+ -+ if (fontlistMS.len == 0) -+ fz_warn(ctx, "couldn't find any usable system fonts"); -+ -+#ifdef NOCJKFONT -+ { -+ // If no CJK fallback font is builtin but one has been shipped separately (in the same -+ // directory as the main executable), add it to the list of loadable system fonts -+ WCHAR szFile[MAX_PATH], *lpFileName; -+ GetModuleFileName(0, szFontDir, MAX_PATH); -+ GetFullPathName(szFontDir, MAX_PATH, szFile, &lpFileName); -+ lstrcpyn(lpFileName, L"DroidSansFallback.ttf", szFile + MAX_PATH - lpFileName); -+ extend_system_font_list(ctx, szFile); -+ } -+#endif -+ -+ // sort the font list, so that it can be searched binarily -+ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); -+ -+#ifdef DEBUG -+ // allow to overwrite system fonts for debugging purposes -+ // (either pass a full path or a search pattern such as "fonts\*.ttf") -+ cch = GetEnvironmentVariable(L"MUPDF_FONTS_PATTERN", szFontDir, nelem(szFontDir)); -+ if (0 < cch && cch < nelem(szFontDir)) -+ { -+ int i, prev_len = fontlistMS.len; -+ extend_system_font_list(ctx, szFontDir); -+ for (i = prev_len; i < fontlistMS.len; i++) -+ { -+ pdf_fontmapMS *entry = bsearch(fontlistMS.fontmap[i].fontface, fontlistMS.fontmap, prev_len, sizeof(pdf_fontmapMS), lookup_compare); -+ if (entry) -+ *entry = fontlistMS.fontmap[i]; -+ } -+ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); -+ } -+#endif -+ -+ // make sure to clean up after ourselves -+ atexit(destroy_system_font_list); -+} -+ -+static fz_font * -+pdf_load_windows_font_by_name(fz_context *ctx, const char *orig_name) -+{ -+ pdf_fontmapMS *found = NULL; -+ char *comma, *fontname; -+ fz_font *font; -+ -+ /* WILLUS MOD--not multi-threaded for k2pdfopt */ -+ /* fz_synchronize_begin(); */ -+ if (fontlistMS.len == 0) -+ { -+ fz_try(ctx) -+ { -+ create_system_font_list(ctx); -+ } -+ fz_catch(ctx) { } -+ } -+ /* WILLUS MOD--not multi-threaded for k2pdfopt */ -+ /* fz_synchronize_end(); */ -+ if (fontlistMS.len == 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror: couldn't find any fonts"); -+ -+ // work on a normalized copy of the font name -+ fontname = fz_strdup(ctx, orig_name); -+ remove_spaces(fontname); -+ -+ // first, try to find the exact font name (including appended style information) -+ comma = strchr(fontname, ','); -+ if (comma) -+ { -+ *comma = '-'; -+ found = pdf_find_windows_font_path(fontname); -+ *comma = ','; -+ } -+ // second, substitute the font name with a known PostScript name -+ else -+ { -+ int i; -+ for (i = 0; i < nelem(baseSubstitutes) && !found; i++) -+ if (!strcmp(fontname, baseSubstitutes[i].name)) -+ found = pdf_find_windows_font_path(baseSubstitutes[i].pattern); -+ } -+ // third, search for the font name without additional style information -+ if (!found) -+ found = pdf_find_windows_font_path(fontname); -+ // fourth, try to separate style from basename for prestyled fonts (e.g. "ArialBold") -+ if (!found && !comma && (str_ends_with(fontname, "Bold") || str_ends_with(fontname, "Italic"))) -+ { -+ int styleLen = str_ends_with(fontname, "Bold") ? 4 : str_ends_with(fontname, "BoldItalic") ? 10 : 6; -+ fontname = fz_resize_array(ctx, fontname, strlen(fontname) + 2, sizeof(char)); -+ comma = fontname + strlen(fontname) - styleLen; -+ memmove(comma + 1, comma, styleLen + 1); -+ *comma = '-'; -+ found = pdf_find_windows_font_path(fontname); -+ *comma = ','; -+ if (!found) -+ found = pdf_find_windows_font_path(fontname); -+ } -+ // fifth, try to convert the font name from the common Chinese codepage 936 -+ if (!found && fontname[0] < 0) -+ { -+ WCHAR cjkNameW[MAX_FACENAME]; -+ char cjkName[MAX_FACENAME]; -+ if (MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, fontname, -1, cjkNameW, nelem(cjkNameW)) && -+ WideCharToMultiByte(CP_UTF8, 0, cjkNameW, -1, cjkName, nelem(cjkName), NULL, NULL)) -+ { -+ comma = strchr(cjkName, ','); -+ if (comma) -+ { -+ *comma = '-'; -+ found = pdf_find_windows_font_path(cjkName); -+ *comma = ','; -+ } -+ if (!found) -+ found = pdf_find_windows_font_path(cjkName); -+ } -+ } -+ -+ fz_free(ctx, fontname); -+ if (!found) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "couldn't find system font '%s'", orig_name); -+ -+ /* -+ fz_warn(ctx, "loading non-embedded font '%s' from '%s'", orig_name, found->fontpath); -+ */ -+ -+ font = fz_new_font_from_file(ctx, orig_name, found->fontpath, found->index, -+ strcmp(found->fontface, "DroidSansFallback") != 0); -+ /* willus mod for MuPDF v1.10, 10-21-2016 */ -+ { -+ fz_font_flags_t *flags; -+ flags=fz_font_flags(font); -+ if (flags!=NULL) -+ flags->ft_substitute = 1; -+ } -+ return font; -+} -+ -+static fz_font * -+pdf_load_windows_font(fz_context *ctx, const char *fontname, int bold, int italic, int needs_exact_metrics) -+{ -+ if (needs_exact_metrics) -+ { -+ const char *clean_name; -+ /* WILLUS: Declare pdf_clean_base14_name() */ -+ extern const char *pdf_clean_base14_name(const char *fontname); -+ -+ /* TODO: the metrics for Times-Roman and Courier don't match -+ those of Windows' Times New Roman and Courier New; for -+ some reason, Poppler doesn't seem to have this problem */ -+ int len; -+ if (fz_lookup_builtin_font(ctx,fontname, bold, italic, &len)) -+ return NULL; -+ -+ /* cf. http://code.google.com/p/sumatrapdf/issues/detail?id=2173 */ -+ clean_name = pdf_clean_base14_name(fontname); -+ if (clean_name != fontname && !strncmp(clean_name, "Times-", 6)) -+ return NULL; -+ } -+ -+ // TODO: unset font->ft_substitute for base14/needs_exact_metrics? -+ return pdf_load_windows_font_by_name(ctx, fontname); -+} -+ -+static const char *clean_font_name(const char *fontname) -+{ -+ int i, k; -+ for (i = 0; i < nelem(base_font_names); i++) -+ for (k = 0; base_font_names[i][k]; k++) -+ if (!strcmp_ignore_space(base_font_names[i][k], fontname)) -+ return base_font_names[i][0]; -+ return fontname; -+} -+ -+ -+/* SumatraPDF: expose clean_font_name */ -+static const char * pdf_clean_base14_name(const char *fontname) -+{ -+ return clean_font_name(fontname); -+} -+ -+static fz_font * -+pdf_load_windows_cjk_font(fz_context *ctx, const char *fontname, int ros, int serif) -+{ -+ fz_font *font; -+ -+ font=NULL; /* WILLUS: Avoid compiler warning */ -+ /* try to find a matching system font before falling back to an approximate one */ -+ fz_try(ctx) -+ { -+ font = pdf_load_windows_font_by_name(ctx, fontname); -+ } -+ fz_catch(ctx) -+ { -+ font = NULL; -+ } -+ if (font) -+ return font; -+ -+ /* try to fall back to a reasonable system font */ -+ fz_try(ctx) -+ { -+ if (serif) -+ { -+ switch (ros) -+ { -+ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "MingLiU"); break; -+ case FZ_ADOBE_GB: font = pdf_load_windows_font_by_name(ctx, "SimSun"); break; -+ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Mincho"); break; -+ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Batang"); break; -+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid serif ros"); -+ } -+ } -+ else -+ { -+ switch (ros) -+ { -+ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "DFKaiShu-SB-Estd-BF"); break; -+ case FZ_ADOBE_GB: -+ fz_try(ctx) -+ { -+ font = pdf_load_windows_font_by_name(ctx, "KaiTi"); -+ } -+ fz_catch(ctx) -+ { -+ font = pdf_load_windows_font_by_name(ctx, "KaiTi_GB2312"); -+ } -+ break; -+ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Gothic"); break; -+ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Gulim"); break; -+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid sans-serif ros"); -+ } -+ } -+ } -+ fz_catch(ctx) -+ { -+#ifdef NOCJKFONT -+ /* If no CJK fallback font is builtin, maybe one has been shipped separately */ -+ font = pdf_load_windows_font_by_name(ctx, "DroidSansFallback"); -+#else -+ fz_rethrow(ctx); -+#endif -+ } -+ -+ return font; -+} -+ -+#endif -+ -+void pdf_install_load_system_font_funcs(fz_context *ctx) -+{ -+#ifdef _WIN32 -+ fz_install_load_system_font_funcs(ctx, pdf_load_windows_font, pdf_load_windows_cjk_font, NULL); -+#endif -+} -diff --git a/source/fitz/font.c b/source/fitz/font.c -index 00c6e8f99..1448b4a56 100644 ---- a/source/fitz/font.c -+++ b/source/fitz/font.c -@@ -4,8 +4,11 @@ - #include "draw-imp.h" - - #include -+/* willus mod -- remove hb includes */ -+/* - #include "hb.h" - #include "hb-ft.h" -+*/ - - #include - -diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c -index 2df90305e..b1f99e056 100644 ---- a/source/fitz/stext-device.c -+++ b/source/fitz/stext-device.c -@@ -825,6 +825,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options - dev->lastchar = ' '; - dev->curdir = 1; - dev->lasttext = NULL; -+ /* willus mod -- seems like this should be here, but not sure. */ -+ if (opts) -+ dev->flags = opts->flags; -+ else -+ dev->flags = 0; - - return (fz_device*)dev; - } -diff --git a/source/fitz/string.c b/source/fitz/string.c -index f8eedb682..7a767983d 100644 ---- a/source/fitz/string.c -+++ b/source/fitz/string.c -@@ -560,6 +560,10 @@ fz_utflen(const char *s) - */ - float fz_atof(const char *s) - { -+/* willus mod: atof(s), #if-#else-#endif */ -+#if (!defined(__SSE__)) -+ return(atof(s)); -+#else - float result; - - if (s == NULL) -@@ -572,6 +576,7 @@ float fz_atof(const char *s) - return 1; - result = fz_clamp(result, -FLT_MAX, FLT_MAX); - return result; -+#endif - } - - /* -diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c -index 4dfdf36fe..acff7d12a 100644 ---- a/source/pdf/pdf-annot.c -+++ b/source/pdf/pdf-annot.c -@@ -5,8 +5,20 @@ - #include - #include - -+/* willus mod--don't use _mkgmtime--not available in Win XP */ - #ifdef _WIN32 --#define timegm _mkgmtime -+static time_t timegm(struct tm *date); -+static time_t timegm(struct tm *date) -+ -+ { -+ time_t t,z; -+ struct tm gmz; -+ -+ z=(time_t)0; -+ gmz=(*gmtime(&z)); -+ t=mktime(date)-mktime(&gmz); -+ return(t); -+ } - #endif - - #define isdigit(c) (c >= '0' && c <= '9') -diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c -index 37444b471..613cc05b9 100644 ---- a/source/pdf/pdf-link.c -+++ b/source/pdf/pdf-link.c -@@ -345,6 +345,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp, - } - return page; - } -+/* willus mod -- be quiet */ -+/* - fz_warn(ctx, "unknown link uri '%s'", uri); -+*/ - return -1; - } -diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c -index 04a772204..9dd0cd898 100644 ---- a/source/pdf/pdf-parse.c -+++ b/source/pdf/pdf-parse.c -@@ -663,9 +663,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, - if (c == '\r') - { - c = fz_peek_byte(ctx, file); -+/* willus mod -- no warning */ -+/* - if (c != '\n') - fz_warn(ctx, "line feed missing after stream begin marker (%d %d R)", num, gen); - else -+*/ -+if (c=='\n') -+/* willus mod -- end */ - fz_read_byte(ctx, file); - } - stm_ofs = fz_tell(ctx, file); -diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c -index 8f888059b..08de7bfba 100644 ---- a/source/pdf/pdf-xref.c -+++ b/source/pdf/pdf-xref.c -@@ -710,8 +710,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b - if (!s) - fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length missing"); - len = fz_atoi(fz_strsep(&s, " ")); -+/* willus mod -- no warning */ -+/* - if (len < 0) - fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length must be positive"); -+*/ - - /* broken pdfs where the section is not on a separate line */ - if (s && *s != '\0') -@@ -1378,7 +1381,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc) - { - pdf_drop_xref_sections(ctx, doc); - fz_rethrow_if(ctx, FZ_ERROR_TRYLATER); -+/* willus mod -- be quiet */ -+/* - fz_warn(ctx, "trying to repair broken xref"); -+*/ - repaired = 1; - } - -@@ -1506,7 +1512,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc) - /* Swallow error, but continue dropping */ - } - -+/* willu smod -- no pdf_drop_js */ -+/* - pdf_drop_js(ctx, doc->js); -+*/ - - pdf_drop_xref_sections(ctx, doc); - fz_free(ctx, doc->xref_index); --- -2.22.0 - diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch deleted file mode 100644 index adfee9ae282f..000000000000 --- a/pkgs/applications/misc/k2pdfopt/tesseract.patch +++ /dev/null @@ -1,675 +0,0 @@ -From 39aa8502eee7bb669a29d1a9b3bfe5c9595ad960 Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer -Date: Fri, 13 Sep 2019 13:45:05 -0400 -Subject: [PATCH] Willus mod changes from k2pdfopt - ---- - src/api/Makefile.am | 1 + - src/api/baseapi.cpp | 87 +++++++++++ - src/api/baseapi.h | 3 + - src/api/tesscapi.cpp | 311 +++++++++++++++++++++++++++++++++++++ - src/api/tesseract.h | 29 ++++ - src/ccmain/tessedit.cpp | 5 +- - src/ccutil/ccutil.h | 7 + - src/ccutil/genericvector.h | 21 ++- - src/ccutil/mainblk.cpp | 17 +- - src/ccutil/params.cpp | 3 +- - src/ccutil/serialis.cpp | 3 + - src/ccutil/serialis.h | 2 + - src/lstm/input.cpp | 3 + - 13 files changed, 488 insertions(+), 4 deletions(-) - create mode 100644 src/api/tesscapi.cpp - create mode 100644 src/api/tesseract.h - -diff --git a/src/api/Makefile.am b/src/api/Makefile.am -index d9b76eb6..cd2dc30f 100644 ---- a/src/api/Makefile.am -+++ b/src/api/Makefile.am -@@ -39,6 +39,7 @@ libtesseract_api_la_SOURCES += lstmboxrenderer.cpp - libtesseract_api_la_SOURCES += pdfrenderer.cpp - libtesseract_api_la_SOURCES += wordstrboxrenderer.cpp - libtesseract_api_la_SOURCES += renderer.cpp -+libtesseract_api_la_SOURCES += tesscapi.cpp - - lib_LTLIBRARIES += libtesseract.la - libtesseract_la_LDFLAGS = $(LEPTONICA_LIBS) $(OPENCL_LDFLAGS) $(libarchive_LIBS) -diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp -index 9245d07c..ea964ee6 100644 ---- a/src/api/baseapi.cpp -+++ b/src/api/baseapi.cpp -@@ -215,6 +215,14 @@ TessBaseAPI::TessBaseAPI() - // Use the current locale if building debug code. - std::locale::global(std::locale("")); - #endif -+ const char *locale; -+ locale = std::setlocale(LC_ALL, nullptr); -+/* willus mod Remove assertions--taken care of in tesscapi.cpp */ -+// ASSERT_HOST(!strcmp(locale, "C")); -+ locale = std::setlocale(LC_CTYPE, nullptr); -+// ASSERT_HOST(!strcmp(locale, "C")); -+ locale = std::setlocale(LC_NUMERIC, nullptr); -+// ASSERT_HOST(!strcmp(locale, "C")); - } - - TessBaseAPI::~TessBaseAPI() { -@@ -1333,6 +1341,85 @@ static void AddBoxToTSV(const PageIterator* it, PageIteratorLevel level, - text->add_str_int("\t", bottom - top); - } - -+/* willus mod */ -+int TessBaseAPI::GetOCRWords(int **x00,int **y00,int **x11,int **y11,int **ybaseline0, -+ char **utf8words) -+ -+ { -+ int iword,nwords,totlen,it8; -+ int *x0,*y0,*x1,*y1,*ybaseline; -+ char *tutf8; -+ -+ ResultIterator *res_it = GetIterator(); -+ /* Count words */ -+ iword=0; -+ totlen=0; -+ while (!res_it->Empty(RIL_BLOCK)) -+ { -+ if (res_it->Empty(RIL_WORD)) -+ { -+ res_it->Next(RIL_WORD); -+ continue; -+ } -+ iword++; -+ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get(); -+ totlen+=strlen(textstr.string())+1; -+ res_it->Next(RIL_WORD); -+ } -+ nwords=iword; -+/* -+printf("\nnwords=%d, totlen=%d\n",nwords,totlen); -+*/ -+ x0=(*x00)=(int *)malloc(sizeof(int)*5*nwords); -+ y0=(*y00)=&x0[nwords]; -+ x1=(*x11)=&y0[nwords]; -+ y1=(*y11)=&x1[nwords]; -+ ybaseline=(*ybaseline0)=&y1[nwords]; -+ tutf8=(*utf8words)=(char *)malloc(totlen); -+ iword=0; -+ it8=0; -+ res_it->Begin(); -+ while (!res_it->Empty(RIL_BLOCK)) -+ { -+ if (res_it->Empty(RIL_WORD)) -+ { -+ res_it->Next(RIL_WORD); -+ continue; -+ } -+ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get(); -+ strcpy(&tutf8[it8],textstr.string()); -+ it8 += strlen(&tutf8[it8])+1; -+ /* -+ STRING textstr(""); -+ textstr += std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get(); -+ */ -+/* -+printf("Word %d: '%s'\n",iword,textstr.string()); -+*/ -+ int left, top, right, bottom; -+ int u1,v1,u2,v2; -+ res_it->BoundingBox(RIL_WORD, &left, &top, &right, &bottom); -+ res_it->Baseline(RIL_WORD, &u1, &v1, &u2, &v2); -+ x0[iword]=left; -+ x1[iword]=right; -+ y0[iword]=top; -+ y1[iword]=bottom; -+ ybaseline[iword]=(v1+v2)/2; -+ iword++; -+/* -+printf("BB: (%d,%d)-(%d,%d) BL: (%d,%d)-(%d,%d)\n",left,bottom,right,top,x1,y1,x2,y2); -+*/ -+ res_it->Next(RIL_WORD); -+ } -+/* -+printf("iword=%d\n",iword); -+*/ -+ return(iword); -+ } -+ -+/* willus mod */ -+int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); -+ - /** - * Make a TSV-formatted string from the internal data structures. - * page_number is 0-based but will appear in the output as 1-based. -diff --git a/src/api/baseapi.h b/src/api/baseapi.h -index 3724dd92..23be5920 100644 ---- a/src/api/baseapi.h -+++ b/src/api/baseapi.h -@@ -575,6 +575,9 @@ class TESS_API TessBaseAPI { - */ - char* GetHOCRText(ETEXT_DESC* monitor, int page_number); - -+/* willus mod */ -+int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); -+ - /** - * Make a HTML-formatted string with hOCR markup from the internal - * data structures. -diff --git a/src/api/tesscapi.cpp b/src/api/tesscapi.cpp -new file mode 100644 -index 00000000..1752fafe ---- /dev/null -+++ b/src/api/tesscapi.cpp -@@ -0,0 +1,311 @@ -+/* -+** tesscapi.cpp willus.com attempt at C wrapper for tesseract. -+** (Butchered from tesseractmain.cpp) -+** Last udpated 9-1-12 -+** -+** Copyright (C) 2012 http://willus.com -+** -+** This program is free software: you can redistribute it and/or modify -+** it under the terms of the GNU Affero General Public License as -+** published by the Free Software Foundation, either version 3 of the -+** License, or (at your option) any later version. -+** -+** This program is distributed in the hope that it will be useful, -+** but WITHOUT ANY WARRANTY; without even the implied warranty of -+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+** GNU Affero General Public License for more details. -+** -+** You should have received a copy of the GNU Affero General Public License -+** along with this program. If not, see . -+** -+*/ -+ -+/* -+#include "mfcpch.h" -+*/ -+// #define USE_VLD //Uncomment for Visual Leak Detector. -+#if (defined _MSC_VER && defined USE_VLD) -+#include -+#endif -+ -+// Include automatically generated configuration file if running autoconf -+#ifdef HAVE_CONFIG_H -+#include "config_auto.h" -+#endif -+#include -+#ifdef USING_GETTEXT -+#include -+#define _(x) gettext(x) -+#else -+#define _(x) (x) -+#endif -+ -+#include "allheaders.h" -+#include "baseapi.h" -+#include "strngs.h" -+#include "params.h" -+#include "blobs.h" -+#include "simddetect.h" -+#include "tesseractclass.h" -+/* -+#include "notdll.h" -+*/ -+ -+/* C Wrappers */ -+#include "tesseract.h" -+ -+// static tesseract::TessBaseAPI api[4]; -+ -+/* -+** ocr_type=0: OEM_DEFAULT -+** ocr_type=1: OEM_TESSERACT_ONLY -+** ocr_type=2: OEM_LSTM_ONLY -+** ocr_type=3: OEM_TESSERACT_LSTM_COMBINED -+*/ -+void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, -+ char *initstr,int maxlen,int *status) -+ -+ { -+ char original_locale[256]; -+ tesseract::TessBaseAPI *api = new tesseract::TessBaseAPI; -+/* -+printf("@tess_capi_init\n"); -+printf(" datapath='%s'\n",datapath); -+printf(" language='%s'\n",language); -+printf(" ocr_type=%d\n",ocr_type); -+*/ -+#ifdef USE_NLS -+ setlocale (LC_ALL, ""); -+ bindtextdomain (PACKAGE, LOCALEDIR); -+ textdomain (PACKAGE); -+#endif -+ /* willus mod, 11-24-16 */ -+ /* Tesseract needs "C" locale to correctly parse all data .traineddata files. */ -+/* -+printf("locale='%s'\n",setlocale(LC_ALL,NULL)); -+printf("ctype='%s'\n",setlocale(LC_CTYPE,NULL)); -+printf("numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); -+*/ -+ strncpy(original_locale,setlocale(LC_ALL,NULL),255); -+ original_locale[255]='\0'; -+/* -+printf("original_locale='%s'\n",original_locale); -+*/ -+ setlocale(LC_ALL,"C"); -+/* -+printf("new locale='%s'\n",setlocale(LC_ALL,NULL)); -+printf("new ctype='%s'\n",setlocale(LC_CTYPE,NULL)); -+printf("new numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); -+*/ -+ // fprintf(stderr, "tesseract %s\n", tesseract::TessBaseAPI::Version()); -+ // Make the order of args a bit more forgiving than it used to be. -+ const char* lang = "eng"; -+ tesseract::PageSegMode pagesegmode = tesseract::PSM_SINGLE_BLOCK; -+ if (language!=NULL && language[0]!='\0') -+ lang = language; -+ /* -+ if (output == NULL) -+ { -+ fprintf(stderr, _("Usage:%s imagename outputbase [-l lang] " -+ "[-psm pagesegmode] [configfile...]\n"), argv[0]); -+ fprintf(stderr, -+ _("pagesegmode values are:\n" -+ "0 = Orientation and script detection (OSD) only.\n" -+ "1 = Automatic page segmentation with OSD.\n" -+ "2 = Automatic page segmentation, but no OSD, or OCR\n" -+ "3 = Fully automatic page segmentation, but no OSD. (Default)\n" -+ "4 = Assume a single column of text of variable sizes.\n" -+ "5 = Assume a single uniform block of vertically aligned text.\n" -+ "6 = Assume a single uniform block of text.\n" -+ "7 = Treat the image as a single text line.\n" -+ "8 = Treat the image as a single word.\n" -+ "9 = Treat the image as a single word in a circle.\n" -+ "10 = Treat the image as a single character.\n")); -+ fprintf(stderr, _("-l lang and/or -psm pagesegmode must occur before any" -+ "configfile.\n")); -+ exit(1); -+ } -+ */ -+/* -+printf("SSE = %s\n",SIMDDetect::IsSSEAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); -+printf("AVX = %s\n",SIMDDetect::IsAVXAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); -+*/ -+/* -+v4.00 loads either TESSERACT enginer, LSTM engine, or both. No CUBE. -+*/ -+ ocr_type=0; /* Ignore specified and use default */ -+ api->SetOutputName(NULL); -+ (*status)=api->Init(datapath,lang, -+ ocr_type==0 ? tesseract::OEM_DEFAULT : -+ (ocr_type==1 ? tesseract::OEM_TESSERACT_ONLY : -+ (ocr_type==2 ? tesseract::OEM_LSTM_ONLY : -+ (tesseract::OEM_TESSERACT_LSTM_COMBINED)))); -+ if ((*status)!=0) -+ { -+ /* willus mod, 11-24-16 */ -+ setlocale(LC_ALL,original_locale); -+ api->End(); -+ delete api; -+ return(NULL); -+ } -+ /* -+ api.Init("tesscapi",lang,tesseract::OEM_DEFAULT, -+ &(argv[arg]), argc - arg, NULL, NULL, false); -+ */ -+ // We have 2 possible sources of pagesegmode: a config file and -+ // the command line. For backwards compatability reasons, the -+ // default in tesseract is tesseract::PSM_SINGLE_BLOCK, but the -+ // default for this program is tesseract::PSM_AUTO. We will let -+ // the config file take priority, so the command-line default -+ // can take priority over the tesseract default, so we use the -+ // value from the command line only if the retrieved mode -+ // is still tesseract::PSM_SINGLE_BLOCK, indicating no change -+ // in any config file. Therefore the only way to force -+ // tesseract::PSM_SINGLE_BLOCK is from the command line. -+ // It would be simpler if we could set the value before Init, -+ // but that doesn't work. -+ if (api->GetPageSegMode() == tesseract::PSM_SINGLE_BLOCK) -+ api->SetPageSegMode(pagesegmode); -+ -+ /* -+ ** Initialization message -+ */ -+ { -+ char istr[1024]; -+ int sse,avx; -+ -+// printf("tessedit_ocr_engine_mode = %d\n",tessedit_ocr_engine_mode); -+ sprintf(istr,"%s",api->Version()); -+ sse=tesseract::SIMDDetect::IsSSEAvailable(); -+ avx=tesseract::SIMDDetect::IsAVXAvailable(); -+ if (sse || avx) -+ sprintf(&istr[strlen(istr)]," [%s]",sse&&avx?"SSE+AVX":(sse?"SSE":"AVX")); -+ sprintf(&istr[strlen(istr)],"\n Tesseract data folder = '%s'",datapath==NULL?getenv("TESSDATA_PREFIX"):datapath); -+ strcat(istr,"\n Tesseract languages: "); -+ GenericVector languages; -+ api->GetLoadedLanguagesAsVector(&languages); -+/* -+printf("OEM=%d\n",api->oem()); -+printf("Langs='%s'\n",api->GetInitLanguagesAsString()); -+printf("AnyTessLang()=%d\n",(int)api->tesseract()->AnyTessLang()); -+printf("AnyLSTMLang()=%d\n",(int)api->tesseract()->AnyLSTMLang()); -+printf("num_sub_langs()=%d\n",api->tesseract()->num_sub_langs()); -+printf("languages.size()=%d\n",(int)languages.size()); -+*/ -+ -+ for (int i=0;i<=api->tesseract()->num_sub_langs();i++) -+ { -+ tesseract::Tesseract *lang1; -+ int eng; -+ lang1 = i==0 ? api->tesseract() : api->tesseract()->get_sub_lang(i-1); -+ eng=(int)lang1->tessedit_ocr_engine_mode; -+ sprintf(&istr[strlen(istr)],"%s%s [%s]",i==0?"":", ",lang1->lang.string(), -+ eng==2?"LSTM+Tess":(eng==1?"LSTM":"Tess")); -+ } -+/* -+printf("%d. '%s'\n",i+1,languages[i].string()); -+printf(" sublang[%d].oem_engine = %d\n",i+1,(int)api->tesseract()->get_sub_lang(i)->tessedit_ocr_engine_mode); -+*/ -+ -+ /* -+ if (ocr_type==0 || ocr_type==3) -+ sprintf(&istr[strlen(istr)],"[LSTM+] (lang="); -+ else if (ocr_type==2) -+ sprintf(&istr[strlen(istr)],"[LSTM] (lang="); -+ strncpy(&istr[strlen(istr)],language,253-strlen(istr)); -+ istr[253]='\0'; -+ strcat(istr,")"); -+ */ -+ if (out!=NULL) -+ fprintf(out,"%s\n",istr); -+ if (initstr!=NULL) -+ { -+ strncpy(initstr,istr,maxlen-1); -+ initstr[maxlen-1]='\0'; -+ } -+ } -+ -+ -+ /* Turn off LSTM debugging output */ -+ api->SetVariable("lstm_debug_level","0"); -+#if (WILLUSDEBUG & 1) -+ api->SetVariable("lstm_debug_level","9"); -+ api->SetVariable("paragraph_debug_level","9"); -+ api->SetVariable("tessdata_manager_debug_level","9"); -+ api->SetVariable("tosp_debug_level","9"); -+ api->SetVariable("wordrec_debug_level","9"); -+ api->SetVariable("segsearch_debug_level","9"); -+#endif -+ /* willus mod, 11-24-16 */ -+ setlocale(LC_ALL,original_locale); -+ return((void *)api); -+ } -+ -+ -+int tess_capi_get_ocr(void *vapi,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out) -+ -+ { -+ tesseract::TessBaseAPI *api; -+ static int old_segmode=-1; -+ -+ api=(tesseract::TessBaseAPI *)vapi; -+ if (old_segmode != segmode) -+ { -+ old_segmode=segmode; -+ api->SetPageSegMode((tesseract::PageSegMode)segmode); -+ } -+ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) -+ { -+ /* pixDestroy(&pix); */ -+ if (out!=NULL) -+ fprintf(out,"tesscapi: Error during bitmap processing.\n"); -+ api->Clear(); -+ return(-1); -+ } -+ strncpy(outstr,api->GetUTF8Text(),maxlen-1); -+ outstr[maxlen-1]='\0'; -+ api->Clear(); -+ return(0); -+ } -+ -+ -+int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, -+ int **left,int **top,int **right,int **bottom, -+ int **ybase,char **text,int *nw, -+ FILE *out) -+ -+ { -+ tesseract::TessBaseAPI *api; -+ static int old_segmode=-1; -+ -+ api=(tesseract::TessBaseAPI *)vapi; -+ if (old_segmode != segmode) -+ { -+ old_segmode=segmode; -+ api->SetPageSegMode((tesseract::PageSegMode)segmode); -+ } -+ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) -+ { -+ if (out!=NULL) -+ fprintf(out,"tesscapi: Error during bitmap processing.\n"); -+ api->Clear(); -+ (*nw)=0; -+ return(-1); -+ } -+ (*nw)=api->GetOCRWords(left,top,right,bottom,ybase,text); -+ api->Clear(); -+ return(0); -+ } -+ -+ -+void tess_capi_end(void *vapi) -+ -+ { -+ tesseract::TessBaseAPI *api; -+ -+ if (vapi==NULL) -+ return; -+ api=(tesseract::TessBaseAPI *)vapi; -+ api->End(); -+ delete api; -+ } -diff --git a/src/api/tesseract.h b/src/api/tesseract.h -new file mode 100644 -index 00000000..575948cc ---- /dev/null -+++ b/src/api/tesseract.h -@@ -0,0 +1,29 @@ -+/* -+** Willus.com's Tesseract C Wrappers -+** -+** 6-8-12 -+** -+*/ -+ -+#ifndef _TESSERACT_H_ -+#define _TESSERACT_H_ -+ -+//#include -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, -+ char *initstr,int maxlen,int *status); -+int tess_capi_get_ocr(void *api,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out); -+int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, -+ int **left,int **top,int **right,int **bottom, -+ int **ybase,char **text,int *nw, -+ FILE *out); -+void tess_capi_end(void *api); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp -index 17f0951b..7af94ee2 100644 ---- a/src/ccmain/tessedit.cpp -+++ b/src/ccmain/tessedit.cpp -@@ -101,6 +101,10 @@ bool Tesseract::init_tesseract_lang_data( - " to your \"tessdata\" directory.\n"); - return false; - } -+ /* willus mod */ -+ TFile fp; -+ strncpy(fp.tfile_filename,tessdata_path.string(),511); -+ fp.tfile_filename[511]='\0'; - #ifndef DISABLED_LEGACY_ENGINE - if (oem == OEM_DEFAULT) { - // Set the engine mode from availability, which can then be overridden by -@@ -116,7 +120,6 @@ bool Tesseract::init_tesseract_lang_data( - #endif // ndef DISABLED_LEGACY_ENGINE - - // If a language specific config file (lang.config) exists, load it in. -- TFile fp; - if (mgr->GetComponent(TESSDATA_LANG_CONFIG, &fp)) { - ParamUtils::ReadParamsFromFp(SET_PARAM_CONSTRAINT_NONE, &fp, - this->params()); -diff --git a/src/ccutil/ccutil.h b/src/ccutil/ccutil.h -index 71e89c60..bdeccc14 100644 ---- a/src/ccutil/ccutil.h -+++ b/src/ccutil/ccutil.h -@@ -80,6 +80,13 @@ class CCUtil { - // Member parameters. - // These have to be declared and initialized after params_ member, since - // params_ should be initialized before parameters are added to it. -+/* willus mod */ -+/* -+ #ifdef _WIN32 -+ STRING_VAR_H(tessedit_module_name, WINDLLNAME, -+ "Module colocated with tessdata dir"); -+ #endif -+*/ - INT_VAR_H(ambigs_debug_level, 0, "Debug level for unichar ambiguities"); - BOOL_VAR_H(use_definite_ambigs_for_classifier, false, - "Use definite ambiguities when running character classifier"); -diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h -index 3556d153..3a5e8662 100644 ---- a/src/ccutil/genericvector.h -+++ b/src/ccutil/genericvector.h -@@ -382,7 +382,26 @@ inline bool LoadDataFromFile(const char* filename, GenericVector* data) { - // reserve an extra byte in case caller wants to append a '\0' character - data->reserve(size + 1); - data->resize_no_init(size); -- result = static_cast(fread(&(*data)[0], 1, size, fp)) == size; -+ /* willus mod Dec 2018--weird issue with Win XP and MinGW gcc 7.3.0 */ -+ /* Can't read entire file at once -- need to break up into smaller blocksize reads */ -+ { -+ int frs,n; -+ int blocksize; -+ blocksize=1024*1024; -+ for (n=0;1;) -+ { -+ int bs; -+ bs= size-n > blocksize ? blocksize : size-n; -+ frs=(int)fread(&(*data)[n],1,bs,fp); -+ n+=frs; -+ if (frs=size) -+ break; -+ } -+ result = static_cast((long)n==size); -+ } -+ /* -+ result = static_cast(fread(&(*data)[0], 1, size, fp)) == size; -+ */ - } - fclose(fp); - } -diff --git a/src/ccutil/mainblk.cpp b/src/ccutil/mainblk.cpp -index 52b04b04..80b26044 100644 ---- a/src/ccutil/mainblk.cpp -+++ b/src/ccutil/mainblk.cpp -@@ -55,8 +55,22 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { - #if defined(_WIN32) - } else if (datadir == nullptr || _access(datadir.string(), 0) != 0) { - /* Look for tessdata in directory of executable. */ -+ /* -+ char drive[_MAX_DRIVE]; -+ char dir[_MAX_DIR]; -+ */ - char path[_MAX_PATH]; -- DWORD length = GetModuleFileName(nullptr, path, sizeof(path)); -+ int i; -+ /* DWORD length = */ GetModuleFileName(nullptr, path, sizeof(path)); -+ /* willus mod--avoid _splitpath_s -- not in XP */ -+ for (i=strlen(path)-1;i>=0 && path[i]!='/' && path[i]!='\\';i--); -+ if (i>=0) -+ { -+ path[i]='\0'; -+ datadir=path; -+ datadir += "/tessdata"; -+ } -+ /* - if (length > 0 && length < sizeof(path)) { - char* separator = std::strrchr(path, '\\'); - if (separator != nullptr) { -@@ -65,6 +79,7 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { - datadir += "/tessdata"; - } - } -+ */ - #endif /* _WIN32 */ - #if defined(TESSDATA_PREFIX) - } else { -diff --git a/src/ccutil/params.cpp b/src/ccutil/params.cpp -index 00bf2563..486c5ce0 100644 ---- a/src/ccutil/params.cpp -+++ b/src/ccutil/params.cpp -@@ -82,7 +82,8 @@ bool ParamUtils::ReadParamsFromFp(SetParamConstraint constraint, TFile *fp, - - if (!foundit) { - anyerr = true; // had an error -- tprintf("Warning: Parameter not found: %s\n", line); -+ /* willus mod */ -+ tprintf("Tesseract warning: Parameter %s not found in file %s.\n",line,fp->tfile_filename); - } - } - } -diff --git a/src/ccutil/serialis.cpp b/src/ccutil/serialis.cpp -index 7def011f..6107a494 100644 ---- a/src/ccutil/serialis.cpp -+++ b/src/ccutil/serialis.cpp -@@ -201,6 +201,9 @@ bool TFile::Open(const STRING& filename, FileReader reader) { - offset_ = 0; - is_writing_ = false; - swap_ = false; -+ /* willus mod */ -+ strncpy(tfile_filename,filename.string(),511); -+ tfile_filename[511]='\0'; - if (reader == nullptr) - return LoadDataFromFile(filename, data_); - else -diff --git a/src/ccutil/serialis.h b/src/ccutil/serialis.h -index 095b9227..4cc8251e 100644 ---- a/src/ccutil/serialis.h -+++ b/src/ccutil/serialis.h -@@ -77,6 +77,8 @@ class TFile { - public: - TFile(); - ~TFile(); -+ /* willus mod */ -+ char tfile_filename[512]; - - // All the Open methods load the whole file into memory for reading. - // Opens a file with a supplied reader, or nullptr to use the default. -diff --git a/src/lstm/input.cpp b/src/lstm/input.cpp -index 73b584b3..0b0b54c3 100644 ---- a/src/lstm/input.cpp -+++ b/src/lstm/input.cpp -@@ -93,8 +93,11 @@ Pix* Input::PrepareLSTMInputs(const ImageData& image_data, - return nullptr; - } - if (width < min_width || height < min_width) { -+ /* willus mod -- no warning */ -+ /* - tprintf("Image too small to scale!! (%dx%d vs min width of %d)\n", width, - height, min_width); -+ */ - pixDestroy(&pix); - return nullptr; - } --- -2.22.0 - diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/applications/misc/openambit/default.nix new file mode 100644 index 000000000000..5ef6d4ae84d4 --- /dev/null +++ b/pkgs/applications/misc/openambit/default.nix @@ -0,0 +1,48 @@ +{ cmake +, fetchFromGitHub +, lib +, libusb1 +, mkDerivation +, python3 +, qtbase +, qttools +, udev +, zlib +}: + +mkDerivation rec { + pname = "openambit"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "openambitproject"; + repo = pname; + rev = version; + sha256 = "1074kvkamwnlkwdajsw1799wddcfkjh2ay6l842r0s4cvrxrai85"; + }; + + nativeBuildInputs = [ cmake qttools ]; + buildInputs = [ libusb1 python3 qtbase udev zlib ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d" ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/openambit --version + ''; + + postInstall = '' + install -m755 -D $src/tools/openambit2gpx.py $out/bin/openambit2gpx + + mv -v $out/lib/udev/rules.d/libambit.rules \ + $out/lib/udev/rules.d/20-libambit.rules + ''; + + meta = with lib; { + description = "Helps fetch data from Suunto Ambit GPS watches"; + homepage = "https://github.com/openambitproject/openambit/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ rycee ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index a06489f190be..2772cb6d987d 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "amfora"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "1z4r1yqy5nkfa7yqcsqpqfdcghw8idryzb3s6d6ibca47r0qlcvw"; + sha256 = "011h5xzwiafh3fdp9wil8n618p45ph9swa66lw6s82ijpiizz79s"; }; - vendorSha256 = "0xj2s14dq10fwqqxjn4d8x6zljd5d15gjbja2gb75rfv09s4fdgv"; + vendorSha256 = "10f3bh3r3jc1185r8r1ihg8rprdpl8qwg5b6wqwsda96ydkbpi2b"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 45bbfbd6c40b..72c3955f90f3 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "19z1v6p59pcl8smywn1b5igqpv9wj48n6500wjxx5ayhc4mg00h2"; + sha256 = "1k023rq4p0hvq5famxm83csp3zsijrki8myk6v83xyfigwxc8sia"; }; vendorSha256 = "0fqdxs3r4249qxlc9cac0lpbqf2aifkcah07v0cckb9rxfyiwhjz"; diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix new file mode 100644 index 000000000000..a262b0487464 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cordless"; + version = "2020-08-30"; + + src = fetchFromGitHub { + owner = "Bios-Marcel"; + repo = pname; + rev = version; + sha256 = "sha256-CwOI7Ah4+sxD9We+Va5a6jYat5mjOeBk2EsOfwskz6k="; + }; + + subPackages = [ "." ]; + + vendorSha256 = "sha256-01I7GrZkaskuz20kVK2YwqvP7ViPMlQ3BFaoLHwgvOE="; + + meta = with stdenv.lib; { + homepage = "https://github.com/Bios-Marcel/cordless"; + description = "Discord terminal client"; + license = licenses.bsd3; + maintainers = with maintainers; [ colemickens ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 8490c0509a1c..c205f18e3663 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -6,6 +6,7 @@ , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null , iceSupport ? false, zeroc-ice ? null +, grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null , nixosTests }: @@ -13,6 +14,7 @@ assert jackSupport -> libjack2 != null; assert speechdSupport -> speechd != null; assert pulseSupport -> libpulseaudio != null; assert iceSupport -> zeroc-ice != null; +assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null); with stdenv.lib; let @@ -117,9 +119,12 @@ let configureFlags = [ "CONFIG+=no-client" - ] ++ optional (!iceSupport) "CONFIG+=no-ice"; + ] ++ optional (!iceSupport) "CONFIG+=no-ice" + ++ optional grpcSupport "CONFIG+=grpc"; - buildInputs = [ libcap ] ++ optional iceSupport zeroc-ice; + buildInputs = [ libcap ] + ++ optional iceSupport zeroc-ice + ++ optionals grpcSupport [ grpc c-ares abseil-cpp which ]; installPhase = '' # bin stuff diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index db05056e7e1c..35315b729c1e 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "rclone"; - version = "1.52.3"; + version = "1.53.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1bf3rhs4dcb8vkzs4a6pk5xrhnkhqsrbf4xrhcqf407r668gdav1"; + sha256 = "1736np95di9ksy6i8glzmvzc7qp4d06354gvrnxbzimgf0mm11wn"; }; - goPackagePath = "github.com/rclone/rclone"; + vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; subPackages = [ "." ]; @@ -19,6 +19,8 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/rclone/rclone/fs.Version=${version}" ]; + postInstall = let rcloneBin = @@ -26,13 +28,13 @@ buildGoPackage rec { then "$out" else stdenv.lib.getBin buildPackages.rclone; in - '' - installManPage $src/rclone.1 - for shell in bash zsh fish; do - ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell - installShellCompletion rclone.$shell - done - ''; + '' + installManPage rclone.1 + for shell in bash zsh fish; do + ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell + installShellCompletion rclone.$shell + done + ''; meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 889f363dfb90..86a2c961194e 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "espanso"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "federico-terzi"; repo = pname; rev = "v${version}"; - sha256 = "11xdnn1iwpx58s3wvjb6dkgfc6dzsblzb6fngc0np5vx8r2pccpg"; + sha256 = "1yspycgmg7vwf4d86r6n24lvgn14aq73fl8sn00shxndramp46ib"; }; - cargoSha256 = "1yjpqjfrixscg52yhalybgp734w3sdqg5hxka8ppcvz7lp3w5b1s"; + cargoSha256 = "0g0xf8j4yjayl7a5sqxm3piiif1hc7ws3i7q8vi7dk8nk609pbxr"; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index d990bc07ad23..9bd25cfff1df 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -50,9 +50,16 @@ python3Packages.buildPythonApplication rec { liblarch ]; + checkInputs = with python3Packages; [ + nose + mock + ]; + format = "other"; strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943) + checkPhase = "python3 ../run-tests"; + meta = with stdenv.lib; { description = " A personal tasks and TODO-list items organizer."; longDescription = '' diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index c0880aa3ecb1..54935dd7072d 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,6 +1,13 @@ -{ stdenv, kdeIntegration, ... }: +{ stdenv, kdeIntegration, fetchpatch, ... }: attrs: { + patches = attrs.patches or [ ] ++ [ + (fetchpatch { + url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; + name = "poppler-0.86.patch"; + sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; + }) + ]; postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' ''; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 567508c36753..d615f2a06f11 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, wrapGAppsHook, makeDesktopItem , atk , cairo +, coreutils , curl , cups , dbus-glib @@ -131,6 +132,12 @@ stdenv.mkDerivation rec { "$out/usr/lib/zotero-bin-${version}/{}" \; ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils ]} + ) + ''; + meta = with stdenv.lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index ce4c872821ec..77969c5ca3f9 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -3,7 +3,7 @@ , faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let - version = "2.1"; + version = "2.2"; in mkDerivation { @@ -14,7 +14,7 @@ in mkDerivation { owner = "AlbrechtL"; repo = "welle.io"; rev = "v${version}"; - sha256 = "1j63gdbd66d6rfjsxwdm2agrcww1rs4438kg7313h6zixpcc1icj"; + sha256 = "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 80f236559f9e..2df8b335bda7 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "05qd96bn2cl7gn5qarbcv6scdpj28qiwdfzalamqk5jjiidpmng5"; + sha256 = "0pyvlcy6jxh0vzpsmywlbzwwdyj3jkcclnqb6sg786mmwrnqzj88"; }; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -30,6 +30,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; + changelog = "https://github.com/git-lfs/git-lfs/releases/tag/v${version}"; license = [ licenses.mit ]; maintainers = [ maintainers.twey maintainers.marsam ]; }; diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 7a0c0d1f1edd..e5f7f8cbeb0d 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2020"; - sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; + buildVersion = "2033"; + sha256 = "1ym806df2hsw1ml932mshlw7cdxfi6jwa3mkh5m7gbmn7qwpm4xb"; } {}; sublime-merge-dev = common { - buildVersion = "2022"; - sha256 = "0fhxz6nx24wbspn7vfli3pvfv6fdbd591m619pvivig3scpidj61"; + buildVersion = "2031"; + sha256 = "1vv3qcggicy5fb4nm2k5a6nw1f20cwxgrmn3xv2dvgx7mpzbhknp"; dev = true; } {}; } diff --git a/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/applications/video/vokoscreen-ng/default.nix new file mode 100644 index 000000000000..600bc715ffb4 --- /dev/null +++ b/pkgs/applications/video/vokoscreen-ng/default.nix @@ -0,0 +1,71 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, fetchpatch +, pkg-config +, qmake +, qttools +, gstreamer +, libX11 +, qtbase +, qtmultimedia +, qtx11extras + +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, gst-plugins-ugly +}: +mkDerivation rec { + + pname = "vokoscreen-ng"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "vkohaupt"; + repo = "vokoscreenNG"; + rev = version; + sha256 = "1spyqw8h8bkc1prdb9aixiw5h3hk3gp2p0nj934bnwq04kmfp660"; + }; + + patches = [ + # Better linux integration + (fetchpatch { + url = "https://github.com/vkohaupt/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637.patch"; + sha256 = "1iibimv8xfxxfk44kkbrkay37ibdndjvs9g53mxr8x8vrsp917bz"; + }) + ]; + + qmakeFlags = [ "src/vokoscreenNG.pro" ]; + + nativeBuildInputs = [ qttools pkg-config qmake ]; + buildInputs = [ + gstreamer + libX11 + qtbase + qtmultimedia + qtx11extras + + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]; + + postPatch = '' + substituteInPlace src/vokoscreenNG.pro \ + --replace lrelease-qt5 lrelease + ''; + + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "User friendly Open Source screencaster for Linux and Windows"; + license = licenses.gpl2Plus; + homepage = "https://github.com/vkohaupt/vokoscreenNG"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index 41304c21ac30..aa559215fe89 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 -, ffmpeg-full, gstreamer, gst_all_1, libpulseaudio, alsaLib, jack2 +, ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , v4l-utils }: mkDerivation rec { pname = "webcamoid"; @@ -17,7 +17,7 @@ mkDerivation rec { libxcb qtbase qtdeclarative qtquickcontrols qtquickcontrols2 ffmpeg-full - gstreamer gst_all_1.gst-plugins-base + gst_all_1.gstreamer gst_all_1.gst-plugins-base alsaLib libpulseaudio jack2 v4l-utils ]; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index f15ce80d6d9c..e6014e35aef9 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -163,7 +163,6 @@ rec { SDL_mixer SDL2_ttf SDL2_mixer - gstreamer libappindicator-gtk2 libcaca libcanberra diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 9fc4b46c9522..39d63e7dd990 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.062"; + version = "1.064"; in fetchzip { name = "recursive-${version}"; @@ -15,7 +15,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "06qilfa0c897shh7m7rpwia02nay8cjwnizzzba27ylzy5pwd96r"; + sha256 = "1pbrqk848nkaambvsz0n8f88xdm8hyib83in27rmal739qh9d1z6"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/data/themes/marwaita-manjaro/default.nix new file mode 100644 index 000000000000..3217175ebd71 --- /dev/null +++ b/pkgs/data/themes/marwaita-manjaro/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "marwaita-manjaro"; + version = "2020-08-29"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = "d97e852931732ae5134784d11b332eadd71b6bbf"; + sha256 = "1qa2mlc6k82i4fkgbkahjz3fhghcf8rx1ayxw0r4xl21mkna7bfy"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Manjaro Style (green version) of Marwaita GTK theme"; + homepage = "https://www.pling.com/p/1351213/"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 4e869469db65..8e8a56d09da4 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "20.10.1"; + version = "20.10.2"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "08zws1qwvfr126fgdkqxxmpsqgfk02s31n90555bd5d66cfgdh72"; + sha256 = "0vxs17nbahrdix1q9xj06nflm344lfgj2mrafsvyfcr2isn61iv6"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 0fa5edc934c4..9ce0306b549a 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -191,8 +191,10 @@ stdenv.mkDerivation rec { ''; postFixup = '' - # EFL applications depend on libcurl, which is linked at runtime by hand in code (it is dlopened) + # Some libraries are linked at runtime by hand in code (they are dlopened) patchelf --add-needed ${curl.out}/lib/libcurl.so $out/lib/libecore_con.so + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libecore_audio.so + patchelf --add-needed ${libsndfile.out}/lib/libsndfile.so $out/lib/libecore_audio.so ''; meta = { diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index e70b9cdc9b53..2d0d34ec067e 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { mesa ]; + mesonFlags = [ + "-D edje-cc=${efl}/bin/edje_cc" + ]; + meta = { description = "Powerful terminal emulator based on EFL"; homepage = "https://www.enlightenment.org/about-terminology"; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 68c1b3b5da43..99175e25120c 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome-icon-theme hicolor-icon-theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome-icon-theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index 770e549fc2cd..9127b7fecb6e 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -1,7 +1,6 @@ { mkDerivation, lib, - copyPathsToStore, extra-cmake-modules, plymouth, nixos-icons, @@ -16,19 +15,21 @@ bottomColor ? "black" }: -let +let validColors = [ "black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green" ]; resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf(toString logoFile)) else logoName; in assert lib.asserts.assertOneOf "topColor" topColor validColors; assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; - + mkDerivation { name = "breeze-plymouth"; nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ]; buildInputs = [ plymouth ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./install-paths.patch + ]; cmakeFlags = [] ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" @@ -36,7 +37,7 @@ mkDerivation { ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}" ; - + postPatch = '' substituteInPlace cmake/FindPlymouth.cmake --subst-var out '' + lib.optionalString (logoFile != null) '' diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/series b/pkgs/desktops/plasma-5/breeze-plymouth/series deleted file mode 100644 index 8920e7ca5189..000000000000 --- a/pkgs/desktops/plasma-5/breeze-plymouth/series +++ /dev/null @@ -1 +0,0 @@ -install-paths.patch diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 7c1f2292ecaa..78b6909f046d 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, diff --git a/pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix new file mode 100644 index 000000000000..cea788f26403 --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix @@ -0,0 +1,39 @@ +{ lib, mkDerivation, fetchFromGitHub +, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: + +mkDerivation rec { + pname = "dynamic_workspaces"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "d86leader"; + repo = pname; + rev = "v${version}"; + sha256 = "1mnwh489i6l8z9s5a1zl7zybkw76pp9fdmmis41mym7r4wz4iznm"; + }; + + buildInputs = [ + kcoreaddons kwindowsystem plasma-framework systemsettings + ]; + + dontBuild = true; + + # 1. --global still installs to $HOME/.local/share so we use --packageroot + # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually + installPhase = '' + runHook preInstall + + plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts + install -Dm644 ${src}/metadata.desktop $out/share/kservices5/dynamic_workspaces.desktop + + runHook postInstall + ''; + + meta = with lib; { + description = "KWin script that automatically adds/removes virtual desktops"; + license = licenses.bsd3; + maintainers = with maintainers; [ samuelgrf ]; + inherit (src.meta) homepage; + inherit (kwindowsystem.meta) platforms; + }; +} diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix index abd655db3753..95480bc5b968 100644 --- a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix +++ b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix @@ -26,7 +26,7 @@ mkDerivation rec { plasmapkg2 --type kwinscript --install ${src}/res/ --packageroot $out/share/kwin/scripts install -Dm644 ${src}/res/metadata.desktop $out/share/kservices5/krohnkite.desktop - runHook postInstalll + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix index da424d04da90..8a455cb88826 100644 --- a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix +++ b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix @@ -31,7 +31,7 @@ mkDerivation rec { plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts install -Dm644 ${src}/metadata.desktop $out/share/kservices5/kwin-script-tiling.desktop - runHook postInstalll + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index cf9d70844014..db952944ecaa 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, propagate, + mkDerivation, lib, propagate, extra-cmake-modules, kwayland, libXrandr, qtbase, qtx11extras }: @@ -12,7 +12,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kwayland libXrandr qtx11extras ]; outputs = [ "out" "dev" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./libkscreen-backends-path.patch + ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" ''; diff --git a/pkgs/desktops/plasma-5/libkscreen/series b/pkgs/desktops/plasma-5/libkscreen/series deleted file mode 100644 index 86bf4ab10602..000000000000 --- a/pkgs/desktops/plasma-5/libkscreen/series +++ /dev/null @@ -1 +0,0 @@ -libkscreen-backends-path.patch diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index b042fc3bd6ac..8ae48b21f7be 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, @@ -30,7 +30,10 @@ mkDerivation { ksysguard kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./hwclock-path.patch + ./tzdir.patch + ]; postPatch = '' sed '1i#include ' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp ''; diff --git a/pkgs/desktops/plasma-5/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series deleted file mode 100644 index 26517ba93565..000000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/series +++ /dev/null @@ -1,2 +0,0 @@ -hwclock-path.patch -tzdir.patch diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index f160150d8b53..c7e3ec30b49f 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -1,18 +1,24 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "fpc-3.0.0-binary"; +stdenv.mkDerivation rec { + pname = "fpc-binary"; + version = "3.2.0"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.i386-linux.tar"; - sha256 = "0h3f1dgs1zsx7vvk9kg67anjvgw5sslfbmjblif7ishbcp3k3g5k"; + url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.i386-linux.tar"; + sha256 = "0y0510b2fbxbqz28967xx8b023k6q9fv5yclfrc1yc9mg8fyn411"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.x86_64-linux.tar"; - sha256 = "1m2xx3nda45cb3zidbjgdr8kddd19zk0khvp7xxdlclszkqscln9"; + url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar"; + sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni"; + } + else if stdenv.hostPlatform.system == "aarch64-linux" then + fetchurl { + url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar"; + sha256 = "1h481ngg3m8nlsg9mw7rr1bn2c4sj4wzqny9bxyq3xvcral12r71"; } else throw "Not supported on ${stdenv.hostPlatform.system}."; @@ -21,4 +27,4 @@ stdenv.mkDerivation { meta = { description = "Free Pascal Compiler from a binary distribution"; }; -} +} diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 42804677dc08..6e7ffefca21f 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -3,23 +3,26 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { - version = "3.0.4"; + version = "3.2.0"; pname = "fpc"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "0xjyhlhz846jbnp12y68c7nq4xmp4i65akfbrjyf3r62ybk18rgn"; + sha256 = "0f38glyn3ffmqww432snhx2b8wyrq0yj1njkp4zh56lqrvm19fgr"; }; buildInputs = [ startFPC gawk ]; glibc = stdenv.cc.libc.out; - preConfigure = - if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' - sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas - sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas - sed -e "s@/lib64[^']*@${glibc}/lib@" -i fpcsrc/compiler/systems/t_linux.pas - '' else ""; + # Patch paths for linux systems. Other platforms will need their own patches. + patches = [ + ./mark-paths.patch # mark paths for later substitution in postPatch + ]; + postPatch = '' + # substitute the markers set by the mark-paths patch + substituteInPlace fpcsrc/compiler/systems/t_linux.pas --subst-var-by dynlinker-prefix "${glibc}" + substituteInPlace fpcsrc/compiler/systems/t_linux.pas --subst-var-by syslibpath "${glibc}/lib" + ''; makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; diff --git a/pkgs/development/compilers/fpc/mark-paths.patch b/pkgs/development/compilers/fpc/mark-paths.patch new file mode 100644 index 000000000000..707c5352de7f --- /dev/null +++ b/pkgs/development/compilers/fpc/mark-paths.patch @@ -0,0 +1,109 @@ +diff --git a/fpcsrc/compiler/systems/t_linux.pas b/fpcsrc/compiler/systems/t_linux.pas +index a7398fb9..8e46fec0 100644 +--- a/fpcsrc/compiler/systems/t_linux.pas ++++ b/fpcsrc/compiler/systems/t_linux.pas +@@ -135,13 +135,13 @@ begin + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true); + { /lib64 should be the really first, so add it before everything else } + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib',true); +- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64',true); ++ LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true); + {$else} + {$ifdef powerpc64} + if target_info.abi<>abi_powerpc_elfv2 then +- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib64;=/usr/X11R6/lib64',true) ++ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/@syslibpath@;=/usr/lib64;=/usr/X11R6/lib64',true) + else +- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true); ++ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/@syslibpath@;=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true); + {$else powerpc64} + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true); + {$endif powerpc64} +@@ -164,7 +164,7 @@ begin + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true); + {$endif i386} + {$ifdef aarch64} +- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true); ++ LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true); + {$endif aarch64} + {$ifdef powerpc} + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true); +@@ -185,53 +185,53 @@ begin + end; + + {$ifdef m68k} +- const defdynlinker='/lib/ld.so.1'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld.so.1'; + {$endif m68k} + + {$ifdef i386} +- const defdynlinker='/lib/ld-linux.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.2'; + {$endif} + + {$ifdef x86_64} +- const defdynlinker='/lib64/ld-linux-x86-64.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib64/ld-linux-x86-64.so.2'; + {$endif x86_64} + + {$ifdef sparc} +- const defdynlinker='/lib/ld-linux.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.2'; + {$endif sparc} + + {$ifdef powerpc} +- const defdynlinker='/lib/ld.so.1'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld.so.1'; + {$endif powerpc} + + {$ifdef powerpc64} +- const defdynlinkerv1='/lib64/ld64.so.1'; +- const defdynlinkerv2='/lib64/ld64.so.2'; ++ const defdynlinkerv1='@dynlinker-prefix@/lib64/ld64.so.1'; ++ const defdynlinkerv2='@dynlinker-prefix@/lib64/ld64.so.2'; + var defdynlinker: string; + {$endif powerpc64} + + {$ifdef arm} + {$ifdef FPC_ARMHF} +- const defdynlinker='/lib/ld-linux-armhf.so.3'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux-armhf.so.3'; + {$else FPC_ARMHF} + {$ifdef FPC_ARMEL} +- const defdynlinker='/lib/ld-linux.so.3'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.3'; + {$else FPC_ARMEL} +- const defdynlinker='/lib/ld-linux.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.2'; + {$endif FPC_ARMEL} + {$endif FPC_ARMHF} + {$endif arm} + + {$ifdef aarch64} +-const defdynlinker='/lib/ld-linux-aarch64.so.1'; ++const defdynlinker='@dynlinker-prefix@/lib/ld-linux-aarch64.so.1'; + {$endif aarch64} + + {$ifdef mips} +- const defdynlinker='/lib/ld.so.1'; ++ const defdynlinker='@dynlinker-prefix@/lib/ld.so.1'; + {$endif mips} + + {$ifdef sparc64} +- const defdynlinker='/lib64/ld-linux.so.2'; ++ const defdynlinker='@dynlinker-prefix@/lib64/ld-linux.so.2'; + {$endif sparc64} + + +@@ -266,9 +266,9 @@ begin + libctype:=uclibc; + end + {$ifdef i386} +- else if FileExists(sysrootpath+'/lib/ld-linux.so.1',false) then ++ else if FileExists(sysrootpath+'@dynlinker-prefix@/lib/ld-linux.so.1',false) then + begin +- DynamicLinker:='/lib/ld-linux.so.1'; ++ DynamicLinker:='@dynlinker-prefix@/lib/ld-linux.so.1'; + libctype:=glibc2; + end + {$endif i386} diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 773e365889b3..e4230093e9c3 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -108,9 +108,9 @@ in { major = "3"; minor = "9"; patch = "0"; - suffix = "b5"; + suffix = "rc1"; }; - sha256 = "0r0m82srq4z44dahczd1cv6wgmxcpqbn5dyd8czcpk2pp9ydgqbc"; + sha256 = "0w6wvyy9fbvfvrmhvmlb5gq18haagywk9hjkp1knjdarfczag9zv"; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 09bf92224858..4eef2d407d8e 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: +{ mkDerivation, lib, fetchurl, qtbase, qtscript, cmake }: mkDerivation rec { pname = "grantlee"; @@ -14,7 +14,10 @@ mkDerivation rec { buildInputs = [ qtbase qtscript ]; nativeBuildInputs = [ cmake ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./grantlee-nix-profiles.patch + ./grantlee-no-canonicalize-filepath.patch + ]; outputs = [ "out" "dev" ]; postFixup = diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series deleted file mode 100644 index 9c4015a1c197..000000000000 --- a/pkgs/development/libraries/grantlee/5/series +++ /dev/null @@ -1,2 +0,0 @@ -grantlee-nix-profiles.patch -grantlee-no-canonicalize-filepath.patch diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 94d71760a7f8..e7e11db61298 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -23,7 +23,7 @@ rec { inherit gst-plugins-base gstreamer gst-plugins-bad; }; - gst-validate = callPackage ./validate { inherit gst-plugins-base; }; + gst-validate = callPackage ./validate { inherit gstreamer gst-plugins-base; }; # note: gst-python is in ./python/default.nix - called under pythonPackages } diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix deleted file mode 100644 index 804d80b8e1d1..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gst-plugins-base, gstreamer }: - -stdenv.mkDerivation rec { - name = "gnonlin-0.10.17"; - - src = fetchurl { - urls = [ - "https://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gst-plugins-base gstreamer ]; - - meta = { - homepage = "https://gstreamer.freedesktop.org/modules/gnonlin.html"; - description = "Gstreamer Non-Linear Multimedia Editing Plugins"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix deleted file mode 100644 index cd37a513184d..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libdvdnav, libdvdread, orc }: - -stdenv.mkDerivation rec { - name = "gst-plugins-bad-0.10.23"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-plugins-bad/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "148lw51dm6pgw8vc6v0fpvm7p233wr11nspdzmvq7bjp2cd7vbhf"; - }; - - postInstall = '' - # Fixes CVE-2016-9447 - # Does not actually impact NSF playback - rm -v $out/lib/gstreamer-0.10/libgstnsf.so - ''; - - buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base libdvdnav libdvdread orc ]; - - enableParallelBuilding = true; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "‘Bad’ (potentially low quality) plug-ins for GStreamer"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - - license = stdenv.lib.licenses.lgpl2Plus; - }; -} diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix deleted file mode 100644 index a19e8ca6a5b4..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia -, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc -, libintl -, ApplicationServices -, # Whether to build no plugins that have external dependencies - # (except the ALSA plugin). - minimalDeps ? false -}: - -stdenv.mkDerivation rec { - name = "gst-plugins-base-0.10.36"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz" - "mirror://gentoo/distfiles/${name}.tar.xz" - ]; - sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z"; - }; - - patches = [ - ./gcc-4.9.patch - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/f672277509705c4034bc92a141eefee4524d15aa.patch"; - name = "CVE-2019-9928.patch"; - sha256 = "1dlamsmyr7chrb6vqqmwikqvvqcx5l7k72p98448qm6k59ndnimc"; - }) - ]; - - postPatch = '' - sed -i 's@/bin/echo@echo@g' configure - sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in - ''; - - outputs = [ "out" "dev" ]; - - # TODO : v4l, libvisual - buildInputs = - [ pkgconfig glib cairo orc libintl ] - # can't build alsaLib on darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib - ++ stdenv.lib.optionals (!minimalDeps) - [ xorg.xlibsWrapper xorg.libXv libogg libtheora libvorbis freetype pango - liboil ] - # can't build cdparanoia on darwin - ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia - ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; - - propagatedBuildInputs = [ gstreamer ]; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = with stdenv.lib; { - homepage = "https://gstreamer.freedesktop.org"; - description = "Base plug-ins for GStreamer"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - # https://github.com/NixOS/nixpkgs/pull/91090#issuecomment-653753497 - broken = true; - }; -} diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch deleted file mode 100644 index fd9f6ea240d2..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=670690 - -From 9bd5a7ae5435469c3557a3d70e762791cb3dc5c7 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Mon, 20 Jan 2014 15:44:09 +0100 -Subject: [PATCH] audioresample: fix build on BSD - -On i386, EMMINTRIN is defined but not usable without sse so check for -__SSE__ and __SSE2__ as well. - -https://bugzilla.gnome.org/show_bug.cgi?id=670690 ---- - gst/audioresample/resample.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c -index 98d006c..481fa01 100644 ---- a/gst/audioresample/resample.c -+++ b/gst/audioresample/resample.c -@@ -77,13 +77,13 @@ - #define EXPORT G_GNUC_INTERNAL - - #ifdef _USE_SSE --#ifndef HAVE_XMMINTRIN_H -+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE - #endif - #endif - - #ifdef _USE_SSE2 --#ifndef HAVE_EMMINTRIN_H -+#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE2 - #endif - #endif --- -1.8.5.3 - diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix deleted file mode 100644 index 225bcc7e263e..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo -, flac, libjpeg, speex, libpng, libdv, libcaca, libvpx -, taglib, libpulseaudio, gdk-pixbuf, orc -, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl -, # Whether to build no plugins that have external dependencies - # (except the PulseAudio plugin). - minimalDeps ? false -}: - -stdenv.mkDerivation rec { - name = "gst-plugins-good-0.10.31"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "1ijswgcrdp243mfsyza31fpzq6plz40p4b83vkr2x4x7807889vy"; - }; - - patches = [ ./v4l.patch ./linux-headers-3.9.patch ]; - - configureFlags = [ "--enable-experimental" "--disable-oss" ]; - - buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base libintl ] - ++ lib.optional stdenv.isLinux libpulseaudio - ++ lib.optionals (!minimalDeps) - [ aalib libcaca cairo libdv flac libjpeg libpng speex - taglib bzip2 libvpx gdk-pixbuf orc libsoup libshout ]; - - enableParallelBuilding = true; - - postInstall = lib.optionalString (!minimalDeps) '' - substituteInPlace $out/lib/gstreamer-0.10/libgstaasink.la \ - --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" - ''; - - # fails 1 out of 65 tests with "Could not read TLS certificate from '../../tests/files/test-cert.pem': TLS support is not available" - doCheck = false; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "`Good' plug-ins for GStreamer"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - - license = stdenv.lib.licenses.lgpl2Plus; - }; -} diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch deleted file mode 100644 index f13d3a166714..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch - -From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 18 Mar 2013 14:59:35 +0000 -Subject: v4l2: fix compilation against newer kernel headers as on FC19 - ---- -diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c -index 07d390a..4c10f4f 100644 ---- a/sys/v4l2/v4l2_calls.c -+++ b/sys/v4l2/v4l2_calls.c -@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) - break; - case V4L2_CID_HFLIP: - case V4L2_CID_VFLIP: -+#ifndef V4L2_CID_PAN_RESET - case V4L2_CID_HCENTER: -+#endif -+#ifndef V4L2_CID_TILT_RESET - case V4L2_CID_VCENTER: -+#endif - #ifdef V4L2_CID_PAN_RESET - case V4L2_CID_PAN_RESET: - #endif --- -cgit v0.9.0.2-2-gbebe diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch deleted file mode 100644 index 22cff574134f..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru -x '*~' gst-plugins-good-0.10.31-orig/sys/v4l2/gstv4l2bufferpool.c gst-plugins-good-0.10.31/sys/v4l2/gstv4l2bufferpool.c ---- gst-plugins-good-0.10.31-orig/sys/v4l2/gstv4l2bufferpool.c 2011-12-30 14:59:13.000000000 +0100 -+++ gst-plugins-good-0.10.31/sys/v4l2/gstv4l2bufferpool.c 2013-01-28 17:41:25.549523708 +0100 -@@ -181,7 +181,6 @@ - GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", - ret->vbuffer.m.offset); - GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); -- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); - - data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, - PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd, diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix deleted file mode 100644 index 5321fc379cc9..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libmad, libdvdread, a52dec, x264, orc, lame, libintl }: - -stdenv.mkDerivation rec { - name = "gst-plugins-ugly-0.10.19"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "1w4d5iz9ffvh43l261zdp997i6s2iwd61lflf755s3sw4xch1a8w"; - }; - - buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame libintl ]; - - enableParallelBuilding = true; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - - license = stdenv.lib.licenses.lgpl2Plus; - }; -} diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix deleted file mode 100644 index 4c56039bd0a3..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, python2Packages, gstreamer, gst-plugins-base -}: - -let - inherit (python2Packages) python pygobject2; -in stdenv.mkDerivation rec { - name = "gst-python-0.10.22"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-python/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "0y1i4n5m1diljqr9dsq12anwazrhbs70jziich47gkdwllcza9lg"; - }; - - hardeningDisable = [ "bindnow" ]; - - # Need to disable the testFake test case due to bug in pygobject. - # See https://bugzilla.gnome.org/show_bug.cgi?id=692479 - patches = [ ./disable-testFake.patch ]; - - buildInputs = - [ pkgconfig gst-plugins-base pygobject2 ] - ; - - propagatedBuildInputs = [ gstreamer python ]; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "Python bindings for GStreamer"; - - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch b/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch deleted file mode 100644 index d0c9960e5d22..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Nurp gst-python-0.10.22.orig/testsuite/test_bin.py gst-python-0.10.22/testsuite/test_bin.py ---- gst-python-0.10.22.orig/testsuite/test_bin.py 2014-10-29 18:58:00.921827721 +0100 -+++ gst-python-0.10.22/testsuite/test_bin.py 2014-10-29 19:00:32.019353092 +0100 -@@ -131,52 +131,6 @@ class BinAddRemove(TestCase): - self.assertRaises(gst.AddError, self.bin.add, src, sink) - self.bin.remove(src, sink) - self.assertRaises(gst.RemoveError, self.bin.remove, src, sink) -- --class Preroll(TestCase): -- def setUp(self): -- TestCase.setUp(self) -- self.bin = gst.Bin('bin') -- -- def tearDown(self): -- # FIXME: wait for state change thread to settle down -- while self.bin.__gstrefcount__ > 1: -- time.sleep(0.1) -- self.assertEquals(self.bin.__gstrefcount__, 1) -- del self.bin -- TestCase.tearDown(self) -- -- def testFake(self): -- src = gst.element_factory_make('fakesrc') -- sink = gst.element_factory_make('fakesink') -- self.bin.add(src) -- -- # bin will go to paused, src pad task will start and error out -- self.bin.set_state(gst.STATE_PAUSED) -- ret = self.bin.get_state() -- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS) -- self.assertEquals(ret[1], gst.STATE_PAUSED) -- self.assertEquals(ret[2], gst.STATE_VOID_PENDING) -- -- # adding the sink will cause the bin to go in preroll mode -- gst.debug('adding sink and setting to PAUSED, should cause preroll') -- self.bin.add(sink) -- sink.set_state(gst.STATE_PAUSED) -- ret = self.bin.get_state(timeout=0) -- self.assertEquals(ret[0], gst.STATE_CHANGE_ASYNC) -- self.assertEquals(ret[1], gst.STATE_PAUSED) -- self.assertEquals(ret[2], gst.STATE_PAUSED) -- -- # to actually complete preroll, we need to link and re-enable fakesrc -- src.set_state(gst.STATE_READY) -- src.link(sink) -- src.set_state(gst.STATE_PAUSED) -- ret = self.bin.get_state() -- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS) -- self.assertEquals(ret[1], gst.STATE_PAUSED) -- self.assertEquals(ret[2], gst.STATE_VOID_PENDING) -- -- self.bin.set_state(gst.STATE_NULL) -- self.bin.get_state() - - class ConstructorTest(TestCase): - def testGood(self): diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch b/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch deleted file mode 100644 index 67dfc34434db..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/gst/gstdatetime.c b/gst/gstdatetime.c -index 60f709f..cdc7e75 100644 ---- a/gst/gstdatetime.c -+++ b/gst/gstdatetime.c -@@ -21,8 +21,8 @@ - #include "config.h" - #endif - --#include "glib-compat-private.h" - #include "gst_private.h" -+#include "glib-compat-private.h" - #include "gstdatetime.h" - #include - #include diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix deleted file mode 100644 index b78f6148e487..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ fetchurl, fetchpatch, stdenv, autoreconfHook -, perl, bison, flex, pkgconfig, glib, libxml2, libintl, libunwind -}: - -stdenv.mkDerivation rec { - name = "gstreamer-0.10.36"; - - src = fetchurl { - urls = - [ "${meta.homepage}/src/gstreamer/${name}.tar.xz" - "mirror://gentoo/distfiles/${name}.tar.xz" - ]; - sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison glib ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin libunwind; - propagatedBuildInputs = [ glib libxml2 ]; - - patches = [ - (fetchpatch { - url = "https://github.com/flathub/com.xnview.XnRetro/raw/fec03bbe240f45aa10d7d4eea9d6f066d9b6ac9c/gstreamer-0.10.36-bison3.patch"; - sha256 = "05aarg3yzl5jx3z5838ixv392g0r3kbsi2vfqniaxmidhnfzij2y"; - }) - (fetchpatch { - url = "https://github.com/GStreamer/common/commit/03a0e5736761a72d4ed880e8c485bbf9e4a8ea47.patch"; - sha256 = "0rin3x01yy78ky3smmhbwlph18hhym18q4x9w6ddiqajg5lk4xhm"; - extraPrefix = "common/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://github.com/GStreamer/common/commit/8aadeaaa8a948d7ce62008789ab03e9aa514c2b9.patch"; - sha256 = "0n2mqvq2al7jr2hflhz4l781i3jya5a9i725jvy508ambpgycz3x"; - extraPrefix = "common/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://github.com/GStreamer/common/commit/7bb2bcecda471a0d514a964365a78150f3ee5747.patch"; - sha256 = "0famdj70m7wjvr1dpy7iywhrkqxmrshxz0rizz1bixgp42dvkhbq"; - extraPrefix = "common/"; - stripLen = 1; - }) - ] ++ - # See https://trac.macports.org/ticket/40783 for explanation of patch - stdenv.lib.optional stdenv.isDarwin ./darwin.patch; - - postPatch = '' - sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in - ''; - - configureFlags = [ - "--disable-examples" - "--localstatedir=/var" - "--disable-gtk-doc" - "--disable-docbook" - ]; - - doCheck = false; # fails. 2 tests crash - - postInstall = '' - # Hm, apparently --disable-gtk-doc is ignored... - rm -rf $out/share/gtk-doc - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "Library for constructing graphs of media-handling components"; - - longDescription = '' - GStreamer is a library for constructing graphs of media-handling - components. The applications it supports range from simple - Ogg/Vorbis playback, audio/video streaming to complex audio - (mixing) and video (non-linear editing) processing. - - Applications can take advantage of advances in codec and filter - technology transparently. Developers can add new codecs and - filters by writing a simple plugin with a clean, generic - interface. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh deleted file mode 100644 index 636e20b732b4..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addGstreamerLibPath () { - if test -d "$1/lib/gstreamer-0.10" - then - export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH-}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10" - fi -} - -addEnvHooks "$hostOffset" addGstreamerLibPath diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix deleted file mode 100644 index 24197b04b73f..000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, glibmm, gstreamer, gst-plugins-base, libsigcxx, libxmlxx, pkgconfig }: - -let - ver_maj = "0.10"; - ver_min = "11"; -in -stdenv.mkDerivation { - name = "gstreamermm-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/gstreamermm/${ver_maj}/gstreamermm-${ver_maj}.${ver_min}.tar.xz"; - sha256 = "12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6"; - }; - - doCheck = false; # Tests require pulseaudio in /homeless-shelter - - propagatedBuildInputs = [ - glibmm gstreamer gst-plugins-base libsigcxx libxmlxx - ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = with stdenv.lib; { - description = "C++ bindings for the GStreamer streaming multimedia library"; - homepage = "https://www.gtkmm.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ plcplc ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index dfb18754c839..92e8a45a4f6f 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + # To use split outputs, we need this so double prefix won't be used in the + # pkg-config files. Hopefully, this won't be needed on the next release, + # _if_ + # https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/merge_requests/1 + # will be merged. For the current release, this merge request won't apply. + ./fix_pkgconfig_includedir.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch new file mode 100644 index 000000000000..d31fe19fb0fe --- /dev/null +++ b/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git i/pkgconfig/meson.build w/pkgconfig/meson.build +index 8ed8299..594cbfe 100644 +--- i/pkgconfig/meson.build ++++ w/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', get_option('prefix')) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('VERSION', gst_version) + diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 3a3f066ad33b..645d05afc2be 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,9 +1,11 @@ -{ mkDerivation, lib, copyPathsToStore, cmake, pkgconfig }: +{ mkDerivation, lib, cmake, pkgconfig }: mkDerivation { name = "extra-cmake-modules"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./nix-lib-path.patch + ]; outputs = [ "out" ]; # this package has no runtime components diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series deleted file mode 100644 index b4569e50a5f7..000000000000 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series +++ /dev/null @@ -1 +0,0 @@ -nix-lib-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index c94c8b91ecd2..0a513d6eed94 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, propagate, + mkDerivation, lib, propagate, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }: @@ -9,7 +9,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ polkit-qt qttools ]; propagatedBuildInputs = [ kcoreaddons ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./cmake-install-paths.patch + ]; # library stores reference to plugin path, # separating $out from $bin would create a reference cycle outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kauth/series b/pkgs/development/libraries/kde-frameworks/kauth/series deleted file mode 100644 index d2689425c387..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kauth/series +++ /dev/null @@ -1 +0,0 @@ -cmake-install-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index 29689c789d3e..ab14529be01e 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews, kpackage, kservice, kxmlgui, qtdeclarative, diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 7e3de9d4d141..5eced8832877 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, docbook_xml_dtd_45, extra-cmake-modules, kdoctools, kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons, @@ -11,7 +11,9 @@ mkDerivation { name = "kdelibs4support"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./nix-kde-include-dir.patch + ]; setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedNativeBuildInputs = [ kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks/kdelibs4support/series deleted file mode 100644 index 9b08ab208774..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/series +++ /dev/null @@ -1 +0,0 @@ -nix-kde-include-dir.patch diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 90a7116f42ad..47831f0f5d92 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib }: @@ -12,5 +12,7 @@ mkDerivation { attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia taglib ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./cmake-install-paths.patch + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks/kfilemetadata/series deleted file mode 100644 index d2689425c387..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/series +++ /dev/null @@ -1 +0,0 @@ -cmake-install-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 8faac005f2ac..76bf0fd05370 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, qtbase, qtsvg, qttools, @@ -8,7 +8,9 @@ mkDerivation { name = "kiconthemes"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./default-theme-breeze.patch + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/series b/pkgs/development/libraries/kde-frameworks/kiconthemes/series deleted file mode 100644 index ab5cc8a3edb2..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/series +++ /dev/null @@ -1 +0,0 @@ -default-theme-breeze.patch diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 116f475e2f8c..654f6e20604a 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, writeScript, + mkDerivation, lib, writeScript, extra-cmake-modules, kdoctools, kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework }: diff --git a/pkgs/development/libraries/kde-frameworks/kinit/series b/pkgs/development/libraries/kde-frameworks/kinit/series deleted file mode 100644 index 9195a4e8e6b0..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kinit/series +++ /dev/null @@ -1,3 +0,0 @@ -kinit-libpath.patch -start_kdeinit-path.patch -kdeinit-extra_libs.patch diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index fee21a6a9235..434496c7b9a9 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, qttools, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, @@ -21,5 +21,8 @@ mkDerivation { kxmlgui qtbase qttools solid ]; outputs = [ "out" "dev" ]; - patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)); + patches = [ + ./samba-search-path.patch + ./kio-debug-module-loader.patch + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kio/series b/pkgs/development/libraries/kde-frameworks/kio/series deleted file mode 100644 index 5330c40a3306..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kio/series +++ /dev/null @@ -1,2 +0,0 @@ -samba-search-path.patch -kio-debug-module-loader.patch diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 6779faa50cdc..6bd42420b85d 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, karchive, kconfig, kcoreaddons, ki18n, qtbase, }: @@ -9,5 +9,8 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./allow-external-paths.patch + ./qdiriterator-follow-symlinks.patch + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/series b/pkgs/development/libraries/kde-frameworks/kpackage/series deleted file mode 100644 index 9b7f076efc70..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kpackage/series +++ /dev/null @@ -1,2 +0,0 @@ -allow-external-paths.patch -qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 356e6537a4fd..630582ecf763 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, qtbase, shared-mime-info, @@ -15,5 +15,8 @@ mkDerivation { ]; propagatedBuildInputs = [ kconfig kcoreaddons ]; propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./qdiriterator-follow-symlinks.patch + ./no-canonicalize-path.patch + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kservice/series b/pkgs/development/libraries/kde-frameworks/kservice/series deleted file mode 100644 index 3ce22dbd35a0..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kservice/series +++ /dev/null @@ -1,2 +0,0 @@ -qdiriterator-follow-symlinks.patch -no-canonicalize-path.patch \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index c075adf02941..1e77b63f7c9a 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, libpthreadstubs, libXdmcp, qtbase, qttools, qtx11extras @@ -14,7 +14,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./platform-plugins-path.patch + ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" ''; diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/series b/pkgs/development/libraries/kde-frameworks/kwindowsystem/series deleted file mode 100644 index 2cd02056ff81..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/series +++ /dev/null @@ -1 +0,0 @@ -platform-plugins-path.patch diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index d6f23a9060ff..95c2a9c3fcf4 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -18,7 +18,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.4"; + version = "4.0.5"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = with stdenv.lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1i0slg2dxjdgw513aml1n9dsbdxn2fimi2b5712d5r9z4ar4xqj7"; + sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5"; }; postPatch = '' diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 8512806e4556..3deea882bb6c 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -3,9 +3,7 @@ , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libmng, which, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi -, buildMultimedia ? false # ancient gstreamer is broken -, alsaLib, gstreamer, gst-plugins-base -, buildWebkit ? false +, alsaLib , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , flashplayerFix ? false, gdk-pixbuf , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 @@ -178,7 +176,7 @@ stdenv.mkDerivation rec { "-exceptions" "-xmlpatterns" "-make" "libs" "-make" "tools" "-make" "translations" - "-no-phonon" (mk buildWebkit "webkit") (mk buildMultimedia "multimedia") "-audio-backend" + "-no-phonon" "-no-webkit" "-no-multimedia" "-audio-backend" ]) ++ [ "-${if demos then "" else "no"}make" "demos" "-${if examples then "" else "no"}make" "examples" @@ -191,9 +189,7 @@ stdenv.mkDerivation rec { [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM zlib libpng openssl dbus freetype fontconfig glib ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used - ++ lib.optional libGLSupported libGLU - ++ lib.optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib - ++ lib.optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ]; + ++ lib.optional libGLSupported libGLU; # The following libraries are only used in plugins buildInputs = diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 69a61caae150..df5d4e68a54b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -199,6 +199,7 @@ , "vim-language-server" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" +, "vscode-json-languageserver-bin" , "vue-cli" , "vue-language-server" , "web-ext" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 23bc954c5e78..db00f42aa05d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "VHRggJbRY8vHIADWVwbq9cZux0L9LdmlN31XA3daVAI4gMkKdQEocxB7KqGDt6SfIJ3NYi/qh1nRJGooYmTBiA=="; }; }; - "@angular-devkit/architect-0.1000.8" = { + "@angular-devkit/architect-0.1001.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1000.8"; + version = "0.1001.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz"; - sha512 = "2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.0.tgz"; + sha512 = "mJYy9tqy7ZfqAJYlQPgcHVUiaAxWnxEEpiTAftsKz/yqdO45YFkzehYXJfCqbAXYr4r7hYY3KqKMgj41ixkS8Q=="; }; }; "@angular-devkit/core-10.0.7" = { @@ -67,13 +67,13 @@ let sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-10.0.8" = { + "@angular-devkit/core-10.1.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.0.8"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz"; - sha512 = "d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.0.tgz"; + sha512 = "oNRwAX+5uEwgheS3UUc1W+AerbimqGojCOTdWWcq5XtSviZnBCp1FeMZV+eB6XgUWfbmbWBu39S3sCYmXVHLwg=="; }; }; "@angular-devkit/core-9.1.12" = { @@ -94,13 +94,13 @@ let sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-10.0.8" = { + "@angular-devkit/schematics-10.1.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.0.8"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz"; - sha512 = "p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.0.tgz"; + sha512 = "5Vl32bHpcB/oj0oNR8nPLXF7DwPVuzrJjosch8G+sPG2gAG6OpwjUhQjY1U6E4xJGDR6j7fX8jw+TwC2cMgUbQ=="; }; }; "@angular-devkit/schematics-9.1.12" = { @@ -229,13 +229,13 @@ let sha512 = "bQVb6PE34iDmZj6wZZzYm3rLjguxoSqHZj4QReVQsOle/LdIwl48hV9Iz/Pivy9NtVCui9LL/lmSQzMt0G0jkw=="; }; }; - "@apollo/federation-0.19.0" = { + "@apollo/federation-0.20.0" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.19.0"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.19.0.tgz"; - sha512 = "8cd8ftHgqaseDTN7RJrROT6FT1xy8RV2Qb9BGhhqPVMHqf08GtidBqQTk6hv1UDR0qu/TRZA6J4Kh7oXeMrPQg=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.0.tgz"; + sha512 = "Q2eGSjrArtY04FSVIxUK3/JaVDDw4aJZBRl0+UZ1dwrpk6YtBpydW2u4X6dPTnBqRDpKVGVmc9gkQr8d3LpcKA=="; }; }; "@apollo/protobufjs-1.0.5" = { @@ -355,22 +355,13 @@ let sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.11.4" = { + "@babel/core-7.11.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.4"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.4.tgz"; - sha512 = "5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg=="; - }; - }; - "@babel/generator-7.11.0" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz"; - sha512 = "fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.5.tgz"; + sha512 = "fsEANVOcZHzrsV6dMVWqpSeXClq3lNbYrfFGme6DE25FQWe7pyeYpXyx9guqUnpy466JLzZ8z4uwSr2iv60V5Q=="; }; }; "@babel/generator-7.11.4" = { @@ -382,6 +373,15 @@ let sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; }; }; + "@babel/generator-7.11.5" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.11.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.5.tgz"; + sha512 = "9UqHWJ4IwRTy4l0o8gq2ef8ws8UPzvtMkVKjTLAiRmza9p9V6Z+OfuNd9fB1j5Q67F+dVJtPC2sZXI8NM9br4g=="; + }; + }; "@babel/helper-annotate-as-pure-7.10.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; @@ -409,13 +409,13 @@ let sha512 = "5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg=="; }; }; - "@babel/helper-builder-react-jsx-experimental-7.10.5" = { + "@babel/helper-builder-react-jsx-experimental-7.11.5" = { name = "_at_babel_slash_helper-builder-react-jsx-experimental"; packageName = "@babel/helper-builder-react-jsx-experimental"; - version = "7.10.5"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.5.tgz"; - sha512 = "Buewnx6M4ttG+NLkKyt7baQn7ScC/Td+e99G914fRU8fGIUivDDgVIQeDHFa5e4CRSJQt58WpNHhsAZgtzVhsg=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz"; + sha512 = "Vc4aPJnRZKWfzeCBsqTBnzulVNjABVdahSPhtdMD3Vs80ykx4a87jTHtF/VR+alSrDmNvat7l13yrRHauGcHVw=="; }; }; "@babel/helper-compilation-targets-7.10.4" = { @@ -625,13 +625,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.4" = { + "@babel/parser-7.11.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.4"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"; - sha512 = "MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; + sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -1156,13 +1156,13 @@ let sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; }; }; - "@babel/plugin-transform-runtime-7.11.0" = { + "@babel/plugin-transform-runtime-7.11.5" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz"; - sha512 = "LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz"; + sha512 = "9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.10.4" = { @@ -1246,13 +1246,13 @@ let sha512 = "8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg=="; }; }; - "@babel/preset-env-7.11.0" = { + "@babel/preset-env-7.11.5" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz"; - sha512 = "2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz"; + sha512 = "kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA=="; }; }; "@babel/preset-flow-7.10.4" = { @@ -1264,13 +1264,13 @@ let sha512 = "XI6l1CptQCOBv+ZKYwynyswhtOKwpZZp5n0LG1QKCo8erRhqjoQV6nvx61Eg30JHpysWQSBwA2AWRU3pBbSY5g=="; }; }; - "@babel/preset-modules-0.1.3" = { + "@babel/preset-modules-0.1.4" = { name = "_at_babel_slash_preset-modules"; packageName = "@babel/preset-modules"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; - sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; "@babel/preset-stage-2-7.8.3" = { @@ -1291,13 +1291,13 @@ let sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; }; }; - "@babel/register-7.10.5" = { + "@babel/register-7.11.5" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.10.5"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.10.5.tgz"; - sha512 = "eYHdLv43nyvmPn9bfNfrcC4+iYNwdQ8Pxk1MFJuU/U5LpSYl/PH4dFMazCYZDFVi8ueG3shvO+AQfLrxpYulQw=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.11.5.tgz"; + sha512 = "CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w=="; }; }; "@babel/runtime-7.10.5" = { @@ -1327,13 +1327,13 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.11.0" = { + "@babel/traverse-7.11.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; - sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; + sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; }; }; "@babel/types-7.10.4" = { @@ -1345,13 +1345,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.11.0" = { + "@babel/types-7.11.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; - sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; + sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; }; }; "@bugsnag/browser-7.3.3" = { @@ -1579,6 +1579,15 @@ let sha512 = "ZHkXKq2XFFmAUdmSZrmqUSIrRM4O9gtkdpxMmV+LQl7kScUnbo6pMnXu6+FTDgZ12aW6SDoZoOJfS56WD+Eu6A=="; }; }; + "@eslint/eslintrc-0.1.3" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz"; + sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="; + }; + }; "@evocateur/libnpmaccess-3.1.2" = { name = "_at_evocateur_slash_libnpmaccess"; packageName = "@evocateur/libnpmaccess"; @@ -1615,13 +1624,22 @@ let sha512 = "EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w=="; }; }; - "@fluentui/date-time-utilities-7.6.0" = { + "@exodus/schemasafe-1.0.0-rc.2" = { + name = "_at_exodus_slash_schemasafe"; + packageName = "@exodus/schemasafe"; + version = "1.0.0-rc.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.2.tgz"; + sha512 = "W98NvvOe/Med3o66xTO03pd7a2omZebH79PV64gSE+ceDdU8uxQhFTa7ISiD1kseyqyOrMyW5/MNdsGEU02i3Q=="; + }; + }; + "@fluentui/date-time-utilities-7.7.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.6.0.tgz"; - sha512 = "lp8BjSF9FW8mpVrfcuVbldVOVZ/lxWzH9xzBG67rkdjIMYwtV0/mFgB6MrKsGvzqDIlvXcoptrcUQNl0/3QA7Q=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.7.0.tgz"; + sha512 = "rgtGX5x1AeYUfilfkgP6ag+ZKx41BJcUs16k6iSxXxd/mt00DAPOGY8ODGikKFpjGKcUwjKfYBssyKkVHDucfA=="; }; }; "@fluentui/keyboard-key-0.2.11" = { @@ -1633,40 +1651,49 @@ let sha512 = "4iG5vNlRD3PrLaMfDTimHNOP1x6V3Dad0fXOwtvBBMsfdySPE9zlY+G+0aqCFcgjymOriFOk0ANZVBpK7XrnTg=="; }; }; - "@fluentui/react-7.132.0" = { + "@fluentui/react-7.134.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.132.0"; + version = "7.134.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.132.0.tgz"; - sha512 = "k2ZMkhUJt+wmJPEZUyWi6oiM3NlXT5zWfF0yEEKJlGeFm55Q1OGr5XdflR5Crd9CYE+zoUN7PoYe3NGebdsIUA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.134.1.tgz"; + sha512 = "UMnf1pfTwuphU3lJAfwVsWZULu7MoJmxg/vJyirOvXa/+lQqGQr/SfXthqlkE0DPRMRr2qqtc9iNCfZxi7dfCg=="; }; }; - "@fluentui/react-focus-7.13.3" = { + "@fluentui/react-focus-7.15.0" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.13.3"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.13.3.tgz"; - sha512 = "P7iptQRBgyAuxLUq7yusVI0FL92wjo5jdzofatkoONxVHAzrTbGsboiu00PbeYbXxEKjA1+v2y2OfbgGRpglZw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.15.0.tgz"; + sha512 = "xbxB0cbyEoUfQZ19pAqBeWCYJ/4IOu1FG4bhVjDimqSD7qKwJbLlJSDNwmHr05SWprdhmqJe23KOwsHMgyvnrw=="; }; }; - "@fluentui/react-icons-0.2.2" = { + "@fluentui/react-icons-0.3.0" = { name = "_at_fluentui_slash_react-icons"; packageName = "@fluentui/react-icons"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.2.2.tgz"; - sha512 = "pofZsHgbBVcyVr3I/LlbrX3P06NZnToxlH7cS9xy3LFcyrj629S5+iEXFdVk4O496MJ6qd4/FyxI/3Ru9UNlDg=="; + url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.3.0.tgz"; + sha512 = "QDrIhLUpkxM5q5bFE4pkweJJsfaNswdfDoc+X6cmr22Dii+anDFTpOcePEJiTtILxdlEmH0968OcZ4BGZF/joQ=="; }; }; - "@fluentui/theme-0.1.2" = { + "@fluentui/react-window-provider-0.3.0" = { + name = "_at_fluentui_slash_react-window-provider"; + packageName = "@fluentui/react-window-provider"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-0.3.0.tgz"; + sha512 = "zHeH1PAmoFB3OkgU8f51E3oGHrL/CjuvdPBlb1SGpByUGNihAgH/CwvJohV9z0yPDkq+chfNUmxWA/oDVpbh6Q=="; + }; + }; + "@fluentui/theme-0.2.0" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.1.2.tgz"; - sha512 = "hjLowlMEH6vVrE+6dNgrZ8vWXK3a750959aWC5Ss0cWMZPtL3oNxCSwsLD6I65HwErhfDIEXw1HIqNEN9XbiAw=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.2.0.tgz"; + sha512 = "L5OwqymTdxTVwBa3ifkQLF1A3YU6WMkMTk6PFIMfOonjt8LJ3yMMqZgz+KQR3sF/tzgy4wzW4oBmrxtTfJS2EQ=="; }; }; "@graphql-cli/common-4.0.0" = { @@ -1687,94 +1714,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.1.0" = { + "@graphql-tools/delegate-6.2.0" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.1.0.tgz"; - sha512 = "LBulO9tEx+4TvRIY3yCivCYdtI18BpDX/qlSs+K7AuTgCH8eJ/S/FinFRTpTK/9bQwXnBh/d9WjiiRekUCiW6g=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.0.tgz"; + sha512 = "jYwg6MuErovAHXhyReTSgRTzdvPB60VEO02KGZskaD5WPqCQy6oqYBetXOp1yG6PBwJvxCTpMKuZvyPVLRM9ww=="; }; }; - "@graphql-tools/graphql-file-loader-6.1.0" = { + "@graphql-tools/graphql-file-loader-6.2.0" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.1.0.tgz"; - sha512 = "UZsCx/JJPlkCPYoKJhOcMpDYRx0RagBJ/0gVjgUyiykGJyl8QqTUz34QZhRFg5WGPWcEyT8z18w5WocPCXwK+g=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.0.tgz"; + sha512 = "anl/fc2KTLF2Eu5Fd9fRYy+N22QBZskP2uKAqyiaJFPiIAOXWAUjK/WJ4uWAAjkGhEnseK0M8hUudgW36w8Smg=="; }; }; - "@graphql-tools/import-6.1.0" = { + "@graphql-tools/import-6.2.0" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.1.0.tgz"; - sha512 = "MuW9v8w8hc6GvsWQH41NnOAr1f7bkV4E6AWMYpndAHPcuwwGHiLHizLCEjbNovzdoA8N9h3sMenhQyRpCAiEzg=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.0.tgz"; + sha512 = "fYLyzAW3RKKfyPO+0nEA86yUP2V2uctdsZVZEamJ9MtjW+UhZf9kbR+NBuX/FbFAQR+F7UMe5GSPjUTKC13CEg=="; }; }; - "@graphql-tools/json-file-loader-6.1.0" = { + "@graphql-tools/json-file-loader-6.2.0" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.1.0.tgz"; - sha512 = "U5+aU4Bi9Se2+rFE0lwARHii1TyKtVG+WPNtBM1YJdgQ800/jrgjSCBl2Js/bd2YkICMLz++lCehyQSgrLpIsg=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.0.tgz"; + sha512 = "kpvYLGuxcq3V9cr996YOCAkw7F/4pC1JY1KxvI3360G0mYVVZcA8Q/XcxcwPwPZrBHDJMHhXvTRZD+svQ49Rxw=="; }; }; - "@graphql-tools/load-6.1.0" = { + "@graphql-tools/load-6.2.0" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.1.0.tgz"; - sha512 = "4puWwWPvLKskTtabMXlYW4fdm5yaAgHNwJeUhs3/ftX9mrJOa8HnfIxULZOES9XEbaRoaVQ0wPRBjJKcTBJ7CQ=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.0.tgz"; + sha512 = "ZsxPXMpLOjNh88Q2XtDmMTP65tQfknZjCgWm9vq+FxlUh//7Z8q6WiChogIEJ9g8G0+XKmLEcA+Vi4L45QX9GA=="; }; }; - "@graphql-tools/merge-6.1.0" = { + "@graphql-tools/merge-6.2.0" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.1.0.tgz"; - sha512 = "dD7J/LELhy87+5V8pko5EhSx2leoRIT02V5coa6S19PTiNrVqCJU/fMMKdWC1FmHSWUYOf+wZhItsilUxPr7XQ=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.0.tgz"; + sha512 = "q2bnFhdw6ssBzIlTkyUGPzBThLHgwuTVCRvjjCepegQCKGzwDypve0n+EMBUnoaOcJ3JRgQHR3eStP2x/S0AYw=="; }; }; - "@graphql-tools/schema-6.1.0" = { + "@graphql-tools/schema-6.2.0" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.1.0.tgz"; - sha512 = "AZflTf9HU3Uy8UgUwxwFXN9Lf+9D36LBoDRIxPRhsj6EtawbwCqsd3UFwNek0OgiwNi3BL2b+D+6QEcw2IOsDA=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.0.tgz"; + sha512 = "wlAIgN6pMgRaruiJqlZLIe+FM834ZYif/P7evCbG71sm7Ou8t0n+dkpf8+qZAa7D+PWO9G96BF1l2NPUlM+KvA=="; }; }; - "@graphql-tools/url-loader-6.1.0" = { + "@graphql-tools/url-loader-6.2.0" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.1.0.tgz"; - sha512 = "AzTDZPQqHv2jrTrKhPgLbeWBhEjwFMAFnRKPsaGnSxkZWAeTeA4XevbWS4wl9jho0klTtSRBbKnNBp+dxbpmwA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.0.tgz"; + sha512 = "bPktwMT42tvsPIlJYQ4bwjnQKhOSwCsV/R81T0tsoh+UbKR2/QxccSQCoNJAUIxP6hXfR+Sc1wMXUw7m8/akrg=="; }; }; - "@graphql-tools/utils-6.1.0" = { + "@graphql-tools/utils-6.2.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.1.0.tgz"; - sha512 = "YcyslZ/8rk5nQOGnkEDp/xi6Xphu0mgjh5LTZ1qUio5P+d95/9MW44cPdmi3Feg4kO8u+1GcPC+685hFpJlZJw=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.0.tgz"; + sha512 = "Z5ONje6tGNvBzGwo/8eIafr98mwuvWpi3IwPp8CKHKjTBAKlUxY8hlwSn+bEMPyuA9uH/7nHWz4lamRQQEHAhg=="; }; }; - "@graphql-tools/wrap-6.1.0" = { + "@graphql-tools/wrap-6.2.0" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.1.0.tgz"; - sha512 = "sJ4ePvgQ2AKWGQ75hockh1k+0BhPbr7SZqe4T/HKNMCuATNiRi0m78FoxHTp/JODMKRPfhadunD74CXrxupy6A=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.0.tgz"; + sha512 = "I7EAvY6x6cBB92j+IrZLE3meYUdmHNK8r/TvHXJ8SmgMJGlt4z8bjOr7WmYdMPufyVdHBSGwECqjWcxOhSxLsA=="; }; }; "@hapi/address-2.1.4" = { @@ -2524,13 +2551,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.79" = { + "@microsoft/load-themed-styles-1.10.82" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.79"; + version = "1.10.82"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.79.tgz"; - sha512 = "p4Ym7B2d8HT1K0VHAQkUw1SRmXQrko59lmqg/cr8ORClXIhoqc6Zt3m6I53olz4af2pXzpiI0ynHu6KmYYLOfQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.82.tgz"; + sha512 = "p92TRErd5xpYkSy7TjNDs+0LmxDBSusmLSgnWCv7xZf9DGXZCW08ZiUVlbsaj3e49kGskOaWQvarMDejm2b+FQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -2569,22 +2596,22 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-3.3.2" = { + "@netlify/build-3.3.5" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "3.3.2"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-3.3.2.tgz"; - sha512 = "nIjjJyKJP+6hAMAfNeNUfMMNvXm8qtAtIv/i+Va7PvapPNO37p5H15o0dlke7xLIQuxuDvd6UE3bilj/c1KvdQ=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-3.3.5.tgz"; + sha512 = "QhPsiexwv2pKJTCvxiOKYaR5LmQS1H9hlF+8PzZBqk/rUUQAt9y6L6gQQJ1hnXEdsFIQGUqBG0aPolKgWQ3H7A=="; }; }; - "@netlify/cache-utils-1.0.1" = { + "@netlify/cache-utils-1.0.2" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.1.tgz"; - sha512 = "wJBHxOWrqGiwgdgd/PxzJC6tVltODDYsqb5Dqs2pJi4LoIXFlAoW+scAWIIURHYs8zodte50pAcMg5cnLLUKPw=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.2.tgz"; + sha512 = "5eB8PpX4UaJsgVWwV+TSuGyzi/rysCqTSZzVVJVDSVr0sQa574N6LmLWuYl0WJluSTWeYtUUlATLeP838FaZfQ=="; }; }; "@netlify/config-0.11.11" = { @@ -2596,13 +2623,13 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.1.2" = { + "@netlify/config-2.1.3" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.2.tgz"; - sha512 = "2DvK5rw4DIrQ+Vla4A/C7euFtP43dCdW8Df2sPAiPvOWZLiV941N7flHRB8IJqOQcV/MaG4+qg+lMlR2KDC/Qg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.3.tgz"; + sha512 = "rasNRIFI/U6j293k46capM+b9yc+NT/wfnqtSjd+WGsXuj6O4iMXuN5gpNteKg5RYGFP4mAkP4BjM+//OBFtvg=="; }; }; "@netlify/functions-utils-1.2.8" = { @@ -2641,13 +2668,13 @@ let sha512 = "TcdVJZ3J4iu+WYV9sLMBOr1jW2+XgLtIt1LfGYqsH+yqfkWoWavV27y5ttznM1BODFYQb9fMJG/xO2wAeXCzMw=="; }; }; - "@netlify/zip-it-and-ship-it-1.3.11" = { + "@netlify/zip-it-and-ship-it-1.3.12" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "1.3.11"; + version = "1.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.3.11.tgz"; - sha512 = "j+DSEwSztqoAMPSvx3PnfHqpR3aCW4B/piLbrRLq+Bp8UElq9UZZN3wzEvTL8NS+2VNb5HvwDYDPev208+Fz8g=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.3.12.tgz"; + sha512 = "FQM/59HXMAKp9k4z6rXDA/FBKFSUaU3n5SFpF2/jScmpCmHBpF+pYIWZmVB4fY17cvq3KIcuSfzf9PqD1B73XQ=="; }; }; "@node-red/editor-api-1.1.3" = { @@ -2749,13 +2776,13 @@ let sha512 = "oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="; }; }; - "@npmcli/git-2.0.3" = { + "@npmcli/git-2.0.4" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.3.tgz"; - sha512 = "c/ODsV5ppjB12VDXKc6hzVNgg6ZJX/etILUn3WgF5NLAYBhQLJ3fBq6uB2jQD4OwqOzJdPT1/xA3Xh3aaWGk5w=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.4.tgz"; + sha512 = "OJZCmJ9DNn1cz9HPXXsPmUBnqaArot3CGYo63CyajHQk+g87rPXVOJByGsskQJhPsUUEXJcsZ2Q6bWd2jSwnBA=="; }; }; "@npmcli/installed-package-contents-1.0.5" = { @@ -2803,15 +2830,6 @@ let sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA=="; }; }; - "@oclif/command-1.7.0" = { - name = "_at_oclif_slash_command"; - packageName = "@oclif/command"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.7.0.tgz"; - sha512 = "TkknFtWcZI8te0E8sW+ohiblExrLx73rIcV4KdIzDX01u+oTZWZaap51F6TSGFnR/Gey0WctaDvJhZlt4xgKdA=="; - }; - }; "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; @@ -2821,15 +2839,6 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/config-1.16.0" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.16.0.tgz"; - sha512 = "vOnMPQcHokC03WBCuLipTxksTwgZcmDOnH2H0UHqndfKKN9GVDzpZTH6zaFVQBdjTME5VtRzg9A2UaNmq6OXWw=="; - }; - }; "@oclif/config-1.17.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; @@ -3091,13 +3100,13 @@ let sha512 = "LUuXiILPURVCF8u4gnE6SWQZ/+1kVnRatXK6SmQyk+ed8F4uDyNCGuIu3/W7jYQB+k7kD6eQZqINuPWvbPTzYQ=="; }; }; - "@primer/octicons-10.0.0" = { + "@primer/octicons-10.1.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-10.0.0.tgz"; - sha512 = "iuQubq62zXZjPmaqrsfsCZUqIJgZhmA6W0tKzIKGRbkoLnff4TFFCL87hfIRATZ5qZPM4m8ioT8/bXI7WVa9WQ=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-10.1.0.tgz"; + sha512 = "oXfV0uIe7I4cb3vUzBPlPZGL5SQ3+joyyRcmk28aJiGFySl8brzL0MJC63RahiNEnIFrL3D5BRVgz5ZGGuHCOg=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -3235,13 +3244,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.0.8" = { + "@schematics/angular-10.1.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.0.8"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz"; - sha512 = "KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.0.tgz"; + sha512 = "kQ925yMmOwiSITY+FhuTvrl3HuEIEUrdByBNB0NlvY+DyJwPlngEOo6Iu0cYWaJcoxM1JscOWL59ZR6W7YCFIg=="; }; }; "@schematics/schematics-0.1000.7" = { @@ -3253,13 +3262,13 @@ let sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1000.8" = { + "@schematics/update-0.1001.0" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1000.8"; + version = "0.1001.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz"; - sha512 = "xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.0.tgz"; + sha512 = "LRGwo37akHe/BUl5FHj74mJ/xhM0Z7W8pWMWJ6zGihs+HNXjTgfYVgGA1TgN0amqQODa3AxxLL6aLj+hVYZi+g=="; }; }; "@serverless/cli-1.5.2" = { @@ -3280,13 +3289,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.34.7" = { + "@serverless/components-2.34.9" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.34.7"; + version = "2.34.9"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.34.7.tgz"; - sha512 = "zQ5S/DjqYKgcUUA/FJGr09m5cQ59eXWMXUoKanZAAmpaAfpvD5uaLbGGlgdIli6JZTks5hLqtjfcar87r94/qg=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.34.9.tgz"; + sha512 = "qFjIeGgR4SjS32Tbl4BvoxOtLpv3Vx4s/81HdmmpdIrMPe7ePGUfkBVBu3axxAXHf4ajlb4WC1HmhTmZAHHSLQ=="; }; }; "@serverless/core-1.1.2" = { @@ -3298,13 +3307,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.7.1" = { + "@serverless/enterprise-plugin-3.8.2" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.7.1"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.7.1.tgz"; - sha512 = "+9/gtrSRCXrO/5gLlFO9hZlxl90ctjsDx8dwKHnO9mVMXJ7RQmUWUj+5h2kSrD6bs2F1RmhLgQhwj7DCGEEAQg=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.8.2.tgz"; + sha512 = "tJqvVBHOQk110UXEO/RVeZIUh/tyBlxalaNnGRiTsbT2kRsq0s/OfznfMufANmlKaKPcoOXxHEW8oaAV4N1XyA=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3325,22 +3334,22 @@ let sha512 = "2c5A6HSWwXluknPNJ2s+Z4WfBwP7Kn6kgsEKD+5xlXpDpBFsRku/xJyO9eqRCwxTM41stgHNC6TRsZ03+wH/rw=="; }; }; - "@serverless/platform-client-1.1.7" = { + "@serverless/platform-client-1.1.8" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.7.tgz"; - sha512 = "520U/OZN/IV1UnqVPGGMnoPM4TsflxffcyNSbs8Nr7G/9eGr1rcHw2vMAU5Z+4M7DoMDi7FogLNCrr51PLGxaQ=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.8.tgz"; + sha512 = "DmU71Lh0ALOMumGD7k2HfO6WwaFpJCA4ech1S9Kd8AQvpKZrT8fyUl9Ymc/E6GJLRC4s3a5wzcsLbu5AiDNyHA=="; }; }; - "@serverless/platform-client-china-1.0.34" = { + "@serverless/platform-client-china-1.0.37" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.34"; + version = "1.0.37"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.34.tgz"; - sha512 = "pEMq9hsPYIzMxEZY/tBscOiUDpGQ17yN7ORAdS/mLNjuoouyOJfTiYtehYoY+wNBm25BIcZnkX81+X+IpyF5ng=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.37.tgz"; + sha512 = "eN2UBK51Z9RkRY5Im0j2wCl3XuHBKiuY3kpQIxtGs52yuQx8PA0I/HBsYwyRgoTpvATK3MM/SsyeKpvNs90+uw=="; }; }; "@serverless/platform-sdk-2.3.1" = { @@ -3460,15 +3469,6 @@ let sha512 = "3X+OwwwT9j0r2ObqxYIiAgdaHsTW71b92PN3wawGAxl4YgPRrRVw8Fouhe41I4WJsn7OlKUNedylZguvpYg9qw=="; }; }; - "@snyk/cli-interface-2.8.0" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.8.0.tgz"; - sha512 = "St/G39iJG1zQK15L24kcVYM2gmFc/ylBCcBqU2DMZKJKwOPccKLUO6s+dWIUXMccQ+DFS6TuHPvuAKQNi9C4Yg=="; - }; - }; "@snyk/cli-interface-2.8.1" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; @@ -3478,6 +3478,15 @@ let sha512 = "pALcfgoY0hAavy/pBlDIqEu+FFC5m+D4bMnCwlQ26mObL/zzxp2+Ohx+HykCIom62u2J94SzAtRLFdm/2TgoOw=="; }; }; + "@snyk/cli-interface-2.9.0" = { + name = "_at_snyk_slash_cli-interface"; + packageName = "@snyk/cli-interface"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.0.tgz"; + sha512 = "KDVHsU71apUPHK1PiIUXVW7stGZilbwKIoi0ffz1Qa0Er03fm3aV602scnOinbTtVy5UTm3L4WmdCdQrRoBYOQ=="; + }; + }; "@snyk/cocoapods-lockfile-parser-3.5.1" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; @@ -3910,13 +3919,13 @@ let sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; }; }; - "@types/babel-types-7.0.8" = { + "@types/babel-types-7.0.9" = { name = "_at_types_slash_babel-types"; packageName = "@types/babel-types"; - version = "7.0.8"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.8.tgz"; - sha512 = "jvu8g4LR7+p6ao30RhTREnEhHxmP4/R9D9/rOR/Kq14FztORty9SKgtOZUNZNMB9CXLxZ54EWu4dArUE8WdTsw=="; + url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz"; + sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA=="; }; }; "@types/babel__core-7.1.9" = { @@ -4135,13 +4144,13 @@ let sha512 = "dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ=="; }; }; - "@types/express-serve-static-core-4.17.9" = { + "@types/express-serve-static-core-4.17.12" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.9"; + version = "4.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.9.tgz"; - sha512 = "DG0BYg6yO+ePW+XoDENYz8zhNGC3jDDEpComMYn7WJc4mY1Us8Rw9ax2YhJXxpyk2SF47PQAoQ0YyVT1a0bEkA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz"; + sha512 = "EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -4297,13 +4306,13 @@ let sha512 = "4jkASx74qGl2OUK8NNFEq10QP0MXriOIqeBeNb1IdevHP8k8VDqS5Uv6nIixAA6ZUjjF6/SwOvecrjXkbcaFzw=="; }; }; - "@types/json-schema-7.0.5" = { + "@types/json-schema-7.0.6" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; - sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; }; }; "@types/json5-0.0.29" = { @@ -4351,13 +4360,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.160" = { + "@types/lodash-4.14.161" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.160"; + version = "4.14.161"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.160.tgz"; - sha512 = "aP03BShJoO+WVndoVj/WNcB/YBPt+CIU1mvaao2GRAHy2yg4pT/XS4XnVHEQBjPJGycWf/9seKEO9vopTJGkvA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz"; + sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; "@types/long-4.0.1" = { @@ -4414,13 +4423,13 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/node-10.17.28" = { + "@types/node-10.17.29" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.28"; + version = "10.17.29"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz"; - sha512 = "dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.29.tgz"; + sha512 = "zLo9rjUeQ5+QVhOufDwrb3XKyso31fJBJnk9wUUQIBDExF/O4LryvpOfozfUaxgqifTnlt7FyqsAPXUq5yFZSA=="; }; }; "@types/node-12.7.12" = { @@ -4432,31 +4441,31 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.15" = { + "@types/node-13.13.16" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.15"; + version = "13.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.15.tgz"; - sha512 = "kwbcs0jySLxzLsa2nWUAGOd/s21WU1jebrEdtzhsj1D4Yps1EOuyI1Qcu+FD56dL7NRNIJtDDjcqIG22NwkgLw=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.16.tgz"; + sha512 = "dJ9vXxJ8MEwzNn4GkoAGauejhXoKuJyYKegsA6Af25ZpEDXomeVXt5HUWUNVHk5UN7+U0f6ghC6otwt+7PdSDg=="; }; }; - "@types/node-14.6.0" = { + "@types/node-14.6.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.6.0"; + version = "14.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.6.0.tgz"; - sha512 = "mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.6.3.tgz"; + sha512 = "pC/hkcREG6YfDfui1FBmj8e20jFU5Exjw4NYDm8kEdrW+mOh0T1Zve8DWKnS7ZIZvgncrctcNCXF4Q2I+loyww=="; }; }; - "@types/node-6.14.10" = { + "@types/node-6.14.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.10"; + version = "6.14.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.10.tgz"; - sha512 = "pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.11.tgz"; + sha512 = "htzPk08CmbGFjgIWaJut1oW2roZAAQxxOhkhsehCVLE7Uocx9wkcHfIQYdBWO7KqbuRvYrdBQtl5h5Mz/GxehA=="; }; }; "@types/node-fetch-2.5.7" = { @@ -4846,40 +4855,40 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.8.3" = { + "@uifabric/foundation-7.9.0" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.8.3.tgz"; - sha512 = "8b5gFeZlBb039iqx0iDZLMV4Pya1l10xJzCteg/C0B66GaKuJuW0sMv8GuFSsqXHnqMuzoakKqyq8zsRIN96Uw=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.0.tgz"; + sha512 = "4gdPwx0HV59aWvPKIw6yIje60CYwJZmTJsdLRXqh8Np1tWp2EsbA8U/IHQL1V91rEN0DlQhASqCDFhfQoD1jUw=="; }; }; - "@uifabric/icons-7.4.3" = { + "@uifabric/icons-7.5.0" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.4.3"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.4.3.tgz"; - sha512 = "/3+JxAXOGKeJAIQlLDFfiQaw7RSnLNWU3BnXbOCWRIzBAJme6XbvU3Oiy6Sgq79CEuSx1gwe8EifYvM8OFMYNA=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.0.tgz"; + sha512 = "RINA9VkajlCnlwEBbqiwLBaaGn38Bf9UvjOuwrrja4B9lclLeQzZuGrG/kp7CnDtIO+LC19OYl/7E3jW7yIihA=="; }; }; - "@uifabric/merge-styles-7.17.0" = { + "@uifabric/merge-styles-7.18.0" = { name = "_at_uifabric_slash_merge-styles"; packageName = "@uifabric/merge-styles"; - version = "7.17.0"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.17.0.tgz"; - sha512 = "UFG0pKqjz6iGcYhDFDSb2br5TEOys90mCaXeXPln8QrIc5NTJG1gWeO4znG6r65e23Ab/hBz+lmoyfYxgr3fZw=="; + url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.18.0.tgz"; + sha512 = "805WIbN7lAJATXKxZjjRbIgN7raRMwWYWeDkJJ52PCPuCesOvbpdr0GkH8rC6GQ7EB0MB7YM2i6Fiye7SFewbw=="; }; }; - "@uifabric/react-hooks-7.10.0" = { + "@uifabric/react-hooks-7.11.0" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.10.0.tgz"; - sha512 = "zbxsFrXexfj5bPDBDh4BNFZj8vs8Jf6jmvZYRk+r/ZtvfceDyjuWcF+fYc2fjCon6pDfL5N8/S5Bc4NRw6sfvw=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.11.0.tgz"; + sha512 = "iU7c+JR+rY5kBTPmrF8F6iJBQw309MX/MvOx6ElhmNceBaa8BqDuqR9+TVfkH+Bxp37bmZnCaQF5w4+QWHZ81g=="; }; }; "@uifabric/set-version-7.0.22" = { @@ -4891,22 +4900,22 @@ let sha512 = "IG35UNJNxqI7NC2eYuobGTD+v4W0VHQcC3bYd5Na9EgoC9jVgguS8n6EXUtP/lC1vJEYEyPEZdVwhPxKw4F4Sw=="; }; }; - "@uifabric/styling-7.15.3" = { + "@uifabric/styling-7.16.0" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.15.3"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.15.3.tgz"; - sha512 = "P8xHumpnr2De6AyiHhi0GBUf6HpV2R/wS8c5fSEhMpMomXjWQrnVeq7OS+896Qw/qCgvT/brjXAI2EzqEPwuvg=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.0.tgz"; + sha512 = "yO404ws8Wl4fjBwG4T58TFJjeU/K+SpWJ4w+WeNMDlJcYe4zXaWn2lbOJtKtQiMl324RAEjFSOuNkXzPb0uOGQ=="; }; }; - "@uifabric/utilities-7.30.0" = { + "@uifabric/utilities-7.31.0" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.30.0"; + version = "7.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.30.0.tgz"; - sha512 = "NO+XkCBsaxVzOA+JytgSGAK3ihPDG5XLPQQhFbAXSEc5eC6qzcSY6JswRPy3hC1DIWicTUh+iTrDbb+x2vZ8Wg=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.31.0.tgz"; + sha512 = "m4Yeyn4gyW7xS8LvOnCesokPModYS2YuE9GQmO++MDZ/vC5RRNlvlyktUZDuxCZ84cNCiXyTQ8nImBaPGnxHVQ=="; }; }; "@vue/cli-shared-utils-4.5.4" = { @@ -4945,76 +4954,76 @@ let sha512 = "/7R3dMrv/tEP4AM22hBDPfXPF24OE/2ddR3cTF1c1fSoHT/LcUvqrlHIb8SlVgl3S7WvF9Prrunp+KzkHW9bSA=="; }; }; - "@vue/compiler-core-3.0.0-rc.9" = { + "@vue/compiler-core-3.0.0-rc.10" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.9.tgz"; - sha512 = "/Ns7KGT5P0wh4JTM91drBmNIiBlKrCFUqIE2vk8dmaVvqEJf1mqympz1CDZpikghCQC6hKu3tYKxA7qtcMRazw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.10.tgz"; + sha512 = "kQzHzRsM0NPAWHeqSTb2J4VsHhjRkGeLTsGzeMnW+sojgTnS3T94KacwvYgVS4qeZAKiDq0bMNZoJWrHVQ3T8g=="; }; }; - "@vue/compiler-dom-3.0.0-rc.9" = { + "@vue/compiler-dom-3.0.0-rc.10" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.9.tgz"; - sha512 = "0hCnrIxwp0TKVXKnGYFztM4LMUvFpfXW7YoEglvHqIfZsGkyKcnCYDx4FPk1frDM21xnrr5HgcHt42rlz8lDBA=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.10.tgz"; + sha512 = "pqIUf5leZm0P9379utrRSVBMxhV8XaqJTEFFp5etCtbEa/H5ALs29EjFMtMcm9sQaVkZlKLu86mgIacbYB9Q3w=="; }; }; - "@vue/compiler-sfc-3.0.0-rc.9" = { + "@vue/compiler-sfc-3.0.0-rc.10" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.9.tgz"; - sha512 = "kmjGzcyp93Q+ZKfvxC3GtI9bEXCa9TxsuO+Q9WtiyvOWBLxZkklQc1n5DFn6vtAUIjjlIE5GZoKawvn9LfKejA=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.10.tgz"; + sha512 = "VIJ+VXqeM7WoRNgD9uYSARVb6CYq+JS2NNHfeerfNc7Uk3pjYHRv1MwEicAvN6zWFm5GLC1ZYTVD+WFg3xGAkQ=="; }; }; - "@vue/compiler-ssr-3.0.0-rc.9" = { + "@vue/compiler-ssr-3.0.0-rc.10" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.9.tgz"; - sha512 = "lpbnkJrhkI5QgprLPXcB1Uq402QiibPFKRUQZ5vu3zeAvUeMYuQUtZS/Dslurcvqd1dbBC/HM0gCpLtjEQ+2qA=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.10.tgz"; + sha512 = "JBPil8sO5j7puB8acX2CQMRXEYB/EP8PoEur7RcF/+aqATI7C4yqWcSLC5TRJpigj6xE6ku6sx8om+j7ZHvgBw=="; }; }; - "@vue/reactivity-3.0.0-rc.9" = { + "@vue/reactivity-3.0.0-rc.10" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.9.tgz"; - sha512 = "1fJSt4zZ/icZUNsN3Te5BeVChmQ7Ner2xUYy9ALtShLSj2RwxRVhtysjXxLE16TbwLkHjsOHjA8tQWrdBfQG0A=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.10.tgz"; + sha512 = "mkUZfOJlbqGZx2cARmhCs5r2+xLJPL7VFNagmlA3Fd66ZXBc3ZvTQdYsY4VUbYJFe5ByIzqu9TZiAkzXY+JVaA=="; }; }; - "@vue/runtime-core-3.0.0-rc.9" = { + "@vue/runtime-core-3.0.0-rc.10" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.9.tgz"; - sha512 = "5tViEzPl8K1moMjCQJXqvTa/RjR/h8cZ9dUDgKfKWvZhxAmXHtmYlBWrvEeFTGWiEuZj0XlZkNxMNjuHLVF0Vg=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.10.tgz"; + sha512 = "VK/kq4gDDoqZ45CVwdbLLpikXLYLCt6YLhdgXX3fhf20gvPqrbEZv1ZNLruNnhhTpf9cLyU4tZ18DHeaUYPziw=="; }; }; - "@vue/runtime-dom-3.0.0-rc.9" = { + "@vue/runtime-dom-3.0.0-rc.10" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.9.tgz"; - sha512 = "OUKFLOaoshmQPaW7iaYuxl9ip3v08g8cXYr0bu68/0r94PF2/xO/b0GhoUoyeqp/pu1VzZ1TxulJ94JOXsuYjg=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.10.tgz"; + sha512 = "bH4GuneHt3FQ+/21jba5orM/CO9N1cnT7J3wtrxopFJ4/4H5cvHXyG6v+ZVTu1d733Ij/6yMRA7xbtfi9a4zJw=="; }; }; - "@vue/shared-3.0.0-rc.9" = { + "@vue/shared-3.0.0-rc.10" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.9.tgz"; - sha512 = "SHD7qwziiG6208nKrs0qqbWbYckvBiCBCLwlRjUb6NEDUMN0TOVyzyaTvdnHND9ion/ZMdwEKMtWWtgJJkHDdw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.10.tgz"; + sha512 = "fI6gVhhgb3cAmEkY4oeVVA2hWZ2xvkgogHdBI5PL7gSvZnOB6XZ2eQGsYjC4W+7BegvEkoMBuZsFXVa4ZQ07XQ=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -5395,22 +5404,22 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; - "@yarnpkg/core-2.1.1" = { + "@yarnpkg/core-2.2.2" = { name = "_at_yarnpkg_slash_core"; packageName = "@yarnpkg/core"; - version = "2.1.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/core/-/core-2.1.1.tgz"; - sha512 = "qeBxz8nHjKAbGTP2ZcXBnXGfM7+cN0A73mIai/24uru1ayvCIgfjWL1uIj/MM+m+K5lJX0Dcn94ZBHWits9JWQ=="; + url = "https://registry.npmjs.org/@yarnpkg/core/-/core-2.2.2.tgz"; + sha512 = "TQ0wqQjbZQDrf31N5v4NtE4Juw1c16hYu9QwNloUxRgY/Z+AQIuqa6Jgv9BbAghchZkSIXDWp6bFGD7C+q7cuA=="; }; }; - "@yarnpkg/fslib-2.1.0" = { + "@yarnpkg/fslib-2.2.1" = { name = "_at_yarnpkg_slash_fslib"; packageName = "@yarnpkg/fslib"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.1.0.tgz"; - sha512 = "E+f8w5yQZnTf1soyTWy7qdf+GmHsY+A0yEN4Di44/Txk6XRIMruyc1ShDi93mOI6ilnXxD87rNms18zJ8WnspA=="; + url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.2.1.tgz"; + sha512 = "7SzLP/RHt8lEOaCTg6hMMrnxc2/Osbu3+UPwLZiZiGtLpYqwtTgtWTlAqddS3+MESXOZhc+3gKLX0lfqm6oWuw=="; }; }; "@yarnpkg/json-proxy-2.1.0" = { @@ -5422,13 +5431,13 @@ let sha512 = "rOgCg2DkyviLgr80mUMTt9vzdf5RGOujQB26yPiXjlz4WNePLBshKlTNG9rKSoKQSOYEQcw6cUmosfOKDatrCw=="; }; }; - "@yarnpkg/libzip-2.1.0" = { + "@yarnpkg/libzip-2.2.0" = { name = "_at_yarnpkg_slash_libzip"; packageName = "@yarnpkg/libzip"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.1.0.tgz"; - sha512 = "39c7KuSWcYUqVxlBLZwfqdD/D6lS+jplNVWd6uAnk8EpnacaYGJRegvkqWyfw5c8KHukNMeEGF5JHrXPZYBM0w=="; + url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.2.0.tgz"; + sha512 = "/YRSPJbPAvHeCJxcXJrUV4eRP9hER6YB6LyZxsFlpyF++eqdOzNu0WsuXRRJxfqYt3hl7SiGFkL23qB9jqC6cw=="; }; }; "@yarnpkg/lockfile-1.1.0" = { @@ -5440,31 +5449,31 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-2.1.0" = { + "@yarnpkg/parsers-2.2.0" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.1.0.tgz"; - sha512 = "75OYQ6PMs1C3zm+W+T1xhLyVDX78zXQGEVHpWd4o/QwpAbhneB3/5FXVGRzI3gjPPWWSb/pKOPB1S6p0xmQD2Q=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.2.0.tgz"; + sha512 = "k1XZaWYRHl7wCj04hcbtzKfPAZbKbsEi7xsB1Ka8obdS6DRnAw7n0gZPvvGjOoqkH95IqWf+Vi7vV5RhlGz63Q=="; }; }; - "@yarnpkg/pnp-2.1.0" = { + "@yarnpkg/pnp-2.2.1" = { name = "_at_yarnpkg_slash_pnp"; packageName = "@yarnpkg/pnp"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/pnp/-/pnp-2.1.0.tgz"; - sha512 = "b8NlB71EFifv1jDX47nFaRXrykROxHcS7YuGb2dQ+Gp9gqJ0thIaZ3yB9+qWF8acdWtNcMpjCug4xkfAAR5Odw=="; + url = "https://registry.npmjs.org/@yarnpkg/pnp/-/pnp-2.2.1.tgz"; + sha512 = "jrwJ3Q6M+nMs4n0O/GgxayU1Bq9mpLoZW2Mb8Nt2fs5whB0CeCr1/pGl9+yiCSjirv9jjp51TVFqF7OPvXy+gA=="; }; }; - "@yarnpkg/shell-2.1.0" = { + "@yarnpkg/shell-2.2.0" = { name = "_at_yarnpkg_slash_shell"; packageName = "@yarnpkg/shell"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/shell/-/shell-2.1.0.tgz"; - sha512 = "9i9ZWqeKHGV0DOfdxTVq5zl73Li8Fg947v57uLBEaytNF+HywkDfouNkg/6HfgBrpI0WH8OJ9Pz/uDaE5cpctw=="; + url = "https://registry.npmjs.org/@yarnpkg/shell/-/shell-2.2.0.tgz"; + sha512 = "IuOZhYxTydNySqP2HlKkfm1QjgCAgVBUZz5O5rXXxpS4vTNSa0q6fwqvNUSrHSWGKH/jAmJS23YbJqislj5wjg=="; }; }; "@zeit/schemas-2.6.0" = { @@ -6502,13 +6511,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.30.2" = { + "apollo-2.30.3" = { name = "apollo"; packageName = "apollo"; - version = "2.30.2"; + version = "2.30.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.30.2.tgz"; - sha512 = "CKQVvfjbeFPVew9q/dGuRNpohenK7oBTKNnwDs89ImEGoPDd7BpXRQUu/mNjUANoDpd2ztYRwO+ZxxVE8P4+sA=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.30.3.tgz"; + sha512 = "5X0a2PaMOYUWhk0DIRzzwu18j6WiVWIvgmciQHY++QV+aKngspXWeqAn+mugSkwkC/GVycl/0Jv/OCdnemE7Og=="; }; }; "apollo-cache-1.3.5" = { @@ -6547,49 +6556,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.37.8" = { + "apollo-codegen-core-0.37.9" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.37.8"; + version = "0.37.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.8.tgz"; - sha512 = "5mIF75iJCGaPXPvWthQjrWKb6YD7KRioODAM6OF5r+foN70Mli2S3g7wCsnmQ0J1TtstntHVnXykHsWClj4NIg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.9.tgz"; + sha512 = "FfsLh/DZkwH1fb5mNaVonBVk9JdJp3D/Bj1AGthw9ldZmd/3s79YfsYXqOsCNJM1TZt6K/du08NMHSLS86YQBA=="; }; }; - "apollo-codegen-flow-0.35.8" = { + "apollo-codegen-flow-0.35.9" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.35.8"; + version = "0.35.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.8.tgz"; - sha512 = "nqTIvqmidL3/k6k0HcJOQfr/vG6a3i2CCKa+w1UwAR9zRJn487lvT3QGSRNuYaohB/wBdGtNk3a1V2FvFyH/xg=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.9.tgz"; + sha512 = "+9gJLQfSy04Y4DwPpicGLpKQ1GORo07sxQWKqJWMtVRj4exKMFXieNawDUKErvxqiwDKXcBO9B1q5MF8BcwWlA=="; }; }; - "apollo-codegen-scala-0.36.8" = { + "apollo-codegen-scala-0.36.9" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.36.8"; + version = "0.36.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.8.tgz"; - sha512 = "6/ulLUqlKUTac5mZNAaFtzYn5LnJbXeMLftCl1NL4dyzFRn4rj+gZjDRP5e74GfDCqLAMSPyVt/6OFBxFKrs7w=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.9.tgz"; + sha512 = "t1ew6IXsFL+sNvyy/kS0VWv8t1WjxC46lt1ISt5v5bgDVyGo2g+cH93SSeEFUjtv+hK3TyqSO1fM0SLHAy8oJA=="; }; }; - "apollo-codegen-swift-0.37.8" = { + "apollo-codegen-swift-0.37.9" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.37.8"; + version = "0.37.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.8.tgz"; - sha512 = "qRqXZg2fLBm5OhJopVwh3Y3RLXeurwAj+bH3xcpxiAX05qci9MVOxwej05nmSu4GUv1csJSLDn93ZjQfByabkQ=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.9.tgz"; + sha512 = "4N8s2yni41/jjbfsyoJ4yxbW8XbL6HbUbxRgvbmckGtoOjQS06PYUD56IibQWbsaBs8gEpu5Z/rE/dL2Y6hZug=="; }; }; - "apollo-codegen-typescript-0.37.8" = { + "apollo-codegen-typescript-0.37.9" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.37.8"; + version = "0.37.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.8.tgz"; - sha512 = "cYysqRnW2h1xKFEZH0o636IeKvWBeeTDZmNZEyfMcl2TtyMRd0cOFUmA0gokX0JK/QzvJuTJgBKD9le9W8wV2w=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.9.tgz"; + sha512 = "DFBa8vUbiVmd/kGG/mjq6umwWxFRYtzllmt2fwHIVCi9z4vDD8Y+6p9acwOxqjqKCVaJshRQCh94zGuW0gY6vA=="; }; }; "apollo-datasource-0.7.2" = { @@ -6637,13 +6646,22 @@ let sha512 = "YSdF/BKPbsnQpxWpmCE53pBJX44aaoif31Y22I/qKpB6ZSGzYijV5YBoCL5Q15H2oA/v/02Oazh9lbp4ek3eig=="; }; }; - "apollo-language-server-1.23.3" = { + "apollo-graphql-0.6.0" = { + name = "apollo-graphql"; + packageName = "apollo-graphql"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.6.0.tgz"; + sha512 = "BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg=="; + }; + }; + "apollo-language-server-1.23.4" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.23.3"; + version = "1.23.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.3.tgz"; - sha512 = "WbK5tlqDpyy5TKjo1tjLIAeeTjlpZpvXURB1Qlx7ZfTqaG1846u9lgYpKw6Ydx/+1Viy60K8z530/gOgI/KmvQ=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.4.tgz"; + sha512 = "PaA25SsAQ30iXfR0noESlNYDNb4RH5S7tjVxBTj53VRArp/gQDWJM6eDvFbH5RH3vXXpfHRVna6YfymDfTPdqg=="; }; }; "apollo-link-1.2.14" = { @@ -6727,13 +6745,13 @@ let sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; }; }; - "apollo-server-core-2.16.1" = { + "apollo-server-core-2.17.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.16.1"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.16.1.tgz"; - sha512 = "nuwn5ZBbmzPwDetb3FgiFFJlNK7ZBFg8kis/raymrjd3eBGdNcOyMTJDl6J9673X9Xqp+dXQmFYDW/G3G8S1YA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.17.0.tgz"; + sha512 = "rjAkBbKSrGLDfg/g5bohnPlQahmkAxgEBuMDVsoF3aa+RaEPXPUMYrLbOxntl0LWeLbPiMa/IyFF43dvlGqV7w=="; }; }; "apollo-server-env-2.4.5" = { @@ -6754,13 +6772,13 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.16.1" = { + "apollo-server-express-2.17.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.16.1"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.16.1.tgz"; - sha512 = "Oq5YNcaMYnRk6jDmA9LWf8oSd2KHDVe7jQ4wtooAvG9FVUD+FaFBgSkytXHMvtifQh2wdF07Ri8uDLMz6IQjTw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.17.0.tgz"; + sha512 = "PonpWOuM1DH3Cz0bu56Tusr3GXOnectC6AD/gy2GXK0v84E7tKTuxEY3SgsgxhvfvvhfwJbXTyIogL/wezqnCw=="; }; }; "apollo-server-plugin-base-0.9.1" = { @@ -6781,13 +6799,13 @@ let sha512 = "my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA=="; }; }; - "apollo-tracing-0.11.1" = { + "apollo-tracing-0.11.2" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.1.tgz"; - sha512 = "l7g+uILw7v32GA46IRXIx5XXbZhFI96BhSqrGK9yyvfq+NMcvVZrj3kIhRImPGhAjMdV+5biA/jztabElAbDjg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.2.tgz"; + sha512 = "QjmRd2ozGD+PfmF6U9w/w6jrclYSBNczN6Bzppr8qA5somEGl5pqdprIZYL28H0IapZiutA3x6p6ZVF/cVX8wA=="; }; }; "apollo-upload-client-11.0.0" = { @@ -7618,15 +7636,6 @@ let sha512 = "XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA=="; }; }; - "ast-types-0.13.4" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.13.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz"; - sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; - }; - }; "ast-types-0.14.1" = { name = "ast-types"; packageName = "ast-types"; @@ -8005,13 +8014,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.740.0" = { + "aws-sdk-2.745.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.740.0"; + version = "2.745.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.740.0.tgz"; - sha512 = "cSedIe7g5/S5o23jHvm9+vWhcYysmuKrmbML1Z0pO9KxlqOA9s4Z5f6Il7ZmvAktfmrxu1SyQu4YEoP5DL4/zw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.745.0.tgz"; + sha512 = "YTmDvxb0foJC/iZOSsn+MdO4g9nPnlyRdhIpFqvPUkrFzWn5rP4mPtDJan2Eu0j4R02pdwfDhmvr82ckH2w7OQ=="; }; }; "aws-sign2-0.6.0" = { @@ -9058,13 +9067,13 @@ let sha512 = "5LhLQeGxdVFumJTbveJS16Rc+Vzh/nbC6o80UMj6ZRvSkiVkk+4L782OMYI0VG1JTfUxiRFP4f+CZBFyuclLBg=="; }; }; - "bl-1.2.2" = { + "bl-1.2.3" = { name = "bl"; packageName = "bl"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; - sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; + url = "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz"; + sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; }; }; "bl-4.0.3" = { @@ -9211,13 +9220,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "blueimp-md5-2.16.0" = { + "blueimp-md5-2.17.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.16.0"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.16.0.tgz"; - sha512 = "j4nzWIqEFpLSbdhUApHRGDwfXbV8ALhqOn+FY5L6XBdKPAXU9BpGgFSbDsgqogfqPPR9R2WooseWCsfhfEC6uQ=="; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.17.0.tgz"; + sha512 = "x5PKJHY5rHQYaADj6NwPUR2QRCUVSggPzrUKkeENpj871o9l9IefJbO2jkT5UvYykeOK9dx0VmkIo6dZ+vThYw=="; }; }; "bn.js-4.11.9" = { @@ -9319,6 +9328,15 @@ let sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; + "bootstrap-3.4.1" = { + name = "bootstrap"; + packageName = "bootstrap"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz"; + sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; + }; + }; "bootstrap-vue-helper-json-1.1.1" = { name = "bootstrap-vue-helper-json"; packageName = "bootstrap-vue-helper-json"; @@ -10417,13 +10435,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001118" = { + "caniuse-lite-1.0.30001123" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001118"; + version = "1.0.30001123"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001118.tgz"; - sha512 = "RNKPLojZo74a0cP7jFMidQI7nvLER40HgNfgKQEJ2PFm225L0ectUungNQoK3Xk3StQcFbpBPNEvoWD59436Hg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001123.tgz"; + sha512 = "03dJDoa4YC4332jq0rqwiM+Hw6tA5RJtrnZKvOQy7ASoIUv8CinkcmGhYpCvCjedvkBQrrKnkcELxrUSW/XwNQ=="; }; }; "capital-case-1.0.3" = { @@ -11209,13 +11227,13 @@ let sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; - "cli-boxes-2.2.0" = { + "cli-boxes-2.2.1" = { name = "cli-boxes"; packageName = "cli-boxes"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz"; - sha512 = "gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w=="; + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; }; "cli-color-0.1.7" = { @@ -11371,13 +11389,13 @@ let sha512 = "s48Efw04VtGyQEwXDrERobMc2DF2DyYQ+2nmNsM7clxOVDtbRI9OjbXRwPeS6G2aFuHy0bB8GUq5MzkmkYt7yw=="; }; }; - "cli-ux-5.4.9" = { + "cli-ux-5.5.0" = { name = "cli-ux"; packageName = "cli-ux"; - version = "5.4.9"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.9.tgz"; - sha512 = "4yCKJbFQqNQxf1v0E5T5aBJLt3SbW6dXc/R7zHp4ycdPMg9fAy5f2vhPsWgXEGCMQg+fgN0Sp7EYcZ1XGkFyUA=="; + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.5.0.tgz"; + sha512 = "aXoHgEOtkem8sJmQrU/jXsojCq8uOp8++9lybCbt9mFDyPouSNawSdoPjuM00PPaSPCJThvY0VNYOQNd6gGQCA=="; }; }; "cli-width-1.1.1" = { @@ -11434,13 +11452,13 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "clipanion-2.4.4" = { + "clipanion-2.5.0" = { name = "clipanion"; packageName = "clipanion"; - version = "2.4.4"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/clipanion/-/clipanion-2.4.4.tgz"; - sha512 = "KjyCBz8xplftHjIK/nOqq/9b3hPlXbAAo/AxoITrO4yySpQ6a9QSJDAfOx9PfcRUHteeqbdNxZKSPfeFqQ7plg=="; + url = "https://registry.npmjs.org/clipanion/-/clipanion-2.5.0.tgz"; + sha512 = "VYOMl0h/mZXQC2BWq7oBto1zY1SkPWUaJjt+cuIred1HrmrcX1I2N+LNyNoRy8Iwu9r6vUxJwS/tWLwhQW4tPw=="; }; }; "clipboard-2.0.6" = { @@ -12253,6 +12271,15 @@ let sha512 = "s7EA+hDtTYNhuXkTlhqew4txMZVdszBmKWSPEMxGr8ru8JXR7bLUFIAtPhcSuFdJQ0ILMxnJi8GkQL0yvDy/YA=="; }; }; + "commander-6.1.0" = { + name = "commander"; + packageName = "commander"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz"; + sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -13262,13 +13289,13 @@ let sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; }; }; - "cpy-8.1.0" = { + "cpy-8.1.1" = { name = "cpy"; packageName = "cpy"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-8.1.0.tgz"; - sha512 = "XwlImkjPxMr01qXqC564VD4rfcDQ2eKtYmFlCy0ixsLRJ1cwYVUBh+v47jsQTO1IrmvdjqO813VpDQ0JiTuOdA=="; + url = "https://registry.npmjs.org/cpy/-/cpy-8.1.1.tgz"; + sha512 = "vqHT+9o67sMwJ5hUd/BAOYeemkU+MuFRsK2c36Xc3eefQpAsp1kAsyDxEDcc5JS1+y9l/XHPrIsVTcyGGmkUUQ=="; }; }; "crc-0.2.0" = { @@ -14162,6 +14189,15 @@ let sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; }; }; + "dataloader-2.0.0" = { + name = "dataloader"; + packageName = "dataloader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dataloader/-/dataloader-2.0.0.tgz"; + sha512 = "YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="; + }; + }; "date-fns-1.30.1" = { name = "date-fns"; packageName = "date-fns"; @@ -14225,13 +14261,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.34" = { + "dayjs-1.8.35" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.34"; + version = "1.8.35"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.34.tgz"; - sha512 = "Olb+E6EoMvdPmAMq2QoucuyZycKHjTlBXmRx8Ada+wGtq4SIXuDCdtoaX4KkK0yjf1fJLnwXQURr8gQKWKaybw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.35.tgz"; + sha512 = "isAbIEenO4ilm6f8cpqvgjZCsuerDAz2Kb7ri201AiNn58aqXuaLJEnCtfIMdCvERZHNGRY5lDMTr/jdAnKSWQ=="; }; }; "deasync-0.1.15" = { @@ -16223,13 +16259,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.549" = { + "electron-to-chromium-1.3.560" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.549"; + version = "1.3.560"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.549.tgz"; - sha512 = "q09qZdginlqDH3+Y1P6ch5UDTW8nZ1ijwMkxFs15J/DAWOwqolIx8HZH1UP0vReByBigk/dPlU22xS1MaZ+kpQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.560.tgz"; + sha512 = "0cEFfOA3sNXfSxo0FIClBhrLVSe/QO9LBiqmmYPm3N/IYyt41NRTa2EhvOMWAOKpjd91t/rq062yhnJzfVMKkQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -17115,13 +17151,13 @@ let sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; }; }; - "eslint-7.7.0" = { + "eslint-7.8.1" = { name = "eslint"; packageName = "eslint"; - version = "7.7.0"; + version = "7.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz"; - sha512 = "1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.8.1.tgz"; + sha512 = "/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w=="; }; }; "eslint-plugin-no-unsanitized-3.1.2" = { @@ -17142,13 +17178,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.0.0-beta.2" = { + "eslint-plugin-vue-7.0.0-beta.3" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.0.0-beta.2"; + version = "7.0.0-beta.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0-beta.2.tgz"; - sha512 = "EpAVWT62JTM7Yo6IUJIaIvNMSuayDaMVMXv1SC96d1/7nyx18U0FrLRKpN2GdTY8Efi4UepgR75XW7ucSRiI7A=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0-beta.3.tgz"; + sha512 = "/p23IRPN9gFNN7dzesrctt06Kvs9E3VRB8BGIAPSEaQNk5yhlKUzntPARjUpsTWW+DQg0mqglZptfkUJK4+4EQ=="; }; }; "eslint-scope-3.7.3" = { @@ -17331,13 +17367,13 @@ let sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; }; }; - "esrecurse-4.2.1" = { + "esrecurse-4.3.0" = { name = "esrecurse"; packageName = "esrecurse"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; }; "essentials-1.1.1" = { @@ -17583,13 +17619,13 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "eventemitter3-4.0.6" = { + "eventemitter3-4.0.7" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.6.tgz"; - sha512 = "s3GJL04SQoM+gn2c14oyqxvZ3Pcq7cduSDqy3sBFXx6UPSUmgVYwQM9zwkTn9je0lrfg0gHEwR42pF3Q2dCQkQ=="; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; "events-1.1.1" = { @@ -17718,15 +17754,6 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-2.1.0" = { - name = "execa"; - packageName = "execa"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz"; - sha512 = "Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw=="; - }; - }; "execa-3.4.0" = { name = "execa"; packageName = "execa"; @@ -19041,13 +19068,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.132.0" = { + "flow-parser-0.133.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.132.0"; + version = "0.133.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.132.0.tgz"; - sha512 = "y1P37zDCPSdphlk+w+roCqcOar6iQdNaAJldJ6xx5/2r4ZRv4KHO+qL+AXwPWp+34eN+oPxPjWnU7GybJnyISQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.133.0.tgz"; + sha512 = "ONvDDUcQVY7bMQG4ht7Ti+2IYjBBPphkc7fGmHXZHrrNNjGG4tykLZjIrIx710/k77x2djaY9VKlHC342Luy3A=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -20211,13 +20238,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-5.11.0" = { + "getmac-5.15.0" = { name = "getmac"; packageName = "getmac"; - version = "5.11.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-5.11.0.tgz"; - sha512 = "p3g41fJt9du5KKkIXaJm7bcUrwUxn8Jg/8AVBgUmBNdCCorczRJXHLqWSETJuib9dptwNuNcfbct/OoM/meiMA=="; + url = "https://registry.npmjs.org/getmac/-/getmac-5.15.0.tgz"; + sha512 = "+XN9PwRDWkZ1xFaQR5GOAPDqlK+eNi5M0QBfqeeJvFJaDrwZzplYg1N8uoOZSB9RtDoPcG58Xq2dOYnbZ23N2Q=="; }; }; "getpass-0.1.6" = { @@ -20391,15 +20418,6 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.1.2" = { - name = "git-url-parse"; - packageName = "git-url-parse"; - version = "11.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.2.tgz"; - sha512 = "gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ=="; - }; - }; "git-url-parse-11.1.3" = { name = "git-url-parse"; packageName = "git-url-parse"; @@ -20941,6 +20959,15 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; + "got-11.6.0" = { + name = "got"; + packageName = "got"; + version = "11.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-11.6.0.tgz"; + sha512 = "ErhWb4IUjQzJ3vGs3+RR12NWlBDDkRciFpAkQ1LPUxi6OnwhGj07gQxjPsyIk69s7qMihwKrKquV6VQq7JNYLA=="; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -21112,15 +21139,6 @@ let sha512 = "6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA=="; }; }; - "graphql-tag-2.10.4" = { - name = "graphql-tag"; - packageName = "graphql-tag"; - version = "2.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.4.tgz"; - sha512 = "O7vG5BT3w6Sotc26ybcvLKNTdfr4GfsIVMD+LdYqXCeJIYPRyp8BIsDOUtxw7S1PYvRw5vH3278J2EDezR6mfA=="; - }; - }; "graphql-tag-2.11.0" = { name = "graphql-tag"; packageName = "graphql-tag"; @@ -22337,13 +22355,13 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-0.21.0" = { + "http-proxy-middleware-1.0.5" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "0.21.0"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.21.0.tgz"; - sha512 = "4Arcl5QQ6pRMRJmtM1WVHKHkFAQn5uvw83XuNeqnMTOikDiCoTxv5/vdudhKQsF+1mtaAawrK2SEB1v2tYecdQ=="; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.0.5.tgz"; + sha512 = "CKzML7u4RdGob8wuKI//H8Ein6wNTEQR7yjVEzPbhBLGdOfkfvgTnp2HLnniKBDP9QW4eG10/724iTWLBeER3g=="; }; }; "http-signature-0.11.0" = { @@ -23057,13 +23075,13 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "ink-3.0.4" = { + "ink-3.0.5" = { name = "ink"; packageName = "ink"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-3.0.4.tgz"; - sha512 = "WURr4mZoIZNaIqrgRHS1QKJsZdhs4UEeZ7IFvQgGCE7xCgtC+Svu7f7MoEuVz2hexCsmOdBKrkhMCRwFncSe1A=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.5.tgz"; + sha512 = "Zc/Yoi3P0cY0DC9ryb3HTwmi4Qgke9332ebOhDRaK9Cw6D+ABAOQPeHG8IdmI1GOkMKRMZwTP/1jRs/b1D1n9Q=="; }; }; "ink-text-input-4.0.0" = { @@ -25280,13 +25298,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.18.2" = { + "jquery.terminal-2.18.3" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.18.2"; + version = "2.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.18.2.tgz"; - sha512 = "i6vjYLg+VwJu7r5rXggGx9ezB2o2VeBbGfAooliIANNQDLZSgh095+TtB7NeO/eS1Nfu6vHrXj5AjPL5v+9I8w=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.18.3.tgz"; + sha512 = "zzMVGYlAC+luF7Omm9UY1/nuvp00mozSgcGImObWSS3uDRtcxnxlwxQLC8tvlTT+koyfOvCBaWgB6AD4DvWVpQ=="; }; }; "js-base64-2.6.4" = { @@ -25550,13 +25568,13 @@ let sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; - "json-parse-even-better-errors-2.3.0" = { + "json-parse-even-better-errors-2.3.1" = { name = "json-parse-even-better-errors"; packageName = "json-parse-even-better-errors"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.0.tgz"; - sha512 = "o3aP+RsWDJZayj1SbHNQAI8x0v3T3SKiGoZlNYfbUP1S3omJQ6i9CnqADqkSPaOAxwua4/1YWx5CM7oiChJt2Q=="; + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; }; "json-parse-helpfulerror-1.0.3" = { @@ -27144,13 +27162,13 @@ let sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced"; }; }; - "locutus-2.0.11" = { + "locutus-2.0.12" = { name = "locutus"; packageName = "locutus"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/locutus/-/locutus-2.0.11.tgz"; - sha512 = "C0q1L38lK5q1t+wE0KY21/9szrBHxye6o2z5EJzU+5B79tubNOC+nLAEzTTn1vPUGoUuehKh8kYKqiVUTWRyaQ=="; + url = "https://registry.npmjs.org/locutus/-/locutus-2.0.12.tgz"; + sha512 = "wnzhY9xOdDb2djr17kQhTh9oZgEfp78zI27KRRiiV1GnPXWA2xfVODbpH3QgpIuUMLupM02+6X/rJXvktTpnoA=="; }; }; "lodash-2.4.2" = { @@ -29700,13 +29718,13 @@ let sha512 = "qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw=="; }; }; - "mem-6.1.0" = { + "mem-6.1.1" = { name = "mem"; packageName = "mem"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-6.1.0.tgz"; - sha512 = "RlbnLQgRHk5lwqTtpEkBTQ2ll/CG/iB+J4Hy2Wh97PjgZgXgWJWrFF+XXujh3UUVLvR4OOTgZzcWMMwnehlEUg=="; + url = "https://registry.npmjs.org/mem/-/mem-6.1.1.tgz"; + sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; "mem-fs-1.2.0" = { @@ -29898,13 +29916,13 @@ let sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; }; }; - "meow-7.1.0" = { + "meow-7.1.1" = { name = "meow"; packageName = "meow"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-7.1.0.tgz"; - sha512 = "kq5F0KVteskZ3JdfyQFivJEj2RaA8NFsS4+r9DaMKLcUHpk5OcHS3Q0XkCXONB1mZRPsu/Y/qImKri0nwSEZog=="; + url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"; + sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; }; }; "merge-1.2.1" = { @@ -30645,13 +30663,13 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; - "mocha-8.1.2" = { + "mocha-8.1.3" = { name = "mocha"; packageName = "mocha"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.2.tgz"; - sha512 = "I8FRAcuACNMLQn3lS4qeWLxXqLvGf6r2CaLstDpZmMUUSmvW6Cnm1AuHxgbc7ctZVRcfwspCRbDHymPsi3dkJw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; + sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; }; }; "mock-require-3.0.3" = { @@ -31203,13 +31221,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "mutexify-1.3.0" = { + "mutexify-1.3.1" = { name = "mutexify"; packageName = "mutexify"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.0.tgz"; - sha512 = "WNPlgZ3AHETGSa4jeRP4aW6BPQ/a++MwoMFFIgrDg80+m70mbxuNOrevANfBDmur82zxTFAY3OwvMAvqrkV2sA=="; + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.1.tgz"; + sha512 = "nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g=="; }; }; "muxrpc-6.5.0" = { @@ -31635,6 +31653,15 @@ let sha512 = "o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA=="; }; }; + "needle-2.5.2" = { + name = "needle"; + packageName = "needle"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz"; + sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ=="; + }; + }; "negotiator-0.3.0" = { name = "negotiator"; packageName = "negotiator"; @@ -31690,13 +31717,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-4.3.12" = { + "netlify-4.3.13" = { name = "netlify"; packageName = "netlify"; - version = "4.3.12"; + version = "4.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-4.3.12.tgz"; - sha512 = "uHyKa0wPwhTJblqY4uoxhOkR34I72o3rItJCpBPL4g+7ELDt88qk//WoV3p9CT1TX+sgXvLZuN92HHAM5OPk/w=="; + url = "https://registry.npmjs.org/netlify/-/netlify-4.3.13.tgz"; + sha512 = "nXiqUm89HOEGOzYiLtxGOUCZ+iJB01zxCMeolaQXaIia6UnFCw/jHMARGXMLpntxkgjclaMgMVzKO3aetbHAvQ=="; }; }; "netlify-redirect-parser-2.5.0" = { @@ -32951,22 +32978,22 @@ let sha512 = "pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ=="; }; }; - "oas-linter-3.1.3" = { + "oas-linter-3.2.0" = { name = "oas-linter"; packageName = "oas-linter"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.1.3.tgz"; - sha512 = "jFWBHjSoqODGo7cKA/VWqqWSLbHNtnyCEpa2nMMS64SzCUbZDk63Oe7LqQZ2qJA0K2VRreYLt6cVkYy6MqNRDg=="; + url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.0.tgz"; + sha512 = "LP5F1dhjULEJV5oGRg6ROztH2FddzttrrUEwq5J2GB2Zy938mg0vwt1+Rthn/qqDHtj4Qgq21duNGHh+Ew1wUg=="; }; }; - "oas-resolver-2.4.3" = { + "oas-resolver-2.4.4" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.3.tgz"; - sha512 = "+66lGk5GewIXoIkqxfeWp89M/SgQT67oITiuG6qNIUuq1gczIIy68ZrMiE+gyDZY2IAdVxY9k73o9nHBnKwHPA=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.4.tgz"; + sha512 = "670+SM5CXYrjI547cgUeQTdB1wJb2gyrJ7bnGywQMrmciKXhXj/EFbE/8c8wed+j1WmGAh7xS+QdQxiuIlNqlw=="; }; }; "oas-schema-walker-1.1.5" = { @@ -33330,13 +33357,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.132.0" = { + "office-ui-fabric-react-7.134.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.132.0"; + version = "7.134.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.132.0.tgz"; - sha512 = "tyJyra4Ovp4fwmttLs/SwPln2zQCEYwS+FwqgdojCaudPnp/J8nGtF78hCBiEdap4KEdnIJb6MCfyVLBW+zs9Q=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.134.1.tgz"; + sha512 = "yQhPdt5kQfzI/MQnqQMu9lf2mgdHSogEfVIYgfOjbvfMJoUzqA/hH3X2Z7RbncdJ/ca2H+GXVp5GvSgahCOs6g=="; }; }; "omggif-1.0.10" = { @@ -33573,6 +33600,15 @@ let sha512 = "4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ=="; }; }; + "open-7.2.1" = { + name = "open"; + packageName = "open"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.2.1.tgz"; + sha512 = "xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA=="; + }; + }; "openapi-default-setter-2.1.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; @@ -33699,13 +33735,13 @@ let sha512 = "8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="; }; }; - "opener-1.5.1" = { + "opener-1.5.2" = { name = "opener"; packageName = "opener"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz"; - sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; + url = "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"; + sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; }; }; "openid-2.0.7" = { @@ -33906,6 +33942,15 @@ let sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww=="; }; }; + "ora-4.1.1" = { + name = "ora"; + packageName = "ora"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz"; + sha512 = "sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A=="; + }; + }; "ora-5.0.0" = { name = "ora"; packageName = "ora"; @@ -34383,15 +34428,6 @@ let sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; - "p-wait-for-2.0.1" = { - name = "p-wait-for"; - packageName = "p-wait-for"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-wait-for/-/p-wait-for-2.0.1.tgz"; - sha512 = "edEuJC7eRokPf3AWycsS3lp8JimWLnVgCeGoWw67qFerUmsAHKyhRBj8rDvaBjPV2bTyzgTwmF+U8vNMMBEcyA=="; - }; - }; "p-wait-for-3.1.0" = { name = "p-wait-for"; packageName = "p-wait-for"; @@ -35859,13 +35895,13 @@ let sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; - "polished-3.6.5" = { + "polished-3.6.6" = { name = "polished"; packageName = "polished"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.6.5.tgz"; - sha512 = "VwhC9MlhW7O5dg/z7k32dabcAFW1VI2+7fSe8cE/kXcfL7mVdoa5UxciYGW2sJU78ldDLT6+ROEKIZKFNTnUXQ=="; + url = "https://registry.npmjs.org/polished/-/polished-3.6.6.tgz"; + sha512 = "yiB2ims2DZPem0kCD6V0wnhcVGFEhNh0Iw0axNpKU+oSAgFt6yx6HxIT23Qg0WWvgS379cS35zT4AOyZZRzpQQ=="; }; }; "portfinder-1.0.28" = { @@ -35932,13 +35968,13 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; - "postcss-calc-7.0.3" = { + "postcss-calc-7.0.4" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.3.tgz"; - sha512 = "IB/EAEmZhIMEIhG7Ov4x+l47UaXOS1n2f4FBUk/aKllQhtSCxWhTzn0nJgkqN7fo/jcWySvWTSB6Syk9L+31bA=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.4.tgz"; + sha512 = "0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw=="; }; }; "postcss-colormin-4.0.3" = { @@ -36652,13 +36688,13 @@ let sha512 = "urhX7U/F+fu8sztEs/Z7CxNS8PdEytEwGKhQaH5fxxCdRmHGT45FoClyDlcZrMk9cK/8JpX/asFmTOHtSGJfLg=="; }; }; - "pretty-bytes-5.3.0" = { + "pretty-bytes-5.4.1" = { name = "pretty-bytes"; packageName = "pretty-bytes"; - version = "5.3.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha512 = "hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="; + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; + sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA=="; }; }; "pretty-format-23.6.0" = { @@ -38371,13 +38407,13 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; - "random-item-1.0.0" = { + "random-item-3.0.0" = { name = "random-item"; packageName = "random-item"; - version = "1.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-item/-/random-item-1.0.0.tgz"; - sha1 = "16ee31626cb050c8a1686a5f0f42a6b99a2aaf11"; + url = "https://registry.npmjs.org/random-item/-/random-item-3.0.0.tgz"; + sha512 = "IpO3Jk9/Dt79R7iS/Fn2d2asGXahMNnXLNRsgSmjTTtiS0tZ972BWEEm9uUgm3YAon5YFUt8126FA9wJAjmeZw=="; }; }; "random-iterate-1.0.1" = { @@ -38767,15 +38803,6 @@ let sha512 = "XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg=="; }; }; - "read-pkg-up-6.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-6.0.0.tgz"; - sha512 = "odtTvLl+EXo1eTsMnoUHRmg/XmXdTkwXVxy4VFE9Kp6cCq7b3l7QMdBndND3eAFzrbSAXC/WCUOQQ9rLjifKZw=="; - }; - }; "read-pkg-up-7.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -38956,13 +38983,13 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; - "recast-0.19.1" = { + "recast-0.20.3" = { name = "recast"; packageName = "recast"; - version = "0.19.1"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.19.1.tgz"; - sha512 = "8FCjrBxjeEU2O6I+2hyHyBFH1siJbMBLwIRvVr1T3FD2cL754sOaJDsJ/8h3xYltasbJ8jqWRIhMuDGBSiSbjw=="; + url = "https://registry.npmjs.org/recast/-/recast-0.20.3.tgz"; + sha512 = "jrEPzRV5B7wfRiN0UYMtjgIx1Hp8MRHdLcMYqMNd0DoOe1CB5JmPL/04I7WPuuApCs7LCSisYK/FfKnPEaJrzw=="; }; }; "rechoir-0.6.2" = { @@ -39073,13 +39100,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "reftools-1.1.5" = { + "reftools-1.1.6" = { name = "reftools"; packageName = "reftools"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/reftools/-/reftools-1.1.5.tgz"; - sha512 = "o7RX5wMzITYj+8P8oaccFH2xYu5nQ63TH0d73Ce5YgpiY9NyFytaQfeg1p1Z5T4yfjKSj0sYuUscBqZgkLsooQ=="; + url = "https://registry.npmjs.org/reftools/-/reftools-1.1.6.tgz"; + sha512 = "rQfJ025lvPjw9qyQuNPqE+cRs5qVs7BMrZwgRJnmuMcX/8r/eJE8f5/RCunJWViXKHmN5K2DFafYzglLOHE/tw=="; }; }; "regenerate-1.4.1" = { @@ -39505,6 +39532,15 @@ let sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; }; }; + "remote-git-tags-3.0.0" = { + name = "remote-git-tags"; + packageName = "remote-git-tags"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz"; + sha512 = "C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w=="; + }; + }; "remove-array-items-1.1.1" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -40297,13 +40333,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.26.5" = { + "rollup-2.26.9" = { name = "rollup"; packageName = "rollup"; - version = "2.26.5"; + version = "2.26.9"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.5.tgz"; - sha512 = "rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.26.9.tgz"; + sha512 = "XIiWYLayLqV+oY4S2Lub/shJq4uk/QQLwWToYCL4LjZbYHbFK3czea4UDVRUJu+zNmKmxq5Zb/OG7c5HSvH2TQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -40837,6 +40873,15 @@ let sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; }; }; + "schema-utils-2.7.1" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; + sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; + }; + }; "scoped-regex-1.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -42124,13 +42169,13 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-cpp-plugin-1.4.0" = { + "snyk-cpp-plugin-1.4.1" = { name = "snyk-cpp-plugin"; packageName = "snyk-cpp-plugin"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.4.0.tgz"; - sha512 = "DaI2u42FRvASQpcu+p52nzDd3QPsrIHLN4JxnvcH32diPps9ynkx5CMNkarBgDo00GZfsWgz9RrDfDFCx3TSQQ=="; + url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.4.1.tgz"; + sha512 = "akhVFsuGBD5yyQtTNoItzG8M6k7dd6A16cHBSoTsP8TgnQdm0QIJMrE2zj0Ak1wgyTCiZeGkI6NE9TDwvvfKLw=="; }; }; "snyk-docker-plugin-3.18.1" = { @@ -42160,13 +42205,13 @@ let sha512 = "XNGHEFyP+pCzcqmXnj5T/1Oy6AZzm2WkTSuUpohWQ/09ecMRCCv2yrr/kwMQemrKN4+7CoJS/9xfm3GnNlzVHA=="; }; }; - "snyk-gradle-plugin-3.5.1" = { + "snyk-gradle-plugin-3.6.2" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.5.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.5.1.tgz"; - sha512 = "8tZwQCqRbjp1azvc+bBRXSbn2AjbUpFAM6qoSpM/IZpfGl1RaOtz4/JTkGFxj+iBhTFoAkGxEunT66eO0pHZZw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.6.2.tgz"; + sha512 = "JJmVOoLCCN58Wjcxdg93KeMjecnypP6+TfnCPuD4NbCNnKSn93c22VKpx6h1/AS1u6EK9dDTelwlYQOopBFA+w=="; }; }; "snyk-module-1.9.1" = { @@ -42430,13 +42475,13 @@ let sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA=="; }; }; - "socks-2.4.1" = { + "socks-2.4.2" = { name = "socks"; packageName = "socks"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.4.1.tgz"; - sha512 = "8mWHeYC1OA0500qzb+sqwm0Hzi8oBpeuI1JugoBVMEJtJvxSgco8xFSK+NRnZcHeeWjTbF82KUDo5sXH22TY5A=="; + url = "https://registry.npmjs.org/socks/-/socks-2.4.2.tgz"; + sha512 = "cE6P9R+/CET9XhIMvqhRgaNT1GXKIahioMjwwhgYOd+8UQWP50rrFm+faqG/4xkZsjTdVeBYr0Tb246BSC9/fg=="; }; }; "socks-proxy-agent-4.0.2" = { @@ -42790,13 +42835,13 @@ let sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; }; }; - "spawn-please-0.3.0" = { + "spawn-please-0.4.1" = { name = "spawn-please"; packageName = "spawn-please"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; - sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; + url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.4.1.tgz"; + sha512 = "YJwFL/shPyY5fddOU1XXkShCDNVkMDGKsGlpB91FKOkRGa+pVAe+A5/CUUwLrZ3e89prqbTXaGapCzTlmc3HaA=="; }; }; "spawn-sync-1.0.15" = { @@ -43186,13 +43231,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.2.0" = { + "ssb-friends-4.2.1" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.2.0.tgz"; - sha512 = "X8UewxMCZImUoYX9eNHdym6oFcfEA610iuyn2cGcHtYZre1J2WiKtCLBB2KIjwWZqlOs1mARE+mkVPYnduZy4Q=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.2.1.tgz"; + sha512 = "DgArf97p2MQxOKn9jWmyxA/6HUiyZkk5QFYohS/qo7CAFJzBJobgoJuvEGjzCgszJAZ/WmGwjYTrKTqFHwMEuQ=="; }; }; "ssb-git-0.5.0" = { @@ -43420,13 +43465,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-validate-4.1.1" = { + "ssb-validate-4.1.2" = { name = "ssb-validate"; packageName = "ssb-validate"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.1.tgz"; - sha512 = "3OsB6qTYlOMUqy4S1i0NuBtiqRW0s9z1Uf+Yqhjcqt7Zu8LTZk59HyhB1gfYmC3xzR/UnHeI7LkJZOt2+r//gA=="; + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.2.tgz"; + sha512 = "dDINHOWMpKfMr/o0OlqCQouKKeqYsODHn9VDUPOpWa82vSW6bnEXmfSNXjFc7Sf7pzCDrUsYlJ81+UUr27CvsA=="; }; }; "ssb-ws-6.2.3" = { @@ -44878,6 +44923,15 @@ let sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; }; }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; "supports-hyperlinks-1.0.1" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; @@ -45004,13 +45058,13 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.32.4" = { + "swagger-ui-dist-3.32.5" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.32.4"; + version = "3.32.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.32.4.tgz"; - sha512 = "3qUqK131a5nqGdDJhLflTNzvrjZgjBlINYNx+Jm5lw/Va88Lcu5iyjUupY3Js/Kf326z1XtXkrr6TbvE6r925g=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.32.5.tgz"; + sha512 = "3SKHv8UVqsKKknivtACHbFDGcn297jkoZN2h6zAZ7b2yoaJNMaRadQpC3qFw3GobZTGzqHCgHph4ZH9NkaCjrQ=="; }; }; "swagger2openapi-5.4.0" = { @@ -47003,15 +47057,6 @@ let sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; }; }; - "type-fest-0.5.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz"; - sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="; - }; - }; "type-fest-0.6.0" = { name = "type-fest"; packageName = "type-fest"; @@ -47183,13 +47228,13 @@ let sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; }; - "uglify-js-3.10.2" = { + "uglify-js-3.10.3" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz"; - sha512 = "GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.3.tgz"; + sha512 = "Lh00i69Uf6G74mvYpHCI9KVVXLcHW/xu79YTvH7Mkc9zyKUeSPz0owW0dguj0Scavns3ZOh3wY63J0Zb97Za2g=="; }; }; "uglify-js-3.4.10" = { @@ -47363,6 +47408,15 @@ let sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="; }; }; + "underscore-1.11.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz"; + sha512 = "xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="; + }; + }; "underscore-1.2.1" = { name = "underscore"; packageName = "underscore"; @@ -47876,13 +47930,13 @@ let sha512 = "0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw=="; }; }; - "universal-analytics-0.4.20" = { + "universal-analytics-0.4.23" = { name = "universal-analytics"; packageName = "universal-analytics"; - version = "0.4.20"; + version = "0.4.23"; src = fetchurl { - url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz"; - sha512 = "gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw=="; + url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz"; + sha512 = "lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A=="; }; }; "universal-user-agent-4.0.1" = { @@ -48173,13 +48227,13 @@ let sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; }; }; - "uri-js-4.2.2" = { + "uri-js-4.4.0" = { name = "uri-js"; packageName = "uri-js"; - version = "4.2.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; + sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; }; }; "urijs-1.19.2" = { @@ -48551,15 +48605,6 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "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"; @@ -49100,13 +49145,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.79.3" = { + "vsce-1.79.5" = { name = "vsce"; packageName = "vsce"; - version = "1.79.3"; + version = "1.79.5"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.79.3.tgz"; - sha512 = "TZb0XrLPDAm/Ns8McayGS2S8XCCMuQPwdUOluKC/0LopyEH7/NnTkM09hF4kOzfvIITuFWy4PT2R1apeLQw3kQ=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.79.5.tgz"; + sha512 = "KZFOthGwxWFwoGqwrkzfTfyCZGuniTofnJ1a/dCzQ2HP93u1UuCKrTQyGT+SuGHu8sNqdBYNe0hb9GC3qCN7fg=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -49145,13 +49190,22 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.8.1" = { + "vscode-json-languageservice-3.8.3" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.8.1"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.1.tgz"; - sha512 = "PYckar/Vgpa/YTthbSnqbxbawxwcGQ+xs/M48muw89uJWe4nZm5yto0oCKMMZHIFD8r3nN6BrmDzXQEaeQ1bBQ=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.3.tgz"; + sha512 = "8yPag/NQHCuTthahyaTtzK0DHT0FKM/xBU0mFBQ8nMo8C1i2P+FCyIVqICoNoHkRI2BTGlXKomPUpsqjSz0TnQ=="; + }; + }; + "vscode-jsonrpc-3.5.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz"; + sha1 = "87239d9e166b2d7352245b8a813597804c1d63aa"; }; }; "vscode-jsonrpc-3.6.0" = { @@ -49208,6 +49262,15 @@ let sha512 = "JrjCUhLpQZxQ5VpWpilOHDMhVsn0fdN5jBh1uFNhSr5c2loJvRdr9Km2EuSQOFfOQsBKx0+xvY8PbsypNEcJ6w=="; }; }; + "vscode-languageserver-3.5.1" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz"; + sha512 = "RYUKn0DgHTFcS8kS4VaNCjNMaQXYqiXdN9bKrFjXzu5RPKfjIYcoh47oVWwZj4L3R/DPB0Se7HPaDatvYY2XgQ=="; + }; + }; "vscode-languageserver-4.0.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -49280,6 +49343,15 @@ let sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; + "vscode-languageserver-protocol-3.5.1" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz"; + sha512 = "1fPDIwsAv1difCV+8daOrJEGunClNJWqnUHq/ncWrjhitKWXgGmRCjlwZ3gDUTt54yRcvXz1PXJDaRNvNH6pYA=="; + }; + }; "vscode-languageserver-protocol-3.6.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -49343,6 +49415,24 @@ let sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; + "vscode-languageserver-types-3.5.0" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz"; + sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; + }; + }; + "vscode-nls-2.0.2" = { + name = "vscode-nls"; + packageName = "vscode-nls"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz"; + sha1 = "808522380844b8ad153499af5c3b03921aea02da"; + }; + }; "vscode-nls-3.2.5" = { name = "vscode-nls"; packageName = "vscode-nls"; @@ -49442,13 +49532,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.0-rc.9" = { + "vue-3.0.0-rc.10" = { name = "vue"; packageName = "vue"; - version = "3.0.0-rc.9"; + version = "3.0.0-rc.10"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.9.tgz"; - sha512 = "bimvpl5q/sKy1dAOE+KNX9T3p6Qq8kuNRmOYwaxtacI91ksjS7nVGse1FANhTL+XTQgl8+ySrd3f67xWi26nxw=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.10.tgz"; + sha512 = "nRsyIQtOWLDMBb5dsPwg/WdIqznCMVWN6O6wJSzhseKC768wHlZKcJ7SPHhWPid9wi3Ykhtl9vtgvxTK/qICkw=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -49757,13 +49847,13 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "websocket-1.0.31" = { + "websocket-1.0.32" = { name = "websocket"; packageName = "websocket"; - version = "1.0.31"; + version = "1.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz"; - sha512 = "VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ=="; + url = "https://registry.npmjs.org/websocket/-/websocket-1.0.32.tgz"; + sha512 = "i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q=="; }; }; "websocket-driver-0.6.5" = { @@ -51009,13 +51099,13 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; - "yaml-language-server-0.10.0" = { + "yaml-language-server-0.10.1" = { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.0.tgz"; - sha512 = "d2/7eGgonEIRcnW9kK+k+ERG4gTOk5BXHr9KjTVv8gEarXKa62Kk+nyFE4AXgMDZ0LXTu8nTuN/AdboJiGN+pQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz"; + sha512 = "R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ=="; }; }; "yamljs-0.3.0" = { @@ -51081,15 +51171,6 @@ let sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg=="; }; }; - "yargs-15.3.1" = { - name = "yargs"; - packageName = "yargs"; - version = "15.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; - sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; - }; - }; "yargs-15.4.1" = { name = "yargs"; packageName = "yargs"; @@ -51252,6 +51333,15 @@ let sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA=="; }; }; + "yarn-1.22.5" = { + name = "yarn"; + packageName = "yarn"; + version = "1.22.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.5.tgz"; + sha512 = "5uzKXwdMc++mYktXqkfpNYT9tY8ViWegU58Hgbo+KXzrzzhEyP1Ip+BTtXloLrXNcNlxFJbLiFKGaS9vK9ym6Q=="; + }; + }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -51306,13 +51396,13 @@ let sha512 = "pLIhhU9z/G+kjOXmJ2bPFm3nejfbH+f1fjYRSOteEXDBrv1EoJE/e+kuHixSXfCYfTkxjYsvRaDX+1QykLCnpQ=="; }; }; - "yeoman-generator-4.11.0" = { + "yeoman-generator-4.12.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.11.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.11.0.tgz"; - sha512 = "++t6t2Z6HjL5F1/UM7+uNvGknKmQdF8tstJx8WKzsUSEpB+19kLVtapSfQIh9uWqm0L59fLWDzUui//WXoynPw=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.12.0.tgz"; + sha512 = "lozwklVQHwUXMM1o8BgxEB8F5BB7vkHW4pjAo1Zt5sJ7FOlWhd6DJ4ZxJ2OK0w+gNYkY/ocPMkUV7DTz/uqEEg=="; }; }; "yn-3.1.1" = { @@ -51447,23 +51537,23 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.0.8"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz"; - sha512 = "unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.0.tgz"; + sha512 = "sWGEVeQQ5PXKuu517fRFEQQ5qopzoWeW+8qBUTrmJt8FztiL2ASyu412iJse56wyGxZvqwUmtzpti5kWHR9XIw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1000.8" - sources."@angular-devkit/core-10.0.8" - sources."@angular-devkit/schematics-10.0.8" - sources."@schematics/angular-10.0.8" - sources."@schematics/update-0.1000.8" + sources."@angular-devkit/architect-0.1001.0" + sources."@angular-devkit/core-10.1.0" + sources."@angular-devkit/schematics-10.1.0" + sources."@schematics/angular-10.1.0" + sources."@schematics/update-0.1001.0" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -51489,12 +51579,12 @@ in ]; }) sources."caseless-0.12.0" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."chownr-1.1.4" sources."cli-cursor-3.1.0" sources."cli-spinners-2.4.0" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -51578,7 +51668,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-7.1.0" + sources."inquirer-7.3.3" sources."ip-1.1.5" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" @@ -51594,23 +51684,15 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" + sources."jsonc-parser-2.3.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.20" - (sources."log-symbols-3.0.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."log-symbols-4.0.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" (sources."make-fetch-happen-5.0.2" // { @@ -51668,8 +51750,8 @@ in sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.0.4" - sources."ora-4.0.4" + sources."open-7.2.0" + sources."ora-5.0.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -51720,7 +51802,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.5" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.2" @@ -51756,7 +51838,7 @@ in ]; }) sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."symbol-observable-1.2.0" (sources."tar-4.4.13" // { dependencies = [ @@ -51774,16 +51856,15 @@ in sources."typedarray-0.0.6" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - (sources."universal-analytics-0.4.20" // { + (sources."universal-analytics-0.4.23" // { dependencies = [ - sources."debug-3.2.6" sources."uuid-3.4.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."util-promisify-2.1.0" - sources."uuid-8.1.0" + sources."uuid-8.3.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -52117,7 +52198,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -52292,7 +52373,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" @@ -52355,9 +52436,9 @@ in sources."@schematics/schematics-0.1000.7" sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -52467,7 +52548,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."chardet-0.7.0" @@ -52563,7 +52644,11 @@ in sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" @@ -52615,7 +52700,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."fragment-cache-0.2.1" @@ -52668,7 +52753,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."rxjs-6.6.2" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."interpret-1.4.0" @@ -52693,7 +52778,7 @@ in sources."isobject-3.0.1" sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json5-1.0.1" sources."jsonfile-6.0.1" @@ -52804,7 +52889,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."log-symbols-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."os-browserify-0.3.0" @@ -53008,7 +53093,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -53085,10 +53170,10 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.19.0" + sources."@apollo/federation-0.20.0" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.28" + sources."@types/node-10.17.29" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -53103,16 +53188,17 @@ in sources."semver-5.7.1" ]; }) - (sources."@babel/core-7.11.4" // { + (sources."@babel/core-7.11.5" // { dependencies = [ - sources."@babel/generator-7.11.4" - sources."@babel/types-7.11.0" + sources."@babel/generator-7.11.5" + sources."@babel/types-7.11.5" sources."semver-5.7.1" + sources."source-map-0.6.1" ]; }) - (sources."@babel/generator-7.11.0" // { + (sources."@babel/generator-7.11.4" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-annotate-as-pure-7.10.4" @@ -53126,7 +53212,7 @@ in sources."@babel/helper-create-regexp-features-plugin-7.10.4" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-explode-assignable-expression-7.11.4" @@ -53135,13 +53221,13 @@ in sources."@babel/helper-hoist-variables-7.10.4" (sources."@babel/helper-member-expression-to-functions-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-module-imports-7.10.4" (sources."@babel/helper-module-transforms-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-optimise-call-expression-7.10.4" @@ -53152,19 +53238,19 @@ in sources."@babel/helper-simple-access-7.10.4" (sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) (sources."@babel/helper-split-export-declaration-7.11.0" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" ]; }) sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" @@ -53226,16 +53312,16 @@ in sources."@babel/plugin-transform-typescript-7.11.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - (sources."@babel/preset-env-7.11.0" // { + (sources."@babel/preset-env-7.11.5" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" sources."semver-5.7.1" ]; }) sources."@babel/preset-flow-7.10.4" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.10.4" - (sources."@babel/register-7.10.5" // { + (sources."@babel/register-7.11.5" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" @@ -53244,9 +53330,11 @@ in }) sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.0" // { + (sources."@babel/traverse-7.11.5" // { dependencies = [ - sources."@babel/types-7.11.0" + sources."@babel/generator-7.11.5" + sources."@babel/types-7.11.5" + sources."source-map-0.6.1" ]; }) sources."@babel/types-7.10.4" @@ -53265,7 +53353,7 @@ in (sources."chalk-3.0.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."color-convert-2.0.1" @@ -53274,16 +53362,17 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/command-1.7.0" // { + (sources."@oclif/command-1.8.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.0" - sources."semver-5.7.1" + sources."semver-7.3.2" ]; }) - (sources."@oclif/config-1.16.0" // { + (sources."@oclif/config-1.17.0" // { dependencies = [ sources."globby-11.0.1" sources."is-wsl-2.2.0" + sources."tslib-2.0.1" ]; }) (sources."@oclif/errors-1.3.3" // { @@ -53358,7 +53447,7 @@ in sources."@types/cors-2.8.7" sources."@types/ejs-2.7.0" sources."@types/express-4.17.7" - sources."@types/express-serve-static-core-4.17.9" + sources."@types/express-serve-static-core-4.17.12" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" sources."@types/graphql-upload-8.0.3" @@ -53378,7 +53467,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -53399,22 +53488,22 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.4" sources."@vue/cli-ui-addon-widgets-4.5.4" - (sources."@vue/compiler-core-3.0.0-rc.9" // { + (sources."@vue/compiler-core-3.0.0-rc.10" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.0-rc.9" - (sources."@vue/compiler-sfc-3.0.0-rc.9" // { + sources."@vue/compiler-dom-3.0.0-rc.10" + (sources."@vue/compiler-sfc-3.0.0-rc.10" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.0-rc.9" - sources."@vue/reactivity-3.0.0-rc.9" - sources."@vue/runtime-core-3.0.0-rc.9" - sources."@vue/runtime-dom-3.0.0-rc.9" - sources."@vue/shared-3.0.0-rc.9" + sources."@vue/compiler-ssr-3.0.0-rc.10" + sources."@vue/reactivity-3.0.0-rc.10" + sources."@vue/runtime-core-3.0.0-rc.10" + sources."@vue/runtime-dom-3.0.0-rc.10" + sources."@vue/shared-3.0.0-rc.10" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -53458,9 +53547,10 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.30.2" // { + (sources."apollo-2.30.3" // { dependencies = [ - sources."graphql-tag-2.10.4" + sources."apollo-graphql-0.6.0" + sources."mkdirp-1.0.4" sources."strip-ansi-5.2.0" ]; }) @@ -53468,20 +53558,17 @@ in sources."apollo-cache-control-0.11.1" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.37.8" // { + (sources."apollo-codegen-core-0.37.9" // { dependencies = [ - (sources."recast-0.19.1" // { - dependencies = [ - sources."ast-types-0.13.3" - ]; - }) + sources."recast-0.20.3" sources."source-map-0.6.1" + sources."tslib-2.0.1" ]; }) - sources."apollo-codegen-flow-0.35.8" - sources."apollo-codegen-scala-0.36.8" - sources."apollo-codegen-swift-0.37.8" - sources."apollo-codegen-typescript-0.37.8" + sources."apollo-codegen-flow-0.35.9" + sources."apollo-codegen-scala-0.36.9" + sources."apollo-codegen-swift-0.37.9" + sources."apollo-codegen-typescript-0.37.9" sources."apollo-datasource-0.7.2" (sources."apollo-engine-reporting-2.3.0" // { dependencies = [ @@ -53491,7 +53578,11 @@ in sources."apollo-engine-reporting-protobuf-0.5.2" sources."apollo-env-0.6.5" sources."apollo-graphql-0.5.0" - sources."apollo-language-server-1.23.3" + (sources."apollo-language-server-1.23.4" // { + dependencies = [ + sources."apollo-graphql-0.6.0" + ]; + }) sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -53501,13 +53592,13 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.2" - sources."apollo-server-core-2.16.1" + sources."apollo-server-core-2.17.0" sources."apollo-server-env-2.4.5" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.16.1" + sources."apollo-server-express-2.17.0" sources."apollo-server-plugin-base-0.9.1" sources."apollo-server-types-0.5.1" - sources."apollo-tracing-0.11.1" + sources."apollo-tracing-0.11.2" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { @@ -53528,7 +53619,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - (sources."ast-types-0.13.4" // { + (sources."ast-types-0.14.1" // { dependencies = [ sources."tslib-2.0.1" ]; @@ -53558,7 +53649,7 @@ in sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."bl-1.2.2" + sources."bl-1.2.3" sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ @@ -53579,14 +53670,14 @@ in sources."ansi-styles-4.2.1" sources."camelcase-5.3.1" sources."chalk-3.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-7.0.3" sources."has-flag-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-5.2.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."term-size-2.2.0" sources."type-fest-0.8.1" ]; @@ -53620,7 +53711,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -53674,11 +53765,11 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."cli-ux-5.4.9" // { + (sources."cli-ux-5.4.10" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."clean-stack-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -53687,9 +53778,9 @@ in sources."fs-extra-9.0.1" sources."has-flag-4.0.0" sources."is-wsl-2.2.0" - sources."semver-5.7.1" - sources."strip-ansi-5.2.0" - sources."supports-color-7.1.0" + sources."semver-7.3.2" + sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.1.0" sources."tslib-2.0.1" sources."type-fest-0.11.0" ]; @@ -53828,7 +53919,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.549" + sources."electron-to-chromium-1.3.560" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -53919,7 +54010,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.132.0" + sources."flow-parser-0.133.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -53959,7 +54050,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.1.2" + sources."git-url-parse-11.1.3" sources."glob-7.1.5" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" @@ -54088,7 +54179,7 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."type-fest-0.11.0" ]; }) @@ -54169,7 +54260,7 @@ in sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -54791,7 +54882,7 @@ in }) sources."upper-case-2.0.1" sources."upper-case-first-2.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" @@ -54832,7 +54923,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.0-rc.9" + sources."vue-3.0.0-rc.10" ]; }) sources."watch-1.0.2" @@ -54876,7 +54967,7 @@ in sources."camelcase-5.3.1" ]; }) - sources."yarn-1.22.4" + sources."yarn-1.22.5" sources."yauzl-2.10.0" sources."yn-3.1.1" sources."zen-observable-0.8.15" @@ -55017,12 +55108,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.11.4" + sources."@babel/generator-7.11.5" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/template-7.10.4" - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -55048,7 +55139,7 @@ in sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."lodash-4.17.20" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" ]; @@ -55102,16 +55193,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.11.4" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/generator-7.11.4" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) + sources."@babel/core-7.11.5" + sources."@babel/generator-7.11.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.11.0" @@ -55124,10 +55207,10 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -55228,7 +55311,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -55363,7 +55446,7 @@ in sources."turndown-4.0.2" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urijs-1.19.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -55768,7 +55851,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.15" + sources."@types/node-13.13.16" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.4" @@ -55829,7 +55912,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-6.0.0" + sources."commander-6.1.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -56128,7 +56211,7 @@ in sources."ultron-1.1.1" sources."underscore-1.6.0" sources."uniq-1.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."utfx-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" @@ -56564,7 +56647,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@typescript-eslint/experimental-utils-3.10.1" sources."@typescript-eslint/parser-3.10.1" sources."@typescript-eslint/types-3.10.1" @@ -56632,7 +56715,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -56729,7 +56812,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.549" + sources."electron-to-chromium-1.3.560" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -56751,7 +56834,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" (sources."execa-0.7.0" // { @@ -56915,7 +57002,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."invert-kv-2.0.0" @@ -57441,7 +57528,7 @@ in }) sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" @@ -57559,10 +57646,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.15"; + version = "0.7.16"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.15.tgz"; - sha512 = "PYnLYoY2w0dsco/EmjjnVodQKsKOgbtDHdokjGphhK66J733ctg4Jww5I8WXAAuCkfUpQmALXdBvNg45PL7C9g=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.16.tgz"; + sha512 = "nYF/RznvKMwVXrW5z4k6Wrw13T6ogdF4TraAMp0P4upAHKhJkkA2aWwzCPiyq9wdadsp9/njWvmMTt5klfAI+g=="; }; buildInputs = globalBuildInputs; meta = { @@ -57636,8 +57723,16 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.4" - sources."@babel/generator-7.11.4" + (sources."@babel/core-7.11.5" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@babel/generator-7.11.5" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.11.0" @@ -57650,15 +57745,15 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -57709,7 +57804,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -57769,7 +57864,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.549" + sources."electron-to-chromium-1.3.560" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -58164,7 +58259,7 @@ in sources."has-values-0.1.4" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -58345,6 +58440,13 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" sources."@emmetio/extract-abbreviation-0.1.6" + (sources."@eslint/eslintrc-0.1.3" // { + dependencies = [ + sources."debug-4.2.0" + sources."ignore-4.0.6" + sources."strip-json-comments-3.1.1" + ]; + }) sources."@mrmlnc/readdir-enhanced-2.2.1" (sources."@nodelib/fs.scandir-2.1.3" // { dependencies = [ @@ -58378,10 +58480,10 @@ in sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/glob-7.1.3" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -58507,7 +58609,7 @@ in ]; }) sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."cliui-4.1.0" @@ -58606,7 +58708,7 @@ in sources."enquirer-2.3.6" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.7.0" // { + (sources."eslint-7.8.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -58623,11 +58725,11 @@ in sources."shebang-regex-3.0.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."which-2.0.2" ]; }) - (sources."eslint-plugin-vue-7.0.0-beta.2" // { + (sources."eslint-plugin-vue-7.0.0-beta.3" // { dependencies = [ sources."semver-7.3.2" ]; @@ -58642,7 +58744,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-0.7.0" @@ -58785,7 +58891,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."invert-kv-2.0.0" @@ -58838,7 +58944,7 @@ in sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.1.3" @@ -59294,7 +59400,7 @@ in }) sources."untildify-2.1.0" sources."update-notifier-3.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -59436,7 +59542,7 @@ in sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.1" + sources."vscode-json-languageservice-3.8.3" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -59453,7 +59559,7 @@ in sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" sources."yaml-ast-parser-custom-tags-0.0.43" - sources."yaml-language-server-0.10.0" + sources."yaml-language-server-0.10.1" ]; buildInputs = globalBuildInputs; meta = { @@ -59569,7 +59675,7 @@ in sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" sources."follow-redirects-1.13.0" @@ -59688,7 +59794,7 @@ in sources."chalk-3.0.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."clone-response-1.0.2" @@ -59868,7 +59974,7 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -59927,7 +60033,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.2.0" + sources."open-7.2.1" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -60042,7 +60148,7 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."systeminformation-4.27.3" sources."term-size-2.2.0" sources."through-2.3.8" @@ -60057,12 +60163,12 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.10.2" + sources."underscore-1.11.0" sources."unique-string-2.0.0" sources."universalify-1.0.0" sources."unpipe-1.0.0" sources."update-notifier-4.1.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -60130,7 +60236,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -60185,7 +60291,7 @@ in sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" sources."cp-file-7.0.0" - sources."cpy-8.1.0" + sources."cpy-8.1.1" sources."debug-2.6.9" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -60284,7 +60390,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."junk-3.1.0" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" @@ -60498,7 +60604,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -60735,7 +60841,7 @@ in sources."ansi-regex-4.1.0" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { dependencies = [ @@ -61175,7 +61281,7 @@ in sources."multicast-dns-7.2.2" sources."multistream-2.1.1" sources."mute-stream-0.0.8" - sources."mutexify-1.3.0" + sources."mutexify-1.3.1" sources."nan-2.14.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" @@ -61423,7 +61529,7 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" @@ -61533,7 +61639,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.740.0" + sources."aws-sdk-2.745.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -61549,7 +61655,7 @@ in sources."delay-4.4.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."events-1.1.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -61626,7 +61732,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uri-js-4.2.2" // { + (sources."uri-js-4.4.0" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -61677,11 +61783,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.4" - sources."@babel/generator-7.11.4" + sources."@babel/core-7.11.5" + sources."@babel/generator-7.11.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.10.5" + sources."@babel/helper-builder-react-jsx-experimental-7.11.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.11.0" @@ -61695,7 +61801,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-syntax-jsx-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -61703,8 +61809,8 @@ in sources."@babel/plugin-transform-parameters-7.10.5" sources."@babel/plugin-transform-react-jsx-7.10.4" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -61712,7 +61818,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -61748,7 +61854,7 @@ in }) sources."chalk-2.4.2" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" sources."clipboardy-2.3.0" @@ -61797,7 +61903,7 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globals-11.12.0" - sources."got-11.5.2" + sources."got-11.6.0" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" @@ -61807,14 +61913,14 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.4" // { + (sources."ink-3.0.5" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) (sources."ink-text-input-4.0.0" // { @@ -61824,7 +61930,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."type-fest-0.15.1" ]; }) @@ -61840,7 +61946,7 @@ in sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."json5-2.1.3" @@ -61859,8 +61965,8 @@ in }) sources."map-age-cleaner-0.1.3" sources."map-obj-4.1.0" - sources."mem-6.1.0" - (sources."meow-7.1.0" // { + sources."mem-6.1.1" + (sources."meow-7.1.1" // { dependencies = [ sources."type-fest-0.13.1" ]; @@ -61948,7 +62054,7 @@ in sources."color-name-1.1.4" ]; }) - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -61974,7 +62080,7 @@ in sources."trim-newlines-3.0.0" sources."type-fest-0.12.0" sources."unicode-emoji-modifier-base-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."widest-line-3.1.0" @@ -62038,10 +62144,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.7.0"; + version = "7.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz"; - sha512 = "1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.8.1.tgz"; + sha512 = "/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -62051,6 +62157,7 @@ in sources."chalk-2.4.2" ]; }) + sources."@eslint/eslintrc-0.1.3" sources."@types/color-name-1.1.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" @@ -62069,7 +62176,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."color-convert-1.9.3" @@ -62092,7 +62199,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" @@ -62156,7 +62267,7 @@ in sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."v8-compile-cache-2.1.1" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -62189,6 +62300,7 @@ in sources."chalk-2.4.2" ]; }) + sources."@eslint/eslintrc-0.1.3" sources."@types/color-name-1.1.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" @@ -62207,7 +62319,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."color-convert-1.9.3" @@ -62221,7 +62333,7 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.7.0" + sources."eslint-7.8.1" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" @@ -62232,7 +62344,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" @@ -62297,7 +62413,7 @@ in sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."v8-compile-cache-2.1.1" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -62477,7 +62593,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -62580,7 +62696,7 @@ in sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.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" @@ -62664,7 +62780,7 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."taskkill-3.1.0" // { dependencies = [ sources."execa-3.4.0" @@ -63271,7 +63387,7 @@ in sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.1" + sources."socks-2.4.2" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -63406,7 +63522,7 @@ in sources."chalk-4.1.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-spinners-2.4.0" sources."cli-width-3.0.0" @@ -63480,7 +63596,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."keyv-3.1.0" @@ -63501,7 +63617,7 @@ in ]; }) sources."map-obj-4.1.0" - (sources."meow-7.1.0" // { + (sources."meow-7.1.1" // { dependencies = [ sources."type-fest-0.13.1" ]; @@ -63589,7 +63705,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -63604,7 +63720,7 @@ in sources."chalk-3.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" @@ -63648,34 +63764,35 @@ in ]; }) sources."@babel/runtime-7.11.2" + sources."@exodus/schemasafe-1.0.0-rc.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.1.0" - (sources."@graphql-tools/graphql-file-loader-6.1.0" // { + sources."@graphql-tools/delegate-6.2.0" + (sources."@graphql-tools/graphql-file-loader-6.2.0" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.1.0" // { + (sources."@graphql-tools/import-6.2.0" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.1.0" // { + (sources."@graphql-tools/json-file-loader-6.2.0" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.1.0" - sources."@graphql-tools/merge-6.1.0" - sources."@graphql-tools/schema-6.1.0" - (sources."@graphql-tools/url-loader-6.1.0" // { + sources."@graphql-tools/load-6.2.0" + sources."@graphql-tools/merge-6.2.0" + sources."@graphql-tools/schema-6.2.0" + (sources."@graphql-tools/url-loader-6.2.0" // { dependencies = [ sources."cross-fetch-3.0.5" ]; }) - sources."@graphql-tools/utils-6.1.0" - sources."@graphql-tools/wrap-6.1.0" + sources."@graphql-tools/utils-6.2.0" + sources."@graphql-tools/wrap-6.2.0" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -63683,7 +63800,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -63721,6 +63838,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."bufferutil-4.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -63766,6 +63884,7 @@ in sources."cross-spawn-6.0.5" sources."d-1.0.1" sources."dashdash-1.14.1" + sources."dataloader-2.0.0" sources."debug-4.2.0" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" @@ -63904,7 +64023,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" @@ -63948,7 +64067,6 @@ in sources."minimist-1.2.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nan-2.14.1" sources."next-tick-1.0.0" sources."nice-try-1.0.5" (sources."no-case-3.0.3" // { @@ -63958,14 +64076,15 @@ in }) sources."node-fetch-2.6.0" sources."node-fetch-h2-2.3.0" + sources."node-gyp-build-3.7.0" sources."node-readfiles-0.2.0" sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.1.3" - sources."oas-resolver-2.4.3" + sources."oas-linter-3.2.0" + sources."oas-resolver-2.4.4" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" @@ -64027,7 +64146,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."reftools-1.1.5" + sources."reftools-1.1.6" sources."regenerator-runtime-0.13.7" sources."regexp.prototype.flags-1.3.0" sources."registry-auth-token-4.2.0" @@ -64078,7 +64197,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."subscriptions-transport-ws-0.9.18" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."swagger2openapi-5.4.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -64102,13 +64221,14 @@ in sources."typedarray-to-buffer-3.1.5" sources."universalify-1.0.0" sources."unixify-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" + sources."utf-8-validate-5.0.2" sources."uuid-3.4.0" sources."valid-url-1.0.9" sources."verror-1.10.0" sources."wcwidth-1.0.1" - (sources."websocket-1.0.31" // { + (sources."websocket-1.0.32" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -64476,7 +64596,7 @@ in dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."memory-streams-0.1.3" @@ -64495,7 +64615,7 @@ in sources."supports-color-2.0.0" (sources."supports-hyperlinks-2.1.0" // { dependencies = [ - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."systeminformation-4.27.3" @@ -65367,7 +65487,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -65455,11 +65575,11 @@ in sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" sources."strip-json-comments-3.1.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."wrappy-1.0.2" @@ -65490,7 +65610,7 @@ in sources."corser-2.0.1" sources."debug-3.2.6" sources."ecstatic-3.3.2" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."follow-redirects-1.13.0" sources."he-1.2.0" sources."http-proxy-1.18.1" @@ -65499,7 +65619,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."opener-1.5.1" + sources."opener-1.5.2" sources."portfinder-1.0.28" sources."qs-6.9.4" sources."requires-port-1.0.0" @@ -65691,7 +65811,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.5.1" - sources."jquery.terminal-2.18.2" + sources."jquery.terminal-2.18.3" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -65927,7 +66047,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.2.0" + sources."open-7.2.1" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -66002,7 +66122,7 @@ in sources."debug-3.2.6" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-4.4.13" sources."through-2.3.8" sources."through2-3.0.2" @@ -66352,7 +66472,7 @@ in sources."unicoderegexp-0.4.1" sources."universalify-1.0.0" sources."unorm-1.6.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -66364,7 +66484,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tslib-2.0.1" ]; }) @@ -66577,7 +66697,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.740.0" // { + (sources."aws-sdk-2.745.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -66994,7 +67114,7 @@ in sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - (sources."needle-2.5.0" // { + (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -67307,7 +67427,7 @@ in ]; }) sources."upper-case-1.1.3" - (sources."uri-js-4.2.2" // { + (sources."uri-js-4.4.0" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -67437,7 +67557,7 @@ in sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; }; dependencies = [ - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -67527,10 +67647,10 @@ in json = nodeEnv.buildNodePackage { name = "json"; packageName = "json"; - version = "9.0.6"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json/-/json-9.0.6.tgz"; - sha1 = "7972c2a5a48a42678db2730c7c2c4ee6e4e24585"; + url = "https://registry.npmjs.org/json/-/json-10.0.0.tgz"; + sha512 = "iK7tAZtpoghibjdB1ncCWykeBMmke3JThUe+rnkD4qkZaglOIQ70Pw7r5UJ4lyUT+7gnw7ehmmLUHDuhqzQD+g=="; }; buildInputs = globalBuildInputs; meta = { @@ -67609,7 +67729,7 @@ in sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -67664,7 +67784,7 @@ in sources."caseless-0.12.0" sources."chalk-3.0.0" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -67859,7 +67979,7 @@ in }) sources."strip-ansi-5.2.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."term-size-2.2.0" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" @@ -67872,7 +67992,7 @@ in sources."unique-string-2.0.0" sources."unpipe-1.0.0" sources."update-notifier-4.1.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -67932,10 +68052,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.1.1"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.1.1.tgz"; - sha512 = "xAlOr5PMqUbiKXSv5PCniHWV3aiwj6wIZ0gUVcwpTCPVQm/qH2WAMFWxtnpM6KJqhkRWrIpovR4Rb0rn8GtJzQ=="; + url = "https://registry.npmjs.org/karma/-/karma-5.2.1.tgz"; + sha512 = "+/AO2fWL7kC3aWTx/lHjtKXfOqh0O+KLtTy4BLQ/b/eciHR4VTHHdPhdrn9sDBQskgDieaBZ+sAKzlldc4GW/Q=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -67998,7 +68118,7 @@ in sources."engine.io-parser-2.2.0" sources."ent-2.2.0" sources."escape-html-1.0.3" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" @@ -68094,7 +68214,7 @@ in sources."ms-2.1.2" ]; }) - sources."source-map-0.6.1" + sources."source-map-0.7.3" sources."statuses-1.5.0" (sources."streamroller-2.2.4" // { dependencies = [ @@ -68431,7 +68551,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."underscore-1.9.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" (sources."utile-0.3.0" // { dependencies = [ sources."async-0.9.2" @@ -68628,7 +68748,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -69067,7 +69187,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -69100,7 +69220,7 @@ in sources."map-cache-0.2.2" sources."map-obj-4.1.0" sources."map-visit-1.0.0" - (sources."meow-7.1.0" // { + (sources."meow-7.1.1" // { dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" @@ -69431,7 +69551,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -69450,7 +69570,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -70384,7 +70504,7 @@ in sources."isobject-3.0.1" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -70414,8 +70534,8 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.4" - sources."@babel/generator-7.11.4" + sources."@babel/core-7.11.5" + sources."@babel/generator-7.11.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" @@ -70445,7 +70565,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" @@ -70499,7 +70619,7 @@ in sources."@babel/plugin-transform-property-literals-7.10.4" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-runtime-7.11.0" + sources."@babel/plugin-transform-runtime-7.11.5" sources."@babel/plugin-transform-shorthand-properties-7.10.4" sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" @@ -70507,22 +70627,18 @@ in sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.0" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-env-7.11.5" + sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" - (sources."@jest/transform-25.5.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."@jest/transform-25.5.1" sources."@jest/types-25.5.0" sources."@types/babel__core-7.1.9" sources."@types/babel__generator-7.6.1" @@ -70534,8 +70650,8 @@ in sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.5" - sources."@types/node-14.6.0" + sources."@types/json-schema-7.0.6" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -70712,7 +70828,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -70721,7 +70837,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) (sources."chokidar-3.4.2" // { @@ -70765,6 +70881,7 @@ in (sources."combine-source-map-0.8.0" // { dependencies = [ sources."convert-source-map-1.1.3" + sources."source-map-0.5.7" ]; }) sources."combined-stream-1.0.8" @@ -70834,7 +70951,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.549" + sources."electron-to-chromium-1.3.560" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -70855,7 +70972,11 @@ in sources."eslint-scope-4.0.3" sources."eslint-visitor-keys-1.3.0" sources."esprima-4.0.1" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."estree-walker-0.6.1" sources."esutils-2.0.3" @@ -70992,7 +71113,11 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inline-source-map-0.6.2" + (sources."inline-source-map-0.6.2" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."insert-module-globals-7.2.0" sources."interpret-1.4.0" sources."invariant-2.2.4" @@ -71038,7 +71163,7 @@ in (sources."jest-worker-25.5.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."js-tokens-4.0.0" @@ -71046,7 +71171,7 @@ in sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" @@ -71288,7 +71413,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."schema-utils-2.7.0" + sources."schema-utils-2.7.1" sources."semver-5.7.1" sources."serialize-javascript-4.0.0" sources."set-blocking-2.0.0" @@ -71325,6 +71450,7 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -71338,13 +71464,9 @@ in ]; }) sources."source-list-map-0.1.8" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" @@ -71399,15 +71521,10 @@ in sources."readable-stream-3.6.0" ]; }) - (sources."terser-4.8.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."terser-4.8.0" (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ sources."schema-utils-1.0.0" - sources."source-map-0.6.1" ]; }) sources."test-exclude-6.0.0" @@ -71452,7 +71569,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -71514,7 +71631,6 @@ in (sources."webpack-sources-1.4.3" // { dependencies = [ sources."source-list-map-2.0.1" - sources."source-map-0.6.1" ]; }) sources."which-2.0.2" @@ -71650,11 +71766,11 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" ]; @@ -71760,7 +71876,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."event-emitter-0.3.5" @@ -71932,7 +72052,7 @@ in sources."type-1.2.0" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -72019,22 +72139,23 @@ in sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.6.0" + sources."@fluentui/date-time-utilities-7.7.0" sources."@fluentui/keyboard-key-0.2.11" - sources."@fluentui/react-7.132.0" - sources."@fluentui/react-focus-7.13.3" - sources."@fluentui/react-icons-0.2.2" - sources."@fluentui/theme-0.1.2" - sources."@microsoft/load-themed-styles-1.10.79" + sources."@fluentui/react-7.134.1" + sources."@fluentui/react-focus-7.15.0" + sources."@fluentui/react-icons-0.3.0" + sources."@fluentui/react-window-provider-0.3.0" + sources."@fluentui/theme-0.2.0" + sources."@microsoft/load-themed-styles-1.10.82" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.8.3" - sources."@uifabric/icons-7.4.3" - sources."@uifabric/merge-styles-7.17.0" - sources."@uifabric/react-hooks-7.10.0" + sources."@uifabric/foundation-7.9.0" + sources."@uifabric/icons-7.5.0" + sources."@uifabric/merge-styles-7.18.0" + sources."@uifabric/react-hooks-7.11.0" sources."@uifabric/set-version-7.0.22" - sources."@uifabric/styling-7.15.3" - sources."@uifabric/utilities-7.30.0" + sources."@uifabric/styling-7.16.0" + sources."@uifabric/utilities-7.31.0" sources."accepts-1.3.7" sources."ajv-6.12.4" sources."ansi-escapes-1.4.0" @@ -72098,7 +72219,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" sources."express-openapi-6.0.0" @@ -72160,7 +72281,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.132.0" + sources."office-ui-fabric-react-7.134.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -72259,7 +72380,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.32.4" + sources."swagger-ui-dist-3.32.5" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -72269,7 +72390,7 @@ in sources."tslib-1.13.0" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -72290,10 +72411,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.2.tgz"; - sha512 = "I8FRAcuACNMLQn3lS4qeWLxXqLvGf6r2CaLstDpZmMUUSmvW6Cnm1AuHxgbc7ctZVRcfwspCRbDHymPsi3dkJw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; + sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -72501,7 +72622,7 @@ in sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -72580,10 +72701,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.59.1"; + version = "2.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.59.1.tgz"; - sha512 = "HoqWho35I89wkJToOjMkcyfs3vXaeRG8/IDaKCXlVWfxLa4X4tEcN+YA/Xt6fHmiRTL8dvZttTO+rwlru7JaBQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.61.0.tgz"; + sha512 = "IGB8m/Cb0LB84K9wXSv3KbGJ29RzPTRt8CfHdH6mBMW5hWk3TfCGIIXl1xjqVR7am4ZxbGlKUcDDiMGGwF+/JQ=="; }; dependencies = [ sources."@analytics/cookie-utils-0.2.3" @@ -72592,7 +72713,7 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@bugsnag/browser-7.3.3" sources."@bugsnag/core-7.3.3" sources."@bugsnag/cuid-3.0.0" @@ -72602,31 +72723,22 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-3.3.2" // { + (sources."@netlify/build-3.3.5" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" - sources."execa-3.4.0" - sources."find-up-4.1.0" - sources."read-pkg-up-7.0.1" sources."resolve-2.0.0-next.1" - sources."uuid-8.3.0" ]; }) - sources."@netlify/cache-utils-1.0.1" - (sources."@netlify/config-2.1.2" // { + sources."@netlify/cache-utils-1.0.2" + (sources."@netlify/config-2.1.3" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" - sources."execa-3.4.0" - sources."find-up-4.1.0" ]; }) sources."@netlify/functions-utils-1.2.8" (sources."@netlify/git-utils-1.0.1" // { dependencies = [ sources."braces-3.0.2" - sources."execa-3.4.0" sources."fill-range-7.0.1" sources."is-number-7.0.0" sources."micromatch-4.0.2" @@ -72634,14 +72746,9 @@ in ]; }) sources."@netlify/open-api-0.16.0" - (sources."@netlify/run-utils-1.0.0" // { + sources."@netlify/run-utils-1.0.0" + (sources."@netlify/zip-it-and-ship-it-1.3.12" // { dependencies = [ - sources."execa-3.4.0" - ]; - }) - (sources."@netlify/zip-it-and-ship-it-1.3.11" // { - dependencies = [ - sources."find-up-4.1.0" sources."resolve-2.0.0-next.1" ]; }) @@ -72654,22 +72761,25 @@ in sources."@nodelib/fs.walk-1.2.4" (sources."@oclif/color-0.1.2" // { dependencies = [ + sources."ansi-styles-3.2.1" (sources."chalk-3.0.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."has-flag-3.0.0" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" - sources."tslib-1.13.0" ]; }) (sources."@oclif/command-1.8.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.0" sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -72691,25 +72801,22 @@ in sources."micromatch-4.0.2" sources."slash-3.0.0" sources."to-regex-range-5.0.1" + sources."tslib-2.0.1" ]; }) (sources."@oclif/errors-1.3.3" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."clean-stack-3.0.0" sources."fs-extra-9.0.1" sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.5" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."@oclif/parser-3.8.5" (sources."@oclif/plugin-help-2.2.3" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" @@ -72730,6 +72837,7 @@ in }) (sources."@oclif/plugin-not-found-1.2.4" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."cli-ux-4.9.3" sources."fs-extra-7.0.1" sources."has-flag-3.0.0" @@ -72739,7 +72847,6 @@ in sources."semver-5.7.1" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" - sources."tslib-1.13.0" sources."universalify-0.1.2" ]; }) @@ -72748,6 +72855,8 @@ in sources."fs-extra-7.0.1" sources."jsonfile-4.0.0" sources."npm-run-path-3.1.0" + sources."path-key-3.1.1" + sources."tslib-2.0.1" sources."universalify-0.1.2" ]; }) @@ -72803,7 +72912,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/semver-5.5.0" @@ -72824,10 +72933,10 @@ in }) sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" - (sources."ansi-styles-3.2.1" // { + (sources."ansi-styles-4.2.1" // { dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."ansicolors-0.3.2" @@ -72862,7 +72971,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.740.0" // { + (sources."aws-sdk-2.745.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -72887,7 +72996,6 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" ]; }) @@ -72919,6 +73027,7 @@ in sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."escape-string-regexp-1.0.5" sources."has-flag-3.0.0" sources."supports-color-5.5.0" @@ -72954,19 +73063,19 @@ in }) sources."clean-deep-3.4.0" sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-progress-3.8.2" - sources."cli-spinners-1.3.1" - (sources."cli-ux-5.4.10" // { + sources."cli-spinners-2.4.0" + (sources."cli-ux-5.5.0" // { dependencies = [ sources."ansi-escapes-4.3.1" - sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."clean-stack-3.0.0" sources."extract-stack-2.0.0" sources."fs-extra-9.0.1" sources."supports-hyperlinks-2.1.0" + sources."tslib-2.0.1" sources."type-fest-0.11.0" ]; }) @@ -72975,14 +73084,9 @@ in sources."clone-1.0.4" sources."clone-response-1.0.2" sources."collection-visit-1.0.0" - (sources."color-3.0.0" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-1.5.3" sources."colors-1.4.0" sources."colorspace-1.1.2" @@ -73023,10 +73127,19 @@ in }) sources."core-util-is-1.0.2" sources."cp-file-7.0.0" - sources."cpy-8.1.0" + (sources."cpy-8.1.1" // { + dependencies = [ + sources."globby-9.2.0" + ]; + }) sources."crc-3.8.0" sources."crc32-stream-3.0.1" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + sources."which-1.3.1" + ]; + }) sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-time-2.1.0" @@ -73050,9 +73163,8 @@ in sources."decompress-response-3.3.0" (sources."decompress-tar-4.1.1" // { dependencies = [ - sources."bl-1.2.2" + sources."bl-1.2.3" sources."file-type-5.2.0" - sources."is-stream-1.1.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."tar-stream-1.6.2" @@ -73061,13 +73173,11 @@ in (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" - sources."is-stream-1.1.0" ]; }) (sources."decompress-targz-4.1.1" // { dependencies = [ sources."file-type-5.2.0" - sources."is-stream-1.1.0" ]; }) (sources."decompress-unzip-4.0.1" // { @@ -73086,19 +73196,7 @@ in sources."define-property-2.0.2" (sources."del-5.1.0" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.4" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" - sources."globby-10.0.2" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.2" sources."slash-3.0.0" - sources."to-regex-range-5.0.1" ]; }) sources."delayed-stream-1.0.0" @@ -73137,7 +73235,6 @@ in sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" sources."p-event-2.3.1" - sources."p-finally-1.0.0" sources."p-timeout-2.0.1" sources."pify-3.0.0" sources."sort-keys-2.0.0" @@ -73168,11 +73265,17 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."events-1.1.1" - (sources."execa-2.1.0" // { + (sources."execa-3.4.0" // { dependencies = [ - sources."npm-run-path-3.1.0" + sources."cross-spawn-7.0.3" + sources."is-stream-2.0.0" + sources."npm-run-path-4.0.1" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" ]; }) (sources."expand-brackets-2.1.4" // { @@ -73246,13 +73349,7 @@ in sources."debug-2.6.9" ]; }) - (sources."find-up-3.0.0" // { - dependencies = [ - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."find-up-4.1.0" sources."flatten-1.0.3" sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" @@ -73303,7 +73400,22 @@ in sources."glob-to-regexp-0.3.0" sources."global-cache-dir-1.0.1" sources."global-dirs-2.0.1" - sources."globby-9.2.0" + (sources."globby-10.0.2" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.4" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) sources."gonzales-pe-4.3.0" (sources."got-9.6.0" // { dependencies = [ @@ -73334,11 +73446,16 @@ in ]; }) sources."has-yarn-2.1.0" - sources."hasha-5.2.0" + (sources."hasha-5.2.0" // { + dependencies = [ + sources."is-stream-2.0.0" + ]; + }) sources."hosted-git-info-2.8.8" sources."http-cache-semantics-4.1.0" (sources."http-call-5.3.0" // { dependencies = [ + sources."is-stream-2.0.0" sources."parse-json-4.0.0" ]; }) @@ -73348,7 +73465,7 @@ in ]; }) sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-0.21.0" // { + (sources."http-proxy-middleware-1.0.5" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -73362,7 +73479,6 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."ignore-4.0.6" - sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -73391,7 +73507,6 @@ in (sources."inquirer-autocomplete-prompt-1.1.0" // { dependencies = [ sources."ansi-escapes-4.3.1" - sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."type-fest-0.11.0" ]; @@ -73407,12 +73522,13 @@ in sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" - sources."is-docker-1.1.0" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" + sources."is-interactive-1.0.0" sources."is-natural-number-4.0.1" sources."is-npm-4.0.0" (sources."is-number-3.0.0" // { @@ -73428,16 +73544,12 @@ in sources."is-plain-object-2.0.4" sources."is-regex-1.1.1" sources."is-retry-allowed-1.2.0" - sources."is-stream-2.0.0" + sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" - (sources."is-wsl-2.2.0" // { - dependencies = [ - sources."is-docker-2.1.1" - ]; - }) + sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."iserror-0.0.2" @@ -73452,15 +73564,11 @@ in sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."jsonfile-6.0.1" sources."junk-3.1.0" sources."jwt-decode-2.2.0" - (sources."keep-func-props-3.0.1" // { - dependencies = [ - sources."mimic-fn-3.1.0" - ]; - }) + sources."keep-func-props-3.0.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" @@ -73514,11 +73622,10 @@ in sources."lodash.uniq-4.5.0" (sources."log-process-errors-5.1.2" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" ]; }) - sources."log-symbols-2.2.0" + sources."log-symbols-3.0.0" (sources."logform-2.2.0" // { dependencies = [ sources."ms-2.1.2" @@ -73554,7 +73661,7 @@ in sources."mime-1.6.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."mimic-fn-2.1.0" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -73589,19 +73696,15 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-4.3.12" // { + (sources."netlify-4.3.13" // { dependencies = [ - sources."p-wait-for-3.1.0" sources."qs-6.9.4" ]; }) (sources."netlify-redirect-parser-2.5.0" // { dependencies = [ sources."@netlify/config-0.11.11" - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" - sources."execa-3.4.0" - sources."find-up-4.1.0" ]; }) sources."netlify-redirector-0.2.0" @@ -73616,15 +73719,12 @@ in }) sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" - sources."npm-bundled-1.1.1" (sources."npm-conf-1.1.3" // { dependencies = [ sources."pify-3.0.0" ]; }) - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" - sources."npm-run-path-4.0.1" + sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -73652,7 +73752,11 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."onetime-5.1.2" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) (sources."open-6.4.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -73664,10 +73768,12 @@ in ]; }) sources."optionator-0.8.3" - (sources."ora-3.4.0" // { + (sources."ora-4.1.1" // { dependencies = [ - sources."cli-spinners-2.4.0" - sources."strip-ansi-5.2.0" + sources."chalk-3.0.0" + sources."cli-cursor-3.1.0" + sources."mute-stream-0.0.8" + sources."restore-cursor-3.1.0" ]; }) sources."os-name-3.1.0" @@ -73684,24 +73790,15 @@ in sources."p-map-2.1.0" ]; }) - sources."p-finally-2.0.1" + sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."p-reduce-2.1.0" - (sources."p-timeout-3.2.0" // { - dependencies = [ - sources."p-finally-1.0.0" - ]; - }) + sources."p-timeout-3.2.0" sources."p-try-2.2.0" - (sources."p-wait-for-2.0.1" // { - dependencies = [ - sources."p-finally-1.0.0" - sources."p-timeout-2.0.1" - ]; - }) + sources."p-wait-for-3.1.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" @@ -73719,20 +73816,11 @@ in sources."parse-ms-2.1.0" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - (sources."password-prompt-1.1.2" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) + sources."password-prompt-1.1.2" sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" + sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" @@ -73741,11 +73829,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-4.2.0" // { - dependencies = [ - sources."find-up-4.1.0" - ]; - }) + sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { dependencies = [ @@ -73759,7 +73843,11 @@ in sources."precond-0.2.3" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."pretty-format-24.9.0" + (sources."pretty-format-24.9.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + ]; + }) sources."pretty-ms-5.1.0" sources."prettyjson-1.2.1" sources."process-nextick-args-2.0.1" @@ -73772,7 +73860,7 @@ in sources."query-string-5.1.1" sources."querystring-0.2.0" sources."random-bytes-1.0.0" - sources."random-item-1.0.0" + sources."random-item-3.0.0" sources."range-parser-1.2.1" (sources."raw-body-2.4.1" // { dependencies = [ @@ -73786,12 +73874,7 @@ in sources."type-fest-0.6.0" ]; }) - (sources."read-pkg-up-6.0.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."type-fest-0.5.2" - ]; - }) + sources."read-pkg-up-7.0.1" sources."readable-stream-3.6.0" sources."readdirp-3.4.0" sources."redeyed-2.1.1" @@ -73819,11 +73902,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - (sources."rxjs-6.6.2" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safe-join-0.1.3" sources."safe-json-stringify-1.2.0" @@ -73855,8 +73934,8 @@ in ]; }) sources."setprototypeof-1.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -73966,7 +74045,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."supports-hyperlinks-1.0.1" // { dependencies = [ sources."has-flag-2.0.0" @@ -74019,12 +74098,8 @@ in ]; }) sources."triple-beam-1.3.0" - sources."tslib-2.0.1" - (sources."tsutils-3.17.1" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."tslib-1.13.0" + sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" @@ -74056,7 +74131,6 @@ in }) (sources."update-notifier-4.1.1" // { dependencies = [ - sources."ansi-styles-4.2.1" sources."chalk-3.0.0" ]; }) @@ -74068,7 +74142,7 @@ in sources."util-deprecate-1.0.2" sources."util.promisify-1.0.1" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."uuid-8.3.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" @@ -74084,20 +74158,15 @@ in sources."widest-line-3.1.0" (sources."windows-release-3.3.3" // { dependencies = [ - sources."cross-spawn-6.0.5" sources."execa-1.0.0" sources."get-stream-4.1.0" - sources."is-stream-1.1.0" - sources."npm-run-path-2.0.2" - sources."p-finally-1.0.0" - sources."path-key-2.0.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" ]; }) - sources."winston-3.3.3" + (sources."winston-3.3.3" // { + dependencies = [ + sources."is-stream-2.0.0" + ]; + }) (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -74105,11 +74174,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-6.2.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - ]; - }) + sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -74117,13 +74182,9 @@ in sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" sources."y18n-4.0.0" - (sources."yargs-15.4.1" // { - dependencies = [ - sources."find-up-4.1.0" - ]; - }) + sources."yargs-15.4.1" sources."yargs-parser-18.1.3" - sources."yarn-1.22.4" + sources."yarn-1.22.5" sources."yauzl-2.10.0" sources."zip-stream-3.0.1" ]; @@ -74258,7 +74319,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -74632,7 +74693,7 @@ in sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."needle-2.5.0" + sources."needle-2.5.2" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -74748,7 +74809,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - (sources."bl-1.2.2" // { + (sources."bl-1.2.3" // { dependencies = [ (sources."readable-stream-2.3.7" // { dependencies = [ @@ -74996,7 +75057,7 @@ in sources."mustache-4.0.1" sources."mute-stream-0.0.8" sources."nan-2.14.0" - (sources."needle-2.5.0" // { + (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -75135,7 +75196,7 @@ in sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -75348,7 +75409,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uid-number-0.0.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -75405,12 +75466,12 @@ in (sources."chalk-3.0.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."chokidar-3.4.2" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -75554,14 +75615,14 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "7.1.1"; + version = "8.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-7.1.1.tgz"; - sha512 = "mTth44/DK4EmTecdyqEzt6C76sSYdCnDrOo39lNcN1/JWOEkcb+uLQ2CRt0gqkCp6DohALs4RpVBVp+E2i+h8Q=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-8.0.5.tgz"; + sha512 = "EZ3DIFvKFNZzwV9OdEYITTAY6fmuD7evItEmf9XyntG4p29n8JpFaGrf9uCQIR0Hx3G5RFNsdCeURHzF6YXIAw=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.3" + sources."@npmcli/git-2.0.4" sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/move-file-1.0.1" sources."@npmcli/promise-spawn-1.2.0" @@ -75622,7 +75683,7 @@ in sources."ci-info-2.0.0" sources."cint-8.2.1" sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-table-0.3.1" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -75630,7 +75691,7 @@ in sources."color-name-1.1.4" sources."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commander-6.0.0" + sources."commander-6.1.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" @@ -75661,7 +75722,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.2" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-minipass-2.1.0" @@ -75711,7 +75772,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-parse-helpfulerror-1.0.3" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -75727,11 +75788,12 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" ]; }) - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.20" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -75800,8 +75862,8 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.0.2" + sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -75810,6 +75872,7 @@ in ]; }) sources."pacote-11.1.11" + sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" @@ -75831,6 +75894,7 @@ in sources."readdir-scoped-modules-1.1.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" + sources."remote-git-tags-3.0.0" sources."request-2.88.2" sources."require-from-string-2.0.2" sources."responselike-1.0.2" @@ -75849,9 +75913,9 @@ in sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.1" + sources."socks-2.4.2" sources."socks-proxy-agent-5.0.0" - sources."spawn-please-0.3.0" + sources."spawn-please-0.4.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."ssri-8.0.0" @@ -75859,7 +75923,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."tar-6.0.5" // { dependencies = [ sources."minizlib-2.1.2" @@ -75880,7 +75944,7 @@ in sources."chalk-3.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -76068,7 +76132,7 @@ in sources."tweetnacl-0.14.5" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -76138,21 +76202,16 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - (sources."@babel/core-7.11.4" // { + (sources."@babel/core-7.11.5" // { dependencies = [ sources."json5-2.1.3" - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/generator-7.11.4" // { - dependencies = [ - sources."source-map-0.5.7" ]; }) + sources."@babel/generator-7.11.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.10.5" + sources."@babel/helper-builder-react-jsx-experimental-7.11.5" sources."@babel/helper-compilation-targets-7.10.4" sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" @@ -76176,7 +76235,7 @@ in sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" @@ -76238,12 +76297,12 @@ in sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.0" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-env-7.11.5" + sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -76361,7 +76420,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001118" + sources."caniuse-lite-1.0.30001123" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -76495,7 +76554,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.549" + sources."electron-to-chromium-1.3.560" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -76795,7 +76854,7 @@ in sources."supports-color-6.1.0" ]; }) - (sources."postcss-calc-7.0.3" // { + (sources."postcss-calc-7.0.4" // { dependencies = [ sources."postcss-value-parser-4.1.0" ]; @@ -77051,7 +77110,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -77127,7 +77186,7 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.5.0" - sources."bl-1.2.2" + sources."bl-1.2.3" sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ @@ -77340,10 +77399,10 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -78045,7 +78104,7 @@ in sources."ultron-1.1.1" sources."uniq-1.0.1" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."utp-0.0.7" @@ -78073,10 +78132,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.5.3"; + version = "5.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.3.tgz"; - sha512 = "1FfqqDOaQKIn10WzP2Vdjwo4KOpdu7s2dRbBMDJi9llHa5BhhHf+ASrW8HTWyqKd03n6wf2NrbFvZreHJKQnZw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.10.tgz"; + sha512 = "lHaae4Xiiz2I6+1czn/3AvvM+O7sHDoiEiBW4UK0NPuWJdCBGuu6qcuneuo02cmo5Hur3KuqgGmUdkMKq7gMnw=="; }; buildInputs = globalBuildInputs; meta = { @@ -78091,10 +78150,10 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.1.tgz"; - sha512 = "bYQy5ydAQJKCMSpvaMg0ThPBeGYqhQXumjbFOmWnL4u65CYXQ16RfS6afGQpit0dGv/fNzxbdDtx8dkqOhhIbg=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.2.tgz"; + sha512 = "3mlEmN1v2NVuosMWZM2tP8bgZn7rO5PYxRRrXtdSyL5KipcgBDjJ9ct8/LKxImMCJJi3x5nYhCGFJOkGyEqXBQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -78133,7 +78192,7 @@ in sources."fs-extra-9.0.1" sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" - sources."get-stdin-7.0.0" + sources."get-stdin-8.0.0" sources."glob-parent-5.1.1" sources."globby-11.0.1" sources."graceful-fs-4.2.4" @@ -78214,7 +78273,7 @@ in sources."sprintf-js-1.0.3" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."universalify-1.0.0" sources."which-module-2.0.0" @@ -78623,10 +78682,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.65"; + version = "1.1.66"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.65.tgz"; - sha512 = "G8tI8Ws5CwXJGJTQ48e0L+56cA31990t9V65EukrefKnLupySPVVpHuUGeCY21LCYqZPg1yY2R8KMbXH1y1uMQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.66.tgz"; + sha512 = "DbtdoFKrg3JrGAEG9bUjN4dNQQeoj7a/vy61Ppi/6KeA1sEclA/sUFFH8Yyb56UDUEXYg2U1dw78zr6mRw+Cog=="; }; buildInputs = globalBuildInputs; meta = { @@ -78805,11 +78864,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/generator-7.11.4" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) + sources."@babel/generator-7.11.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" @@ -78817,15 +78872,16 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" + sources."@exodus/schemasafe-1.0.0-rc.2" sources."@types/color-name-1.1.1" sources."ajv-5.5.2" sources."ansi-regex-3.0.0" @@ -79020,8 +79076,8 @@ in sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.1.3" - sources."oas-resolver-2.4.3" + sources."oas-linter-3.2.0" + sources."oas-resolver-2.4.4" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."object-assign-4.1.1" @@ -79044,7 +79100,7 @@ in sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" - sources."polished-3.6.5" + sources."polished-3.6.6" sources."postcss-value-parser-4.1.0" sources."prismjs-1.21.0" sources."process-0.11.10" @@ -79086,7 +79142,7 @@ in sources."tslib-1.13.0" ]; }) - sources."reftools-1.1.5" + sources."reftools-1.1.6" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" @@ -79137,7 +79193,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -79217,10 +79273,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.26.5"; + version = "2.26.9"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.5.tgz"; - sha512 = "rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.26.9.tgz"; + sha512 = "XIiWYLayLqV+oY4S2Lub/shJq4uk/QQLwWToYCL4LjZbYHbFK3czea4UDVRUJu+zNmKmxq5Zb/OG7c5HSvH2TQ=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -79248,6 +79304,7 @@ in sources."chalk-2.4.2" ]; }) + sources."@eslint/eslintrc-0.1.3" sources."@rollup/plugin-commonjs-13.0.2" sources."@rollup/plugin-node-resolve-8.4.0" sources."@rollup/pluginutils-3.1.0" @@ -79255,7 +79312,7 @@ in sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/mocha-7.0.2" sources."@types/node-12.7.12" @@ -79305,7 +79362,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."cheerio-1.0.0-rc.3" @@ -79355,7 +79412,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.7.0" // { + (sources."eslint-7.8.1" // { dependencies = [ sources."semver-7.3.2" ]; @@ -79370,7 +79427,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."estree-walker-1.0.1" sources."esutils-2.0.3" @@ -79460,7 +79521,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.1.2" // { + (sources."mocha-8.1.3" // { dependencies = [ sources."debug-4.1.1" sources."escape-string-regexp-4.0.0" @@ -79515,7 +79576,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.26.5" + sources."rollup-2.26.9" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -79556,11 +79617,11 @@ in sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" - (sources."vsce-1.79.3" // { + (sources."vsce-1.79.5" // { dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" @@ -79741,7 +79802,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid2-0.0.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-0.4.9" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -79863,7 +79924,7 @@ in sources."supports-color-5.5.0" sources."term-size-1.2.0" sources."update-check-1.5.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."vary-1.1.2" sources."which-1.3.1" sources."widest-line-2.0.1" @@ -79882,10 +79943,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.80.0"; + version = "1.81.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.80.0.tgz"; - sha512 = "gIHWDwW5ZkKD+WKMhVUPAmhn95Tk8vFru7feYpbJ4WZgzz/M0HkHpph3rA7YxiWBJChghaLXO7HwvbnxJ1nvCw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.81.1.tgz"; + sha512 = "CaNAEFDc1V7egtIcJcF5A7ba6ipD9FG0ZPbHr0M4m8IMsmfWAewdhhj1BdlcpaD16mNZH9bjXYT28z+mHKZ4/w=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -79905,7 +79966,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@serverless/cli-1.5.2" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.34.7" // { + (sources."@serverless/components-2.34.9" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -79916,11 +79977,11 @@ in sources."fs-extra-7.0.1" ]; }) - sources."@serverless/enterprise-plugin-3.7.1" + sources."@serverless/enterprise-plugin-3.8.2" sources."@serverless/event-mocks-1.1.1" sources."@serverless/inquirer-1.1.2" - sources."@serverless/platform-client-1.1.7" - (sources."@serverless/platform-client-china-1.0.34" // { + sources."@serverless/platform-client-1.1.8" + (sources."@serverless/platform-client-china-1.0.37" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" @@ -79945,10 +80006,10 @@ in sources."@types/chalk-2.2.0" sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" - sources."@types/lodash-4.14.160" + sources."@types/lodash-4.14.161" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -80013,7 +80074,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.740.0" // { + (sources."aws-sdk-2.745.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -80100,7 +80161,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" (sources."cli-color-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -80152,7 +80213,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.34" + sources."dayjs-1.8.35" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -80164,7 +80225,7 @@ in sources."decompress-response-3.3.0" (sources."decompress-tar-4.1.1" // { dependencies = [ - sources."bl-1.2.2" + sources."bl-1.2.3" sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -80608,7 +80669,7 @@ in sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-2.0.1" - (sources."open-7.2.0" // { + (sources."open-7.2.1" // { dependencies = [ sources."is-docker-2.1.1" ]; @@ -80651,7 +80712,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.15" + sources."@types/node-13.13.16" ]; }) sources."pseudomap-1.0.2" @@ -80809,7 +80870,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."tabtab-3.0.2" // { dependencies = [ sources."debug-4.2.0" @@ -80867,7 +80928,7 @@ in sources."cli-boxes-1.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.10.3" // { dependencies = [ @@ -81128,7 +81189,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."utf8-2.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -81546,10 +81607,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.385.0"; + version = "1.388.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.385.0.tgz"; - sha512 = "sh+/Lt7764pWzuiXke+ICuBG88QLX9ZrCYmCJXJ9ZU0D9P+Uo25bVqE+OyJIhR4et6VRt60ZQim0iferz6K0mA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.388.0.tgz"; + sha512 = "Oe4aDzp3iyBNpZCYxAxNWaN7l5aAB7dAVd3MLuJ3jdbJXcucMwc3MAfoZ91dmVb4SMO2qsOpiq6+qO6W8nuASA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -81557,7 +81618,7 @@ in sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-2.1.1" - (sources."@snyk/cli-interface-2.8.1" // { + (sources."@snyk/cli-interface-2.9.0" // { dependencies = [ (sources."@snyk/dep-graph-1.19.0" // { dependencies = [ @@ -81605,17 +81666,15 @@ in sources."@types/color-name-1.1.1" sources."@types/debug-4.1.5" sources."@types/emscripten-1.39.4" - sources."@types/glob-7.1.3" sources."@types/hosted-git-info-2.7.0" sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.15" + sources."@types/node-13.13.16" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.5" - (sources."@yarnpkg/core-2.1.1" // { + (sources."@yarnpkg/core-2.2.2" // { dependencies = [ sources."ansi-styles-4.2.1" sources."camelcase-5.3.1" @@ -81629,17 +81688,17 @@ in sources."semver-7.3.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."which-2.0.2" ]; }) - sources."@yarnpkg/fslib-2.1.0" + sources."@yarnpkg/fslib-2.2.1" sources."@yarnpkg/json-proxy-2.1.0" - sources."@yarnpkg/libzip-2.1.0" + sources."@yarnpkg/libzip-2.2.0" sources."@yarnpkg/lockfile-1.1.0" - sources."@yarnpkg/parsers-2.1.0" - sources."@yarnpkg/pnp-2.1.0" - (sources."@yarnpkg/shell-2.1.0" // { + sources."@yarnpkg/parsers-2.2.0" + sources."@yarnpkg/pnp-2.2.1" + (sources."@yarnpkg/shell-2.2.0" // { dependencies = [ sources."cross-spawn-7.0.3" sources."path-key-3.1.1" @@ -81694,7 +81753,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."brace-expansion-1.1.11" @@ -81713,13 +81772,12 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."child-process-1.0.2" - sources."chownr-1.1.4" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-spinner-0.2.10" sources."cli-width-2.2.1" - sources."clipanion-2.4.4" + sources."clipanion-2.5.0" (sources."cliui-3.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -81797,7 +81855,6 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."fs-constants-1.0.0" - sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { dependencies = [ @@ -81815,7 +81872,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" - sources."globby-10.0.2" + sources."globby-11.0.1" sources."got-11.4.0" sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" @@ -81888,6 +81945,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."lie-3.3.0" + sources."lodash-4.17.20" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" @@ -81926,8 +81984,6 @@ in 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."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -81948,7 +82004,7 @@ in sources."object.assign-4.1.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.2.0" + sources."open-7.2.1" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" @@ -81990,7 +82046,7 @@ in sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.3.0" + sources."pretty-bytes-5.4.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" @@ -82039,7 +82095,7 @@ in sources."slash-3.0.0" sources."smart-buffer-4.1.0" sources."snyk-config-3.1.0" - (sources."snyk-cpp-plugin-1.4.0" // { + (sources."snyk-cpp-plugin-1.4.1" // { dependencies = [ sources."tslib-2.0.1" ]; @@ -82064,25 +82120,15 @@ in sources."tmp-0.2.0" ]; }) - (sources."snyk-gradle-plugin-3.5.1" // { + (sources."snyk-gradle-plugin-3.6.2" // { dependencies = [ - (sources."@snyk/cli-interface-2.8.0" // { - dependencies = [ - (sources."@snyk/dep-graph-1.19.0" // { - dependencies = [ - sources."tslib-2.0.1" - ]; - }) - sources."tslib-1.13.0" - ]; - }) sources."ansi-styles-4.2.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."rimraf-3.0.2" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tmp-0.2.1" sources."tslib-2.0.1" ]; @@ -82090,6 +82136,12 @@ in sources."snyk-module-3.1.0" (sources."snyk-mvn-plugin-2.19.1" // { dependencies = [ + sources."@snyk/cli-interface-2.8.1" + (sources."@snyk/dep-graph-1.19.0" // { + dependencies = [ + sources."tslib-2.0.1" + ]; + }) sources."tmp-0.1.0" sources."tslib-1.11.1" ]; @@ -82110,7 +82162,7 @@ in }) (sources."snyk-policy-1.14.1" // { dependencies = [ - sources."@types/node-6.14.10" + sources."@types/node-6.14.11" sources."hosted-git-info-2.8.8" (sources."snyk-module-2.1.0" // { dependencies = [ @@ -82127,7 +82179,7 @@ in }) (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ - sources."@types/node-6.14.10" + sources."@types/node-6.14.11" sources."debug-3.2.6" sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" @@ -82186,11 +82238,6 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."tar-4.4.13" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) (sources."tar-stream-2.1.3" // { dependencies = [ sources."readable-stream-3.6.0" @@ -82221,7 +82268,7 @@ in sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.10.2" + sources."underscore-1.11.0" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-4.1.1" // { @@ -82231,7 +82278,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."url-parse-lax-3.0.0" @@ -82901,7 +82948,7 @@ in sources."multiserver-3.6.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" - sources."mutexify-1.3.0" + sources."mutexify-1.3.1" sources."muxrpc-6.5.0" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" @@ -83182,7 +83229,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.4.1" + sources."socks-2.4.2" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -83209,7 +83256,7 @@ in ]; }) sources."ssb-ebt-5.6.7" - sources."ssb-friends-4.2.0" + sources."ssb-friends-4.2.1" (sources."ssb-gossip-1.1.1" // { dependencies = [ sources."atomic-file-1.1.5" @@ -83242,7 +83289,7 @@ in sources."ssb-ref-2.14.0" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" - sources."ssb-validate-4.1.1" + sources."ssb-validate-4.1.2" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -83392,7 +83439,7 @@ in sources."ws-1.1.5" ]; }) - sources."@types/babel-types-7.0.8" + sources."@types/babel-types-7.0.9" sources."@types/babylon-6.16.5" sources."accepts-1.3.7" sources."acorn-3.3.0" @@ -83442,7 +83489,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.740.0" // { + (sources."aws-sdk-2.745.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -83677,7 +83724,7 @@ in }) (sources."http-proxy-1.18.1" // { dependencies = [ - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" ]; }) sources."http-signature-1.1.1" @@ -84096,7 +84143,7 @@ in sources."uid2-0.0.3" sources."ultron-1.0.2" sources."unpipe-1.0.0" - (sources."uri-js-4.2.2" // { + (sources."uri-js-4.4.0" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -84859,7 +84906,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -85020,7 +85067,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-module-2.0.0" @@ -85420,7 +85467,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."type-fest-0.8.1" ]; }) @@ -85443,7 +85490,7 @@ in sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."clone-response-1.0.2" sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" @@ -85545,7 +85592,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" @@ -85581,7 +85628,7 @@ in sources."vfile-location-3.1.0" ]; }) - sources."meow-7.1.0" + sources."meow-7.1.1" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -85764,7 +85811,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."url-parse-lax-3.0.0" @@ -86168,7 +86215,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.0" @@ -86293,7 +86340,7 @@ in sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" (sources."express-4.17.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -86398,7 +86445,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - (sources."needle-2.5.0" // { + (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -86550,7 +86597,7 @@ in sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" sources."strtok3-6.0.4" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" sources."to-array-0.1.4" @@ -86566,7 +86613,7 @@ in sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."urlsafe-base64-1.0.0" sources."util-deprecate-1.0.2" @@ -86599,10 +86646,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.120.0"; + version = "0.120.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.120.0.tgz"; - sha512 = "Swffpi3EAHWkmqC1MagKEzR5XgwkDiyeWI3M7vkGbBc0xhq2LcQmJj5DqBruLkrgcZQ+fM/+fSQBU1tDvggO4A=="; + url = "https://registry.npmjs.org/three/-/three-0.120.1.tgz"; + sha512 = "ktaCRFUR7JUZcKec+cBRz+oBex5pOVaJhrtxvFF2T7on53o9UkEux+/Nh1g/4zeb4t/pbxIFcADbn/ACu3LC1g=="; }; buildInputs = globalBuildInputs; meta = { @@ -86734,7 +86781,7 @@ in sources."tweetnacl-0.14.5" sources."uglify-js-3.4.10" sources."universalify-0.1.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.3.3" sources."verror-1.10.0" (sources."winston-1.1.2" // { @@ -86964,7 +87011,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.10" + sources."@types/node-6.14.11" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -87084,10 +87131,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz"; - sha512 = "GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.3.tgz"; + sha512 = "Lh00i69Uf6G74mvYpHCI9KVVXLcHW/xu79YTvH7Mkc9zyKUeSPz0owW0dguj0Scavns3ZOh3wY63J0Zb97Za2g=="; }; buildInputs = globalBuildInputs; meta = { @@ -87102,18 +87149,18 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.9.tgz"; - sha512 = "H+CLr9LrO0xZ0UbDz8K3KK//oBc3XDuj4he86Xnw/zjIPJlknOuiHdmPRYTlgo7/0zGEmvVgxZ+m3aqUMIpIhQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.10.tgz"; + sha512 = "WLrNg3hngoQJc3Ka1NxbWQMYjFJx013Xd9hNiRvHU1NUFMy8H5/5dT83Wh64gr2CJz5zNQlrqTkrfaWbwS/jEQ=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."@primer/octicons-10.0.0" + sources."@primer/octicons-10.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -87134,8 +87181,9 @@ in sources."base64id-2.0.0" sources."better-assert-1.0.2" sources."blob-0.0.5" - sources."blueimp-md5-2.16.0" + sources."blueimp-md5-2.17.0" sources."body-parser-1.19.0" + sources."bootstrap-3.4.1" sources."brace-expansion-1.1.11" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { @@ -87218,7 +87266,7 @@ in sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" - sources."getmac-5.11.0" + sources."getmac-5.15.0" sources."glob-7.1.6" sources."got-9.6.0" sources."has-binary2-1.0.3" @@ -87290,7 +87338,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-7.0.4" + sources."open-7.2.1" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -87409,7 +87457,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-15.3.1" + sources."yargs-15.4.1" sources."yargs-parser-18.1.3" sources."yeast-0.1.2" ]; @@ -87507,6 +87555,57 @@ in bypassCache = true; reconstructLock = true; }; + vscode-json-languageserver-bin = nodeEnv.buildNodePackage { + name = "vscode-json-languageserver-bin"; + packageName = "vscode-json-languageserver-bin"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-json-languageserver-bin/-/vscode-json-languageserver-bin-1.0.1.tgz"; + sha512 = "WU+Ks0OEo1c4pgFUA4gIockhzlRqWqSRL2NXHOCtYhJnuIqfrNgSyECZC+nCMyn/CnzpPuQQjzC74GWlIRXnZQ=="; + }; + dependencies = [ + sources."agent-base-4.3.0" + sources."debug-3.1.0" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."http-proxy-agent-2.1.0" + sources."https-proxy-agent-2.2.4" + sources."jsonc-parser-1.0.3" + sources."ms-2.0.0" + (sources."request-light-0.2.5" // { + dependencies = [ + sources."vscode-nls-4.1.2" + ]; + }) + (sources."vscode-json-languageservice-3.8.3" // { + dependencies = [ + sources."jsonc-parser-2.3.0" + sources."vscode-nls-4.1.2" + sources."vscode-uri-2.1.2" + ]; + }) + sources."vscode-jsonrpc-3.5.0" + sources."vscode-languageserver-3.5.1" + (sources."vscode-languageserver-protocol-3.5.1" // { + dependencies = [ + sources."vscode-languageserver-types-3.5.0" + ]; + }) + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" + sources."vscode-nls-2.0.2" + sources."vscode-uri-1.0.8" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JSON language server"; + homepage = "https://github.com/vscode-langservers/vscode-json-languageserver-bin#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; packageName = "vue-cli"; @@ -87537,7 +87636,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - sources."bl-1.2.2" + sources."bl-1.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."buffer-5.6.0" @@ -87760,12 +87859,12 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.10.2" + sources."uglify-js-3.10.3" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" sources."unzip-response-2.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" sources."user-home-2.0.0" @@ -87819,7 +87918,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-14.6.0" + sources."@types/node-14.6.3" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -87942,7 +88041,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."cliui-4.1.0" @@ -88032,7 +88131,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-0.7.0" @@ -88658,7 +88761,7 @@ in }) sources."untildify-2.1.0" sources."update-notifier-3.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -88770,7 +88873,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."JSONSelect-0.2.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" @@ -88839,7 +88942,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.1.0" sources."bindings-1.5.0" - (sources."bl-1.2.2" // { + (sources."bl-1.2.3" // { dependencies = [ (sources."readable-stream-2.3.7" // { dependencies = [ @@ -88916,7 +89019,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -89030,7 +89133,11 @@ in sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."event-to-promise-0.8.0" @@ -89543,7 +89650,7 @@ in }) sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."table-5.4.6" (sources."tar-stream-1.6.2" // { dependencies = [ @@ -89601,7 +89708,7 @@ in sources."chalk-3.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -89881,7 +89988,11 @@ in }) sources."errno-0.1.7" sources."eslint-scope-4.0.3" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" @@ -90193,7 +90304,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -90564,7 +90675,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."accepts-1.3.7" sources."ajv-6.12.4" sources."ajv-errors-1.0.1" @@ -90696,7 +90807,7 @@ in sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."eventemitter3-4.0.6" + sources."eventemitter3-4.0.7" sources."eventsource-1.0.7" sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { @@ -91094,7 +91205,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -91143,17 +91254,17 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.0.3"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz"; - sha512 = "q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.1.0.tgz"; + sha512 = "aWjIuLt1OVQxaDVffnt3bnGmLA8zGgAJaFwPA+a+QYVPh1vhIKjVfh3SbOFLV0kRPvGBITbw17n5CsmiBS4LQQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@npmcli/move-file-1.0.1" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."aggregate-error-3.1.0" sources."ajv-6.12.4" sources."ajv-keywords-3.5.2" @@ -91228,7 +91339,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.1.9" sources."safe-buffer-5.2.1" - sources."schema-utils-2.7.0" + sources."schema-utils-2.7.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" sources."slash-3.0.0" @@ -91239,7 +91350,7 @@ in sources."to-regex-range-5.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."webpack-sources-1.4.3" sources."wrappy-1.0.2" sources."yallist-4.0.0" @@ -91274,7 +91385,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.15" + sources."@types/node-13.13.16" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -91427,7 +91538,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.2.0" + sources."open-7.2.1" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-1.2.0" (sources."parse-torrent-7.1.3" // { @@ -91602,10 +91713,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.0.tgz"; - sha512 = "d2/7eGgonEIRcnW9kK+k+ERG4gTOk5BXHr9KjTVv8gEarXKa62Kk+nyFE4AXgMDZ0LXTu8nTuN/AdboJiGN+pQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz"; + sha512 = "R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -91622,7 +91733,7 @@ in sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.1" + sources."vscode-json-languageservice-3.8.3" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -91653,15 +91764,14 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.22.4"; + version = "1.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.4.tgz"; - sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.5.tgz"; + sha512 = "5uzKXwdMc++mYktXqkfpNYT9tY8ViWegU58Hgbo+KXzrzzhEyP1Ip+BTtXloLrXNcNlxFJbLiFKGaS9vK9ym6Q=="; }; buildInputs = globalBuildInputs; meta = { description = "📦🐈 Fast, reliable, and secure dependency management."; - homepage = "https://github.com/yarnpkg/yarn#readme"; license = "BSD-2-Clause"; }; production = true; @@ -91687,7 +91797,7 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.0" + sources."@types/node-14.6.3" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -92045,7 +92155,7 @@ in sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -92070,7 +92180,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."locutus-2.0.11" + sources."locutus-2.0.12" sources."lodash-4.17.20" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" @@ -92221,7 +92331,7 @@ in sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.3.0" + sources."pretty-bytes-5.4.1" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" @@ -92476,7 +92586,7 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" @@ -92563,12 +92673,12 @@ in sources."ansi-regex-3.0.0" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."type-fest-0.11.0" sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.11.0" // { + (sources."yeoman-generator-4.12.0" // { dependencies = [ sources."debug-4.2.0" sources."diff-4.0.2" diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix new file mode 100644 index 000000000000..512748907003 --- /dev/null +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "csexp"; + version = "1.3.1"; + + useDune2 = true; + + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz"; + sha256 = "0maihbqbqq9bwr0r1cv51r3m4hrkx9cf5wnxcz7rjgn13lcc9s49"; + }; + + postPatch = '' + substituteInPlace src/csexp.ml --replace Result.result Result.t + ''; + + meta = with lib; { + homepage = "https://github.com/ocaml-dune/csexp"; + description = "Minimal support for Canonical S-expressions"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index fcb93aac799d..65c55da6e3b3 100644 --- a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-action-plugin"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/dune-build-info/default.nix b/pkgs/development/ocaml-modules/dune-build-info/default.nix index 3c828ebdcdb9..5d9f105782b4 100644 --- a/pkgs/development/ocaml-modules/dune-build-info/default.nix +++ b/pkgs/development/ocaml-modules/dune-build-info/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-build-info"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index aa12ebc8d796..16e365dd4f38 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -1,15 +1,15 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_2, csexp, result }: buildDunePackage rec { pname = "dune-configurator"; useDune2 = true; - inherit (dune_2) src version; + inherit (dune_2) src version patches; dontAddPrefix = true; - propagatedBuildInputs = [ dune-private-libs ]; + propagatedBuildInputs = [ csexp result ]; meta = with lib; { description = "Helper library for gathering system configuration"; diff --git a/pkgs/development/ocaml-modules/dune-glob/default.nix b/pkgs/development/ocaml-modules/dune-glob/default.nix index 34b79068c115..c7c6f9be4ee0 100644 --- a/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-glob"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 9eb253f02e5b..8a635efa3a59 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { useDune2 = true; - inherit (dune_2) src version; + inherit (dune_2) src version patches; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 731a5303ff51..39201d0570b3 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, piqi, camlp4 }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }: stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.7.7"; pname = "piqi-ocaml"; + name = "ocaml${ocaml.version}-${pname}-${version}"; - src = fetchurl { - url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz"; - sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv"; + src = fetchFromGitHub { + owner = "alavrik"; + repo = pname; + rev = "v${version}"; + sha256 = "1913jpsb8mvqi8609j4g4sm5jhg50dq0xqxgy8nmvknfryyc89nm"; }; - patches = [ (fetchpatch { - url = "https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch"; - sha256 = "071s4xjyr6xx95v6az2lbl2igc87n7z5jqnnbhfq2pidrxakd0la"; - })]; - - buildInputs = [ ocaml findlib piqi camlp4 ]; + buildInputs = [ ocaml findlib piqi stdlib-shims ]; createFindlibDestdir = true; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 48aa68f30540..1f314dc7408a 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.32.2-r1"; + version = "3.33.0-r1"; disabled = isPyPy; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "0gwhcvklrgng8gg6in42h0aj2bsq522bhhs2pp3cqdrmypkjdm59"; + sha256 = "05mxcw1382xx22285fnv92xblqby3adfrvvalaw4dc6rzsn6kcan"; }; buildInputs = [ sqlite ]; diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index e5879bd4e8c3..3c019cdf31ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "211527511d7616a383cc196956eaf2b7ee016f2367d367924b3715f2a41106da"; + sha256 = "fe6e216ce7293219b7d8d1cbcca7cf2f4511f134c2bf0b3455078bf086436c5f"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 8e186da6d880..603bd81ad1cb 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "9.2.0"; + version = "9.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e7904b60c42a153b64b1604f3c698602686b38787bebdaed6e808cd43b6e5967"; + sha256 = "04ca071d1d6af854b6a5947c5aed803924ccbd2ea0d240285b6fa68dc4ab75a9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index fd6cd26c7c6c..a4b1679b250a 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -7,6 +7,7 @@ , msrestazure , azure-common , azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { @@ -23,6 +24,7 @@ buildPythonPackage rec { msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 3873f08e3ce2..d5e4226b5ccc 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f65c1985a47e0ac55e7d5d9cc1bd5e95335a111566edc289d460aa2bc8f80991"; + sha256 = "b12318392e6f5100246c60de88879e24b15db104d00f9704a4ff51e7344594f1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 8e101ef051ac..b6cd9ca5c8ad 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "11.1.0"; + version = "11.2.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ef23587c1b6dc0866ebf0e91e83ba05d7f7e4fea7951b704781b9cd9f5f27f1c"; + sha256 = "fc8e3cbf3c58cab98d9b2218c774dae2cc90b693f5ab5a24a7a959febe6c0528"; }; propagatedBuildInputs = [ azure-mgmt-common ]; diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix new file mode 100644 index 000000000000..ffdb6eb53788 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, azure-common +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-mgmt-synapse"; + version = "0.3.0"; + disabled = pythonOlder "3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + msrest + msrestazure + ]; + + pythonImportsCheck = [ "azure.mgmt.synapse" ]; + + meta = with lib; { + description = "Azure python SDK"; + homepage = "https://github.com/Azure/azure-sdk-for-python/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 2d1ff4c29164..18e4a12d3b36 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.3.5"; + version = "0.4.1"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "71c238c785786a159b3ffd587a5e7fa1d9a517b66b592ae277fed73a9fbfa2b0"; + sha256 = "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix new file mode 100644 index 000000000000..d9d0941abde0 --- /dev/null +++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-synapse-accesscontrol"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + pythonImportsCheck = [ "azure.synapse.accesscontrol" ]; + + meta = with lib; { + description = "Azure python SDK"; + homepage = "https://github.com/Azure/azure-sdk-for-python/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix new file mode 100644 index 000000000000..bf75e987bdcb --- /dev/null +++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-synapse-spark"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qijqp6llshqas422lnqvpv45iv99n7f13v86znql40y3jp5n3ir"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + pythonImportsCheck = [ "azure.synapse.spark" ]; + + meta = with lib; { + description = "Azure python SDK"; + homepage = "https://github.com/Azure/azure-sdk-for-python/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix new file mode 100644 index 000000000000..130d07d61ff4 --- /dev/null +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -0,0 +1,35 @@ +{ stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + black +}: + +buildPythonPackage rec { + pname = "black-macchiato"; + version = "1.3.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "wbolster"; + repo = pname; + rev = version; + sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl"; + }; + + propagatedBuildInputs = [ black ]; + + checkInputs = [ pytestCheckHook black ]; + + pythonImportsCheck = [ "black" ]; + + meta = with stdenv.lib; { + description = "This is a small utility built on top of the black Python code formatter to enable formatting of partial files"; + homepage = "https://github.com/wbolster/black-macchiato"; + license = licenses.bsd3; + maintainers = with maintainers; [ jperras ]; + }; + +} diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix new file mode 100644 index 000000000000..2e433aa5d459 --- /dev/null +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }: + +buildPythonPackage rec { + pname = "django-maintenance-mode"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "fabiocaccamo"; + repo = pname; + rev = version; + sha256 = "1k06fhqd8wyrkp795x5j2r328l2phqgg1m1qm7fh4l2qrha43aw6"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Shows a 503 error page when maintenance-mode is on"; + homepage = "https://github.com/fabiocaccamo/django-maintenance-mode"; + maintainers = with maintainers; [ mrmebelman ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/dnspython/1.nix b/pkgs/development/python-modules/dnspython/1.nix new file mode 100644 index 000000000000..d4ebaf82b3d2 --- /dev/null +++ b/pkgs/development/python-modules/dnspython/1.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, lib, pythonOlder }: + +buildPythonPackage rec { + pname = "dnspython"; + version = "1.16.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; + }; + + # needs networking for some tests + doCheck = false; + + meta = { + description = "A DNS toolkit for Python 3.x"; + homepage = "http://www.dnspython.org"; + # BSD-like, check http://www.dnspython.org/LICENSE for details + license = lib.licenses.free; + }; +} diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index 7ca97cba8831..fb1bf7549fcc 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -1,15 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }: buildPythonPackage rec { version = "4.0.0"; pname = "ftputil"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "d494c47f24fd3f8fbe92d40d90e0902c0e04288f200688af2b16d6b46fe441e1"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest freezegun ]; checkPhase = '' touch Makefile diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index d34fc8cb5704..73bdb31da9d8 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "068nkdbag049cjs9q3rrs5j5f1239202y0g9xblii6rr0fjgyhf3"; + sha256 = "c37ff4b93606e6a452b72cdb992da5e0544be12912fac01b31ddbdd61f6d5bd0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index 5011ef7efb93..bf8a9d3bbdbd 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -18,9 +18,10 @@ buildPythonPackage rec { sqlalchemy ]; - checkPhase = '' - ${python.interpreter} tests/test_citext.py - ''; + # tests are not packaged in pypi tarball + doCheck = false; + + pythonImportsCheck = [ "citext" ]; meta = with lib; { description = "A sqlalchemy plugin that allows postgres use of CITEXT"; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index cc73e1469092..e450bbefe242 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.2.4"; + version = "2.2.5"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "0vrl9q7rm8bjxbb5076qx2cbva1wp1gp6z0pjwpg70z90gp49n2p"; + sha256 = "1x9crby4idkvfy6i5l0r00ixnx3ij68zjh1l5n92hyzlf0snv28d"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index a9ea826e2f63..cc3ef8ed0f7f 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.132.0"; + version = "0.133.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1080kf2zxhbgz1zhm54w3hqbbvwpfllapcq4pgwahfyvf6zb86d7"; + sha256 = "1r4s4gw50pvp4r4mq2w45s9i7fbkf7zycgp8rrj1dqzmkl9v6kii"; }; installPhase = '' @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; + broken = stdenv.isAarch64; # https://github.com/facebook/flow/issues/7556 maintainers = with maintainers; [ marsam puffnfresh ]; }; } diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 23ca35b3717e..f04d060290f1 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "hotspot"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "v${version}"; - sha256 = "05rkzrvak93z8mzcpm4mcjxb933l8pjsxr9a595wfn1gn2ihmada"; + sha256 = "1f68bssh3p387hkavfjkqcf7qf7w5caznmjfjldicxphap4riqr5"; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix new file mode 100644 index 000000000000..adf17dabecee --- /dev/null +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "svlint"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = "svlint"; + rev = "v${version}"; + sha256 = "0gn68achvhyxljvhw5rwraxjcgdwrl1bwbsn596ka15nrk4lwb34"; + }; + + cargoSha256 = "0v94zsh4jhzjnqbkgwn8rjbs72i5cw2nmkwn7xhdbbwxh17a88x4"; + + meta = with lib; { + description = "SystemVerilog linter"; + homepage = "https://github.com/dalance/svlint"; + license = licenses.mit; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 95e38e3a0f5e..ec47fdadd1b9 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "15pnyi6gay287vkcrgsirsyyps3ya2lsih1ljkcsqdxzr596mcv3"; + sha256 = "13kqcdrdzkbg6h5za6hhkzdx4nbrg5yl97ydj2hfcakl00q4y0dp"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index c2dadeb6a933..664dd61246d6 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "dapper"; - version = "0.5.1"; + version = "0.5.3"; goPackagePath = "github.com/rancher/dapper"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "rancher"; repo = "dapper"; rev = "v${version}"; - sha256 = "0sf56ii4sn2wdq5kiyl02sgvq0lvynzgiq8v5wrkkabj5107fiqw"; + sha256 = "1h62jahrxpmqx6r3mlakzap8gisrymgkp5syyarpab05qm1inngd"; }; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} diff --git a/pkgs/development/tools/misc/asls/default.nix b/pkgs/development/tools/misc/asls/default.nix index 6999eb3e47a4..5b53456deac6 100644 --- a/pkgs/development/tools/misc/asls/default.nix +++ b/pkgs/development/tools/misc/asls/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "asls"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz"; - sha256 = "14dcms0xl6dncwf16vixvf7rq7g15iwq8h4vja0dsiisyfm08aks"; + sha256 = "1h6r2lbf54aylzmbiy74ys42fhjv9q824bdrcp40gxx1v2yjc5h5"; }; buildInputs = [ erlangR22 ]; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 716a30587852..a6b0383d54f7 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -24,12 +24,12 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-08-04"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "77c33c1d71a8c303f53ccad577eb0a3799e87bda"; - sha256 = "10pwiww96dbbszzvnj7abn851h89n30ziahjj2zm3liyzyvbylyf"; + rev = "e707990e2d6afab203c7ef1d769d49c564eff151"; + sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa"; }; nix = nixFlakes; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index eac705294f39..30823b43acbc 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, fetchpatch }: if stdenv.lib.versionOlder ocaml.version "4.08" then throw "dune is not available for OCaml ${ocaml.version}" @@ -6,17 +6,25 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "058wiyncczbmlfxj3cnwn5n68wkmbaf4mgjm2bkp2hffpn2wl5xl"; + sha256 = "0lnfmc06yhbdiv6mmp0aksnnvzz4aw4zabrdg89p5msyzir3qrvn"; }; buildInputs = [ ocaml findlib ]; buildFlags = "release"; + patches = [ + # Fix setup.ml configure path. Remove with the next release. + (fetchpatch { + url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch"; + sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28"; + }) + ]; + dontAddPrefix = true; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index ed1a4361120e..54712be2b6ec 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.8"; + version = "3.3.9"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "0j27piq9hqhr2jp89ni73kchw33pcx7gnjkh8rd6qa8hc12xd794"; + sha256 = "00ng8299l5rzpak8ljxzr6dgxw6z52ivm91159ahv09xk4d0y5x3"; }; buildInputs = [ yojson ]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index dfdd921fd03d..22ce3553352f 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.4"; + version = "1.22.5"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1s054c9cmlmzy6cfkawhaxvaxhqcq0a17n4sb12p0bp2lzkax9lm"; + sha256 = "1yb1pb80jhw6mx1r28hf7zd54dygmnrf30r3fz7kn9nrgdpl5in8"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 00df6f338210..f31a44e97c09 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -2,6 +2,7 @@ , lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools +, llvm , withServer ? true }: @@ -27,6 +28,7 @@ mkDerivation rec { buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image fpc lua5_1 + llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 ffmpeg_3 freeglut physfs qtbase ] ++ lib.optional withServer ghc; @@ -34,6 +36,10 @@ mkDerivation rec { postPatch = '' substituteInPlace gameServer/CMakeLists.txt \ --replace mask evaluate + + # compile with fpc >= 3.2.0 + # https://github.com/archlinux/svntogit-community/blob/75a1b3900fb3dd553d5114bbc8474d85fd6abb02/trunk/PKGBUILD#L26 + sed -i 's/procedure ShiftWorld(Dir: LongInt); inline;/procedure ShiftWorld(Dir: LongInt);/' hedgewars/uWorld.pas ''; cmakeFlags = [ @@ -42,7 +48,7 @@ mkDerivation rec { ]; - # hslogger brings network-3 and network-bsd which conflict with + # hslogger brings network-3 and network-bsd which conflict with # network-2.6.3.1 preConfigure = '' substituteInPlace gameServer/CMakeLists.txt \ @@ -97,6 +103,5 @@ mkDerivation rec { all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; inherit (ghc.meta) platforms; - hydraPlatforms = []; }; } diff --git a/pkgs/games/left4gore/default.nix b/pkgs/games/left4gore/default.nix new file mode 100644 index 000000000000..597f7da2b3d2 --- /dev/null +++ b/pkgs/games/left4gore/default.nix @@ -0,0 +1,48 @@ +{ stdenvNoCC, lib, fetchurl, buildFHSUserEnv }: + +let + version = "2.3"; + + # Unwrapped package, for putting into the FHS env + left4gore-unwrapped = stdenvNoCC.mkDerivation { + pname = "left4gore-unwrapped"; + inherit version; + + src = fetchurl { + url = "http://www.left4gore.com/dist/left4gore-${version}-linux.tar.gz"; + sha256 = "1n57nh32ybn6kirn8djh0nsjx6m84c0jfi1x8r4w2qr0qky3z7p0"; + }; + + installPhase = '' + mkdir -p $out/bin + cp left4gore $out/bin + ''; + }; + + # FHS env, as patchelf will not work + env = buildFHSUserEnv { + name = "left4gore-env-${version}"; + targetPkgs = _: [ left4gore-unwrapped ]; + runScript = "left4gore"; + }; + +in stdenvNoCC.mkDerivation { + pname = "left4gore"; + inherit version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + ln -s ${env}/bin/* $out/bin/left4gore + ''; + + meta = with lib; { + homepage = "http://www.left4gore.com"; + description = "Memory patcher which adds the gore back into Left 4 Dead 2"; + license = licenses.unfree; # Probably the best choice + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 2c7cde78c438..189c4d1c1076 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -89,6 +89,7 @@ in buildFHSUserEnv rec { at-spi2-core # CrossCode gst_all_1.gstreamer gst_all_1.gst-plugins-ugly + gst_all_1.gst-plugins-base libdrm mono xorg.xkeyboardconfig @@ -193,8 +194,6 @@ in buildFHSUserEnv rec { SDL_mixer SDL2_ttf SDL2_mixer - gstreamer - gst-plugins-base libappindicator-gtk2 libcaca libcanberra diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index b2d601df3498..b6e1da204edf 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -1,7 +1,26 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig -, lua, fpc, pcre, portaudio, freetype, libpng -, SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf -, ffmpeg, sqlite, zlib, libX11, libGLU, libGL }: +{ stdenv +, autoreconfHook +, fetchFromGitHub +, fetchpatch +, pkgconfig +, lua +, fpc +, pcre +, portaudio +, freetype +, libpng +, SDL2 +, SDL2_image +, SDL2_gfx +, SDL2_mixer +, SDL2_net, SDL2_ttf +, ffmpeg +, sqlite +, zlib +, libX11 +, libGLU +, libGL +}: let sharedLibs = [ @@ -12,17 +31,25 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "unstable-2019-01-07"; + version = "2020.4.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; - rev = "3df142590f29db1505cc58746af9f8cf7cb4a6a5"; - sha256 = "0853rg7vppkmw37wm9xm0m0wab3r09ws6w04xs2wgwj1mwl0d70j"; + rev = "v${version}"; + sha256 = "0vmfv8zpyf8ymx3rjydpd7iqis080lni94vb316vfxkgvjmqbhym"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ fpc libpng ] ++ sharedLibs; + patches = [ + (fetchpatch { + name = "fpc-3.2-support.patch"; + url = "https://github.com/UltraStar-Deluxe/USDX/commit/1b8e8714c1523ef49c2fd689a1545d097a3d76d7.patch"; + sha256 = "02zmjymj9w1mkpf7armdpf067byvml6lprs1ca4lhpkv45abddp4"; + }) + ]; + postPatch = '' substituteInPlace src/config.inc.in \ --subst-var-by libpcre_LIBNAME libpcre.so.1 diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 77b1777ab634..378a252e9da0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -329,12 +329,12 @@ let clang_complete = buildVimPluginFrom2Nix { pname = "clang_complete"; - version = "2020-05-06"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "10e5102af5d1b16ba7aa3fb51d67153041f82ed7"; - sha256 = "0crynvmdp9a5rws5hfnsn19kxqviyp29n8fz40wq7k1g5vrhvdl7"; + rev = "e0f5c246883fb06b6331ff5bec8ef1c3c71af3d4"; + sha256 = "0kincdj1l3d552pjnrdjcl72fpln6klc85b01m1sn2b2dlin3xhz"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; @@ -363,18 +363,6 @@ let meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; - coc-css = buildVimPluginFrom2Nix { - pname = "coc-css"; - version = "2020-06-28"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-css"; - rev = "a8cde12697de70dddf235ada61dc3601a6c04b57"; - sha256 = "03n7czxiraa9pjcdfigmxgwyprpijbs0vhmzccxx0nwm038291y6"; - }; - meta.homepage = "https://github.com/neoclide/coc-css/"; - }; - coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; version = "2019-01-19"; @@ -387,38 +375,14 @@ let meta.homepage = "https://github.com/neoclide/coc-denite/"; }; - coc-emmet = buildVimPluginFrom2Nix { - pname = "coc-emmet"; - version = "2020-07-16"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-emmet"; - rev = "8f25e0b7deb1cd54ce096cf713147662c43781f6"; - sha256 = "0z9y8nxzjqf78l7hmq59by559f178jxhadn82h1hwqmdjpq72jcm"; - }; - meta.homepage = "https://github.com/neoclide/coc-emmet/"; - }; - - coc-eslint = buildVimPluginFrom2Nix { - pname = "coc-eslint"; - version = "2020-08-22"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-eslint"; - rev = "ba4d02c324e3eb5d5f111fe510f623ef14ee340c"; - sha256 = "1badkyfa8zznwlb9a6kqxnyylcjb72rfjrzb48pvx2dr7s631x8g"; - }; - meta.homepage = "https://github.com/neoclide/coc-eslint/"; - }; - coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-08-12"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "b05b60c9e53a657f4a7c4dcf064032ce806cd0f4"; - sha256 = "10z3xrkkj0140a8cbix7yrky7nsczjcdflnl7a8b0ywwq16jd3hp"; + rev = "e1ef6be69cbafff868a45d2b20a6b2325f4baa26"; + sha256 = "0acwlr4pr87jx0a83mq73dh9jwd4iwnv1rs6pd2mdbj4ix0avxyw"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -435,138 +399,18 @@ let meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; - coc-git = buildVimPluginFrom2Nix { - pname = "coc-git"; - version = "2020-08-21"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-git"; - rev = "5a768cd395fc94e0448c596fafaf5f78d15fb968"; - sha256 = "019mb2v7ldyzjjh86kxyxrbrgyf9chgp0f0nkwk0fiwf2qi2141y"; - }; - meta.homepage = "https://github.com/neoclide/coc-git/"; - }; - - coc-go = buildVimPluginFrom2Nix { - pname = "coc-go"; - version = "2020-08-25"; - src = fetchFromGitHub { - owner = "josa42"; - repo = "coc-go"; - rev = "fbac3db20cc5e728b6f1c86bbb73414254c3dce3"; - sha256 = "1d9izf0ypnpbwg15kz3fd62gzz6c5h5568ydc7h5hxh4zj5qfg5h"; - }; - meta.homepage = "https://github.com/josa42/coc-go/"; - }; - - coc-highlight = buildVimPluginFrom2Nix { - pname = "coc-highlight"; - version = "2019-10-18"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-highlight"; - rev = "b4e82ebd5fe855d004dd481e2ecf2fa88faed284"; - sha256 = "06h64jq8cgj5hc19inidns046kkb76750179jsw7xv5zbp93ygap"; - }; - meta.homepage = "https://github.com/neoclide/coc-highlight/"; - }; - - coc-html = buildVimPluginFrom2Nix { - pname = "coc-html"; - version = "2020-07-28"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-html"; - rev = "36aaa65d5ee7d998727776739d03affcc26bbe5b"; - sha256 = "07vb9jgy9bpq5k1gymr2ys8smafcrybf0nmpkfsq8scqxsydnnq9"; - }; - meta.homepage = "https://github.com/neoclide/coc-html/"; - }; - - coc-imselect = buildVimPluginFrom2Nix { - pname = "coc-imselect"; - version = "2020-02-18"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-imselect"; - rev = "01442d2fb7d344122e59755f59782a0e1bf7d294"; - sha256 = "1vqx9yna66njdw1my15ac6djr3yvnb6das96nx12mpingnw85kky"; - }; - meta.homepage = "https://github.com/neoclide/coc-imselect/"; - }; - - coc-java = buildVimPluginFrom2Nix { - pname = "coc-java"; - version = "2020-08-11"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-java"; - rev = "aed8ccb10acf1863fb0fe622f21c3a0be18e362f"; - sha256 = "1hrwj4x09gnqnwv43bxx9w2y3nrhqbjc3yl2q8ck22212s66wkpi"; - }; - meta.homepage = "https://github.com/neoclide/coc-java/"; - }; - - coc-jest = buildVimPluginFrom2Nix { - pname = "coc-jest"; - version = "2020-05-27"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-jest"; - rev = "431471caa9011868327fff0f9f7e0a944b7ca33b"; - sha256 = "0vcri3kp8njsp4zgl74vc6ydhxq5spzx6pm798jh2lvrid2byvg9"; - }; - meta.homepage = "https://github.com/neoclide/coc-jest/"; - }; - - coc-json = buildVimPluginFrom2Nix { - pname = "coc-json"; - version = "2020-05-12"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-json"; - rev = "66b482dbc8008b9a111e6141aa2e63baa16fb2d4"; - sha256 = "0ixqk417ba1yz7lnjkir5h9h8qm5jc9sh2190vmddxr8wgxhjhbb"; - }; - meta.homepage = "https://github.com/neoclide/coc-json/"; - }; - - coc-lists = buildVimPluginFrom2Nix { - pname = "coc-lists"; - version = "2020-07-23"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-lists"; - rev = "bf352d6befd23804897a08b50fa6edcea676a7b3"; - sha256 = "0r8sbw4pgaay2zjh2rv1x926hs8jixznanc2dxjvicjnmgbg1nmn"; - }; - meta.homepage = "https://github.com/neoclide/coc-lists/"; - }; - coc-markdownlint = buildVimPluginFrom2Nix { pname = "coc-markdownlint"; - version = "2020-08-02"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "a1d6162a898b1538eb061675a63251cbd4eb8470"; - sha256 = "0gmci9x7kppv14lr8x8fnmkq1rp5lm8x66904fy419jipnl96g6g"; + rev = "9e68427e138bcce5440fd29fd632081962f6c6e9"; + sha256 = "064afqfjjx1ad26sgbypzivcpdx5n45wa5d93dbib4wrvkkqyslm"; }; meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; }; - coc-metals = buildVimPluginFrom2Nix { - pname = "coc-metals"; - version = "2020-08-21"; - src = fetchFromGitHub { - owner = "ckipp01"; - repo = "coc-metals"; - rev = "e2f5e3c2bc6a8226cea5a607585f6db554e15846"; - sha256 = "0kp8q5ds9b64acmkc006664460lfcahly65bx5x95rvy0wy8z5b1"; - }; - meta.homepage = "https://github.com/ckipp01/coc-metals/"; - }; - coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2020-04-07"; @@ -579,114 +423,6 @@ let meta.homepage = "https://github.com/neoclide/coc-neco/"; }; - coc-pairs = buildVimPluginFrom2Nix { - pname = "coc-pairs"; - version = "2020-03-09"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-pairs"; - rev = "79deeaabdc4f091c22f3dd67d439a0a336e8aa7e"; - sha256 = "1w6p2dk7yj8ldxg1qxh9zpn9ypm6gn66gi0vbax33wf5c0dmp0v9"; - }; - meta.homepage = "https://github.com/neoclide/coc-pairs/"; - }; - - coc-prettier = buildVimPluginFrom2Nix { - pname = "coc-prettier"; - version = "2020-07-23"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-prettier"; - rev = "4857302b60bb0c9db20fa8db71b0eac4696c9254"; - sha256 = "114yn1sc457jc9jp5hvw3k0dvm0i9bcn6v2dqvb9dgwskq78ca7f"; - }; - meta.homepage = "https://github.com/neoclide/coc-prettier/"; - }; - - coc-python = buildVimPluginFrom2Nix { - pname = "coc-python"; - version = "2020-06-15"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-python"; - rev = "241c6b39e6618279b619926269431ef45de87840"; - sha256 = "1x3lrk4x7qhp9pg8x11k36pcgd5f45la4r77fq82jy307s5dny20"; - }; - meta.homepage = "https://github.com/neoclide/coc-python/"; - }; - - coc-r-lsp = buildVimPluginFrom2Nix { - pname = "coc-r-lsp"; - version = "2019-12-07"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-r-lsp"; - rev = "a1b97e36c601975a8d730b6965f25592b1ecd1e7"; - sha256 = "04g1kbgm8p0asrsibmg4w6wj8i2xzwc70g7rkcs2bj3pakbkvws6"; - }; - meta.homepage = "https://github.com/neoclide/coc-r-lsp/"; - }; - - coc-rls = buildVimPluginFrom2Nix { - pname = "coc-rls"; - version = "2020-08-11"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-rls"; - rev = "49ed83bb6d6bc01142ba18774575987b12857aee"; - sha256 = "05lbfl60ka9zx8s6ack92v3vk3zj47w1fscdfkdqafcaqizlgia1"; - }; - meta.homepage = "https://github.com/neoclide/coc-rls/"; - }; - - coc-rust-analyzer = buildVimPluginFrom2Nix { - pname = "coc-rust-analyzer"; - version = "2020-08-31"; - src = fetchFromGitHub { - owner = "fannheyward"; - repo = "coc-rust-analyzer"; - rev = "d66f9a5744477b317423d06463331df7b80a0a7f"; - sha256 = "0vlbyjz09n0zvkbx1kks44mawn21xr24ry28z21zgcv6r0clh1xk"; - }; - meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; - }; - - coc-smartf = buildVimPluginFrom2Nix { - pname = "coc-smartf"; - version = "2019-07-26"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-smartf"; - rev = "d40714eab8e5fe26fac492ffd30e98cd1bfbdec5"; - sha256 = "0kfrq5hk8zn24cl7fiy48nyvd30a2dva93c61079axkdg9912yd7"; - }; - meta.homepage = "https://github.com/neoclide/coc-smartf/"; - }; - - coc-snippets = buildVimPluginFrom2Nix { - pname = "coc-snippets"; - version = "2020-06-10"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-snippets"; - rev = "a36f36afe7094562756202d1bb88c1f80597393e"; - sha256 = "117idj29gk8psj27zmwazanwxf4br08mlkcpnkxyw6blm5aibzpp"; - }; - meta.homepage = "https://github.com/neoclide/coc-snippets/"; - }; - - coc-solargraph = buildVimPluginFrom2Nix { - pname = "coc-solargraph"; - version = "2020-08-16"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-solargraph"; - rev = "e61385cc483768afc8d8c064b5c98baa474d0d9c"; - sha256 = "1hiy12h85z8m6i4nc92jpi6z0zph8rpdmgb75czhy5y0cjwkn59q"; - }; - meta.homepage = "https://github.com/neoclide/coc-solargraph/"; - }; - coc-spell-checker = buildVimPluginFrom2Nix { pname = "coc-spell-checker"; version = "2020-08-01"; @@ -699,78 +435,6 @@ let meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; - coc-stylelint = buildVimPluginFrom2Nix { - pname = "coc-stylelint"; - version = "2019-08-20"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-stylelint"; - rev = "288a372261cbc23ae4a6e26b1621c6e3218d00ad"; - sha256 = "1qir8diqnv1a78lzw9p3jsbni52gdg38rx1lj5i4iyff9282ir2x"; - }; - meta.homepage = "https://github.com/neoclide/coc-stylelint/"; - }; - - coc-tabnine = buildVimPluginFrom2Nix { - pname = "coc-tabnine"; - version = "2020-01-06"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tabnine"; - rev = "442c829185ecab2268d1b9fd076c5286bbd39562"; - sha256 = "0as4b33nnp7anqbxkkja8lp37y4a74b3507zyk3gmmna0my1ca3r"; - }; - meta.homepage = "https://github.com/neoclide/coc-tabnine/"; - }; - - coc-tslint = buildVimPluginFrom2Nix { - pname = "coc-tslint"; - version = "2019-07-03"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tslint"; - rev = "6128761577806d7047fa05d1a527945490d6316c"; - sha256 = "1vi4vrawknkd5wjyb0j143jbfis9vaanl219a7argirwjs057vpd"; - }; - meta.homepage = "https://github.com/neoclide/coc-tslint/"; - }; - - coc-tslint-plugin = buildVimPluginFrom2Nix { - pname = "coc-tslint-plugin"; - version = "2019-07-18"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tslint-plugin"; - rev = "acc1356253a5088f630d9910b5fc13dc5d108bbc"; - sha256 = "1cjgimqgd70x5zhw641z6g4hc54vrkg3r4sscg092gkrdpkq3969"; - }; - meta.homepage = "https://github.com/neoclide/coc-tslint-plugin/"; - }; - - coc-tsserver = buildVimPluginFrom2Nix { - pname = "coc-tsserver"; - version = "2020-08-21"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tsserver"; - rev = "516f2bd75afee70bb8668aa2ecbc00ebfd5984a0"; - sha256 = "1qdgm9w9d9n0aq5y77zlhxzjdilxky7n4ipl6y6gr2pirxw5idw5"; - }; - meta.homepage = "https://github.com/neoclide/coc-tsserver/"; - }; - - coc-vetur = buildVimPluginFrom2Nix { - pname = "coc-vetur"; - version = "2020-08-22"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-vetur"; - rev = "217251dd0fe87d951e630e8fa9d4cde84da0ec91"; - sha256 = "13ni7j70pcz9w856hrgnbm0jsv7a22f1r42wnvif5lvhrcfw3y9d"; - }; - meta.homepage = "https://github.com/neoclide/coc-vetur/"; - }; - coc-vimlsp = buildVimPluginFrom2Nix { pname = "coc-vimlsp"; version = "2020-08-01"; @@ -783,54 +447,6 @@ let meta.homepage = "https://github.com/iamcco/coc-vimlsp/"; }; - coc-vimtex = buildVimPluginFrom2Nix { - pname = "coc-vimtex"; - version = "2020-07-22"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-vimtex"; - rev = "4c88459c1ccf0c0e1935b73f216d974a3c89f4e5"; - sha256 = "0gk38r8060linhbcsqfhv7bxggz4fqi4chsfpxf6b0rnmca851pa"; - }; - meta.homepage = "https://github.com/neoclide/coc-vimtex/"; - }; - - coc-wxml = buildVimPluginFrom2Nix { - pname = "coc-wxml"; - version = "2019-06-20"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-wxml"; - rev = "f02550939d33a0175c34186904c376bbae878e60"; - sha256 = "1448019dzdy55j4plhzlnp2qkfzk0zkqqs7kn94ndn60hn1x889m"; - }; - meta.homepage = "https://github.com/neoclide/coc-wxml/"; - }; - - coc-yaml = buildVimPluginFrom2Nix { - pname = "coc-yaml"; - version = "2020-08-21"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-yaml"; - rev = "a453c70b2507d66e48a2d4e89f78cb5f340f140f"; - sha256 = "0av0jv0g01cpkf5rsicniq7maa6c509bc3gs5piczf5za990nrsx"; - }; - meta.homepage = "https://github.com/neoclide/coc-yaml/"; - }; - - coc-yank = buildVimPluginFrom2Nix { - pname = "coc-yank"; - version = "2020-06-02"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-yank"; - rev = "7983c28509a61a7eb014e178525845797f5779ed"; - sha256 = "1mjdd1kqvc5hzygjs2gv8vrpr3wc2a9590cr6vq0pfllxbkyqjng"; - }; - meta.homepage = "https://github.com/neoclide/coc-yank/"; - }; - coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; version = "2020-08-26"; @@ -894,12 +510,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-08-29"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "ade764f6937721493cbfdc21b5b7e44ba71ee5cc"; - sha256 = "1abdgqpnljy17wfx3ixa73hyzhf3rixmnb2b8h8iyks3hgv9i36r"; + rev = "3de0996f965a218573e2fa62379cce9ed5c8dbc3"; + sha256 = "0glai58hpwivfc67ndv588b4rsb27m40fblp8ydrf37w7cj787dz"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -990,12 +606,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-07-11"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "528766a549dc5022f3d89e84cbb80c7b911994f1"; - sha256 = "160h9b59znbb0i6c7lh132mn5bl4njazfqsadz3p995vb9yc0sa6"; + rev = "e23f03632ad2544f0232b824dd5520fd0b58d235"; + sha256 = "12b127v6yxwik7q2wbyqag4082yzp44sm0x4xwnv55xhlz4w6xws"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -1134,24 +750,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-08-03"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7df7851826a1e8417a9b242d4ce3bd09ae1c6298"; - sha256 = "1rf5qir9ybk1l7bb63xkprssa8jpsiap26yn6k3xy2drfvbrlika"; + rev = "5fbc044e3e8ecf80c589d6e87859dcc4c005f2e5"; + sha256 = "0w8k8bylsh45314yg8g9hrrpkacfp3gixk8qba46lajzib298g63"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-07-11"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "d620b34fe5035807ad680004812080edc0f2a794"; - sha256 = "09s86h14nrscpn16xppyz8nnjchyfv91z2cx4p0a2m46hqx962jj"; + rev = "2c4d9117186a6cf86030d213ef2de60b5dbced19"; + sha256 = "1aka5zg7jihy1958xp4j2z3kdzmb2d4w5cbl95na4hik5rz4hyxj"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2880,12 +2496,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2020-08-30"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "b7b311e22a0b071dfb43aa6a9ccc0ed92e5eab3d"; - sha256 = "1q9z5hryjm6j2bb6iy57bwadm45m402k2bq1w0dkn1bgsnfkbsg3"; + rev = "419fa4006e7c15cbc2f81f5110952de562494cd4"; + sha256 = "1snkk214j49wyar98jx65bkkzaj5fnq8d8d8dfnz81ymx3dv6pqv"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -2904,12 +2520,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-08-31"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "5948aba886e8aad26043402684cf85c307813c4d"; - sha256 = "1x9pmxwm3lh5w7d22danp8r8g5hycxl1w8q8d1milx882qsjwnqa"; + rev = "36f3e036e5b244af01947339da92430c4761e57e"; + sha256 = "0nymrwc129mxgsw9ziw616zpn2q9a83cnlwkvbjpv3c78im8jnka"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3661,12 +3277,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-08-29"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "e5c864738db6135a27b6373585d6f4987ffdddb5"; - sha256 = "0zqmh4lrlb8v1l17789dbl2rj9i0ywcjdpjxzpikiajnsd8q4yl6"; + rev = "e1c2c98922ef922070e055a4a55f5b17659a69d8"; + sha256 = "1dirz26hf66g4hichfni95mga1mwk1dmq2jyrlj9f3ph428ps61a"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -4406,12 +4022,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-08-31"; + version = "2020-09-03"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "3850f5aebffeddf3f1a9dfcd8430e8d0b1413480"; - sha256 = "1ivrsiqid4g89vb0kz3mdmlmar4m5irbnqb5j2lnaxbr7dfl7w3c"; + rev = "973ebcf5411eea777450673b0b3f132beb5004d7"; + sha256 = "1fdlfx5lw1lkw3ikwap8h8sr2f8g43j87r2vl9y4w0rph240rj1v"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4694,12 +4310,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-08-31"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "b136fd27a0afaee8306655eca7ac19d0e780faa3"; - sha256 = "0b6cjxjzkqsrip8b8glwgjam17hjrpk21pgyikfhdrv2cxqvil9z"; + rev = "4bc6add29683230dd79a53b2ae8c770fa548a708"; + sha256 = "1vz5fbq5aqlqh6sg6flg8lcds50vy8nck21jpppvhxq7acjn5630"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -4970,24 +4586,24 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-08-31"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "ff4c8b634676e67bf089e936c9afb1d308d594dc"; - sha256 = "1vj0qvbxsp6r4g8v2xwpgmswy54l4lvphzmmvkxp58cpwj7cc10w"; + rev = "95eb7818f70339a29b7d655fc834ba12ccc2922c"; + sha256 = "18yv4y3p8hlyrhadd2nc464cb9hql89mrpvvcdh4sxqn4qn8pmmk"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; - version = "2020-07-08"; + version = "2020-09-03"; src = fetchFromGitHub { owner = "thosakwe"; repo = "vim-flutter"; - rev = "359052369690541a9ede6e897fde4dca867a5109"; - sha256 = "1303dskqbg1c5n3hczzw7x3gn5kl7hlfha824klwlkx91ga2jhck"; + rev = "a5ad99680b4c40cfa7477684e50d6c5b36d17601"; + sha256 = "1zf12nh2sdrh6by3mb2zzhy8dd9xlmj3fa9jykzqa1gvqgp8lg5m"; }; meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; @@ -5294,12 +4910,12 @@ let vim-html-template-literals = buildVimPluginFrom2Nix { pname = "vim-html-template-literals"; - version = "2020-05-17"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "jonsmithers"; repo = "vim-html-template-literals"; - rev = "0959db06cd74408935a589fb59ec63af91a1557b"; - sha256 = "0vq0y9adx2023p0nqv020921r474216msrkm0lkb5v776xm4mks2"; + rev = "602dba70bdcfc2e280e0c0503e74a8a92519db49"; + sha256 = "0x0sbmcig3r058sg78bfj8dv0lwlgdcwvw9kxviynyhk2qkg9zl9"; }; meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; @@ -5715,12 +5331,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-08-31"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "1230ae8fa3d7004e6c3d74c1a5aa6c17acaf9f74"; - sha256 = "1q08h0in1x4hhhvpjx379qw07ghinrxizzvr8f7xxsgg9lpdjxji"; + rev = "a8dd16f59a1f56ee40d0d403a722b6d556fa04e9"; + sha256 = "1m08v4b0l88ly5jhklr4hx642gdypz315x9yhsni9bnxi9dhhkaa"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5835,12 +5451,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-08-30"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "e0714a6e21dfba55b1af202d09f8f50d27b00e85"; - sha256 = "0q1sxla2s381yjsyjjcd77pp4s98s0579mpr4iln59z60ysayc95"; + rev = "77231afb915b32e1530f48e96a64db5cd0948487"; + sha256 = "1hb8kqn70vi17mf2wiliqrkyp1n9zc53020kaw961vqvnk5mqsvg"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -6243,12 +5859,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-08-29"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "d4fcef1aa835f20f4f9df41eceb406b66f446f70"; - sha256 = "1jn0581k1xcsvl0nz0q3qbz2k4cpzn9bjw77fn86xx3v9pg55szh"; + rev = "63119f09d1390b61155cc0dc3ff497356d2fc7e5"; + sha256 = "0b04la1i0sawkwbwhb708jzdqflpdxavbf2s0dw8ys65z79z8qzn"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6687,12 +6303,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-08-30"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "7d82982e3858a6a514525acbba8bf2dff7da6c64"; - sha256 = "124iqc9vdaa4ms03v20d9np95dizbp23gs3680dws1gjskq9z2pv"; + rev = "65e5e4668371152c6ef7a6269c6a6b960cef21b4"; + sha256 = "0bfibshqqa17n9vbdd2g8kalnc78v1ag3hzws9pdacrcsxhsh0ry"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -6928,12 +6544,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-08-31"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "d1b82e939135bbfc928d2fe54382631f20c6cbb3"; - sha256 = "1avlh0srwi0xyawp24s1s2hlzs1pj83d5wsn5ha8y9hd96byaxja"; + rev = "795f16430c568fc13266be9239bf70f19b8ae50f"; + sha256 = "06j24di1r2p1qpiy86h75ghfsf0lqkfllf7kf64gjas89gbc9i89"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -7216,12 +6832,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-08-31"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "7bdd786c0ffe1f0876eabcd70daa15f82dc07af9"; - sha256 = "1bab231y2fcdnpi3fi3as79m2cx28d2drpy5iv77h5q1xgpz2jak"; + rev = "b4ea93fbcb578250da97722ca825a73a66c3d5c8"; + sha256 = "0zgy4q2b5fywqiv2chz3fly4liy8br2mdj1kf4m43b6pil77qpbi"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7468,12 +7084,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-08-29"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "e634982d78573cf0d678b2981b9ac59cd99126cb"; - sha256 = "09ifckx1rks7qdj6zq7vqw3acfx6bxqa6ylsls1rnckn0fnn6li4"; + rev = "e81be848a112350656e7c273777185c3c1a88e3e"; + sha256 = "07xfkvhanwi7x5kyw0wzgia33wrxi8xpxxf546xkd06bz0j6kqv4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7481,12 +7097,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-08-30"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5ff0ed043eefba26f93883759204e86d25323253"; - sha256 = "0nhxcfkr9f1svjki8m85if8acanw06ki1gax8x47sr43xns1i92r"; + rev = "ec219646136de3040356b00d0dc74520950bd761"; + sha256 = "1329cg02mxplflfpww69avn71pz0sj1ihl3qkwmz9b90whglczmr"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7699,12 +7315,12 @@ let zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2020-08-30"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "94b8319a881b0d2dfe738bae23dbc2129f0e78db"; - sha256 = "1js7zadw2y2gml3h1z5nqsjw8jafhgw4f2ajplr5nvai8j89j983"; + rev = "e1f66dd35ec86ee0aec0b9ef1818f97023f914c4"; + sha256 = "10aizq0xvln917i9jji6fxdxdgfbvcvd041z6qq2m23h5xs232w8"; }; meta.homepage = "https://github.com/jnurmine/zenburn/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index db1fd71d2f41..525fb34cefbe 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -14,9 +14,6 @@ , nodePackages , dasht -# coc-go dependency -, go - # deoplete-khard dependency , khard @@ -125,199 +122,6 @@ self: super: { ''; }); - coc-go = super.coc-go.overrideAttrs(old: { - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/coc-go/src/utils/tools.ts \ - --replace 'const cmd = `GOPATH=''${gopath}; go ''${args}`' 'const cmd = `GOPATH=''${gopath}; ${go}/bin/go ''${args}`' - ''; - }); - - coc-css = buildVimPluginFrom2Nix { - pname = "coc-css"; - version = nodePackages.coc-css.version; - src = "${nodePackages.coc-css}/lib/node_modules/coc-css"; - }; - - coc-emmet = buildVimPluginFrom2Nix { - pname = "coc-emmet"; - version = nodePackages.coc-emmet.version; - src = "${nodePackages.coc-emmet}/lib/node_modules/coc-emmet"; - }; - - coc-eslint = buildVimPluginFrom2Nix { - pname = "coc-eslint"; - version = nodePackages.coc-eslint.version; - src = "${nodePackages.coc-eslint}/lib/node_modules/coc-eslint"; - }; - - coc-git = buildVimPluginFrom2Nix { - pname = "coc-git"; - version = nodePackages.coc-git.version; - src = "${nodePackages.coc-git}/lib/node_modules/coc-git"; - }; - - coc-highlight = buildVimPluginFrom2Nix { - pname = "coc-highlight"; - version = nodePackages.coc-highlight.version; - src = "${nodePackages.coc-highlight}/lib/node_modules/coc-highlight"; - }; - - coc-html = buildVimPluginFrom2Nix { - pname = "coc-html"; - version = nodePackages.coc-html.version; - src = "${nodePackages.coc-html}/lib/node_modules/coc-html"; - }; - - coc-imselect = buildVimPluginFrom2Nix { - pname = "coc-imselect"; - version = nodePackages.coc-imselect.version; - src = "${nodePackages.coc-imselect}/lib/node_modules/coc-imselect"; - }; - - coc-java = buildVimPluginFrom2Nix { - pname = "coc-java"; - version = nodePackages.coc-java.version; - src = "${nodePackages.coc-java}/lib/node_modules/coc-java"; - }; - - coc-jest = buildVimPluginFrom2Nix { - pname = "coc-jest"; - version = nodePackages.coc-jest.version; - src = "${nodePackages.coc-jest}/lib/node_modules/coc-jest"; - }; - - coc-json = buildVimPluginFrom2Nix { - pname = "coc-json"; - version = nodePackages.coc-json.version; - src = "${nodePackages.coc-json}/lib/node_modules/coc-json"; - }; - - coc-lists = buildVimPluginFrom2Nix { - pname = "coc-lists"; - version = nodePackages.coc-lists.version; - src = "${nodePackages.coc-lists}/lib/node_modules/coc-lists"; - }; - - coc-metals = buildVimPluginFrom2Nix { - pname = "coc-metals"; - version = nodePackages.coc-metals.version; - src = "${nodePackages.coc-metals}/lib/node_modules/coc-metals"; - }; - - coc-pairs = buildVimPluginFrom2Nix { - pname = "coc-pairs"; - version = nodePackages.coc-pairs.version; - src = "${nodePackages.coc-pairs}/lib/node_modules/coc-pairs"; - }; - - coc-prettier = buildVimPluginFrom2Nix { - pname = "coc-prettier"; - version = nodePackages.coc-prettier.version; - src = "${nodePackages.coc-prettier}/lib/node_modules/coc-prettier"; - }; - - coc-python = buildVimPluginFrom2Nix { - pname = "coc-python"; - version = nodePackages.coc-python.version; - src = "${nodePackages.coc-python}/lib/node_modules/coc-python"; - }; - - coc-r-lsp = buildVimPluginFrom2Nix { - pname = "coc-r-lsp"; - version = nodePackages.coc-r-lsp.version; - src = "${nodePackages.coc-r-lsp}/lib/node_modules/coc-r-lsp"; - }; - - coc-rls = buildVimPluginFrom2Nix { - pname = "coc-rls"; - version = nodePackages.coc-rls.version; - src = "${nodePackages.coc-rls}/lib/node_modules/coc-rls"; - }; - - coc-rust-analyzer = buildVimPluginFrom2Nix { - pname = "coc-rust-analyzer"; - version = nodePackages.coc-rust-analyzer.version; - src = "${nodePackages.coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer"; - }; - - coc-smartf = buildVimPluginFrom2Nix { - pname = "coc-smartf"; - version = nodePackages.coc-smartf.version; - src = "${nodePackages.coc-smartf}/lib/node_modules/coc-smartf"; - }; - - coc-snippets = buildVimPluginFrom2Nix { - pname = "coc-snippets"; - version = nodePackages.coc-snippets.version; - src = "${nodePackages.coc-snippets}/lib/node_modules/coc-snippets"; - }; - - coc-solargraph = buildVimPluginFrom2Nix { - pname = "coc-solargraph"; - version = nodePackages.coc-solargraph.version; - src = "${nodePackages.coc-solargraph}/lib/node_modules/coc-solargraph"; - }; - - coc-stylelint = buildVimPluginFrom2Nix { - pname = "coc-stylelint"; - version = nodePackages.coc-stylelint.version; - src = "${nodePackages.coc-stylelint}/lib/node_modules/coc-stylelint"; - }; - - coc-tabnine = buildVimPluginFrom2Nix { - pname = "coc-tabnine"; - version = nodePackages.coc-tabnine.version; - src = "${nodePackages.coc-tabnine}/lib/node_modules/coc-tabnine"; - }; - - coc-tslint = buildVimPluginFrom2Nix { - pname = "coc-tslint"; - version = nodePackages.coc-tslint.version; - src = "${nodePackages.coc-tslint}/lib/node_modules/coc-tslint"; - }; - - coc-tslint-plugin = buildVimPluginFrom2Nix { - pname = "coc-tslint-plugin"; - version = nodePackages.coc-tslint-plugin.version; - src = "${nodePackages.coc-tslint-plugin}/lib/node_modules/coc-tslint-plugin"; - }; - - coc-tsserver = buildVimPluginFrom2Nix { - pname = "coc-tsserver"; - version = nodePackages.coc-tsserver.version; - src = "${nodePackages.coc-tsserver}/lib/node_modules/coc-tsserver"; - }; - - coc-vetur = buildVimPluginFrom2Nix { - pname = "coc-vetur"; - version = nodePackages.coc-vetur.version; - src = "${nodePackages.coc-vetur}/lib/node_modules/coc-vetur"; - }; - - coc-vimtex = buildVimPluginFrom2Nix { - pname = "coc-vimtex"; - version = nodePackages.coc-vimtex.version; - src = "${nodePackages.coc-vimtex}/lib/node_modules/coc-vimtex"; - }; - - coc-wxml = buildVimPluginFrom2Nix { - pname = "coc-wxml"; - version = nodePackages.coc-wxml.version; - src = "${nodePackages.coc-wxml}/lib/node_modules/coc-wxml"; - }; - - coc-yaml = buildVimPluginFrom2Nix { - pname = "coc-yaml"; - version = nodePackages.coc-yaml.version; - src = "${nodePackages.coc-yaml}/lib/node_modules/coc-yaml"; - }; - - coc-yank = buildVimPluginFrom2Nix { - pname = "coc-yank"; - version = nodePackages.coc-yank.version; - src = "${nodePackages.coc-yank}/lib/node_modules/coc-yank"; - }; - command-t = super.command-t.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' @@ -791,4 +595,47 @@ self: super: { ln -s ${maple-bin}/bin/maple $target/bin/maple ''; }); -} +} // ( + let + nodePackageNames = [ + "coc-go" + "coc-css" + "coc-emmet" + "coc-eslint" + "coc-git" + "coc-highlight" + "coc-html" + "coc-imselect" + "coc-java" + "coc-jest" + "coc-json" + "coc-lists" + "coc-metals" + "coc-pairs" + "coc-prettier" + "coc-python" + "coc-r-lsp" + "coc-rls" + "coc-rust-analyzer" + "coc-smartf" + "coc-snippets" + "coc-solargraph" + "coc-stylelint" + "coc-tabnine" + "coc-tslint" + "coc-tslint-plugin" + "coc-tsserver" + "coc-vetur" + "coc-vimtex" + "coc-wxml" + "coc-yaml" + "coc-yank" + ]; + nodePackage2VimPackage = name: buildVimPluginFrom2Nix { + pname = name; + inherit (nodePackages.${name}) version; + src = "${nodePackages.${name}}/lib/node_modules/${name}"; + }; + in + lib.genAttrs nodePackageNames nodePackage2VimPackage +) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0b367bd4bb17..e2a4b090aaa0 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -54,7 +54,6 @@ chriskempson/base16-vim christoomey/vim-sort-motion christoomey/vim-tmux-navigator ckarnell/antonys-macro-repeater -ckipp01/coc-metals cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim @@ -103,7 +102,6 @@ ensime/ensime-vim ervandew/supertab esneider/YUNOcommit.vim fannheyward/coc-markdownlint -fannheyward/coc-rust-analyzer farmergreg/vim-lastplace fatih/vim-go fcpg/vim-osc52 @@ -190,7 +188,6 @@ jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug -josa42/coc-go joshdick/onedark.vim jpalardy/vim-slime jparise/vim-graphql @@ -348,37 +345,8 @@ ncm2/ncm2-tmux ncm2/ncm2-ultisnips ncm2/ncm2-vim ndmitchell/ghcid -neoclide/coc-css neoclide/coc-denite -neoclide/coc-emmet -neoclide/coc-eslint -neoclide/coc-git -neoclide/coc-highlight -neoclide/coc-html -neoclide/coc-imselect -neoclide/coc-java -neoclide/coc-jest -neoclide/coc-json -neoclide/coc-lists neoclide/coc-neco -neoclide/coc-pairs -neoclide/coc-prettier -neoclide/coc-python -neoclide/coc-r-lsp -neoclide/coc-rls -neoclide/coc-smartf -neoclide/coc-snippets -neoclide/coc-solargraph -neoclide/coc-stylelint -neoclide/coc-tabnine -neoclide/coc-tslint -neoclide/coc-tslint-plugin -neoclide/coc-tsserver -neoclide/coc-vetur -neoclide/coc-vimtex -neoclide/coc-wxml -neoclide/coc-yaml -neoclide/coc-yank neoclide/coc.nvim@release neoclide/denite-extra neoclide/denite-git diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 448e6865e18b..742a3948707e 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yabai"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "11rsi6z2z7ynfqs1xq3bvf187k5xnwm0d45a8ai9hrqdsf3f1j19"; + sha256 = "0y4idivqkmi3xsc8yjdzh1b15qzgyqlw7ifs26v3dc91lkjhfc4x"; }; buildInputs = [ Carbon Cocoa ScriptingBridge xxd ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 04d121de3071..05fc466f0f97 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.195"; + version = "4.14.196"; # 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 = "08d08la3h48fbdlr3h8zbvdghydx3x9cwb4yrnm0n93hhrwjhkrr"; + sha256 = "16mhqymwkgqi8zalcij5c754smc8ysvfw6l2cwshr4scipsv4qay"; }; } // (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 2eb697be6844..c683b222f0c7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.142"; + version = "4.19.143"; # 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 = "19372sri4962dqf5rbr211lrfpckmj11kxsginfcwwid4hfdn4k9"; + sha256 = "1383yfwb962mhn25b3b3zqrwnpyp01g5xclsv14wra0fdz33ahra"; }; } // (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 0be1f1bef7b5..0fccc800c073 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.234"; + version = "4.4.235"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "123354h05fip161rzlxc8h0cn5lh0d1gz06gc5b7zyz9i2lxv539"; + sha256 = "0w5pkv936zb0shjgnpv17gcp5n8f91djznzq54p6j1bl5q2qdyqd"; }; } // (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 8ec9b8e51a34..75af5a09d4d6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.234"; + version = "4.9.235"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qw26x2qc29yr094c7scw68m9yz4j0b2c4f92rvi3s31s928avvm"; + sha256 = "1hqcb3zw4546h6x5xy2mywdznha8813lx15mxbgfbvwm4qhsc9g6"; }; } // (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 4c5d4bcd8e87..24bff3218690 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.61"; + version = "5.4.62"; # 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 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"; + sha256 = "0w49y8lymz23x4mr5byaxnrkhm56lwfhnqkra07hqyfr5y63v216"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 59acda122aac..5ea15aa5a1bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.5"; + version = "5.8.6"; # 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 = "0zwl0nk3x6fxwsbnmpx1drh7v0116yhgamisb1pghd472mmw6klx"; + sha256 = "180bka8a0f2ykaifgb323pzgh0n909mlrsk08l08zmifggnh19cc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index fb2773b4d3ad..f9196fc16864 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pcre , tinyxml , libusb1 @@ -12,7 +12,6 @@ , gst_all_1 , libwebcam , libunwind -, gstreamer , elfutils , orc , python3 @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -46,54 +45,37 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base libwebcam libunwind - gstreamer elfutils orc python3 libuuid ]; - cmakeFlags = [ "-DBUILD_ARAVIS=OFF" # For GigE support. Won't need it as our camera is usb. "-DBUILD_GST_1_0=ON" "-DBUILD_TOOLS=ON" "-DBUILD_V4L2=ON" "-DBUILD_LIBUSB=ON" + "-DTCAM_INSTALL_UDEV=${placeholder "out"}/lib/udev/rules.d" + "-DTCAM_INSTALL_UVCDYNCTRL=${placeholder "out"}/share/uvcdynctrl/data/199e" + "-DTCAM_INSTALL_GST_1_0=${placeholder "out"}/lib/gstreamer-1.0" + "-DTCAM_INSTALL_GIR=${placeholder "out"}/share/gir-1.0" + "-DTCAM_INSTALL_TYPELIB=${placeholder "out"}/lib/girepository-1.0" + "-DTCAM_INSTALL_SYSTEMD=${placeholder "out"}/etc/systemd/system" + # There are gobject introspection commands launched as part of the build. Those have a runtime + # dependency on `libtcam` (which itself is built as part of this build). In order to allow + # that, we set the dynamic linker's path to point on the build time location of the library. + "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; postPatch = '' - substituteInPlace ./data/udev/80-theimagingsource-cameras.rules.in \ - --replace "/usr/bin/uvcdynctrl" "${libwebcam}/bin/uvcdynctrl" \ - --replace "/path/to/tiscamera/uvc-extensions" "$out/share/uvcdynctrl/data/199e" - substituteInPlace ./src/BackendLoader.cpp \ --replace '"libtcam-v4l2.so"' "\"$out/lib/tcam-0/libtcam-v4l2.so\"" \ --replace '"libtcam-aravis.so"' "\"$out/lib/tcam-0/libtcam-aravis.so\"" \ --replace '"libtcam-libusb.so"' "\"$out/lib/tcam-0/libtcam-libusb.so\"" ''; - preConfigure = '' - cmakeFlagsArray=( - $cmakeFlagsArray - "-DCMAKE_INSTALL_PREFIX=$out" - "-DTCAM_INSTALL_UDEV=$out/lib/udev/rules.d" - "-DTCAM_INSTALL_UVCDYNCTRL=$out/share/uvcdynctrl/data/199e" - "-DTCAM_INSTALL_GST_1_0=$out/lib/gstreamer-1.0" - "-DTCAM_INSTALL_GIR=$out/share/gir-1.0" - "-DTCAM_INSTALL_TYPELIB=$out/lib/girepository-1.0" - "-DTCAM_INSTALL_SYSTEMD=$out/etc/systemd/system" - ) - ''; - - - # There are gobject introspection commands launched as part of the build. Those have a runtime - # dependency on `libtcam` (which itself is built as part of this build). In order to allow - # that, we set the dynamic linker's path to point on the build time location of the library. - preBuild = '' - export LD_LIBRARY_PATH=$PWD/src''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; - meta = with lib; { description = "The Linux sources and UVC firmwares for The Imaging Source cameras"; homepage = "https://github.com/TheImagingSource/tiscamera"; diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix index ac6e85b8049b..23acaaa3e231 100644 --- a/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zenmonitor"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "ocerman"; repo = "zenmonitor"; rev = "v${version}"; - sha256 = "1g6sk2mcd7znjq6zmbf2fgn02a0yimyv2dw2143aciq2pxqjawmp"; + sha256 = "0smv94vi36hziw42gasivyw25h5n1sgwwk1cv78id5g85w0kw246"; }; buildInputs = [ gtk3 ]; diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 08b05084e9eb..92ca263f46fe 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9"; + version = "0.9.0.2"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "106f0gagq81rwykppyfjc7q8ibq3j89lp08hqgbmcv26hxb89rbj"; + sha256 = "1lvldklj61hg9h1m0ixaa4zcf4ggdj6wf4myhwwampq4bmr2havj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 360e39ab685d..a2f417d88fae 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -14,14 +14,14 @@ let }; in with python.pkgs; buildPythonApplication rec { pname = "pinnwand"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "supakeen"; repo = pname; rev = "v${version}"; - sha256 = "1rk7rpyb4vmqxqqv8k9jpjmgakr3mn1iaqxyj34r74p1n5vfzimq"; + sha256 = "0cxdpc3lxgzakzgvdyyrn234380dm05svnwr8av5nrjp4nm9s8z4"; }; nativeBuildInputs = [ diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index ad351c89a668..7680bfe2e417 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -3,7 +3,7 @@ let package = (import ./node.nix { inherit pkgs system; }).package; in package.override rec { - version = "1.14.2"; + version = "1.14.3"; reconstructLock = true; postInstall = '' @@ -20,7 +20,7 @@ package.override rec { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "0yv51rds28az5pqzgkprhrzwmky29l1mvqb73l7dbs8qlx8x1x52"; + sha256 = "164ddb8i4r6rjahjic09sd24xbms4d6b6bnwx0d9fh8sn3ib4v06"; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index df818634036a..62cc54c86364 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@babel/cli-7.10.4" = { + "@babel/cli-7.10.5" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.10.4.tgz"; - sha512 = "xX99K4V1BzGJdQANK5cwK+EpF1vP9gvqhn+iWvG+TubCjecplW7RSQimJ2jcCvu6fnK5pY6mZMdu6EWTj32QVA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.10.5.tgz"; + sha512 = "j9H9qSf3kLdM0Ao3aGPbGZ73mEA9XazuupcS6cDGWuiyAcANoguhP0r2Lx32H5JGw4sSSoHG3x/mxVnHgvOoyA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -22,49 +22,31 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.10.4" = { + "@babel/compat-data-7.11.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.4.tgz"; - sha512 = "t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"; + sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.10.4" = { + "@babel/core-7.11.1" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.10.4"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.10.4.tgz"; - sha512 = "3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz"; + sha512 = "XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ=="; }; }; - "@babel/core-7.10.5" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz"; - sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; - }; - }; - "@babel/generator-7.10.4" = { + "@babel/generator-7.11.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz"; - sha512 = "toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng=="; - }; - }; - "@babel/generator-7.10.5" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz"; - sha512 = "3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz"; + sha512 = "fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -94,13 +76,13 @@ let sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.10.4" = { + "@babel/helper-create-class-features-plugin-7.10.5" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz"; - sha512 = "9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; + sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A=="; }; }; "@babel/helper-create-regexp-features-plugin-7.10.4" = { @@ -112,13 +94,13 @@ let sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g=="; }; }; - "@babel/helper-define-map-7.10.4" = { + "@babel/helper-define-map-7.10.5" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz"; - sha512 = "nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; + sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; }; }; "@babel/helper-explode-assignable-expression-7.10.4" = { @@ -157,22 +139,13 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.10.4" = { + "@babel/helper-member-expression-to-functions-7.11.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz"; - sha512 = "m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.10.5" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz"; - sha512 = "HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; + sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; }; }; "@babel/helper-module-imports-7.10.4" = { @@ -184,22 +157,13 @@ let sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; }; }; - "@babel/helper-module-transforms-7.10.4" = { + "@babel/helper-module-transforms-7.11.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz"; - sha512 = "Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q=="; - }; - }; - "@babel/helper-module-transforms-7.10.5" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz"; - sha512 = "4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; + sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; }; }; "@babel/helper-optimise-call-expression-7.10.4" = { @@ -220,13 +184,13 @@ let sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; }; }; - "@babel/helper-regex-7.10.4" = { + "@babel/helper-regex-7.10.5" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.4.tgz"; - sha512 = "inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ=="; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; + sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; }; }; "@babel/helper-remap-async-to-generator-7.10.4" = { @@ -256,13 +220,22 @@ let sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; }; }; - "@babel/helper-split-export-declaration-7.10.4" = { + "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = { + name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; + packageName = "@babel/helper-skip-transparent-expression-wrappers"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; + sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q=="; + }; + }; + "@babel/helper-split-export-declaration-7.11.0" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; - sha512 = "pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; }; }; "@babel/helper-validator-identifier-7.10.4" = { @@ -301,31 +274,22 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.10.4" = { + "@babel/parser-7.11.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.10.4"; + version = "7.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz"; - sha512 = "8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz"; + sha512 = "REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA=="; }; }; - "@babel/parser-7.10.5" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz"; - sha512 = "wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ=="; - }; - }; - "@babel/plugin-proposal-async-generator-functions-7.10.4" = { + "@babel/plugin-proposal-async-generator-functions-7.10.5" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz"; - sha512 = "MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; + sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg=="; }; }; "@babel/plugin-proposal-class-properties-7.10.4" = { @@ -346,6 +310,15 @@ let sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; }; }; + "@babel/plugin-proposal-export-namespace-from-7.10.4" = { + name = "_at_babel_slash_plugin-proposal-export-namespace-from"; + packageName = "@babel/plugin-proposal-export-namespace-from"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; + sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg=="; + }; + }; "@babel/plugin-proposal-json-strings-7.10.4" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; @@ -355,6 +328,15 @@ let sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; }; }; + "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = { + name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; + packageName = "@babel/plugin-proposal-logical-assignment-operators"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; + sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q=="; + }; + }; "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; @@ -373,13 +355,13 @@ let sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.10.4" = { + "@babel/plugin-proposal-object-rest-spread-7.11.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz"; - sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; + sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { @@ -391,13 +373,13 @@ let sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.10.4" = { + "@babel/plugin-proposal-optional-chaining-7.11.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz"; - sha512 = "ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; + sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; }; }; "@babel/plugin-proposal-private-methods-7.10.4" = { @@ -454,6 +436,15 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; + "@babel/plugin-syntax-export-namespace-from-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-export-namespace-from"; + packageName = "@babel/plugin-syntax-export-namespace-from"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; + }; + }; "@babel/plugin-syntax-import-meta-7.10.4" = { name = "_at_babel_slash_plugin-syntax-import-meta"; packageName = "@babel/plugin-syntax-import-meta"; @@ -571,13 +562,13 @@ let sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; }; }; - "@babel/plugin-transform-block-scoping-7.10.4" = { + "@babel/plugin-transform-block-scoping-7.11.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.10.4"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz"; - sha512 = "J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; + sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew=="; }; }; "@babel/plugin-transform-classes-7.10.4" = { @@ -670,13 +661,13 @@ let sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw=="; }; }; - "@babel/plugin-transform-modules-amd-7.10.4" = { + "@babel/plugin-transform-modules-amd-7.10.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz"; - sha512 = "3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; + sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw=="; }; }; "@babel/plugin-transform-modules-commonjs-7.10.4" = { @@ -688,13 +679,13 @@ let sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.10.4" = { + "@babel/plugin-transform-modules-systemjs-7.10.5" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz"; - sha512 = "Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; + sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw=="; }; }; "@babel/plugin-transform-modules-umd-7.10.4" = { @@ -733,13 +724,13 @@ let sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ=="; }; }; - "@babel/plugin-transform-parameters-7.10.4" = { + "@babel/plugin-transform-parameters-7.10.5" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz"; - sha512 = "RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; + sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw=="; }; }; "@babel/plugin-transform-property-literals-7.10.4" = { @@ -778,13 +769,13 @@ let sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; }; }; - "@babel/plugin-transform-spread-7.10.4" = { + "@babel/plugin-transform-spread-7.11.0" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz"; - sha512 = "1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; + sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw=="; }; }; "@babel/plugin-transform-sticky-regex-7.10.4" = { @@ -796,13 +787,13 @@ let sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ=="; }; }; - "@babel/plugin-transform-template-literals-7.10.4" = { + "@babel/plugin-transform-template-literals-7.10.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz"; - sha512 = "4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; + sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw=="; }; }; "@babel/plugin-transform-typeof-symbol-7.10.4" = { @@ -814,13 +805,13 @@ let sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; }; }; - "@babel/plugin-transform-typescript-7.10.4" = { + "@babel/plugin-transform-typescript-7.11.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.4.tgz"; - sha512 = "3WpXIKDJl/MHoAN0fNkSr7iHdUMHZoppXjf2HJ9/ed5Xht5wNIsXllJXdityKOxeA3Z8heYRb1D3p2H5rfCdPw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; + sha512 = "edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w=="; }; }; "@babel/plugin-transform-unicode-escapes-7.10.4" = { @@ -841,13 +832,13 @@ let sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/preset-env-7.10.4" = { + "@babel/preset-env-7.11.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.4.tgz"; - sha512 = "tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz"; + sha512 = "2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg=="; }; }; "@babel/preset-modules-0.1.3" = { @@ -868,13 +859,13 @@ let sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; }; }; - "@babel/runtime-7.10.4" = { + "@babel/runtime-7.11.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.10.4"; + version = "7.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz"; - sha512 = "UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; + sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; "@babel/template-7.10.4" = { @@ -886,40 +877,22 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.10.4" = { + "@babel/traverse-7.11.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz"; - sha512 = "aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; + sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; }; }; - "@babel/traverse-7.10.5" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz"; - sha512 = "yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ=="; - }; - }; - "@babel/types-7.10.4" = { + "@babel/types-7.11.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz"; - sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; - }; - }; - "@babel/types-7.10.5" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz"; - sha512 = "ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; + sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -967,58 +940,58 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/console-26.1.0" = { + "@jest/console-26.2.0" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-26.1.0.tgz"; - sha512 = "+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A=="; + url = "https://registry.npmjs.org/@jest/console/-/console-26.2.0.tgz"; + sha512 = "mXQfx3nSLwiHm1i7jbu+uvi+vvpVjNGzIQYLCfsat9rapC+MJkS4zBseNrgJE0vU921b3P67bQzhduphjY3Tig=="; }; }; - "@jest/core-26.1.0" = { + "@jest/core-26.2.2" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-26.1.0.tgz"; - sha512 = "zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw=="; + url = "https://registry.npmjs.org/@jest/core/-/core-26.2.2.tgz"; + sha512 = "UwA8gNI8aeV4FHGfGAUfO/DHjrFVvlBravF1Tm9Kt6qFE+6YHR47kFhgdepOFpADEKstyO+MVdPvkV6/dyt9sA=="; }; }; - "@jest/environment-26.1.0" = { + "@jest/environment-26.2.0" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-26.1.0.tgz"; - sha512 = "86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-26.2.0.tgz"; + sha512 = "oCgp9NmEiJ5rbq9VI/v/yYLDpladAAVvFxZgNsnJxOETuzPZ0ZcKKHYjKYwCtPOP1WCrM5nmyuOhMStXFGHn+g=="; }; }; - "@jest/fake-timers-26.1.0" = { + "@jest/fake-timers-26.2.0" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.1.0.tgz"; - sha512 = "Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA=="; + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.2.0.tgz"; + sha512 = "45Gfe7YzYTKqTayBrEdAF0qYyAsNRBzfkV0IyVUm3cx7AsCWlnjilBM4T40w7IXT5VspOgMPikQlV0M6gHwy/g=="; }; }; - "@jest/globals-26.1.0" = { + "@jest/globals-26.2.0" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-26.1.0.tgz"; - sha512 = "MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-26.2.0.tgz"; + sha512 = "Hoc6ScEIPaym7RNytIL2ILSUWIGKlwEv+JNFof9dGYOdvPjb2evEURSslvCMkNuNg1ECEClTE8PH7ULlMJntYA=="; }; }; - "@jest/reporters-26.1.0" = { + "@jest/reporters-26.2.2" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.1.0.tgz"; - sha512 = "SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.2.2.tgz"; + sha512 = "7854GPbdFTAorWVh+RNHyPO9waRIN6TcvCezKVxI1khvFq9YjINTW7J3WU+tbR038Ynn6WjYred6vtT0YmIWVQ=="; }; }; "@jest/source-map-26.1.0" = { @@ -1030,31 +1003,31 @@ let sha512 = "XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA=="; }; }; - "@jest/test-result-26.1.0" = { + "@jest/test-result-26.2.0" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.1.0.tgz"; - sha512 = "Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.2.0.tgz"; + sha512 = "kgPlmcVafpmfyQEu36HClK+CWI6wIaAWDHNxfQtGuKsgoa2uQAYdlxjMDBEa3CvI40+2U3v36gQF6oZBkoKatw=="; }; }; - "@jest/test-sequencer-26.1.0" = { + "@jest/test-sequencer-26.2.2" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz"; - sha512 = "Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.2.2.tgz"; + sha512 = "SliZWon5LNqV/lVXkeowSU6L8++FGOu3f43T01L1Gv6wnFDP00ER0utV9jyK9dVNdXqfMNCN66sfcyar/o7BNw=="; }; }; - "@jest/transform-26.1.0" = { + "@jest/transform-26.2.2" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-26.1.0.tgz"; - sha512 = "ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-26.2.2.tgz"; + sha512 = "c1snhvi5wRVre1XyoO3Eef5SEWpuBCH/cEbntBUd9tI5sNYiBDmO0My/lc5IuuGYKp/HFIHV1eZpSx5yjdkhKw=="; }; }; "@jest/types-25.5.0" = { @@ -1066,112 +1039,103 @@ let sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; - "@jest/types-26.1.0" = { + "@jest/types-26.2.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz"; - sha512 = "GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ=="; + url = "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz"; + sha512 = "lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA=="; }; }; - "@serialport/binding-abstract-9.0.0" = { + "@serialport/binding-abstract-9.0.1" = { name = "_at_serialport_slash_binding-abstract"; packageName = "@serialport/binding-abstract"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.0.tgz"; - sha512 = "ZU+6ZypP33Rzda1cDnpN0+CNfnODwbRU66GBawNtj2+xE+OMI7a0hbuZAYvQ+BThyDfdX/vn55P1YYeVWI8qpQ=="; + url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.1.tgz"; + sha512 = "ncUFSRyVdpyCRuah2dzrs99UfEWWMAhV31ae2FT6j4f8TypQ8OgAF8KkcHiD4M3wORDh3UKCCTS7n8aJWge1RA=="; }; }; - "@serialport/binding-mock-9.0.0" = { + "@serialport/binding-mock-9.0.1" = { name = "_at_serialport_slash_binding-mock"; packageName = "@serialport/binding-mock"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.0.tgz"; - sha512 = "E65ZbykGwZSoHpQvjuJkTbwEM0uZku+SROtO+VMs/mShMalBnOSoRDU2IedkFKvz6IqowZZOVyaBUbnKYoAUuQ=="; + url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.1.tgz"; + sha512 = "C01T6iX+nNKB7S6BhQEy5nfk4lUk/CkdFEfen9DDPYhtFtIsm5GCGvRB3Fjnp+8oDrGWJOrZfxFf3kWOOx665A=="; }; }; - "@serialport/bindings-9.0.0" = { + "@serialport/bindings-9.0.1" = { name = "_at_serialport_slash_bindings"; packageName = "@serialport/bindings"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.0.tgz"; - sha512 = "2LoYX80h5U8uIgpPaBXpIhs9uXIPhn6k+9u0FH3mFPHHeJ/tyVliwbj7uxdQ6xAUe5Zf3T2cH9JC/LnxewWyuw=="; + url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.1.tgz"; + sha512 = "O5QuwCdnHuZygBKw7tVq2wHysfOnCbOyKtR/k9T9zHqptd89Tzy6xJQNtnrcbV/2D22noKX6yWj+1wqvNe6NRA=="; }; }; - "@serialport/parser-byte-length-9.0.0" = { + "@serialport/parser-byte-length-9.0.1" = { name = "_at_serialport_slash_parser-byte-length"; packageName = "@serialport/parser-byte-length"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.0.tgz"; - sha512 = "MaXWTqxz9SeWaN488uFhDMA3cy2sQFoGHDQqDpy6q9wBGlPBe+UpRAznzOoNPkAehqyPo1Vc7gxYsBfgjZtWaw=="; + url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.1.tgz"; + sha512 = "1Ikv4lgCNw8OMf35yCpgzjHwkpgBEkhBuXFXIdWZk+ixaHFLlAtp03QxGPZBmzHMK58WDmEQoBHC1V5BkkAKSQ=="; }; }; - "@serialport/parser-cctalk-9.0.0" = { + "@serialport/parser-cctalk-9.0.1" = { name = "_at_serialport_slash_parser-cctalk"; packageName = "@serialport/parser-cctalk"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.0.tgz"; - sha512 = "tFJRF+uceEMYQeOLi92CYr1SScnI+2QLkawNHaVwwcmLV0ezwmsm1hvwBCWHkWDsY6U1SiElNJ5HpF89kS28zQ=="; + url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.1.tgz"; + sha512 = "GtMda2DeJ+23bNqOc79JYV06dax2n3FLLFM3zA7nfReCOi98QbuDj4TUbFESMOnp4DB0oMO0GYHCR9gHOedTkg=="; }; }; - "@serialport/parser-delimiter-9.0.0" = { + "@serialport/parser-delimiter-9.0.1" = { name = "_at_serialport_slash_parser-delimiter"; packageName = "@serialport/parser-delimiter"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.0.tgz"; - sha512 = "OesbvlJf1BjFC1zde6cnW1RttxZ8BoXGCOiNvM9mLKdvJ06l9o/4HyVCg2bymj6ziy/gz4407pwyPfvVYApE3A=="; + url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.1.tgz"; + sha512 = "+oaSl5zEu47OlrRiF5p5tn2qgGqYuhVcE+NI+Pv4E1xsNB/A0fFxxMv/8XUw466CRLEJ5IESIB9qbFvKE6ltaQ=="; }; }; - "@serialport/parser-readline-9.0.0" = { + "@serialport/parser-readline-9.0.1" = { name = "_at_serialport_slash_parser-readline"; packageName = "@serialport/parser-readline"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.0.tgz"; - sha512 = "JMCqfn6A+BzcCc/4upYeLB48zijBJmOO/YGcyilXgCW0Mfedqsewgtatmk2tqFhQoJfjyOu3dRE3Lz9xHlRGZQ=="; + url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.1.tgz"; + sha512 = "38058gxvyfgdeLpg3aUyD98NuWkVB9yyTLpcSdeQ3GYiupivwH6Tdy/SKPmxlHIw3Ml2qil5MR2mtW2fLPB5CQ=="; }; }; - "@serialport/parser-ready-9.0.0" = { + "@serialport/parser-ready-9.0.1" = { name = "_at_serialport_slash_parser-ready"; packageName = "@serialport/parser-ready"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.0.tgz"; - sha512 = "oSQR7773Jdc6SjXMA1mWgfFlyBLcIRlZtt1BJMfO07k3ynBmanJ4VysVDTDvxtsREHLgcjoLRKQC/6wl2wvXOQ=="; + url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.1.tgz"; + sha512 = "lgzGkVJaaV1rJVx26WwI2UKyPxc0vu1rsOeldzA3VVbF+ABrblUQA06+cRPpT6k96GY+X4+1fB1rWuPpt8HbgQ=="; }; }; - "@serialport/parser-regex-9.0.0" = { + "@serialport/parser-regex-9.0.1" = { name = "_at_serialport_slash_parser-regex"; packageName = "@serialport/parser-regex"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.0.tgz"; - sha512 = "Q4LDXbWnun5r1ML6ZLS5Wb2BurnkJjtP1geHtZbshLUmpfms++Q28li8OPzv/KQ6praC1HDRG37D0AY6xoObSw=="; + url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.1.tgz"; + sha512 = "BHTV+Lkl+J8hSecFtDRENaR4fgA6tw44J+dmA1vEKEyum0iDN4bihbu8yvztYyo4PhBGUKDfm/PnD5EkJm0dPA=="; }; }; - "@serialport/stream-9.0.0" = { + "@serialport/stream-9.0.1" = { name = "_at_serialport_slash_stream"; packageName = "@serialport/stream"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.0.tgz"; - sha512 = "JK952xKP+7PX3tXj9DgKafQaAru0sdbkTIY1OpjUNGp0xYWTVUbZRnLK//MLkH6FpoDTJc9ghN2ILK0YRtpLLA=="; - }; - }; - "@sinonjs/commons-1.8.0" = { - name = "_at_sinonjs_slash_commons"; - packageName = "@sinonjs/commons"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz"; - sha512 = "wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q=="; + url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.1.tgz"; + sha512 = "S1xaf99vygbrMDNS/9GHYZYskWJHXJy6dCksW+ME2dzNXEXpz64vF0iug1tC1EIAhME9oD/s3ky2C9CUAd/GUg=="; }; }; "@sinonjs/commons-1.8.1" = { @@ -1291,13 +1255,13 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jest-26.0.4" = { + "@types/jest-26.0.9" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "26.0.4"; + version = "26.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.4.tgz"; - sha512 = "4fQNItvelbNA9+sFgU+fhJo8ZFF+AS4Egk3GWwCW2jFtViukXbnztccafAdLhzE/0EiCogljtQQXP8aQ9J7sFg=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.9.tgz"; + sha512 = "k4qFfJ5AUKrWok5KYXp2EPm89b0P/KZpl7Vg4XuOTVVQEhLDBDBU3iBFrjjdgd8fLw96aAtmnwhXHl63bWeBQQ=="; }; }; "@types/json-schema-7.0.5" = { @@ -1318,22 +1282,13 @@ let sha512 = "M0ISm1qsNvkdXNZml1r/1bEVqt5SJHF/LFcCtH5dHfsSIG0LEj5FhwK0f4fZy9WPCsXjmrKfpzgEW/bdQuKqmQ=="; }; }; - "@types/node-14.0.22" = { + "@types/node-14.0.27" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.22"; + version = "14.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.22.tgz"; - sha512 = "emeGcJvdiZ4Z3ohbmw93E/64jRzUHAItSHt8nF7M4TGgQTiWqFVGB8KNpLGFmUHmHLvjvBgFwVlqNcq+VuGv9g=="; - }; - }; - "@types/node-14.0.23" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.0.23"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz"; - sha512 = "Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz"; + sha512 = "kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="; }; }; "@types/normalize-package-data-2.4.0" = { @@ -1390,13 +1345,13 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; - "@typescript-eslint/eslint-plugin-3.6.0" = { + "@typescript-eslint/eslint-plugin-3.8.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.6.0.tgz"; - sha512 = "ubHlHVt1lsPQB/CZdEov9XuOFhNG9YRC//kuiS1cMQI6Bs1SsqKrEmZnpgRwthGR09/kEDtr9MywlqXyyYd8GA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.8.0.tgz"; + sha512 = "lFb4VCDleFSR+eo4Ew+HvrJ37ZH1Y9ZyE+qyP7EiwBpcCVxwmUc5PAqhShCQ8N8U5vqYydm74nss+a0wrrCErw=="; }; }; "@typescript-eslint/experimental-utils-2.34.0" = { @@ -1408,31 +1363,31 @@ let sha512 = "eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA=="; }; }; - "@typescript-eslint/experimental-utils-3.6.0" = { + "@typescript-eslint/experimental-utils-3.8.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.6.0.tgz"; - sha512 = "4Vdf2hvYMUnTdkCNZu+yYlFtL2v+N2R7JOynIOkFbPjf9o9wQvRwRkzUdWlFd2YiiUwJLbuuLnl5civNg5ykOQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz"; + sha512 = "o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w=="; }; }; - "@typescript-eslint/parser-3.6.0" = { + "@typescript-eslint/parser-3.8.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.6.0.tgz"; - sha512 = "taghDxuLhbDAD1U5Fk8vF+MnR0yiFE9Z3v2/bYScFb0N1I9SK8eKHkdJl1DAD48OGFDMFTeOTX0z7g0W6SYUXw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.8.0.tgz"; + sha512 = "u5vjOBaCsnMVQOvkKCXAmmOhyyMmFFf5dbkM3TIbg3MZ2pyv5peE4gj81UAbTHwTOXEwf7eCQTUMKrDl/+qGnA=="; }; }; - "@typescript-eslint/types-3.6.0" = { + "@typescript-eslint/types-3.8.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.6.0.tgz"; - sha512 = "JwVj74ohUSt0ZPG+LZ7hb95fW8DFOqBuR6gE7qzq55KDI3BepqsCtHfBIoa0+Xi1AI7fq5nCu2VQL8z4eYftqg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.8.0.tgz"; + sha512 = "8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -1444,40 +1399,40 @@ let sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "@typescript-eslint/typescript-estree-3.6.0" = { + "@typescript-eslint/typescript-estree-3.8.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.6.0.tgz"; - sha512 = "G57NDSABHjvob7zVV09ehWyD1K6/YUKjz5+AufObFyjNO4DVmKejj47MHjVHHlZZKgmpJD2yyH9lfCXHrPITFg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.8.0.tgz"; + sha512 = "MTv9nPDhlKfclwnplRNDL44mP2SY96YmPGxmMbMy6x12I+pERcxpIUht7DXZaj4mOKKtet53wYYXU0ABaiXrLw=="; }; }; - "@typescript-eslint/visitor-keys-3.6.0" = { + "@typescript-eslint/visitor-keys-3.8.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "3.6.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.6.0.tgz"; - sha512 = "p1izllL2Ubwunite0ITjubuMQRBGgjdVYwyG7lXPX8GbrA6qF0uwSRz9MnXZaHMxID4948gX0Ez8v9tUDi/KfQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz"; + sha512 = "gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA=="; }; }; - "abab-2.0.3" = { + "abab-2.0.4" = { name = "abab"; packageName = "abab"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz"; - sha512 = "tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz"; + sha512 = "Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ=="; }; }; - "acorn-7.3.1" = { + "acorn-7.4.0" = { name = "acorn"; packageName = "acorn"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz"; - sha512 = "tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz"; + sha512 = "+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="; }; }; "acorn-globals-6.0.0" = { @@ -1786,13 +1741,13 @@ let sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; }; }; - "babel-jest-26.1.0" = { + "babel-jest-26.2.2" = { name = "babel-jest"; packageName = "babel-jest"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.1.0.tgz"; - sha512 = "Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.2.2.tgz"; + sha512 = "JmLuePHgA+DSOdOL8lPxCgD2LhPPm+rdw1vnxR73PpIrnmKCS2/aBhtkAcxQWuUcW2hBrH8MJ3LKXE7aWpNZyA=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -1813,13 +1768,13 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-26.1.0" = { + "babel-plugin-jest-hoist-26.2.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz"; - sha512 = "qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz"; + sha512 = "B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA=="; }; }; "babel-preset-current-node-syntax-0.1.3" = { @@ -1831,13 +1786,13 @@ let sha512 = "uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ=="; }; }; - "babel-preset-jest-26.1.0" = { + "babel-preset-jest-26.2.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz"; - sha512 = "na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.2.0.tgz"; + sha512 = "R1k8kdP3R9phYQugXeNnK/nvCGlBzG4m3EoIIukC80GXb6wCv2XiwPhK6K9MAkQcMszWBYvl2Wm+yigyXFQqXg=="; }; }; "balanced-match-1.0.0" = { @@ -1948,13 +1903,13 @@ let sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; }; - "browserslist-4.13.0" = { + "browserslist-4.14.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz"; - sha512 = "MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz"; + sha512 = "pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ=="; }; }; "bser-2.1.1" = { @@ -2029,13 +1984,13 @@ let sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; }; }; - "caniuse-lite-1.0.30001099" = { + "caniuse-lite-1.0.30001112" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001099"; + version = "1.0.30001112"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz"; - sha512 = "sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001112.tgz"; + sha512 = "J05RTQlqsatidif/38aN3PGULCLrg8OYQOlJUKbeYVzC2mGZkZLIztwRlB3MtrfLmawUmjFlNJvy/uhwniIe1Q=="; }; }; "capture-exit-2.0.0" = { @@ -2641,13 +2596,22 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "electron-to-chromium-1.3.496" = { + "electron-to-chromium-1.3.526" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.496"; + version = "1.3.526"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.496.tgz"; - sha512 = "TXY4mwoyowwi4Lsrq9vcTUYBThyc1b2hXaTZI13p8/FRhY2CTaq5lK+DVjhYkKiTLsKt569Xes+0J5JsVXFurQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.526.tgz"; + sha512 = "HiroW5ZbGwgT8kCnoEO8qnGjoTPzJxduvV/Vv/wH63eo2N6Zj3xT5fmmaSPAPUM05iN9/5fIEkIg3owTtV6QZg=="; + }; + }; + "emittery-0.7.1" = { + name = "emittery"; + packageName = "emittery"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz"; + sha512 = "d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ=="; }; }; "emoji-regex-7.0.3" = { @@ -2758,13 +2722,13 @@ let sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; }; }; - "escalade-3.0.1" = { + "escalade-3.0.2" = { name = "escalade"; packageName = "escalade"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz"; - sha512 = "DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz"; + sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="; }; }; "escape-string-regexp-1.0.5" = { @@ -2794,22 +2758,13 @@ let sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; }; - "eslint-7.4.0" = { + "eslint-7.6.0" = { name = "eslint"; packageName = "eslint"; - version = "7.4.0"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.4.0.tgz"; - sha512 = "gU+lxhlPHu45H3JkEGgYhWhkR9wLHHEXC9FbWFnTlEkbKyZKWgWRLgf61E8zWmBuI6g5xKBph9ltg3NtZMVF8g=="; - }; - }; - "eslint-7.5.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz"; - sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz"; + sha512 = "QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w=="; }; }; "eslint-config-google-0.14.0" = { @@ -2821,13 +2776,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-23.18.0" = { + "eslint-plugin-jest-23.20.0" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "23.18.0"; + version = "23.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.18.0.tgz"; - sha512 = "wLPM/Rm1SGhxrFQ2TKM/BYsYPhn7ch6ZEK92S2o/vGkAAnDXM0I4nTIo745RIX+VlCRMFgBuJEax6XfTHMdeKg=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.20.0.tgz"; + sha512 = "+6BGQt85OREevBDWCvhqj1yYA4+BFK4XnRZSGJionuEYmcglMZYLNNBBemwzbqUAckURaHdJSBcjHPyrtypZOw=="; }; }; "eslint-scope-5.1.0" = { @@ -2857,15 +2812,6 @@ let sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; - "espree-7.1.0" = { - name = "espree"; - packageName = "espree"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.1.0.tgz"; - sha512 = "dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw=="; - }; - }; "espree-7.2.0" = { name = "espree"; packageName = "espree"; @@ -2911,13 +2857,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.1.0" = { + "estraverse-5.2.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"; - sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; }; }; "esutils-2.0.3" = { @@ -2992,13 +2938,13 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-26.1.0" = { + "expect-26.2.0" = { name = "expect"; packageName = "expect"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-26.1.0.tgz"; - sha512 = "QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw=="; + url = "https://registry.npmjs.org/expect/-/expect-26.2.0.tgz"; + sha512 = "8AMBQ9UVcoUXt0B7v+5/U5H6yiUR87L6eKCfjE3spx7Ya5lF+ebUo37MCFBML2OiLfkX1sxmQOZhIDonyVTkcw=="; }; }; "ext-1.4.0" = { @@ -3496,13 +3442,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.1.3" = { + "har-validator-5.1.5" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.3"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; "has-flag-3.0.0" = { @@ -3586,13 +3532,13 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "highlight.js-10.1.1" = { + "highlight.js-10.1.2" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz"; - sha512 = "b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.2.tgz"; + sha512 = "Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA=="; }; }; "hosted-git-info-2.8.8" = { @@ -3874,13 +3820,13 @@ let sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; - "is-docker-2.0.0" = { + "is-docker-2.1.1" = { name = "is-docker"; packageName = "is-docker"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz"; - sha512 = "pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ=="; + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; + sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; }; }; "is-extendable-0.1.1" = { @@ -4162,40 +4108,40 @@ let sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; }; }; - "jest-26.1.0" = { + "jest-26.2.2" = { name = "jest"; packageName = "jest"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-26.1.0.tgz"; - sha512 = "LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw=="; + url = "https://registry.npmjs.org/jest/-/jest-26.2.2.tgz"; + sha512 = "EkJNyHiAG1+A8pqSz7cXttoVa34hOEzN/MrnJhYnfp5VHxflVcf2pu3oJSrhiy6LfIutLdWo+n6q63tjcoIeig=="; }; }; - "jest-changed-files-26.1.0" = { + "jest-changed-files-26.2.0" = { name = "jest-changed-files"; packageName = "jest-changed-files"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.1.0.tgz"; - sha512 = "HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw=="; + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.2.0.tgz"; + sha512 = "+RyJb+F1K/XBLIYiL449vo5D+CvlHv29QveJUWNPXuUicyZcq+tf1wNxmmFeRvAU1+TzhwqczSjxnCCFt7+8iA=="; }; }; - "jest-cli-26.1.0" = { + "jest-cli-26.2.2" = { name = "jest-cli"; packageName = "jest-cli"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.1.0.tgz"; - sha512 = "Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.2.2.tgz"; + sha512 = "vVcly0n/ijZvdy6gPQiQt0YANwX2hLTPQZHtW7Vi3gcFdKTtif7YpI85F8R8JYy5DFSWz4x1OW0arnxlziu5Lw=="; }; }; - "jest-config-26.1.0" = { + "jest-config-26.2.2" = { name = "jest-config"; packageName = "jest-config"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-26.1.0.tgz"; - sha512 = "ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-26.2.2.tgz"; + sha512 = "2lhxH0y4YFOijMJ65usuf78m7+9/8+hAb1PZQtdRdgnQpAb4zP6KcVDDktpHEkspBKnc2lmFu+RQdHukUUbiTg=="; }; }; "jest-diff-25.5.0" = { @@ -4207,13 +4153,13 @@ let sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; }; }; - "jest-diff-26.1.0" = { + "jest-diff-26.2.0" = { name = "jest-diff"; packageName = "jest-diff"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.1.0.tgz"; - sha512 = "GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.2.0.tgz"; + sha512 = "Wu4Aopi2nzCsHWLBlD48TgRy3Z7OsxlwvHNd1YSnHc7q1NJfrmyCPoUXrTIrydQOG5ApaYpsAsdfnMbJqV1/wQ=="; }; }; "jest-docblock-26.0.0" = { @@ -4225,31 +4171,31 @@ let sha512 = "RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w=="; }; }; - "jest-each-26.1.0" = { + "jest-each-26.2.0" = { name = "jest-each"; packageName = "jest-each"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-26.1.0.tgz"; - sha512 = "lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-26.2.0.tgz"; + sha512 = "gHPCaho1twWHB5bpcfnozlc6mrMi+VAewVPNgmwf81x2Gzr6XO4dl+eOrwPWxbkYlgjgrYjWK2xgKnixbzH3Ew=="; }; }; - "jest-environment-jsdom-26.1.0" = { + "jest-environment-jsdom-26.2.0" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz"; - sha512 = "dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw=="; + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.2.0.tgz"; + sha512 = "sDG24+5M4NuIGzkI3rJW8XUlrpkvIdE9Zz4jhD8OBnVxAw+Y1jUk9X+lAOD48nlfUTlnt3lbAI3k2Ox+WF3S0g=="; }; }; - "jest-environment-node-26.1.0" = { + "jest-environment-node-26.2.0" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.1.0.tgz"; - sha512 = "DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.2.0.tgz"; + sha512 = "4M5ExTYkJ19efBzkiXtBi74JqKLDciEk4CEsp5tTjWGYMrlKFQFtwIVG3tW1OGE0AlXhZjuHPwubuRYY4j4uOw=="; }; }; "jest-get-type-25.2.6" = { @@ -4270,58 +4216,58 @@ let sha512 = "zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg=="; }; }; - "jest-haste-map-26.1.0" = { + "jest-haste-map-26.2.2" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.1.0.tgz"; - sha512 = "WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.2.2.tgz"; + sha512 = "3sJlMSt+NHnzCB+0KhJ1Ut4zKJBiJOlbrqEYNdRQGlXTv8kqzZWjUKQRY3pkjmlf+7rYjAV++MQ4D6g4DhAyOg=="; }; }; - "jest-jasmine2-26.1.0" = { + "jest-jasmine2-26.2.2" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz"; - sha512 = "1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ=="; + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.2.2.tgz"; + sha512 = "Q8AAHpbiZMVMy4Hz9j1j1bg2yUmPa1W9StBvcHqRaKa9PHaDUMwds8LwaDyzP/2fkybcTQE4+pTMDOG9826tEw=="; }; }; - "jest-leak-detector-26.1.0" = { + "jest-leak-detector-26.2.0" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz"; - sha512 = "dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.2.0.tgz"; + sha512 = "aQdzTX1YiufkXA1teXZu5xXOJgy7wZQw6OJ0iH5CtQlOETe6gTSocaYKUNui1SzQ91xmqEUZ/WRavg9FD82rtQ=="; }; }; - "jest-matcher-utils-26.1.0" = { + "jest-matcher-utils-26.2.0" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz"; - sha512 = "PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.2.0.tgz"; + sha512 = "2cf/LW2VFb3ayPHrH36ZDjp9+CAeAe/pWBAwsV8t3dKcrINzXPVxq8qMWOxwt5BaeBCx4ZupVGH7VIgB8v66vQ=="; }; }; - "jest-message-util-26.1.0" = { + "jest-message-util-26.2.0" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.1.0.tgz"; - sha512 = "dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.2.0.tgz"; + sha512 = "g362RhZaJuqeqG108n1sthz5vNpzTNy926eNDszo4ncRbmmcMRIUAZibnd6s5v2XSBCChAxQtCoN25gnzp7JbQ=="; }; }; - "jest-mock-26.1.0" = { + "jest-mock-26.2.0" = { name = "jest-mock"; packageName = "jest-mock"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.1.0.tgz"; - sha512 = "1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.2.0.tgz"; + sha512 = "XeC7yWtWmWByoyVOHSsE7NYsbXJLtJNgmhD7z4MKumKm6ET0si81bsSLbQ64L5saK3TgsHo2B/UqG5KNZ1Sp/Q=="; }; }; "jest-pnp-resolver-1.2.2" = { @@ -4342,94 +4288,94 @@ let sha512 = "Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A=="; }; }; - "jest-resolve-26.1.0" = { + "jest-resolve-26.2.2" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.1.0.tgz"; - sha512 = "KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.2.2.tgz"; + sha512 = "ye9Tj/ILn/0OgFPE/3dGpQPUqt4dHwIocxt5qSBkyzxQD8PbL0bVxBogX2FHxsd3zJA7V2H/cHXnBnNyyT9YoQ=="; }; }; - "jest-resolve-dependencies-26.1.0" = { + "jest-resolve-dependencies-26.2.2" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz"; - sha512 = "fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.2.2.tgz"; + sha512 = "S5vufDmVbQXnpP7435gr710xeBGUFcKNpNswke7RmFvDQtmqPjPVU/rCeMlEU0p6vfpnjhwMYeaVjKZAy5QYJA=="; }; }; - "jest-runner-26.1.0" = { + "jest-runner-26.2.2" = { name = "jest-runner"; packageName = "jest-runner"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.1.0.tgz"; - sha512 = "elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.2.2.tgz"; + sha512 = "/qb6ptgX+KQ+aNMohJf1We695kaAfuu3u3ouh66TWfhTpLd9WbqcF6163d/tMoEY8GqPztXPLuyG0rHRVDLxCA=="; }; }; - "jest-runtime-26.1.0" = { + "jest-runtime-26.2.2" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.1.0.tgz"; - sha512 = "1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.2.2.tgz"; + sha512 = "a8VXM3DxCDnCIdl9+QucWFfQ28KdqmyVFqeKLigHdErtsx56O2ZIdQkhFSuP1XtVrG9nTNHbKxjh5XL1UaFDVQ=="; }; }; - "jest-serializer-26.1.0" = { + "jest-serializer-26.2.0" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.1.0.tgz"; - sha512 = "eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.2.0.tgz"; + sha512 = "V7snZI9IVmyJEu0Qy0inmuXgnMWDtrsbV2p9CRAcmlmPVwpC2ZM8wXyYpiugDQnwLHx0V4+Pnog9Exb3UO8M6Q=="; }; }; - "jest-snapshot-26.1.0" = { + "jest-snapshot-26.2.2" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "26.1.0"; + version = "26.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.1.0.tgz"; - sha512 = "YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.2.2.tgz"; + sha512 = "NdjD8aJS7ePu268Wy/n/aR1TUisG0BOY+QOW4f6h46UHEKOgYmmkvJhh2BqdVZQ0BHSxTMt04WpCf9njzx8KtA=="; }; }; - "jest-util-26.1.0" = { + "jest-util-26.2.0" = { name = "jest-util"; packageName = "jest-util"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-26.1.0.tgz"; - sha512 = "rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-26.2.0.tgz"; + sha512 = "YmDwJxLZ1kFxpxPfhSJ0rIkiZOM0PQbRcfH0TzJOhqCisCAsI1WcmoQqO83My9xeVA2k4n+rzg2UuexVKzPpig=="; }; }; - "jest-validate-26.1.0" = { + "jest-validate-26.2.0" = { name = "jest-validate"; packageName = "jest-validate"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.1.0.tgz"; - sha512 = "WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.2.0.tgz"; + sha512 = "8XKn3hM6VIVmLNuyzYLCPsRCT83o8jMZYhbieh4dAyKLc4Ypr36rVKC+c8WMpWkfHHpGnEkvWUjjIAyobEIY/Q=="; }; }; - "jest-watcher-26.1.0" = { + "jest-watcher-26.2.0" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.1.0.tgz"; - sha512 = "ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.2.0.tgz"; + sha512 = "674Boco4Joe0CzgKPL6K4Z9LgyLx+ZvW2GilbpYb8rFEUkmDGgsZdv1Hv5rxsRpb1HLgKUOL/JfbttRCuFdZXQ=="; }; }; - "jest-worker-26.1.0" = { + "jest-worker-26.2.1" = { name = "jest-worker"; packageName = "jest-worker"; - version = "26.1.0"; + version = "26.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz"; - sha512 = "Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.2.1.tgz"; + sha512 = "+XcGMMJDTeEGncRb5M5Zq9P7K4sQ1sirhjdOxsN1462h6lFo9w59bl2LVQmdGEEeU3m+maZCkS2Tcc9SfCHO4A=="; }; }; "js-tokens-4.0.0" = { @@ -4459,13 +4405,13 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsdom-16.3.0" = { + "jsdom-16.4.0" = { name = "jsdom"; packageName = "jsdom"; - version = "16.3.0"; + version = "16.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-16.3.0.tgz"; - sha512 = "zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz"; + sha512 = "lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w=="; }; }; "jsesc-0.5.0" = { @@ -5044,22 +4990,22 @@ let sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; }; }; - "node-notifier-7.0.1" = { + "node-notifier-7.0.2" = { name = "node-notifier"; packageName = "node-notifier"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.1.tgz"; - sha512 = "VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.2.tgz"; + sha512 = "ux+n4hPVETuTL8+daJXTOC6uKLgMsl1RYfFv7DKRzyvzBapqco0rZZ9g72ZN8VS6V+gvNYHYa/ofcCY8fkJWsA=="; }; }; - "node-releases-1.1.59" = { + "node-releases-1.1.60" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.59"; + version = "1.1.60"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz"; - sha512 = "H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz"; + sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; }; }; "noop-logger-0.1.1" = { @@ -5233,13 +5179,13 @@ let sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; }; }; - "onetime-5.1.0" = { + "onetime-5.1.1" = { name = "onetime"; packageName = "onetime"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; - sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.1.tgz"; + sha512 = "ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg=="; }; }; "optionator-0.8.3" = { @@ -5323,13 +5269,13 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; - "parse-json-5.0.0" = { + "parse-json-5.0.1" = { name = "parse-json"; packageName = "parse-json"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz"; - sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz"; + sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ=="; }; }; "parse5-5.1.1" = { @@ -5494,13 +5440,13 @@ let sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; }; }; - "pretty-format-26.1.0" = { + "pretty-format-26.2.0" = { name = "pretty-format"; packageName = "pretty-format"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz"; - sha512 = "GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.2.0.tgz"; + sha512 = "qi/8IuBu2clY9G7qCXgCdD1Bf9w+sXakdHTRToknzMtVy0g7c4MBWaZy7MfB7ndKZovRO6XRwJiAYqq+MC7SDA=="; }; }; "process-nextick-args-2.0.1" = { @@ -5674,13 +5620,13 @@ let sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; }; - "regenerator-runtime-0.13.5" = { + "regenerator-runtime-0.13.7" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.5"; + version = "0.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; }; }; "regenerator-transform-0.14.5" = { @@ -5782,22 +5728,22 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; - "request-promise-core-1.1.3" = { + "request-promise-core-1.1.4" = { name = "request-promise-core"; packageName = "request-promise-core"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; }; }; - "request-promise-native-1.0.8" = { + "request-promise-native-1.0.9" = { name = "request-promise-native"; packageName = "request-promise-native"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ=="; + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; "require-directory-2.1.1" = { @@ -5989,13 +5935,13 @@ let sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; - "serialport-9.0.0" = { + "serialport-9.0.1" = { name = "serialport"; packageName = "serialport"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-9.0.0.tgz"; - sha512 = "4kQqIM0XhT6QECyzJtPdSsDWRFt8u3/vscQxb+z4TrAMiPDkDGBTLDaXmCxarXDa1s7EeK1IyxMce9wzWPFzAQ=="; + url = "https://registry.npmjs.org/serialport/-/serialport-9.0.1.tgz"; + sha512 = "35Ms8dqjtAb73lptfEZG2l/nFZOxHt3hUjCHvl+g3Mu737gzFLDpSBrRywBJw4G4eS5ozZ3YcthwYnop1WO+ng=="; }; }; "set-blocking-2.0.0" = { @@ -6079,13 +6025,13 @@ let sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; - "simple-concat-1.0.0" = { + "simple-concat-1.0.1" = { name = "simple-concat"; packageName = "simple-concat"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; - sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; }; }; "simple-get-3.1.0" = { @@ -6466,15 +6412,6 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strip-json-comments-3.1.0" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; - sha512 = "e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="; - }; - }; "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -6853,13 +6790,13 @@ let sha512 = "zo09yRj+xwLFE3hyhJeVHWRSPuKEIAsFK5r2u47KL/HBKqpwdUSanoaz5L34IKiSATFrjG5ywmIu98hPVMfxZg=="; }; }; - "typedoc-plugin-markdown-2.3.1" = { + "typedoc-plugin-markdown-2.4.0" = { name = "typedoc-plugin-markdown"; packageName = "typedoc-plugin-markdown"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.3.1.tgz"; - sha512 = "7rlmg1tLjddYy11uznHCAlyoOpxdWnFXqGEZ7j2mJ4KJg2avwWgEpw6SFZVofgPCGn36zklpFS51lHxYSRTLVQ=="; + url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.4.0.tgz"; + sha512 = "m4eOwxSzeCbGNFzPDadNQcuMbkbc/45fgXsIP/m4K20i/8zVhCBmvoTxmKUqWYVTYc1BTtvQD5hY/qCueHoLFw=="; }; }; "typedoc-plugin-no-inherit-1.1.10" = { @@ -6880,22 +6817,22 @@ let sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; }; }; - "typescript-3.9.6" = { + "typescript-3.9.7" = { name = "typescript"; packageName = "typescript"; - version = "3.9.6"; + version = "3.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz"; - sha512 = "Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz"; + sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; }; }; - "uglify-js-3.10.0" = { + "uglify-js-3.10.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; - sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz"; + sha512 = "RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q=="; }; }; "ultron-1.1.1" = { @@ -7060,13 +6997,13 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-7.0.3" = { + "uuid-8.3.0" = { name = "uuid"; packageName = "uuid"; - version = "7.0.3"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; - sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz"; + sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="; }; }; "v8-compile-cache-2.1.1" = { @@ -7384,29 +7321,29 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "zigbee-herdsman-0.12.108" = { + "zigbee-herdsman-0.12.116" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.12.108"; + version = "0.12.116"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.108.tgz"; - sha512 = "5xPgCYFAu/Q8mibEzB2be/nkkyCjMNKox+sYnaNNbUm0w25YRcI3FWuxE+wl9v7UVopZ8P9Wfou+XGsFbdaWRA=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.116.tgz"; + sha512 = "eMpqW5KWiVR5jMW7gelDrZB7sgohD8CoJeAH91bd89zR/vM3sTnSTC/HRpqRlEsPeYqwCRBKExf57q2iDQbWaA=="; }; }; - "zigbee-herdsman-converters-12.0.147" = { + "zigbee-herdsman-converters-12.0.161" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "12.0.147"; + version = "12.0.161"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.147.tgz"; - sha512 = "WlNkN5xG+HdS1hZ5jTjR2vFii1OfOqTFUEQ+uZg06L7V1TucHRPlQ4AMY0WUQksnX2uuRqwehA3iuyszZjBAOg=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.161.tgz"; + sha512 = "iufUoZL86uTplW8vEjevFtAb7KITox2vXHB+0l9dE7lJqYyiGKyEoRqbjkmqBNqFjkJXD4eAM0VpsVAbHGbDMg=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.14.2"; + version = "1.14.3"; src = ./.; dependencies = [ sources."@dabh/diagnostics-2.0.2" @@ -7549,53 +7486,57 @@ let sources."wrappy-1.0.2" sources."ws-3.3.3" sources."xtend-4.0.2" - (sources."zigbee-herdsman-0.12.108" // { + (sources."zigbee-herdsman-0.12.116" // { dependencies = [ - sources."@babel/cli-7.10.4" + sources."@babel/cli-7.10.5" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.10.4" - sources."@babel/core-7.10.4" - sources."@babel/generator-7.10.4" + sources."@babel/compat-data-7.11.0" + sources."@babel/core-7.11.1" + sources."@babel/generator-7.11.0" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" - sources."@babel/helper-create-class-features-plugin-7.10.4" + sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" - sources."@babel/helper-define-map-7.10.4" + sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.10.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.4" + sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.4" - sources."@babel/plugin-proposal-async-generator-functions-7.10.4" + sources."@babel/parser-7.11.3" + sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.10.4" sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.11.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.10.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" @@ -7609,7 +7550,7 @@ let sources."@babel/plugin-transform-arrow-functions-7.10.4" sources."@babel/plugin-transform-async-to-generator-7.10.4" sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.11.1" sources."@babel/plugin-transform-classes-7.10.4" sources."@babel/plugin-transform-computed-properties-7.10.4" sources."@babel/plugin-transform-destructuring-7.10.4" @@ -7620,39 +7561,39 @@ let sources."@babel/plugin-transform-function-name-7.10.4" sources."@babel/plugin-transform-literals-7.10.4" sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.5" sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.10.5" sources."@babel/plugin-transform-modules-umd-7.10.4" sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" sources."@babel/plugin-transform-new-target-7.10.4" sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.5" sources."@babel/plugin-transform-property-literals-7.10.4" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.10.4" + sources."@babel/plugin-transform-typescript-7.11.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.10.4" + sources."@babel/preset-env-7.11.0" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-typescript-7.10.4" - sources."@babel/runtime-7.10.4" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.4" - sources."@babel/types-7.10.4" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" - (sources."@jest/console-26.1.0" // { + (sources."@jest/console-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7662,9 +7603,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/core-26.1.0" // { + (sources."@jest/core-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" @@ -7682,9 +7623,9 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."@jest/environment-26.1.0" // { + (sources."@jest/environment-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7693,9 +7634,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/fake-timers-26.1.0" // { + (sources."@jest/fake-timers-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7704,9 +7645,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/globals-26.1.0" // { + (sources."@jest/globals-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7715,9 +7656,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/reporters-26.1.0" // { + (sources."@jest/reporters-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7733,9 +7674,9 @@ let sources."source-map-0.6.1" ]; }) - (sources."@jest/test-result-26.1.0" // { + (sources."@jest/test-result-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7744,10 +7685,10 @@ let sources."supports-color-7.1.0" ]; }) - sources."@jest/test-sequencer-26.1.0" - (sources."@jest/transform-26.1.0" // { + sources."@jest/test-sequencer-26.2.2" + (sources."@jest/transform-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" sources."chalk-4.1.0" @@ -7773,17 +7714,17 @@ let sources."supports-color-7.1.0" ]; }) - sources."@serialport/binding-abstract-9.0.0" - sources."@serialport/binding-mock-9.0.0" - sources."@serialport/bindings-9.0.0" - sources."@serialport/parser-byte-length-9.0.0" - sources."@serialport/parser-cctalk-9.0.0" - sources."@serialport/parser-delimiter-9.0.0" - sources."@serialport/parser-readline-9.0.0" - sources."@serialport/parser-ready-9.0.0" - sources."@serialport/parser-regex-9.0.0" - sources."@serialport/stream-9.0.0" - sources."@sinonjs/commons-1.8.0" + sources."@serialport/binding-abstract-9.0.1" + sources."@serialport/binding-mock-9.0.1" + sources."@serialport/bindings-9.0.1" + sources."@serialport/parser-byte-length-9.0.1" + sources."@serialport/parser-cctalk-9.0.1" + sources."@serialport/parser-delimiter-9.0.1" + sources."@serialport/parser-readline-9.0.1" + sources."@serialport/parser-ready-9.0.1" + sources."@serialport/parser-regex-9.0.1" + sources."@serialport/stream-9.0.1" + sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" sources."@types/babel__core-7.1.9" sources."@types/babel__generator-7.6.1" @@ -7796,32 +7737,32 @@ let sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/jest-26.0.4" + sources."@types/jest-26.0.9" sources."@types/json-schema-7.0.5" sources."@types/nedb-1.8.10" - sources."@types/node-14.0.22" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."@types/prettier-2.0.2" sources."@types/serialport-8.0.1" sources."@types/stack-utils-1.0.1" sources."@types/yargs-15.0.5" sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-3.6.0" // { + (sources."@typescript-eslint/eslint-plugin-3.8.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.6.0" - sources."@typescript-eslint/parser-3.6.0" - sources."@typescript-eslint/types-3.6.0" - (sources."@typescript-eslint/typescript-estree-3.6.0" // { + sources."@typescript-eslint/experimental-utils-3.8.0" + sources."@typescript-eslint/parser-3.8.0" + sources."@typescript-eslint/types-3.8.0" + (sources."@typescript-eslint/typescript-estree-3.8.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-3.6.0" - sources."abab-2.0.3" - sources."acorn-7.3.1" + sources."@typescript-eslint/visitor-keys-3.8.0" + sources."abab-2.0.4" + sources."acorn-7.4.0" sources."acorn-globals-6.0.0" sources."acorn-jsx-5.2.0" sources."acorn-walk-7.2.0" @@ -7856,9 +7797,9 @@ let sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" - (sources."babel-jest-26.1.0" // { + (sources."babel-jest-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7870,9 +7811,9 @@ let }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.1.0" + sources."babel-plugin-jest-hoist-26.2.0" sources."babel-preset-current-node-syntax-0.1.3" - sources."babel-preset-jest-26.1.0" + sources."babel-preset-jest-26.2.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -7900,14 +7841,14 @@ let ]; }) sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.13.0" + sources."browserslist-4.14.0" sources."bser-2.1.1" sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001099" + sources."caniuse-lite-1.0.30001112" sources."capture-exit-2.0.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -7948,11 +7889,7 @@ let ]; }) sources."core-util-is-1.0.2" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) + sources."cross-spawn-6.0.5" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -7989,12 +7926,13 @@ let ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.496" + sources."electron-to-chromium-1.3.526" + sources."emittery-0.7.1" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."escalade-3.0.1" + sources."escalade-3.0.2" sources."escape-string-regexp-1.0.5" (sources."escodegen-1.14.3" // { dependencies = [ @@ -8005,7 +7943,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.4.0" // { + (sources."eslint-7.6.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -8021,18 +7959,19 @@ let sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."strip-ansi-6.0.0" - sources."strip-json-comments-3.1.0" + sources."strip-json-comments-3.1.1" sources."supports-color-7.1.0" + sources."which-2.0.2" ]; }) sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.1.0" + sources."espree-7.2.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -8050,9 +7989,9 @@ let ]; }) sources."expand-template-2.0.3" - (sources."expect-26.1.0" // { + (sources."expect-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8126,7 +8065,7 @@ let ]; }) sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" sources."has-unicode-2.0.1" @@ -8136,7 +8075,7 @@ let sources."kind-of-4.0.0" ]; }) - sources."highlight.js-10.1.1" + sources."highlight.js-10.1.2" sources."hosted-git-info-2.8.8" sources."html-encoding-sniffer-2.0.1" sources."html-escaper-2.0.2" @@ -8177,7 +8116,7 @@ let sources."kind-of-5.1.0" ]; }) - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -8218,21 +8157,21 @@ let ]; }) sources."istanbul-reports-3.0.2" - (sources."jest-26.1.0" // { + (sources."jest-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-26.1.0" + sources."jest-cli-26.2.2" sources."supports-color-7.1.0" ]; }) - (sources."jest-changed-files-26.1.0" // { + (sources."jest-changed-files-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8247,11 +8186,12 @@ let sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."supports-color-7.1.0" + sources."which-2.0.2" ]; }) - (sources."jest-config-26.1.0" // { + (sources."jest-config-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" @@ -8263,7 +8203,7 @@ let sources."is-number-7.0.0" sources."jest-get-type-26.0.0" sources."micromatch-4.0.2" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" sources."to-regex-range-5.0.1" ]; @@ -8279,9 +8219,9 @@ let ]; }) sources."jest-docblock-26.0.0" - (sources."jest-each-26.1.0" // { + (sources."jest-each-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -8289,13 +8229,13 @@ let sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-environment-jsdom-26.1.0" // { + (sources."jest-environment-jsdom-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8304,9 +8244,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-environment-node-26.1.0" // { + (sources."jest-environment-node-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8316,9 +8256,9 @@ let ]; }) sources."jest-get-type-25.2.6" - (sources."jest-haste-map-26.1.0" // { + (sources."jest-haste-map-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."braces-3.0.2" @@ -8334,22 +8274,22 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-jasmine2-26.1.0" // { + (sources."jest-jasmine2-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-leak-detector-26.1.0" // { + (sources."jest-leak-detector-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -8357,13 +8297,13 @@ let sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-matcher-utils-26.1.0" // { + (sources."jest-matcher-utils-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -8371,15 +8311,15 @@ let sources."color-name-1.1.4" sources."diff-sequences-26.0.0" sources."has-flag-4.0.0" - sources."jest-diff-26.1.0" + sources."jest-diff-26.2.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-message-util-26.1.0" // { + (sources."jest-message-util-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" sources."chalk-4.1.0" @@ -8394,9 +8334,9 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-mock-26.1.0" // { + (sources."jest-mock-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8407,9 +8347,9 @@ let }) sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - (sources."jest-resolve-26.1.0" // { + (sources."jest-resolve-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8419,9 +8359,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-resolve-dependencies-26.1.0" // { + (sources."jest-resolve-dependencies-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8430,9 +8370,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-runner-26.1.0" // { + (sources."jest-runner-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8441,9 +8381,9 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-runtime-26.1.0" // { + (sources."jest-runtime-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8453,10 +8393,10 @@ let sources."supports-color-7.1.0" ]; }) - sources."jest-serializer-26.1.0" - (sources."jest-snapshot-26.1.0" // { + sources."jest-serializer-26.2.0" + (sources."jest-snapshot-26.2.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -8464,16 +8404,16 @@ let sources."color-name-1.1.4" sources."diff-sequences-26.0.0" sources."has-flag-4.0.0" - sources."jest-diff-26.1.0" + sources."jest-diff-26.2.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."semver-7.3.2" sources."supports-color-7.1.0" ]; }) - (sources."jest-util-26.1.0" // { + (sources."jest-util-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" sources."chalk-4.1.0" @@ -8487,9 +8427,9 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-validate-26.1.0" // { + (sources."jest-validate-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."camelcase-6.0.0" @@ -8498,13 +8438,13 @@ let sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."pretty-format-26.2.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-watcher-26.1.0" // { + (sources."jest-watcher-26.2.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.2.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8513,7 +8453,7 @@ let sources."supports-color-7.1.0" ]; }) - (sources."jest-worker-26.1.0" // { + (sources."jest-worker-26.2.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -8522,7 +8462,7 @@ let sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jsdom-16.3.0" + sources."jsdom-16.4.0" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -8569,12 +8509,13 @@ let sources."node-abi-2.18.0" sources."node-int64-0.4.0" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-7.0.1" // { + (sources."node-notifier-7.0.2" // { dependencies = [ sources."semver-7.3.2" + sources."which-2.0.2" ]; }) - sources."node-releases-1.1.59" + sources."node-releases-1.1.60" sources."noop-logger-0.1.1" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" @@ -8595,7 +8536,7 @@ let sources."object.assign-4.1.0" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."optionator-0.9.1" sources."p-each-series-2.1.0" sources."p-finally-1.0.0" @@ -8603,7 +8544,7 @@ let sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."parse5-5.1.1" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -8647,7 +8588,7 @@ let sources."rechoir-0.6.2" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpp-3.1.0" @@ -8667,8 +8608,8 @@ let sources."uuid-3.4.0" ]; }) - sources."request-promise-core-1.1.3" - (sources."request-promise-native-1.0.8" // { + sources."request-promise-core-1.1.4" + (sources."request-promise-native-1.0.9" // { dependencies = [ sources."tough-cookie-2.5.0" ]; @@ -8688,7 +8629,7 @@ let sources."sane-4.1.0" sources."saxes-5.0.1" sources."semver-5.7.1" - sources."serialport-9.0.0" + sources."serialport-9.0.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -8700,7 +8641,7 @@ let sources."shelljs-0.8.4" sources."shellwords-0.1.1" sources."signal-exit-3.0.3" - sources."simple-concat-1.0.0" + sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."sisteransi-1.0.5" sources."slash-2.0.0" @@ -8817,7 +8758,7 @@ let sources."typedarray-to-buffer-3.1.5" sources."typedoc-0.17.8" sources."typedoc-default-themes-0.10.2" - (sources."typedoc-plugin-markdown-2.3.1" // { + (sources."typedoc-plugin-markdown-2.4.0" // { dependencies = [ sources."fs-extra-9.0.1" sources."jsonfile-6.0.1" @@ -8826,8 +8767,8 @@ let }) sources."typedoc-plugin-no-inherit-1.1.10" sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-3.9.6" - sources."uglify-js-3.10.0" + sources."typescript-3.9.7" + sources."uglify-js-3.10.1" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" @@ -8849,7 +8790,7 @@ let sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-7.0.3" + sources."uuid-8.3.0" sources."v8-compile-cache-2.1.1" (sources."v8-to-istanbul-4.1.4" // { dependencies = [ @@ -8869,7 +8810,7 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."which-2.0.2" + sources."which-1.3.1" sources."which-module-2.0.0" sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" @@ -8906,10 +8847,10 @@ let sources."yargs-parser-18.1.3" ]; }) - (sources."zigbee-herdsman-converters-12.0.147" // { + (sources."zigbee-herdsman-converters-12.0.161" // { dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.10.5" // { + (sources."@babel/core-7.11.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -8917,21 +8858,21 @@ let sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.10.5" // { + (sources."@babel/generator-7.11.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" (sources."@babel/highlight-7.10.4" // { @@ -8939,7 +8880,7 @@ let sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.3" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.10.4" @@ -8952,14 +8893,14 @@ let sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.10.5" // { + (sources."@babel/traverse-7.11.0" // { dependencies = [ sources."debug-4.1.1" sources."globals-11.12.0" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.10.5" + sources."@babel/types-7.11.0" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" (sources."@istanbuljs/load-nyc-config-1.1.0" // { @@ -8968,21 +8909,21 @@ let ]; }) sources."@istanbuljs/schema-0.1.2" - sources."@jest/console-26.1.0" - (sources."@jest/core-26.1.0" // { + sources."@jest/console-26.2.0" + (sources."@jest/core-26.2.2" // { dependencies = [ sources."rimraf-3.0.2" ]; }) - sources."@jest/environment-26.1.0" - sources."@jest/fake-timers-26.1.0" - sources."@jest/globals-26.1.0" - sources."@jest/reporters-26.1.0" + sources."@jest/environment-26.2.0" + sources."@jest/fake-timers-26.2.0" + sources."@jest/globals-26.2.0" + sources."@jest/reporters-26.2.2" sources."@jest/source-map-26.1.0" - sources."@jest/test-result-26.1.0" - sources."@jest/test-sequencer-26.1.0" - sources."@jest/transform-26.1.0" - sources."@jest/types-26.1.0" + sources."@jest/test-result-26.2.0" + sources."@jest/test-sequencer-26.2.2" + sources."@jest/transform-26.2.2" + sources."@jest/types-26.2.0" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" sources."@types/babel__core-7.1.9" @@ -8995,7 +8936,7 @@ let sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.5" - sources."@types/node-14.0.23" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."@types/prettier-2.0.2" sources."@types/stack-utils-1.0.1" @@ -9008,8 +8949,8 @@ let sources."ms-2.1.2" ]; }) - sources."abab-2.0.3" - sources."acorn-7.3.1" + sources."abab-2.0.4" + sources."acorn-7.4.0" sources."acorn-globals-6.0.0" sources."acorn-jsx-5.2.0" sources."acorn-walk-7.2.0" @@ -9043,11 +8984,11 @@ let sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."axios-0.19.2" - sources."babel-jest-26.1.0" + sources."babel-jest-26.2.2" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.1.0" + sources."babel-plugin-jest-hoist-26.2.0" sources."babel-preset-current-node-syntax-0.1.3" - sources."babel-preset-jest-26.1.0" + sources."babel-preset-jest-26.2.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -9141,6 +9082,7 @@ let ]; }) sources."ecc-jsbn-0.1.2" + sources."emittery-0.7.1" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -9154,14 +9096,14 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.5.0" // { + (sources."eslint-7.6.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-23.18.0" + sources."eslint-plugin-jest-23.20.0" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" @@ -9169,7 +9111,7 @@ let sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -9194,7 +9136,7 @@ let sources."extend-shallow-2.0.1" ]; }) - (sources."expect-26.1.0" // { + (sources."expect-26.2.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -9247,7 +9189,7 @@ let sources."graceful-fs-4.2.4" sources."growly-1.3.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -9298,7 +9240,7 @@ let sources."kind-of-5.1.0" ]; }) - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -9334,12 +9276,12 @@ let ]; }) sources."istanbul-reports-3.0.2" - (sources."jest-26.1.0" // { + (sources."jest-26.2.2" // { dependencies = [ - sources."jest-cli-26.1.0" + sources."jest-cli-26.2.2" ]; }) - (sources."jest-changed-files-26.1.0" // { + (sources."jest-changed-files-26.2.0" // { dependencies = [ sources."execa-4.0.3" sources."get-stream-5.1.0" @@ -9347,35 +9289,35 @@ let sources."npm-run-path-4.0.1" ]; }) - sources."jest-config-26.1.0" - sources."jest-diff-26.1.0" + sources."jest-config-26.2.2" + sources."jest-diff-26.2.0" sources."jest-docblock-26.0.0" - sources."jest-each-26.1.0" - sources."jest-environment-jsdom-26.1.0" - sources."jest-environment-node-26.1.0" + sources."jest-each-26.2.0" + sources."jest-environment-jsdom-26.2.0" + sources."jest-environment-node-26.2.0" sources."jest-get-type-26.0.0" - sources."jest-haste-map-26.1.0" - sources."jest-jasmine2-26.1.0" - sources."jest-leak-detector-26.1.0" - sources."jest-matcher-utils-26.1.0" - sources."jest-message-util-26.1.0" - sources."jest-mock-26.1.0" + sources."jest-haste-map-26.2.2" + sources."jest-jasmine2-26.2.2" + sources."jest-leak-detector-26.2.0" + sources."jest-matcher-utils-26.2.0" + sources."jest-message-util-26.2.0" + sources."jest-mock-26.2.0" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - sources."jest-resolve-26.1.0" - sources."jest-resolve-dependencies-26.1.0" - sources."jest-runner-26.1.0" - sources."jest-runtime-26.1.0" - sources."jest-serializer-26.1.0" - sources."jest-snapshot-26.1.0" - sources."jest-util-26.1.0" - (sources."jest-validate-26.1.0" // { + sources."jest-resolve-26.2.2" + sources."jest-resolve-dependencies-26.2.2" + sources."jest-runner-26.2.2" + sources."jest-runtime-26.2.2" + sources."jest-serializer-26.2.0" + sources."jest-snapshot-26.2.2" + sources."jest-util-26.2.0" + (sources."jest-validate-26.2.0" // { dependencies = [ sources."camelcase-6.0.0" ]; }) - sources."jest-watcher-26.1.0" - (sources."jest-worker-26.1.0" // { + sources."jest-watcher-26.2.0" + (sources."jest-worker-26.2.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -9384,7 +9326,7 @@ let sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jsdom-16.3.0" + sources."jsdom-16.4.0" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -9428,7 +9370,7 @@ let sources."nice-try-1.0.5" sources."node-int64-0.4.0" sources."node-modules-regexp-1.0.0" - sources."node-notifier-7.0.1" + sources."node-notifier-7.0.2" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -9451,7 +9393,7 @@ let sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."optionator-0.9.1" sources."p-each-series-2.1.0" sources."p-finally-1.0.0" @@ -9459,7 +9401,7 @@ let sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."parse5-5.1.1" sources."pascalcase-0.1.1" sources."path-exists-4.0.0" @@ -9472,7 +9414,7 @@ let sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-26.1.0" // { + (sources."pretty-format-26.2.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -9504,8 +9446,8 @@ let sources."uuid-3.4.0" ]; }) - sources."request-promise-core-1.1.3" - (sources."request-promise-native-1.0.8" // { + sources."request-promise-core-1.1.4" + (sources."request-promise-native-1.0.9" // { dependencies = [ sources."tough-cookie-2.5.0" ]; @@ -9668,7 +9610,7 @@ let sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-7.0.3" + sources."uuid-8.3.0" sources."v8-compile-cache-2.1.1" (sources."v8-to-istanbul-4.1.4" // { dependencies = [ diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index f9dd578ad98b..3f344f673f16 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,4 +1,4 @@ -{ autoreconfHook, lib, stdenv, fetchurl }: +{ stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { name = "dash-0.5.11.1"; @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # Temporary fix until a proper one is accepted upstream - patches = lib.lists.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; - nativeBuildInputs = lib.lists.optional stdenv.isDarwin autoreconfHook; + patches = stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; meta = with stdenv.lib; { homepage = "http://gondor.apana.org.au/~herbert/dash/"; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index c1d02f3cd403..325bae4f9cce 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "antibody"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "0ldvihpm14h0gcn7iz5yxg1wbfv24flx6y8khdanw21lf9nmp59z"; + sha256 = "0icag53svzdm7yvzp855fp0f7q0g0jkfmjaa1sj6mmb01c1xgzi1"; }; vendorSha256 = "0z8fma3v2dph8nv3q4lmv43s6p5sc338xb7kcmnpwcc0iw7b4vyj"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 25bb91a84e22..018bf01f7d94 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-09-02"; + version = "2020-09-03"; pname = "oh-my-zsh"; - rev = "7256c03ce1c54bd08ecab954c91a0231386556a6"; + rev = "87edf16e05598505927410f6b06bbc5a6003805b"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0sp9np1kh0h0wdqhn871zibsd7jkp0hjjih8n88wcsbqhggmp95q"; + sha256 = "0c13vkh9w3sxdy12b17yqa676cp83jb3a4pwc2xx2xggcxpn72by"; }; installPhase = '' diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 192a788b935e..3743cad11a30 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.10.1"; + version = "2.11.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "03mard9cyffn109c1p0hrdi4cjxbwyk98677qrira9yvy6rw04bg"; + sha256 = "11jmgc73b0w725rq89j6hk6gh67nfdbzp3rmywmrnah683d6xbpx"; }; # put packages that needs to be overriden in the py package scope @@ -105,10 +105,13 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-sql azure-mgmt-sqlvirtualmachine azure-mgmt-storage + azure-mgmt-synapse azure-mgmt-trafficmanager azure-mgmt-web azure-multiapi-storage azure-storage-blob + azure-synapse-accesscontrol + azure-synapse-spark colorama cryptography Fabric diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 1ff74369432a..8d17c9ff2017 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -139,8 +139,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.1.0" "zip" - "1pgxl2gzc1dm7akcqm6fl0y35sb3jdgcz6d7k6vsq93gb3gzrrwv"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.2.0" "zip" + "ddfe4c0c55f0e3fd1f66dd82c1d4a3d872ce124639b9a77fcd172daf464438a5"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.5.0" "zip" "1nh626jg459p9f96glv74dph3vmpybm5cs8rrj1s65kn3m8jf591"; @@ -160,8 +160,8 @@ let azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; - azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.0.0" "zip" - "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; + azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" + "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.15.0" "zip" "03ysr8kx0gavjrxsi9wqrgxpg3g17nvii7z68qfm0k2mv6ryj3z7"; @@ -187,8 +187,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.11.0" "zip" - "0193y0w5lcrayf8g0sxaj57w52kixdk3x5b8kga5is4pdjq7c6k2"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.12.0" "zip" + "7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; @@ -229,6 +229,9 @@ let azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; + azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.3.0" "zip" + "0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy"; + azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip" "1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77"; @@ -238,8 +241,8 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.0.0" "zip" "1qisnwn0gqfsa3h5x0fdbsgdjwn92hdbg71gdijrja0kryb328k5"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.2.0" "zip" - "1r5ww9ndya6sifafrbp4cr5iyyaww2ns7wrbqm6hc6aqxcpf30qq"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b2" "zip" + "10kpfzgsyh648a9z194vysgfl5887qwwamyd1r32zfqi9fr4js5l"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip" "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm"; @@ -265,8 +268,11 @@ let azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.6.0" "zip" - "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5i"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip" + "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5a"; + + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.4.1" "zip" + "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -297,6 +303,26 @@ let }; }); + azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { + version = "0.2.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; + extension = "zip"; + }; + }); + + azure-synapse-spark = super.azure-synapse-spark.overrideAttrs(oldAttrs: rec { + version = "0.2.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1qijqp6llshqas422lnqvpv45iv99n7f13v86znql40y3jp5n3ir"; + extension = "zip"; + }; + }); + azure-keyvault = super.azure-keyvault.overrideAttrs(oldAttrs: rec { version = "1.1.0"; src = super.fetchPypi { diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 70a0aff118db..2f0deed7f613 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -8,7 +8,7 @@ let in buildGoPackage rec { pname = "gocryptfs"; - version = "1.7.1"; + version = "1.8.0"; goPackagePath = "github.com/rfjakob/gocryptfs"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "1zhzhvjhvi6xzib985bsnj9yzp4zsnm91m1679nbab6vm3kanq06"; + sha256 = "1acalwrr5xqhpqca3gypj0s68w6vpckxmg5z5gfgh8wx6nqx4aw9"; }; postPatch = "rm -r tests"; diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index c5a5af212d90..c8efa4d61abd 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -4,13 +4,14 @@ stdenv.mkDerivation rec { pname = "securefs"; - version = "0.8.3"; + version = "0.11.1"; src = fetchFromGitHub { - sha256 = "0nf0bd163gz844mikqab2mh7xjlj31ixa6hi85qxdifyjpfjv7y4"; + sha256 = "1sxfgqgy63ml7vg7zj3glvra4wj2qmfv9jzmpm1jqy8hq7qlqlsx"; rev = version; repo = "securefs"; owner = "netheril96"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index bfb50c45f40b..4507c4fed853 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchsvn -, pkgconfig +, pkg-config , libjpeg , libpng , flex @@ -27,14 +27,8 @@ stdenv.mkDerivation { sha256 = "1m7ks6k53gsjsdazgf22g16dfgj3pqvqy9mhxzlwszv5808sj5w5"; }; - postPatch = '' - # Install libnetpbm.so symlink to correct destination - substituteInPlace lib/Makefile \ - --replace '/sharedlink' '/lib' - ''; - nativeBuildInputs = [ - pkgconfig + pkg-config flex makeWrapper ]; @@ -48,6 +42,14 @@ stdenv.mkDerivation { libtiff ] ++ lib.optional enableX11 libX11; + enableParallelBuilding = true; + + postPatch = '' + # Install libnetpbm.so symlink to correct destination + substituteInPlace lib/Makefile \ + --replace '/sharedlink' '/lib' + ''; + configurePhase = '' runHook preConfigure @@ -72,8 +74,6 @@ stdenv.mkDerivation { runHook postConfigure ''; - enableParallelBuilding = true; - installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/antimicroX/default.nix b/pkgs/tools/misc/antimicroX/default.nix index 23418ced829e..cb5496d450c4 100644 --- a/pkgs/tools/misc/antimicroX/default.nix +++ b/pkgs/tools/misc/antimicroX/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "antimicroX"; - version = "3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "juliagoda"; repo = "antimicroX"; rev = version; - sha256 = "0li22sjl95233azxhyda36idnfzbb4b02wf57hnpnba6qvrlpwwl"; + sha256 = "05asxlkgb4cgvpcyksw1cx8cz8nzi8hmw8b91lw92892j7a2r7wj"; }; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig itstool ]; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 1096cce496ef..3fb2a5d76a06 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "direnv"; - version = "2.21.3"; + version = "2.22.0"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; + sha256 = "06z85r99w0nr093fawva6sysdlrdsfjjf7asx96k1sjv56sb306m"; }; # we have no bash at the moment for windows diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 75e8d5d4887c..238ff73ba387 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "181xlm0zj9pb73ijwf202kwwm2jji0m11ynsbaxl44alva3xpvmk"; + sha256 = "1rcbxqcxr8v5faa52psjsjjlnkia5cwc3b1cwka9f5cxwhdwg7hr"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1ypphm9n6wri5f03fj65i5p6lb11qj5zp8ddvybanaypv5llkfcb"; + cargoSha256 = "1q15xy15hk6r3sai9wry2jm57dhinx6r84yxg9fwvq354613k645"; doCheck = false; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index ed4f7a5f704f..54dd51ba9189 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.0.13"; + version = "8.3.0"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0vinccakinp996kqzry8irk7sf4djajxdfmpy982dl5y45491l4a"; + sha256 = "0kl6sbq0lzrvf4wzz5bvz81ncmfw5lm7pjr2r2xx4sws1w006nq2"; }; - vendorSha256 = "1d6gg7c0rb45zy9rilacn2xyr3kcb7acsh389hk6lppipmhpzr5a"; + vendorSha256 = "0qfrc3c4fsg3w2zcpdr93ilknxhshcysvin029va154sq3zmggbn"; doCheck = false; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 8f231935ee37..8f279ff688af 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "1jyik1022iv8nqjfrv3lkvcpr8zsaxfx8hi7yagklbs6vzlg80jg"; + sha256 = "14iwwg1iqfxjhpw9p3ddq53l901v9l9n2r60q9q6jls8hfqcgsnj"; }; vendorSha256 = null; diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index ce86e1171004..71146b15ea3d 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -5,14 +5,20 @@ let honggfuzz = stdenv.mkDerivation rec { pname = "honggfuzz"; - version = "2.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "${version}"; - sha256 = "0ycpx087mhv5s7w01chg2b6rfb3zgfpp9in0x73kpv7y4dcvg7gw"; + sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33"; }; + + postPatch = '' + substituteInPlace hfuzz_cc/hfuzz-cc.c \ + --replace '"clang' '"${clang}/bin/clang' + ''; + enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix index 838873b7557f..6c8e9c56cdc9 100644 --- a/pkgs/tools/system/ddrescueview/default.nix +++ b/pkgs/tools/system/ddrescueview/default.nix @@ -1,20 +1,24 @@ { stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk-pixbuf, glib, gtk2, libX11, pango }: -stdenv.mkDerivation rec { - name = "ddrescueview-0.4alpha3"; +let + versionBase = "0.4"; + versionSuffix = "alpha4"; +in stdenv.mkDerivation rec { + pname = "ddrescueview"; + version = "${versionBase}${versionSuffix}"; + name = "ddrescueview-0.4alpha4"; src = fetchurl { - name = "${name}.tar.xz"; - url = "mirror://sourceforge/ddrescueview/ddrescueview-source-0.4%7Ealpha3.tar.xz"; - sha256 = "0603jisxkswfyh93s3i20f8ns4yf83dmgmy0lg5001rvaw9mkw9j"; + name = "ddrescueview-${versionBase}${versionSuffix}.tar.xz"; + url = "mirror://sourceforge/ddrescueview/ddrescueview-source-${versionBase}~${versionSuffix}.tar.xz"; + sha256 = "0v159nlc0lrqznbbwi7zda619is5h2rjk55gz6cl807j0kd19ycc"; }; + sourceRoot = "ddrescueview-source-${versionBase}~${versionSuffix}/source"; nativeBuildInputs = [ fpc lazarus ]; buildInputs = [ atk cairo gdk-pixbuf glib gtk2 libX11 pango ]; - sourceRoot = "source"; - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = '' @@ -24,9 +28,8 @@ stdenv.mkDerivation rec { installPhase = '' install -Dt $out/bin ddrescueview cd ../resources/linux - install -Dt $out/share/applications ddrescueview.desktop - install -Dt $out/share/icons/hicolor/32x32/apps ddrescueview.xpm - install -Dt $out/share/man/man1 ddrescueview.1 + mkdir -p "$out/share" + cp -ar applications icons man $out/share ''; meta = with lib; { diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 2d86894808c4..fe4622f3381e 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,28 +1,18 @@ { lib, fetchFromGitHub, stdenv, autoreconfHook , ncurses, IOKit, python3 -, fetchpatch }: stdenv.mkDerivation rec { pname = "htop"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4"; + sha256 = "0kjlphdvwwbj91kk91s4ksc954d3c2bznddzx2223jmb1bn9rcsa"; }; - patches = [ - # Never use glyphs for checkmarks. Issue - https://github.com/htop-dev/htop/issues/29 - # Remove with the next release. - (fetchpatch { - url = "https://github.com/htop-dev/htop/commit/96074058278829facb86f6f4de099d56a00a0c0e.patch"; - sha256 = "1rnfvjfsvfgr1s7kzr1hk6nwik6shcq4mg6dlbgdq0f2fz0cnazk"; - }) - ]; - nativeBuildInputs = [ autoreconfHook python3 ]; buildInputs = [ ncurses diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index e5316e028dbe..752721689baa 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,6 +1,7 @@ { stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig , CoreFoundation, IOKit, libossp_uuid , curl, libcap, libuuid, lm_sensors, zlib, fetchpatch +, nixosTests , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -14,14 +15,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.23.2"; + version = "1.24.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1vv92plk9dxk6fl76ik1zralpzc35ymrfyrf1cr6pv8q3agyy5k4"; + sha256 = "19zr2wlsc8rbw6a7vjy4ivgq71l34lh70pcgwa0k5sp1vryj7r3d"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -36,12 +37,6 @@ in stdenv.mkDerivation rec { patches = [ ./no-files-in-etc-and-var.patch - ] ++ stdenv.lib.optionals (!stdenv.cc.isGNU) [ - # fix memcpy typo for non-gnu. Remove with the next release. - (fetchpatch { - url = "https://github.com/netdata/netdata/commit/da7f267196b489e9a75724b68897e8f2e6137d72.patch"; - sha256 = "1j2sa06j6v491nw58bjx5nqqyfi1n2n9z3p3jiy4yh74m3asldlv"; - }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; @@ -77,6 +72,8 @@ in stdenv.mkDerivation rec { rm -r $out/sbin ''; + passthru.tests.netdata = nixosTests.netdata; + meta = { description = "Real-time performance monitoring tool"; homepage = "https://my-netdata.io/"; @@ -84,5 +81,4 @@ in stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; }; - } diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 002615077467..5c6025b245e0 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -19,19 +19,18 @@ , ibus , json-glib , pantheon -, libwnck3 , xorg }: stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.3.3"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "0ml57j6jagqvjlpgn1bcyx08h71kcxalh69y03y2lj84x5ib8qz3"; + sha256 = "1db3fbawh4qwdqby5ji4g26pksi4q253r5zvd3kv1m2ljmwrrwj0"; }; nativeBuildInputs = [ @@ -55,7 +54,6 @@ stdenv.mkDerivation rec { dbus ibus json-glib - libwnck3 xorg.libXtst pantheon.granite pantheon.elementary-gtk-theme @@ -83,6 +81,8 @@ stdenv.mkDerivation rec { Save your often used text snippets and then expand them whenever you type their abbreviation. For example:- "spr`" expands to "Snippet Pixie rules!" + + For non-accessible applications such as browsers and Electron apps, there's a shortcut (default is Ctrl+`) for opening a search window that pastes the selected snippet. ''; homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d36f73e2f867..b96bcd40c791 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -188,11 +188,6 @@ mapAliases ({ googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 - gst_plugins_bad = gst-plugins-bad; # added 2017-02 - gst_plugins_base = gst-plugins-base; # added 2017-02 - gst_plugins_good = gst-plugins-good; # added 2017-02 - gst_plugins_ugly = gst-plugins-ugly; # added 2017-02 - gst_python = gst-python; # added 2017-02 gtk_doc = gtk-doc; # added 2018-02-25 guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 @@ -681,18 +676,6 @@ mapAliases ({ ocamlPackages_4_03 ocamlPackages_latest; - gst_all = { # added 2018-04-25 - inherit (pkgs) gstreamer gnonlin gst-python; - gstPluginsBase = pkgs.gst-plugins-base; - gstPluginsBad = pkgs.gst-plugins-bad; - gstPluginsGood = pkgs.gst-plugins-good; - gstPluginsUgly = pkgs.gst-plugins-ugly; - gst-plugins-base = pkgs.gst-plugins-base; - gst-plugins-bad = pkgs.gst-plugins-bad; - gst-plugins-good = pkgs.gst-plugins-good; - gst-plugins-ugly = pkgs.gst-plugins-ugly; - }; - # added 2019-08-01 mumble_git = pkgs.mumble; murmur_git = pkgs.murmur; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf9973ec27f4..3e5434eba137 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10554,6 +10554,8 @@ in black = with python3Packages; toPythonApplication black; + black-macchiato = with python3Packages; toPythonApplication black-macchiato; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -11503,6 +11505,8 @@ in summon = callPackage ../development/tools/summon { }; + svlint = callPackage ../development/tools/analysis/svlint { }; + swarm = callPackage ../development/tools/analysis/swarm { }; swiftformat = callPackage ../development/tools/swiftformat { }; @@ -12575,24 +12579,6 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }); - gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { }; - - gst-plugins-base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; - - gst-plugins-good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {}; - - gst-plugins-bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {}; - - gst-plugins-ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; - - gst-python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; - - gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { }; - - gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; - gusb = callPackage ../development/libraries/gusb { }; qt-mobility = callPackage ../development/libraries/qt-mobility {}; @@ -18933,6 +18919,8 @@ in marwaita = callPackage ../data/themes/marwaita { }; + marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -19863,6 +19851,8 @@ in convchain = callPackage ../tools/graphics/convchain {}; + cordless = callPackage ../applications/networking/instant-messengers/cordless { }; + coursera-dl = callPackage ../applications/misc/coursera-dl {}; coyim = callPackage ../applications/networking/instant-messengers/coyim {}; @@ -21937,6 +21927,7 @@ in avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; + grpcSupport = config.murmur.grpcSupport or true; }).murmur; mumble = (callPackages ../applications/networking/mumble { @@ -22271,6 +22262,8 @@ in inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; + openambit = qt5.callPackage ../applications/misc/openambit { }; + openbox = callPackage ../applications/window-managers/openbox { }; openbox-menu = callPackage ../applications/misc/openbox-menu { @@ -24810,6 +24803,8 @@ in legendary-gl = python38Packages.callPackage ../games/legendary-gl { }; + left4gore-bin = callPackage ../games/left4gore { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; @@ -25502,6 +25497,8 @@ in plasma-applet-caffeine-plus = libsForQt5.callPackage ../desktops/plasma-5/addons/caffeine-plus.nix { }; + kwin-dynamic-workspaces = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix { }; + kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; @@ -27392,6 +27389,10 @@ in vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; + vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly; + }; + vttest = callPackage ../tools/misc/vttest { }; wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 32bb7d337860..d0dc0bf1e918 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -173,6 +173,8 @@ let cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + csexp = callPackage ../development/ocaml-modules/csexp { }; + cstruct = if lib.versionAtLeast ocaml.version "4.2" then callPackage ../development/ocaml-modules/cstruct {} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29e23ce83b6b..c4ad9f1669d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -677,6 +677,8 @@ in { azure-mgmt-subscription = callPackage ../development/python-modules/azure-mgmt-subscription { }; + azure-mgmt-synapse = callPackage ../development/python-modules/azure-mgmt-synapse { }; + azure-mgmt-trafficmanager = callPackage ../development/python-modules/azure-mgmt-trafficmanager { }; azure-mgmt-web = callPackage ../development/python-modules/azure-mgmt-web { }; @@ -705,6 +707,10 @@ in { azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; + azure-synapse-accesscontrol = callPackage ../development/python-modules/azure-synapse-accesscontrol { }; + + azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { }; + Babel = callPackage ../development/python-modules/Babel { }; babelfish = callPackage ../development/python-modules/babelfish { }; @@ -842,6 +848,8 @@ in { black = callPackage ../development/python-modules/black { }; + black-macchiato = callPackage ../development/python-modules/black-macchiato { }; + bleach = callPackage ../development/python-modules/bleach { }; bleak = callPackage ../development/python-modules/bleak { }; @@ -1610,6 +1618,8 @@ in { django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; + django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { }; + django_nose = callPackage ../development/python-modules/django_nose { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; @@ -1694,7 +1704,13 @@ in { dnslib = callPackage ../development/python-modules/dnslib { }; - dnspython = callPackage ../development/python-modules/dnspython { }; + dnspython = if isPy3k then + callPackage ../development/python-modules/dnspython { } + else + self.dnspython_1; + + dnspython_1 = callPackage ../development/python-modules/dnspython/1.nix { }; + dns = self.dnspython; # Alias for compatibility, 2017-12-10 doc8 = callPackage ../development/python-modules/doc8 { };