diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 8de523e89dfd..bde4183a65b1 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -744,6 +744,53 @@ with the exception of `other` (see `format` in unittestFlags = [ "-s" "tests" "-v" ]; ``` +##### Using sphinxHook {#using-sphinxhook} + +The `sphinxHook` is a helpful tool to build documentation and manpages +using the popular Sphinx documentation generator. +It is setup to automatically find common documentation source paths and +render them using the default `html` style. + +``` + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + sphinxHook + ]; +``` + +The hook will automatically build and install the artifact into the +`doc` output, if it exists. It also provides an automatic diversion +for the artifacts of the `man` builder into the `man` target. + +``` + outputs = [ + "out" + "doc" + "man" + ]; + + # Use multiple builders + sphinxBuilders = [ + "singlehtml" + "man" + ]; +``` + +Overwrite `sphinxRoot` when the hook is unable to find your +documentation source root. + +``` + # Configure sphinxRoot for uncommon paths + sphinxRoot = "weird/docs/path"; +``` + +The hook is also available to packages outside the python ecosystem by +referencing it using `python3.pkgs.sphinxHook`. + ### Develop local package {#develop-local-package} As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) @@ -1270,16 +1317,17 @@ are used in `buildPythonPackage`. - `pytestCheckHook` to run tests with `pytest`. See [example usage](#using-pytestcheckhook). - `pythonCatchConflictsHook` to check whether a Python package is not already existing. - `pythonImportsCheckHook` to check whether importing the listed modules works. +- `pythonRelaxDepsHook` will relax Python dependencies restrictions for the package. + See [example usage](#using-pythonrelaxdepshook). - `pythonRemoveBinBytecode` to remove bytecode from the `/bin` folder. - `setuptoolsBuildHook` to build a wheel using `setuptools`. - `setuptoolsCheckHook` to run tests with `python setup.py test`. +- `sphinxHook` to build documentation and manpages using Sphinx. - `venvShellHook` to source a Python 3 `venv` at the `venvDir` location. A `venv` is created if it does not yet exist. `postVenvCreation` can be used to to run commands only after venv is first created. - `wheelUnpackHook` to move a wheel to the correct folder so it can be installed with the `pipInstallHook`. -- `pythonRelaxDepsHook` will relax Python dependencies restrictions for the package. - See [example usage](#using-pythonrelaxdepshook). - `unittestCheckHook` will run tests with `python -m unittest discover`. See [example usage](#using-unittestcheckhook). ### Development mode {#development-mode} diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index 0c01aa57f7e9..40a2c9aae81a 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -130,8 +130,8 @@ in type = types.attrsOf (types.submodule ({ config, options, ... }: { freeformType = datasetSettingsType; options = commonOptions // datasetOptions; - config.use_template = mkAliasDefinitions (mkDefault options.useTemplate or { }); - config.process_children_only = mkAliasDefinitions (mkDefault options.processChildrenOnly or { }); + config.use_template = modules.mkAliasAndWrapDefsWithPriority id (options.useTemplate or { }); + config.process_children_only = modules.mkAliasAndWrapDefsWithPriority id (options.processChildrenOnly or { }); })); default = { }; description = lib.mdDoc "Datasets to snapshot."; diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index 97833c37e6ef..411ebcead9f6 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -34,6 +34,7 @@ in { autosnap = true; }; datasets."pool/sanoid".use_template = [ "test" ]; + datasets."pool/compat".useTemplate = [ "test" ]; extraArgs = [ "--verbose" ]; }; @@ -51,6 +52,12 @@ in { # Test pool without parent (regression test for https://github.com/NixOS/nixpkgs/pull/180111) "pool".target = "root@target:pool/full-pool"; + + # Test backward compatible options (regression test for https://github.com/NixOS/nixpkgs/issues/181561) + "pool/compat" = { + target = "root@target:pool/compat"; + extraArgs = [ "--no-sync-snap" ]; + }; }; }; }; @@ -70,6 +77,7 @@ in { "udevadm settle", "zpool create pool -R /mnt /dev/vdb1", "zfs create pool/sanoid", + "zfs create pool/compat", "zfs create pool/syncoid", "udevadm settle", ) @@ -94,6 +102,7 @@ in { # Take snapshot with sanoid source.succeed("touch /mnt/pool/sanoid/test.txt") + source.succeed("touch /mnt/pool/compat/test.txt") source.systemctl("start --wait sanoid.service") assert len(source.succeed("zfs allow pool")) == 0, "Pool shouldn't have delegated permissions set after snapshotting" @@ -111,6 +120,9 @@ in { source.systemctl("start --wait syncoid-pool.service") target.succeed("[[ -d /mnt/pool/full-pool/syncoid ]]") + source.systemctl("start --wait syncoid-pool-compat.service") + target.succeed("cat /mnt/pool/compat/test.txt") + assert len(source.succeed("zfs allow pool")) == 0, "Pool shouldn't have delegated permissions set after syncing snapshots" assert len(source.succeed("zfs allow pool/sanoid")) == 0, "Sanoid dataset shouldn't have delegated permissions set after syncing snapshots" assert len(source.succeed("zfs allow pool/syncoid")) == 0, "Syncoid dataset shouldn't have delegated permissions set after syncing snapshots" diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 1af5357cf0eb..ab298c9d8514 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -106,6 +106,8 @@ stdenv.mkDerivation rec { makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ "''${gappsWrapperArgs[@]}" + substituteInPlace $out/share/applications/tidal-hifi.desktop --replace \ + "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" ''; meta = with lib; { diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index f60ea4ea90c8..a51edc39556e 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2022-03-06"; + version = "2022-08-06"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-w66wi+aMwQa9akfNA/1cS6UmDXPWC4OPK9BIa9Kt47A="; + sha256 = "sha256-IGLoiUeHcTlQ+WJTot3o5/Q+jRJcY52I3xHDAT0zuIU="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 5c64d8826f68..b73e5a1800b0 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, - kholidays, kcalutils, kcontacts, kdav, kidentitymanagement, + cyrus_sasl, kholidays, kcalutils, kcontacts, kdav, kidentitymanagement, kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, pimcommon, libkgapi, libsecret, qca-qt5, qtkeychain, qtnetworkauth, qtspeech, qtwebengine, qtxmlpatterns, @@ -23,4 +23,7 @@ mkDerivation { pimcommon libkgapi libsecret qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns ]; + qtWrapperArgs = [ + "--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl libkgapi ]}" + ]; } diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/applications/misc/darkman/default.nix new file mode 100644 index 000000000000..a6c32d2ba89f --- /dev/null +++ b/pkgs/applications/misc/darkman/default.nix @@ -0,0 +1,49 @@ +{ lib, fetchFromGitLab, buildGoModule, scdoc, nix-update-script }: + +buildGoModule rec { + pname = "darkman"; + version = "1.3.1"; + + src = fetchFromGitLab { + owner = "WhyNotHugo"; + repo = "darkman"; + rev = "v${version}"; + sha256 = "09iwc9cwwc88c6yrf6a552nbsnf1w8cnlra9axsar2p0k21v5yl1"; + }; + + vendorSha256 = "09rjqw6v1jaf0mhmycw9mcay9q0y1fya2azj8216gdgkl48ics08"; + + nativeBuildInputs = [ scdoc ]; + + postPatch = '' + substituteInPlace darkman.service \ + --replace "/usr/bin/darkman" "$out/bin/darkman" + substituteInPlace contrib/dbus/nl.whynothugo.darkman.service \ + --replace "/usr/bin/darkman" "$out/bin/darkman" + substituteInPlace contrib/dbus/org.freedesktop.impl.portal.desktop.darkman.service \ + --replace "/usr/bin/darkman" "$out/bin/darkman" + ''; + + buildPhase = '' + runHook preBuild + make build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make PREFIX=$out install + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Framework for dark-mode and light-mode transitions on Linux desktop"; + homepage = "https://gitlab.com/WhyNotHugo/darkman"; + license = licenses.isc; + maintainers = [ maintainers.ajgrf ]; + }; +} diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 5119dd48e0da..97feebefa5d3 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -4,6 +4,7 @@ , libtiff , librsvg , libiconv +, bash }: stdenv.mkDerivation rec { @@ -17,13 +18,20 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; + strictDeps = true; + nativeBuildInputs = [ + librsvg + ]; + buildInputs = [ libjpeg libtiff - librsvg libiconv + bash ]; + enableParallelBuilding = true; + meta = with lib; { description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files"; homepage = "http://djvu.sourceforge.net"; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 04e4567334a4..9d91a48a8bea 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.9.3"; + version = "3.9.4"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-fRlHI2g+pSexPzeEqUnow5WTPvNMGnQNWjnllzJ42fY="; + sha256 = "sha256-KIqbugEzwjlDcQPiQQjN+i05rcMNIbYpGufVYZwQ/uQ="; }; vendorSha256 = "sha256-ZOY25wgxCdVQafdhBW4Z3aQxOGTs7N3SvSDJ/Fu5psg="; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 495fd38b63d5..be6293a1ba4b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -169,9 +169,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.2.7"; - sha256 = "sha256-0AGONBurlm0cSM4HyAmUxLt8GdnqNPh146A8ibyfe+k="; - vendorSha256 = "sha256-Whe1prBGsE0q0QdNkzAKwvAP7EVlnD/985gjngh+VI4="; + version = "1.2.8"; + sha256 = "sha256-FJHZtYQHzRPWlSlXYu8mdd0YddIrBy8eBzhsvAHwfZw="; + vendorSha256 = "sha256-VKJ+aWZYD6N8HDJwUEtgWxoBMGOa27K9ze2RUJvuipc="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch b/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch new file mode 100644 index 000000000000..b42b7c3295c3 --- /dev/null +++ b/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch @@ -0,0 +1,95 @@ +From b9bf46966dd7931f9f33c30ed608a21d0e71e923 Mon Sep 17 00:00:00 2001 +From: rewine +Date: Tue, 19 Jul 2022 13:19:10 +0800 +Subject: [PATCH 1/2] remove dependency on vendored library + +--- + CuteMarkEd.pro | 4 +--- + app-static/app-static.pro | 11 ++--------- + app/app.pro | 2 -- + app/cutemarkdownhighlighter.h | 2 +- + 4 files changed, 4 insertions(+), 15 deletions(-) + +diff --git a/CuteMarkEd.pro b/CuteMarkEd.pro +index 4ee92e3..0d247a4 100644 +--- a/CuteMarkEd.pro ++++ b/CuteMarkEd.pro +@@ -9,12 +9,10 @@ TEMPLATE = subdirs + CONFIG += c++14 + + SUBDIRS = \ +- 3rdparty \ + libs \ + app-static \ + app \ +- fontawesomeicon \ +- test ++ fontawesomeicon + + # build order: 3rdparty -> libs -> app-static -> app & test + #libs.depends = 3rdparty +diff --git a/app-static/app-static.pro b/app-static/app-static.pro +index cd3c292..560b4fc 100644 +--- a/app-static/app-static.pro ++++ b/app-static/app-static.pro +@@ -13,7 +13,6 @@ CONFIG += c++11 + + INCLUDEPATH += $$PWD + # MD4C library +-INCLUDEPATH += $$PWD/../3rdparty/md4c/src + + SOURCES += \ + snippets/jsonsnippettranslator.cpp \ +@@ -34,10 +33,7 @@ SOURCES += \ + revealviewsynchronizer.cpp \ + htmlpreviewcontroller.cpp \ + htmlviewsynchronizer.cpp \ +- yamlheaderchecker.cpp \ +- $$PWD/../3rdparty/md4c/src/md4c.c \ +- $$PWD/../3rdparty/md4c/src/entity.c \ +- $$PWD/../3rdparty/md4c/src/md4c-html.c ++ yamlheaderchecker.cpp + + HEADERS += \ + snippets/snippet.h \ +@@ -64,10 +60,7 @@ HEADERS += \ + revealviewsynchronizer.h \ + htmlpreviewcontroller.h \ + htmlviewsynchronizer.h \ +- yamlheaderchecker.h \ +- $$PWD/../3rdparty/md4c/src/md4c.h \ +- $$PWD/../3rdparty/md4c/src/entity.h \ +- $$PWD/../3rdparty/md4c/src/md4c-html.h ++ yamlheaderchecker.h + + + #unix:!symbian { +diff --git a/app/app.pro b/app/app.pro +index 4827673..ab961cf 100644 +--- a/app/app.pro ++++ b/app/app.pro +@@ -40,8 +40,6 @@ macx { + } + + #qmarkdowntextedit +-include(../3rdparty/qmarkdowntextedit/qmarkdowntextedit.pri) +-include(../3rdparty/hunspell/hunspell.pri) + INCLUDEPATH += $$PWD + + SOURCES += \ +diff --git a/app/cutemarkdownhighlighter.h b/app/cutemarkdownhighlighter.h +index c99ab56..78f2be6 100644 +--- a/app/cutemarkdownhighlighter.h ++++ b/app/cutemarkdownhighlighter.h +@@ -19,7 +19,7 @@ + + #include + +-#include "../3rdparty/qmarkdowntextedit/markdownhighlighter.h" ++#include + + namespace hunspell { + class SpellChecker; +-- +2.36.1 + diff --git a/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch b/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch new file mode 100644 index 000000000000..89b5441738c5 --- /dev/null +++ b/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch @@ -0,0 +1,25 @@ +From bdc66eace846edc8a7b435f7ca9f324427243ce4 Mon Sep 17 00:00:00 2001 +From: rewine +Date: Thu, 21 Jul 2022 17:30:22 +0800 +Subject: [PATCH 2/2] use pkgcofig to find libraries + +--- + app/app.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/app/app.pro b/app/app.pro +index ab961cf..475487d 100644 +--- a/app/app.pro ++++ b/app/app.pro +@@ -13,6 +13,8 @@ win32: QT += winextras + TARGET = cutemarked + TEMPLATE = app + CONFIG += c++11 ++CONFIG += link_pkgconfig ++PKGCONFIG += QMarkdownTextedit hunspell md4c-html + + unix:!macx { + CONFIG += link_pkgconfig +-- +2.36.1 + diff --git a/pkgs/applications/office/cutemarked-ng/default.nix b/pkgs/applications/office/cutemarked-ng/default.nix new file mode 100644 index 000000000000..9488546aad6e --- /dev/null +++ b/pkgs/applications/office/cutemarked-ng/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, pkg-config +, qttools +, qtbase +, qtwebengine +, wrapQtAppsHook +, qmarkdowntextedit +, md4c +, hunspell +}: + +stdenv.mkDerivation rec { + pname = "CuteMarkEd-NG"; + version = "unstable-2021-07-29"; + + src = fetchFromGitHub { + owner = "Waqar144"; + repo = pname; + rev = "9431ac603cef23d6f29e51e18f1eeee156f5bfb3"; + sha256 = "sha256-w/D4C2ZYgI/7ZCDamTQlhrJ9vtvAMThgM/fopkdKWYc"; + }; + + patches = [ + ./0001-remove-dependency-on-vendored-library.patch + ./0002-use-pkgcofig-to-find-libraries.patch + ]; + + postPatch = '' + substituteInPlace app/app.pro \ + --replace '$$[QT_INSTALL_BINS]/lrelease' "lrelease" + ''; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + md4c + qtwebengine + qmarkdowntextedit + hunspell.dev + ]; + + meta = with lib; { + description = "A Qt-based, free and open source markdown editor"; + homepage = "https://github.com/Waqar144/CuteMarkEd-NG"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ rewine ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/applications/science/math/wolfram-engine/l10ns.nix index 9bee8052c6e3..8fb4b0d7e0fe 100644 --- a/pkgs/applications/science/math/wolfram-engine/l10ns.nix +++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -7,6 +7,13 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ + { + version = "13.1.0"; + lang = "en"; + language = "English"; + sha256 = "1659kyp38a8xknic95pynx9fsgn96i8jn9lnk89pc8n6vydw1460"; + installer = "WolframEngine_13.1.0_LINUX.sh"; + } { version = "13.0.1"; lang = "en"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c8ca224a952b..3dea75cc622a 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -10,24 +10,24 @@ with lib; let pname = "gitkraken"; - version = "8.6.0"; + version = "8.8.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-BBhKenEm1D680wJ1hmIOM/AdXN1DxoipLf9K4eHESzs="; + sha256 = "sha256-F/uqV6CL/zFERS6nKVD8kEqCZQ2O9AGGzU5uCJ94qwk="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-fyRhvaKDGYyKu6lAxHb5ve7Ix+7Tuu5JWXnqBF73ti4="; + sha256 = "sha256-TWkwN39SxPRvUUjAPSBxv4octWasjRiA91FNCWRya44="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "sha256-qbu3gPTo5zY7OQyULY2iIUDQjwjlL4xZdkl68rE3VHA="; + sha256 = "sha256-drAj0t8BRUETQ6mZPdHXgkuFAKeYsGLE8oLtf/imHk4="; }; }; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index d20c6125beb2..ee146127a38f 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -57,10 +57,10 @@ , libdvdcss , libbluray # Darwin-specific -, AudioToolbox ? null -, Foundation ? null -, libobjc ? null -, VideoToolbox ? null +, AudioToolbox +, Foundation +, libobjc +, VideoToolbox # GTK # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, # which in turn depends on systemd. systemd is not supported on Darwin, so diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 35b5f71411ee..8b81110b8485 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-SXmYf1IvHXzNLP6w8MzFx6W2kX4yIICuACOJ8Yu/HWE="; + sha256 = "sha256-SAq6sXhYySqebXbWHJ9X6q1wWnNJjgwKf8YLTXZpKuA="; }; - vendorSha256 = "sha256-nqfCdvgK2JF4XNnA14KJNngP2M/OKThawdTo+iPjRNM="; + vendorSha256 = "sha256-Yz2lea+ttgNbfP1mL+kwTKmo81Q6GGjJyvDANzeckpo="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/data/icons/hackneyed/default.nix b/pkgs/data/icons/hackneyed/default.nix new file mode 100644 index 000000000000..74aedaa3786e --- /dev/null +++ b/pkgs/data/icons/hackneyed/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchzip, stdenvNoCC, fetchFromGitLab, xcursorgen, imagemagick6, inkscape }: + +stdenvNoCC.mkDerivation rec { + pname = "hackneyed"; + version = "0.8.2"; + + src = fetchFromGitLab { + owner = "Enthymeme"; + repo = "hackneyed-x11-cursors"; + rev = version; + sha256 = "sha256-Wtrw/EzxCj4cAyfdBp0OJE4+c6FouW7+b6nFTLxdXNY="; + }; + + buildInputs = [ imagemagick6 inkscape xcursorgen ]; + + postPatch = '' + patchShebangs *.sh + substituteInPlace make-png.sh \ + --replace /usr/bin/inkscape ${inkscape}/bin/inkscape + ''; + + enableParallelBuilding = true; + + makeFlags = [ "PREFIX=$(out)" ]; + buildFlags = [ "theme" "theme.left" ]; + + meta = with lib; { + homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors"; + description = "A scalable cursor theme that resembles Windows 3.x/NT 3.x cursors"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 5964eb66f8dc..50b320a26976 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.18.8" = { + "@babel/compat-data-7.18.13" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.18.8"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"; - sha512 = "HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.13.tgz"; + sha512 = "5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw=="; }; }; "@babel/core-7.12.10" = { @@ -49,13 +49,13 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.18.7" = { + "@babel/generator-7.18.13" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.18.7"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz"; - sha512 = "shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz"; + sha512 = "CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -67,31 +67,31 @@ let sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz"; - sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"; + sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; }; }; - "@babel/helper-compilation-targets-7.18.6" = { + "@babel/helper-compilation-targets-7.18.9" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz"; - sha512 = "vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz"; + sha512 = "tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg=="; }; }; - "@babel/helper-create-class-features-plugin-7.18.6" = { + "@babel/helper-create-class-features-plugin-7.18.13" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.18.6"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz"; - sha512 = "YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz"; + sha512 = "hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA=="; }; }; "@babel/helper-create-regexp-features-plugin-7.18.6" = { @@ -103,13 +103,13 @@ let sha512 = "7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="; }; }; - "@babel/helper-environment-visitor-7.18.6" = { + "@babel/helper-environment-visitor-7.18.9" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz"; - sha512 = "8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; + sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; }; }; "@babel/helper-explode-assignable-expression-7.18.6" = { @@ -121,13 +121,13 @@ let sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.18.6" = { + "@babel/helper-function-name-7.18.9" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz"; - sha512 = "0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz"; + sha512 = "fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A=="; }; }; "@babel/helper-hoist-variables-7.18.6" = { @@ -139,13 +139,13 @@ let sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.18.6" = { + "@babel/helper-member-expression-to-functions-7.18.9" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.6.tgz"; - sha512 = "CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; + sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; }; }; "@babel/helper-module-imports-7.18.6" = { @@ -157,13 +157,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.18.8" = { + "@babel/helper-module-transforms-7.18.9" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.18.8"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.8.tgz"; - sha512 = "che3jvZwIcZxrwh63VfnFTUzcAM9v/lznYkkRxIBGMPt1SudOKHAEec0SIRCfiuIzTcF7VGj/CaTT6gY4eWxvA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz"; + sha512 = "KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -175,31 +175,31 @@ let sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.18.6" = { + "@babel/helper-plugin-utils-7.18.9" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz"; - sha512 = "gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz"; + sha512 = "aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="; }; }; - "@babel/helper-remap-async-to-generator-7.18.6" = { + "@babel/helper-remap-async-to-generator-7.18.9" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz"; - sha512 = "z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"; + sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; }; }; - "@babel/helper-replace-supers-7.18.6" = { + "@babel/helper-replace-supers-7.18.9" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.6.tgz"; - sha512 = "fTf7zoXnUGl9gF25fXCWE26t7Tvtyn6H4hkLSYhATwJvw2uYxd3aoXplMSe0g9XbwK7bmxNes7+FGO0rB/xC0g=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; + sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; }; }; "@babel/helper-simple-access-7.18.6" = { @@ -211,13 +211,13 @@ let sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.18.6" = { + "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.6.tgz"; - sha512 = "4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"; + sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw=="; }; }; "@babel/helper-split-export-declaration-7.18.6" = { @@ -229,6 +229,15 @@ let sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; + "@babel/helper-string-parser-7.18.10" = { + name = "_at_babel_slash_helper-string-parser"; + packageName = "@babel/helper-string-parser"; + version = "7.18.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; + sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + }; + }; "@babel/helper-validator-identifier-7.18.6" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; @@ -247,22 +256,22 @@ let sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helper-wrap-function-7.18.6" = { + "@babel/helper-wrap-function-7.18.11" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.18.6"; + version = "7.18.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz"; - sha512 = "I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz"; + sha512 = "oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w=="; }; }; - "@babel/helpers-7.18.6" = { + "@babel/helpers-7.18.9" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz"; - sha512 = "vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz"; + sha512 = "Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ=="; }; }; "@babel/highlight-7.18.6" = { @@ -274,22 +283,22 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.18.8" = { + "@babel/parser-7.18.13" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.8"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.8.tgz"; - sha512 = "RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz"; + sha512 = "dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.18.6" = { + "@babel/plugin-proposal-async-generator-functions-7.18.10" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.18.6"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz"; - sha512 = "WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz"; + sha512 = "1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew=="; }; }; "@babel/plugin-proposal-class-properties-7.18.6" = { @@ -310,13 +319,13 @@ let sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.18.6" = { + "@babel/plugin-proposal-export-namespace-from-7.18.9" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.6.tgz"; - sha512 = "zr/QcUlUo7GPo6+X1wC98NJADqmy5QTFWWhqeQWiki4XHafJtLl/YMGkmRB2szDD2IYJCCdBTd4ElwhId9T7Xw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; + sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; }; }; "@babel/plugin-proposal-json-strings-7.18.6" = { @@ -328,13 +337,13 @@ let sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.18.6" = { + "@babel/plugin-proposal-logical-assignment-operators-7.18.9" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.6.tgz"; - sha512 = "zMo66azZth/0tVd7gmkxOkOjs2rpHyhpcFo565PUP37hSp6hSd9uUKIfTDFMz58BwqgQKhJ9YxtM5XddjXVn+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"; + sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q=="; }; }; "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { @@ -355,13 +364,13 @@ let sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.18.6" = { + "@babel/plugin-proposal-object-rest-spread-7.18.9" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.6.tgz"; - sha512 = "9yuM6wr4rIsKa1wlUAbZEazkCrgw2sMPEXCr4Rnwetu7cEW1NydkCWytLuYletbf8vFxdJxFhwEZqMpOx2eZyw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; + sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { @@ -373,13 +382,13 @@ let sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.18.6" = { + "@babel/plugin-proposal-optional-chaining-7.18.9" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.6.tgz"; - sha512 = "PatI6elL5eMzoypFAiYDpYQyMtXTn+iMhuxxQt5mAXD4fEmKorpSI3PHd+i3JXBJN3xyA6MvJv7at23HffFHwA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"; + sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w=="; }; }; "@babel/plugin-proposal-private-methods-7.18.6" = { @@ -535,40 +544,40 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.18.6" = { + "@babel/plugin-transform-block-scoping-7.18.9" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.6.tgz"; - sha512 = "pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; + sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; }; }; - "@babel/plugin-transform-classes-7.18.8" = { + "@babel/plugin-transform-classes-7.18.9" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.18.8"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.8.tgz"; - sha512 = "RySDoXdF6hgHSHuAW4aLGyVQdmvEX/iJtjVre52k0pxRq4hzqze+rAVP++NmNv596brBpYmaiKgTZby7ziBnVg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz"; + sha512 = "EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g=="; }; }; - "@babel/plugin-transform-computed-properties-7.18.6" = { + "@babel/plugin-transform-computed-properties-7.18.9" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.6.tgz"; - sha512 = "9repI4BhNrR0KenoR9vm3/cIc1tSBIo+u1WVjKCAynahj25O8zfbiE6JtAtHPGQSs4yZ+bA8mRasRP+qc+2R5A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"; + sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.18.6" = { + "@babel/plugin-transform-destructuring-7.18.13" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.6"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.6.tgz"; - sha512 = "tgy3u6lRp17ilY8r1kP4i2+HDUwxlVqq3RTc943eAWSzGgpU1qhiKpqZ5CMyHReIYPHdo3Kg8v8edKtDqSVEyQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; + sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -580,13 +589,13 @@ let sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.18.6" = { + "@babel/plugin-transform-duplicate-keys-7.18.9" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.6.tgz"; - sha512 = "NJU26U/208+sxYszf82nmGYqVF9QN8py2HFTblPT9hbawi8+1C5a9JubODLTGFuT0qlkqVinmkwOD13s0sZktg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; + sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; }; }; "@babel/plugin-transform-exponentiation-operator-7.18.6" = { @@ -607,22 +616,22 @@ let sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; }; }; - "@babel/plugin-transform-function-name-7.18.6" = { + "@babel/plugin-transform-function-name-7.18.9" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.6.tgz"; - sha512 = "kJha/Gbs5RjzIu0CxZwf5e3aTTSlhZnHMT8zPWnJMjNpLOUgqevg+PN5oMH68nMCXnfiMo4Bhgxqj59KHTlAnA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; + sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; }; }; - "@babel/plugin-transform-literals-7.18.6" = { + "@babel/plugin-transform-literals-7.18.9" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.6.tgz"; - sha512 = "x3HEw0cJZVDoENXOp20HlypIHfl0zMIhMVZEBVTfmqbObIpsMxMbmU5nOEO8R7LYT+z5RORKPlTI5Hj4OsO9/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; + sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; }; }; "@babel/plugin-transform-member-expression-literals-7.18.6" = { @@ -652,13 +661,13 @@ let sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.18.6" = { + "@babel/plugin-transform-modules-systemjs-7.18.9" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.6.tgz"; - sha512 = "UbPYpXxLjTw6w6yXX2BYNxF3p6QY225wcTkfQCy3OMnSlS/C3xGtwUjEzGkldb/sy6PWLiCQ3NbYfjWUTI3t4g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz"; + sha512 = "zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A=="; }; }; "@babel/plugin-transform-modules-umd-7.18.6" = { @@ -751,13 +760,13 @@ let sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; }; }; - "@babel/plugin-transform-spread-7.18.6" = { + "@babel/plugin-transform-spread-7.18.9" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.6.tgz"; - sha512 = "ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz"; + sha512 = "39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA=="; }; }; "@babel/plugin-transform-sticky-regex-7.18.6" = { @@ -769,31 +778,31 @@ let sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; }; }; - "@babel/plugin-transform-template-literals-7.18.6" = { + "@babel/plugin-transform-template-literals-7.18.9" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.6.tgz"; - sha512 = "UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; + sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.18.6" = { + "@babel/plugin-transform-typeof-symbol-7.18.9" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.6.tgz"; - sha512 = "7m71iS/QhsPk85xSjFPovHPcH3H9qeyzsujhTc+vcdnsXavoWYJ74zx0lP5RhpC5+iDnVLO+PPMHzC11qels1g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; + sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.18.6" = { + "@babel/plugin-transform-unicode-escapes-7.18.10" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.18.6"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz"; - sha512 = "XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"; + sha512 = "kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ=="; }; }; "@babel/plugin-transform-unicode-regex-7.18.6" = { @@ -832,31 +841,31 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.18.6" = { + "@babel/template-7.18.10" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.18.6"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz"; - sha512 = "JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; + sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.18.8" = { + "@babel/traverse-7.18.13" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.8"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.8.tgz"; - sha512 = "UNg/AcSySJYR/+mIcJQDCv00T+AqRO7j/ZEJLzpaYtgM48rMg5MnkJgyNqkzo88+p4tfRvZJCEiwwfG6h4jkRg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz"; + sha512 = "N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA=="; }; }; - "@babel/types-7.18.8" = { + "@babel/types-7.18.13" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.8"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.8.tgz"; - sha512 = "qwpdsmraq0aJ3osLJRApsc2ouSJCdnMeZwB0DhbtHAtRpZNZCdlbRnHIgcRKzdE1g0iOGg644fzjOBcdOz9cPw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz"; + sha512 = "ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ=="; }; }; "@hapi/address-2.1.4" = { @@ -949,13 +958,13 @@ let sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; }; - "@jridgewell/trace-mapping-0.3.14" = { + "@jridgewell/trace-mapping-0.3.15" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.14"; + version = "0.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz"; - sha512 = "bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz"; + sha512 = "oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1039,6 +1048,15 @@ let sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; + "@sindresorhus/is-4.6.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz"; + sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -1174,22 +1192,22 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.182" = { + "@types/lodash-4.14.184" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.182"; + version = "4.14.184"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz"; - sha512 = "/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.184.tgz"; + sha512 = "RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q=="; }; }; - "@types/minimatch-3.0.5" = { + "@types/minimatch-5.1.0" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; - version = "3.0.5"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"; - sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.0.tgz"; + sha512 = "0RJHq5FqDWo17kdHe+SMDJLfxmLaqHbWnqZ6gNKzDvStUlrmx/eKIY17+ifLS1yybo7X86aUshQMlittDOVNnw=="; }; }; "@types/mkdirp-0.5.2" = { @@ -1201,13 +1219,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-18.0.3" = { + "@types/node-18.7.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.0.3"; + version = "18.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz"; - sha512 = "HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.7.13.tgz"; + sha512 = "46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw=="; }; }; "@types/node-8.10.66" = { @@ -1282,13 +1300,13 @@ let sha512 = "gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ=="; }; }; - "@types/uglify-js-3.16.0" = { + "@types/uglify-js-3.17.0" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.16.0"; + version = "3.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.16.0.tgz"; - sha512 = "0yeUr92L3r0GLRnBOvtYK1v2SjqMIqQDHMl7GLb+l2L8+6LSFWEEWEIgVsPdMn5ImLM8qzWT8xFPtQYpp8co0g=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.0.tgz"; + sha512 = "3HO6rm0y+/cqvOyA8xcYLweF0TKXlAxmQASjbOi49Co51A1N4nR4bEwBgRoD9kNM+rqFGArjKr654SLp2CoGmQ=="; }; }; "@types/webpack-4.41.32" = { @@ -1516,13 +1534,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.7.1" = { + "acorn-8.8.0" = { name = "acorn"; packageName = "acorn"; - version = "8.7.1"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; - sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"; + sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; }; }; "address-1.0.3" = { @@ -2398,13 +2416,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.21.1" = { + "browserslist-4.21.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.21.1"; + version = "4.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.1.tgz"; - sha512 = "Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz"; + sha512 = "898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ=="; }; }; "buffer-4.9.2" = { @@ -2533,6 +2551,15 @@ let sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; }; }; + "cacheable-lookup-5.0.4" = { + name = "cacheable-lookup"; + packageName = "cacheable-lookup"; + version = "5.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; + sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; + }; + }; "cacheable-request-6.1.0" = { name = "cacheable-request"; packageName = "cacheable-request"; @@ -2650,13 +2677,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001364" = { + "caniuse-lite-1.0.30001382" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001364"; + version = "1.0.30001382"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001364.tgz"; - sha512 = "9O0xzV3wVyX0SlegIQ6knz+okhBB5pE0PC40MNdwcipjwpxoUEHL24uJ+gG42cgklPjfO5ZjZPme9FTSN3QT2Q=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001382.tgz"; + sha512 = "2rtJwDmSZ716Pxm1wCtbPvHtbDWAreTPxXbkc5RkKglow3Ig/4GNGazDI9/BVnXbG/wnv6r3B5FEbkfg9OcTGg=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2875,13 +2902,13 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; - "cli-spinners-2.6.1" = { + "cli-spinners-2.7.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz"; - sha512 = "x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz"; + sha512 = "qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="; }; }; "cli-table-0.3.4" = { @@ -2938,13 +2965,13 @@ let sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; }; }; - "clone-response-1.0.2" = { + "clone-response-1.0.3" = { name = "clone-response"; packageName = "clone-response"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; - sha512 = "yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q=="; + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz"; + sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; }; }; "coa-2.0.2" = { @@ -3136,13 +3163,13 @@ let sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; }; }; - "commander-9.3.0" = { + "commander-9.4.0" = { name = "commander"; packageName = "commander"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz"; - sha512 = "hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz"; + sha512 = "sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="; }; }; "common-tags-1.8.2" = { @@ -3379,13 +3406,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.23.4" = { + "core-js-compat-3.25.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.23.4"; + version = "3.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.4.tgz"; - sha512 = "RkSRPe+JYEoflcsuxJWaiMPhnZoFS51FcIxm53k4KzhISCBTmaGlto9dTIrYuk0hnJc3G6pKufAKepHnBq6B6Q=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.0.tgz"; + sha512 = "extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow=="; }; }; "core-util-is-1.0.2" = { @@ -3775,6 +3802,15 @@ let sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; }; }; + "decompress-response-6.0.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; + }; + }; "deep-equal-0.2.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -4189,13 +4225,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.185" = { + "electron-to-chromium-1.4.228" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.185"; + version = "1.4.228"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.185.tgz"; - sha512 = "9kV/isoOGpKkBt04yYNaSWIBn3187Q5VZRtoReq8oz5NY/A4XmU6cAoqgQlDp7kKJCZMRjWZ8nsQyxfpFHvfyw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.228.tgz"; + sha512 = "XfDHCvou7CsDMlFwb0WZ1tWmW48e7Sn7VBRyPfZsZZila9esRsJl1trO+OqDNV97GggFSt0ISbWslKXfQkG//g=="; }; }; "elliptic-6.5.4" = { @@ -4810,13 +4846,13 @@ let sha512 = "hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ=="; }; }; - "fastest-levenshtein-1.0.12" = { + "fastest-levenshtein-1.0.16" = { name = "fastest-levenshtein"; packageName = "fastest-levenshtein"; - version = "1.0.12"; + version = "1.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; - sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; + url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"; + sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; }; }; "fastq-1.13.0" = { @@ -5602,6 +5638,15 @@ let sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; }; }; + "got-11.8.5" = { + name = "got"; + packageName = "got"; + version = "11.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-11.8.5.tgz"; + sha512 = "o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ=="; + }; + }; "got-9.6.0" = { name = "got"; packageName = "got"; @@ -6034,6 +6079,15 @@ let sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; }; }; + "http2-wrapper-1.0.3" = { + name = "http2-wrapper"; + packageName = "http2-wrapper"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; + sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; + }; + }; "https-browserify-1.0.0" = { name = "https-browserify"; packageName = "https-browserify"; @@ -6421,13 +6475,13 @@ let sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; - "is-core-module-2.9.0" = { + "is-core-module-2.10.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; - sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz"; + sha512 = "Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg=="; }; }; "is-data-descriptor-0.1.4" = { @@ -7141,13 +7195,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.3.2" = { + "keyv-4.4.1" = { name = "keyv"; packageName = "keyv"; - version = "4.3.2"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.3.2.tgz"; - sha512 = "kn8WmodVBe12lmHpA6W8OY7SNh6wVR+Z+wZESF4iF5FCazaVXGWOtnbnvX0tMQ1bO+/TmOD9LziuYMvrIIs0xw=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.4.1.tgz"; + sha512 = "PzByhNxfBLnSBW2MZi1DF+W5+qB/7BMpOokewqIvqS8GFtP7xHm2oeGU72Y1fhtfOv/FiEnI4+nyViYDmUChnw=="; }; }; "killable-1.0.1" = { @@ -7744,6 +7798,15 @@ let sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; + "mimic-response-3.1.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; + }; + }; "mini-css-extract-plugin-0.12.0" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; @@ -7843,13 +7906,13 @@ let sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; - "minipass-3.3.4" = { + "minipass-3.3.5" = { name = "minipass"; packageName = "minipass"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz"; - sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; + sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; }; }; "minizlib-1.3.3" = { @@ -8374,13 +8437,13 @@ let sha512 = "GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA=="; }; }; - "object.assign-4.1.2" = { + "object.assign-4.1.4" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.2"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; - sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"; + sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; "object.entries-1.1.5" = { @@ -9130,13 +9193,13 @@ let sha512 = "8xCNE/aT/EXKenuMDZ+xTVwkT8gsoHN2z/Q29l80u0ppGEXVvsKRzNMbtKhg8LS8k1tJLAHHylf6p4VFmP6XUQ=="; }; }; - "portfinder-1.0.28" = { + "portfinder-1.0.32" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.28"; + version = "1.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz"; - sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA=="; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz"; + sha512 = "on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg=="; }; }; "posix-character-classes-0.1.1" = { @@ -9157,13 +9220,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.14" = { + "postcss-8.4.16" = { name = "postcss"; packageName = "postcss"; - version = "8.4.14"; + version = "8.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; - sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"; + sha512 = "ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="; }; }; "postcss-calc-7.0.5" = { @@ -9814,6 +9877,15 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; + "quick-lru-5.1.1" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + }; + }; "randombytes-2.1.0" = { name = "randombytes"; packageName = "randombytes"; @@ -10264,6 +10336,15 @@ let sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; }; + "resolve-alpn-1.2.1" = { + name = "resolve-alpn"; + packageName = "resolve-alpn"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; + sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; + }; + }; "resolve-cwd-2.0.0" = { name = "resolve-cwd"; packageName = "resolve-cwd"; @@ -10318,13 +10399,13 @@ let sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; }; }; - "responselike-2.0.0" = { + "responselike-2.0.1" = { name = "responselike"; packageName = "responselike"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz"; - sha512 = "xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw=="; + url = "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; }; }; "restore-cursor-2.0.0" = { @@ -10858,13 +10939,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.10.0" = { + "simple-git-3.13.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.10.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.10.0.tgz"; - sha512 = "2w35xrS5rVtAW0g67LqtxCZN5cdddz/woQRfS0OJXaljXEoTychZ4jnE+CQgra/wX4ZvHeiChTUMenCwfIYEYw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.13.0.tgz"; + sha512 = "VYrs3joeHvWGcN3K135RpGpPjm4AHYeOrclwew6LlfHgq6ozQYIW2yMnmjf4PCgVOuSYCbXkdUjyiFawuJz8MA=="; }; }; "simple-swizzle-0.2.2" = { @@ -11083,13 +11164,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.11" = { + "spdx-license-ids-3.0.12" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.11"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; - sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"; + sha512 = "rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA=="; }; }; "spdy-4.0.2" = { @@ -11641,22 +11722,22 @@ let sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; }; }; - "terser-4.8.0" = { + "terser-4.8.1" = { name = "terser"; packageName = "terser"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"; - sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; + url = "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz"; + sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.14.1" = { + "terser-5.15.0" = { name = "terser"; packageName = "terser"; - version = "5.14.1"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz"; - sha512 = "+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ=="; + url = "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz"; + sha512 = "L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -12217,13 +12298,13 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; - "update-browserslist-db-1.0.4" = { + "update-browserslist-db-1.0.5" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz"; - sha512 = "jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz"; + sha512 = "dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q=="; }; }; "upgrade-1.1.0" = { @@ -12910,13 +12991,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.5.8" = { + "ws-7.5.9" = { name = "ws"; packageName = "ws"; - version = "7.5.8"; + version = "7.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz"; - sha512 = "ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; + sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; "xmlbuilder-13.0.2" = { @@ -13388,7 +13469,7 @@ in sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.4" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."moment-2.29.4" @@ -13536,7 +13617,7 @@ in sources."call-bind-1.0.2" sources."chalk-3.0.0" sources."chokidar-3.5.3" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-5.1.0" @@ -13669,7 +13750,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" ]; buildInputs = globalBuildInputs; meta = { @@ -13898,7 +13979,7 @@ in sources."chokidar-3.5.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.3.0" + sources."commander-9.4.0" sources."cross-spawn-7.0.3" sources."elm-solve-deps-wasm-1.0.1" sources."fill-range-7.0.1" @@ -13956,12 +14037,12 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.0.3" + sources."@types/node-18.7.13" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" sources."caw-2.0.1" - (sources."clone-response-1.0.2" // { + (sources."clone-response-1.0.3" // { dependencies = [ sources."mimic-response-1.0.1" ]; @@ -13986,7 +14067,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.3.2" + sources."keyv-4.4.1" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" @@ -14000,7 +14081,7 @@ in sources."pify-3.0.0" sources."proto-list-1.2.4" sources."pump-3.0.0" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."safe-buffer-5.2.1" sources."safename-1.0.2" sources."semver-7.3.7" @@ -14274,49 +14355,50 @@ in dependencies = [ sources."@babel/cli-7.12.10" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.8" + sources."@babel/compat-data-7.18.13" sources."@babel/core-7.12.10" - sources."@babel/generator-7.18.7" + sources."@babel/generator-7.18.13" sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" - (sources."@babel/helper-compilation-targets-7.18.6" // { + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" + (sources."@babel/helper-compilation-targets-7.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.6" + sources."@babel/helper-create-class-features-plugin-7.18.13" sources."@babel/helper-create-regexp-features-plugin-7.18.6" - sources."@babel/helper-environment-visitor-7.18.6" + sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-explode-assignable-expression-7.18.6" - sources."@babel/helper-function-name-7.18.6" + sources."@babel/helper-function-name-7.18.9" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.6" + sources."@babel/helper-member-expression-to-functions-7.18.9" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.18.8" + sources."@babel/helper-module-transforms-7.18.9" sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.18.6" - sources."@babel/helper-remap-async-to-generator-7.18.6" - sources."@babel/helper-replace-supers-7.18.6" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-remap-async-to-generator-7.18.9" + sources."@babel/helper-replace-supers-7.18.9" sources."@babel/helper-simple-access-7.18.6" - sources."@babel/helper-skip-transparent-expression-wrappers-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" sources."@babel/helper-validator-identifier-7.18.6" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.18.6" - sources."@babel/helpers-7.18.6" + sources."@babel/helper-wrap-function-7.18.11" + sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.8" - sources."@babel/plugin-proposal-async-generator-functions-7.18.6" + sources."@babel/parser-7.18.13" + sources."@babel/plugin-proposal-async-generator-functions-7.18.10" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" - sources."@babel/plugin-proposal-export-namespace-from-7.18.6" + sources."@babel/plugin-proposal-export-namespace-from-7.18.9" sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.18.6" + sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.6" + sources."@babel/plugin-proposal-object-rest-spread-7.18.9" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -14334,20 +14416,20 @@ in sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.6" - sources."@babel/plugin-transform-classes-7.18.8" - sources."@babel/plugin-transform-computed-properties-7.18.6" - sources."@babel/plugin-transform-destructuring-7.18.6" + sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-classes-7.18.9" + sources."@babel/plugin-transform-computed-properties-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.13" sources."@babel/plugin-transform-dotall-regex-7.18.6" - sources."@babel/plugin-transform-duplicate-keys-7.18.6" + sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" sources."@babel/plugin-transform-for-of-7.18.8" - sources."@babel/plugin-transform-function-name-7.18.6" - sources."@babel/plugin-transform-literals-7.18.6" + sources."@babel/plugin-transform-function-name-7.18.9" + sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" sources."@babel/plugin-transform-modules-amd-7.18.6" sources."@babel/plugin-transform-modules-commonjs-7.18.6" - sources."@babel/plugin-transform-modules-systemjs-7.18.6" + sources."@babel/plugin-transform-modules-systemjs-7.18.9" sources."@babel/plugin-transform-modules-umd-7.18.6" sources."@babel/plugin-transform-named-capturing-groups-regex-7.18.6" sources."@babel/plugin-transform-new-target-7.18.6" @@ -14358,18 +14440,18 @@ in sources."@babel/plugin-transform-reserved-words-7.18.6" sources."@babel/plugin-transform-runtime-7.12.10" sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.18.6" + sources."@babel/plugin-transform-spread-7.18.9" sources."@babel/plugin-transform-sticky-regex-7.18.6" - sources."@babel/plugin-transform-template-literals-7.18.6" - sources."@babel/plugin-transform-typeof-symbol-7.18.6" - sources."@babel/plugin-transform-unicode-escapes-7.18.6" + sources."@babel/plugin-transform-template-literals-7.18.9" + sources."@babel/plugin-transform-typeof-symbol-7.18.9" + sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.18.6" - sources."@babel/traverse-7.18.8" - sources."@babel/types-7.18.8" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.13" + sources."@babel/types-7.18.13" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -14379,20 +14461,20 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.14" + sources."@jridgewell/trace-mapping-0.3.15" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" - sources."@types/minimatch-3.0.5" - sources."@types/node-18.0.3" + sources."@types/minimatch-5.1.0" + sources."@types/node-18.7.13" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.16.0" // { + (sources."@types/uglify-js-3.17.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -14539,7 +14621,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.1" + sources."browserslist-4.21.3" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -14556,7 +14638,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001364" + sources."caniuse-lite-1.0.30001382" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -14655,7 +14737,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.23.4" // { + (sources."core-js-compat-3.25.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -14756,7 +14838,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.185" + sources."electron-to-chromium-1.4.228" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -14774,7 +14856,7 @@ in sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.3.0" + sources."commander-9.4.0" sources."glob-8.0.3" sources."has-flag-4.0.0" sources."minimatch-5.1.0" @@ -15068,7 +15150,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.9.0" + sources."is-core-module-2.10.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -15241,7 +15323,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.2" + sources."object.assign-4.1.4" sources."object.entries-1.1.5" sources."object.getownpropertydescriptors-2.1.4" sources."object.pick-1.3.0" @@ -15309,7 +15391,7 @@ in ]; }) sources."pkginfo-0.4.1" - (sources."portfinder-1.0.28" // { + (sources."portfinder-1.0.32" // { dependencies = [ sources."async-2.6.4" sources."debug-3.2.7" @@ -15443,7 +15525,7 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.4.14" + sources."postcss-8.4.16" ]; }) sources."postcss-selector-parser-6.0.10" @@ -15698,7 +15780,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" + sources."spdx-license-ids-3.0.12" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -15785,7 +15867,7 @@ in sources."rimraf-2.6.3" ]; }) - (sources."terser-4.8.0" // { + (sources."terser-4.8.1" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.6.1" @@ -15880,7 +15962,7 @@ in ]; }) sources."upath-1.2.0" - sources."update-browserslist-db-1.0.4" + sources."update-browserslist-db-1.0.5" sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -16176,7 +16258,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.14" + sources."@jridgewell/trace-mapping-0.3.15" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -16186,14 +16268,14 @@ in sources."@types/debug-0.0.30" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.37" - sources."@types/lodash-4.14.182" - sources."@types/minimatch-3.0.5" + sources."@types/lodash-4.14.184" + sources."@types/minimatch-5.1.0" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."ansi-escapes-3.2.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" @@ -16223,7 +16305,7 @@ in sources."call-bind-1.0.2" sources."chalk-3.0.0" sources."chokidar-3.5.2" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."command-exists-1.2.9" @@ -16422,7 +16504,7 @@ in sources."strip-json-comments-2.0.1" sources."sudo-prompt-8.2.5" sources."supports-color-7.2.0" - (sources."terser-5.14.1" // { + (sources."terser-5.15.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -16441,7 +16523,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" ]; buildInputs = globalBuildInputs; meta = { @@ -16456,25 +16538,21 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.7.2"; + version = "2.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.7.2.tgz"; - sha512 = "llkRvxgR2GOmtc7wi2vAM+u9j61Pf1fmPsAbpsE4X0ZfusJv0Dddor3lHNNZ0MmpYzNxpm7npxNqYRXs5JIz9A=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.7.4.tgz"; + sha512 = "D6J3Gx1JCuNiTk7QeXbRkywLhEtOWqvZKyZoihxQdYlxUqVICwvQf2qaP0d1QunpQKY22iQQpzyEn0PAczNn7Q=="; }; dependencies = [ - sources."@sindresorhus/is-2.1.1" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.0.3" + sources."@types/node-18.7.13" sources."@types/responselike-1.0.0" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" @@ -16486,33 +16564,32 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" - sources."cacheable-lookup-2.0.1" + sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."chalk-4.1.2" sources."chokidar-3.5.3" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."clone-1.0.4" - (sources."clone-response-1.0.2" // { - dependencies = [ - sources."mimic-response-1.0.1" - ]; - }) + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.4" - sources."decompress-response-5.0.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" - sources."duplexer3-0.1.5" sources."elm-tooling-1.8.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."fast-levenshtein-3.0.0" - sources."fastest-levenshtein-1.0.12" + sources."fastest-levenshtein-1.0.16" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."folder-hash-3.3.3" @@ -16526,10 +16603,11 @@ in ]; }) sources."glob-parent-5.1.2" - sources."got-10.7.0" + sources."got-11.8.5" sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.0" + sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -16543,13 +16621,13 @@ in sources."isexe-2.0.0" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.3.2" + sources."keyv-4.4.1" sources."kleur-3.0.3" sources."locate-path-5.0.0" sources."log-symbols-4.1.0" sources."lowercase-keys-2.0.0" sources."mimic-fn-2.1.0" - sources."mimic-response-2.1.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.8" sources."minimist-1.2.6" sources."mkdirp-0.5.6" @@ -16560,11 +16638,8 @@ in sources."onetime-5.1.2" sources."ora-5.4.1" sources."p-cancelable-2.1.1" - sources."p-event-4.2.0" - sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" - sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -16572,9 +16647,11 @@ in sources."picomatch-2.3.1" sources."prompts-2.4.2" sources."pump-3.0.0" + sources."quick-lru-5.1.1" sources."readable-stream-3.6.0" sources."readdirp-3.6.0" - sources."responselike-2.0.0" + sources."resolve-alpn-1.2.1" + sources."responselike-2.0.1" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" @@ -16589,9 +16666,8 @@ in sources."supports-hyperlinks-2.2.0" sources."temp-0.9.4" sources."terminal-link-2.1.1" - sources."to-readable-stream-2.1.0" sources."to-regex-range-5.0.1" - sources."type-fest-0.10.0" + sources."type-fest-0.21.3" sources."universalify-2.0.0" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" @@ -16625,7 +16701,7 @@ in sources."lru-cache-6.0.0" sources."ms-2.1.2" sources."semver-7.3.7" - sources."simple-git-3.10.0" + sources."simple-git-3.13.0" sources."upath-2.0.1" sources."yallist-4.0.0" ]; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 0f175c90920e..5d605b240ad8 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -6,6 +6,7 @@ , isPy3k , ensureNewerSourcesForZipFilesHook , findutils +, installShellFiles }: let @@ -190,6 +191,6 @@ in rec { sphinxHook = callPackage ({ sphinx }: makeSetupHook { name = "python${python.pythonVersion}-sphinx-hook"; - deps = [ sphinx ]; + deps = [ sphinx installShellFiles ]; } ./sphinx-hook.sh) {}; } diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index 92cc9e52ed21..ae386ca859f4 100644 --- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -1,20 +1,14 @@ -# This hook automatically finds Sphinx documentation, builds it in html format -# and installs it. -# -# This hook knows about several popular locations in which subdirectory -# documentation may be, but in very unusual cases $sphinxRoot directory can be -# set explicitly. -# -# Name of the directory relative to ${doc:-$out}/share/doc is normally also -# deduced automatically, but can be overridden with $sphinxOutdir variable. -# -# Sphinx build system can depend on arbitrary amount of python modules, client -# code is responsible for ensuring that all dependencies are present. +# shellcheck shell=bash +echo "Sourcing sphinx-hook" + +declare -a __sphinxBuilders buildSphinxPhase() { - local __sphinxRoot="" o + echo "Executing buildSphinxPhase" + local __sphinxRoot="" runHook preBuildSphinx + if [[ -n "${sphinxRoot:-}" ]] ; then # explicit root if ! [[ -f "${sphinxRoot}/conf.py" ]] ; then echo 2>&1 "$sphinxRoot/conf.py: no such file" @@ -22,10 +16,10 @@ buildSphinxPhase() { fi __sphinxRoot=$sphinxRoot else - for o in doc docs doc/source docs/source ; do - if [[ -f "$o/conf.py" ]] ; then - echo "Sphinx documentation found in $o" - __sphinxRoot=$o + for candidate in doc docs doc/source docs/source ; do + if [[ -f "$candidate/conf.py" ]] ; then + echo "Sphinx documentation found in $candidate" + __sphinxRoot=$candidate break fi done @@ -35,23 +29,44 @@ buildSphinxPhase() { echo 2>&1 "Sphinx documentation not found, use 'sphinxRoot' variable" exit 1 fi - sphinx-build -M html "${__sphinxRoot}" ".sphinx/html" -v + + if [ -n "${sphinxBuilders-}" ]; then + eval "__sphinxBuilders=($sphinxBuilders)" + else + __sphinxBuilders=(html) + fi + + for __builder in "${__sphinxBuilders[@]}"; do + echo "Executing sphinx-build with ${__builder} builder" + sphinx-build -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v + done runHook postBuildSphinx } installSphinxPhase() { + echo "Executing installSphinxPhase" + local docdir="" runHook preInstallSphinx - docdir="${doc:-$out}/share/doc/${sphinxOutdir:-$name}" - mkdir -p "$docdir" + for __builder in "${__sphinxBuilders[@]}"; do + # divert output for man builder + if [ "$__builder" == "man" ]; then + installManPage .sphinx/man/man/* - cp -r .sphinx/html/html "$docdir/" - rm -fr "${docdir}/html/_sources" "${docdir}/html/.buildinfo" + else + # shellcheck disable=2154 + docdir="${doc:-$out}/share/doc/${pname}" + + mkdir -p "$docdir" + + cp -r ".sphinx/${__builder}/${__builder}" "$docdir/" + rm -fr "${docdir}/${__builder}/_sources" "${docdir}/${__builder}/.buildinfo" + fi + done runHook postInstallSphinx } -preDistPhases+=" buildSphinxPhase" -postPhases+=" installSphinxPhase" +preDistPhases+=" buildSphinxPhase installSphinxPhase" diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 5296b5ffa3d9..1b461ee9e1cd 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -10,11 +10,13 @@ , libdrm , enableX11 ? stdenv.isLinux , libX11 + # for passhtru.tests +, pkgsi686Linux }: stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.5.0"; + version = "22.5.2"; outputs = [ "out" "dev" ]; @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-8E3MN4a+k8YA+uuUPApYFvT82bgJHE1cnPyuAO6R1tA="; + sha256 = "sha256-3WqmTM68XdQfGibkVAT1S9N7Cn8eviNM6qUeF8qogtc="; }; patches = [ @@ -58,6 +60,10 @@ stdenv.mkDerivation rec { $out/lib/dri/iHD_drv_video.so ''; + passthru.tests = { + inherit (pkgsi686Linux) intel-media-driver; + }; + meta = with lib; { description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; longDescription = '' diff --git a/pkgs/development/libraries/qmarkdowntextedit/default.nix b/pkgs/development/libraries/qmarkdowntextedit/default.nix new file mode 100644 index 000000000000..23241502d183 --- /dev/null +++ b/pkgs/development/libraries/qmarkdowntextedit/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "qmarkdowntextedit"; + version = "unstable-2022-08-24"; + + src = fetchFromGitHub { + owner = "pbek"; + repo = pname; + rev = "f7ddc0d520407405b9b132ca239f4a927e3025e6"; + sha256 = "sha256-TEb2w48MZ8U1INVvUiS1XohdvnVLBCTba31AwATd/oE="; + }; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + qmakeFlags = [ + "qmarkdowntextedit-lib.pro" + "PREFIX=${placeholder "out"}" + "LIBDIR=${placeholder "out"}/lib" + ]; + + meta = with lib; { + description = "C++ Qt QPlainTextEdit widget with markdown highlighting and some other goodies"; + homepage = "https://github.com/pbek/qmarkdowntextedit"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 3e3ab72d2720..d3fc35bbfc7d 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-ogj8eFkiDtjFcBb3Yip909gKBIeALsoH3LnRIjQmLMA="; + hash = "sha256-S92ookWpQ4OW53oYXPiCokUchI+47CILDR5RXxPJbmU="; }; patches = [ diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 4f895c851597..d9341a96d3e8 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -5,7 +5,7 @@ , blas , lapack , gfortran -, enableAMPL ? stdenv.isLinux, libamplsolver +, enableAMPL ? true, libamplsolver }: assert (!blas.isILP64) && (!lapack.isILP64); diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix index bcbde5f61359..d6e9db9d341d 100644 --- a/pkgs/development/libraries/science/math/libamplsolver/default.nix +++ b/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, substitute, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "libamplsolver"; @@ -10,18 +10,17 @@ stdenv.mkDerivation rec { }; patches = [ - # Debian provides a patch to build a shared library - (fetchpatch { - url = "https://sources.debian.org/data/main/liba/libamplsolver/0~20190702-2/debian/patches/fix-makefile-shared-lib.patch"; - sha256 = "sha256-96qwj3fLugzbsfxguKMce13cUo7XGC4VUE7xKcJs42Y="; + (substitute { + src = ./libamplsolver-sharedlib.patch; + replacements = [ "--replace" "@sharedlibext@" "${stdenv.hostPlatform.extensions.sharedLibrary}" ]; }) ]; installPhase = '' runHook preInstall - pushd sys.`uname -m`.`uname -s` + pushd sys.$(uname -m).$(uname -s) install -D -m 0644 *.h -t $out/include - install -D -m 0644 *.so* -t $out/lib + install -D -m 0644 *${stdenv.hostPlatform.extensions.sharedLibrary}* -t $out/lib install -D -m 0644 *.a -t $out/lib popd runHook postInstall @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { description = "A library of routines that help solvers work with AMPL"; homepage = "https://ampl.com/netlib/ampl/"; license = [ licenses.mit ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ aanderse ]; }; } diff --git a/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch b/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch new file mode 100644 index 000000000000..f2af2910e89c --- /dev/null +++ b/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch @@ -0,0 +1,39 @@ +Authors: Andrei Rozanski and Grace Dinh +Last-Update: 2022-08-23 +Description: fix makefile.u in order to get libamplsover.so (Linux) or libamplsolver.dylib (Mac) + +--- a/makefile.u ++++ b/makefile.u + +@@ -26,8 +26,9 @@ + + .SUFFIXES: .c .o + CC = cc +-CFLAGS = -O ++CFLAGS := $(CFLAGS) -pipe -DASL_BUILD -fPIC -DPIC + SHELL=/bin/sh ++OFILES=$(addsuffix .o,$(basename $(a))) + + # Add -DNO_RUSAGE to the CFLAGS assignment if your system + # lacks getrusage(). This only matters for compiling xectim.c. +@@ -86,7 +87,7 @@ + .c.o: + $(CC) -c $(CFLAGS) $*.c + +-all: arith.h stdio1.h amplsolver.a funcadd0.o ++all: arith.h stdio1.h amplsolver.a funcadd0.o libamplsolver@sharedlibext@ + + a = \ + asldate.c \ +@@ -189,6 +190,11 @@ + # search path, e.g. + # exec true + # or just comment out the ranlib invocation above. ++libamplsolver.so: $(OFILES) ++ $(CC) $^ -shared -Wl,-soname,libamplsolver.so.0 $(LDFLAGS) -o $@.0 ++ ln -s $@.0 $@ ++libamplsolver.dylib: amplsolver.a ++ $(CC) -fpic -shared -Wl,-all_load amplsolver.a $(LDFLAGS) -o libamplsolver.dylib + + Aslh = arith.h asl.h funcadd.h stdio1.h + auxinfo.o libnamsave.o: funcadd.h stdio1.h \ No newline at end of file diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 2ecf7729f4bf..09e6e2d6a03c 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,14 +1,7 @@ { lib, stdenv, fetchurl, pkg-config -, openssl ? null, zlib ? null, gnutls ? null +, gnutls }: -let - xor = a: b: (a || b) && (!(a && b)); -in - -assert xor (openssl != null) (gnutls != null); -assert !(xor (openssl != null) (zlib != null)); - stdenv.mkDerivation rec { pname = "ucommon"; version = "7.0.0"; @@ -29,8 +22,8 @@ stdenv.mkDerivation rec { --replace 'ifndef UCOMMON_SYSRUNTIME' 'if 0' ''; - # ucommon.pc has link time depdendencies on -lssl, -lcrypto, -lz, -lgnutls - propagatedBuildInputs = [ openssl zlib gnutls ]; + # ucommon.pc has link time depdendencies on -lusecure -lucommon -lgnutls + propagatedBuildInputs = [ gnutls ]; doCheck = true; @@ -38,7 +31,6 @@ stdenv.mkDerivation rec { description = "C++ library to facilitate using C++ design patterns"; homepage = "https://www.gnu.org/software/commoncpp/"; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix new file mode 100644 index 000000000000..2f6ba2e29a23 --- /dev/null +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -0,0 +1,76 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pythonOlder +, poetry-core +, grpclib +, python-dateutil +, dataclasses +, black +, jinja2 +, isort +, python +, pytestCheckHook +, pytest-asyncio +, pytest-mock +, tomlkit +, grpcio-tools +}: + +buildPythonPackage rec { + pname = "betterproto"; + version = "2.0.0b5"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "danielgtaylor"; + repo = "python-betterproto"; + rev = "v${version}"; + sha256 = "sha256-XyXdpo3Yo4aO1favMWC7i9utz4fNDbKbsnYXJW0b7Gc="; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + grpclib + python-dateutil + ] ++ lib.optional (pythonOlder "3.7") [ + dataclasses + ]; + + passthru.optional-dependencies.compiler = [ + black + jinja2 + isort + ]; + + pythonImportsCheck = [ "betterproto" ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + pytest-mock + tomlkit + grpcio-tools + ] ++ passthru.optional-dependencies.compiler; + + # The tests require the generation of code before execution. This requires + # the protoc-gen-python_betterproto script from the packge to be on PATH. + preCheck = '' + export PATH=$PATH:$out/bin + ${python.interpreter} -m tests.generate + ''; + + meta = with lib; { + description = "Clean, modern, Python 3.6+ code generator & library for Protobuf 3 and async gRPC"; + longDescription = '' + This project aims to provide an improved experience when using Protobuf / + gRPC in a modern Python environment by making use of modern language + features and generating readable, understandable, idiomatic Python code. + ''; + homepage = "https://github.com/danielgtaylor/python-betterproto"; + license = licenses.mit; + maintainers = with maintainers; [ nikstur ]; + }; +} diff --git a/pkgs/development/python-modules/cairo-lang/default.nix b/pkgs/development/python-modules/cairo-lang/default.nix new file mode 100644 index 000000000000..de2b0253e1b5 --- /dev/null +++ b/pkgs/development/python-modules/cairo-lang/default.nix @@ -0,0 +1,96 @@ +{ lib +, fetchzip +, buildPythonPackage +, setuptools +, ecdsa +, fastecdsa +, sympy +, frozendict +, marshmallow +, marshmallow-enum +, marshmallow-dataclass +, marshmallow-oneofschema +, pipdeptree +, eth-hash +, web3 +, aiohttp +, cachetools +, mpmath +, numpy +, prometheus-client +, typeguard +, lark +, pyyaml +, pytest-asyncio +, pytest +, pytestCheckHook +, gmp +}: + +buildPythonPackage rec { + pname = "cairo-lang"; + version = "0.9.1"; + + src = fetchzip { + url = "https://github.com/starkware-libs/cairo-lang/releases/download/v${version}/cairo-lang-${version}.zip"; + sha256 = "sha256-i4030QLG6PssfKD5FO4VrZxap19obMZ3Aa77p5MXlNY="; + }; + + # TODO: remove a substantial part when https://github.com/starkware-libs/cairo-lang/pull/88/files is merged. + # TODO: pytest and pytest-asyncio must be removed as they are check inputs in fact. + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'frozendict==1.2' 'frozendict>=1.2' \ + --replace 'lark-parser' 'lark' \ + --replace 'pytest-asyncio' ''' \ + --replace "pytest" ''' + + substituteInPlace starkware/cairo/lang/compiler/parser_transformer.py \ + --replace 'value, meta' 'meta, value' \ + --replace 'value: Tuple[CommaSeparatedWithNotes], meta' 'meta, value: Tuple[CommaSeparatedWithNotes]' + substituteInPlace starkware/cairo/lang/compiler/parser.py \ + --replace 'standard' 'basic' + ''; + + buildInputs = [ gmp ]; + + propagatedBuildInputs = [ + aiohttp + cachetools + setuptools + ecdsa + fastecdsa + sympy + mpmath + numpy + typeguard + frozendict + prometheus-client + marshmallow + marshmallow-enum + marshmallow-dataclass + marshmallow-oneofschema + pipdeptree + lark + web3 + eth-hash + eth-hash.optional-dependencies.pycryptodome + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # There seems to be no test included in the ZIP release… + # Cloning from GitHub is harder because they use a custom CMake setup + # TODO(raitobezarius): upstream was pinged out of band about it. + doCheck = false; + + meta = { + homepage = "https://github.com/starkware/cairo-lang"; + description = "Tooling for Cairo language"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raitobezarius ]; + }; +} diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index be091e21742d..8631457ab85a 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.7.1"; + version = "22.8.23"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eG/1BENY93j76ZFlcnariDFkK9yspqgNUxFPdAhBCVA="; + hash = "sha256-5SBG/lrbe25kcABngDpOdjA/JJQ0DKcCYi6JBxTurPg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index ad7d4a9def73..faa967d0ce4f 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -39,6 +39,9 @@ buildPythonPackage rec { ]; checkPhase = '' + # tries to trigger flake8 and fails + rm hacking/tests/test_doctest.py + stestr run ''; diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix index e76f8c8de9e8..6af860a39805 100644 --- a/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -80,6 +80,8 @@ buildPythonPackage rec { runHook postCheck ''; + doCheck = false; + pythonImportsCheck = [ "ipfshttpclient" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 3b584a04b9b2..ae1e48f35a22 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.5.0"; + version = "2.6.0"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-Cdzf6qQZQzH+tRyLEYvi7c01L5i+6WmgHozLhFQNsiQ="; + hash = "sha256-EplQodBTdZCqhM+6nCovpnqDJ6zvu+jG5muVMLIxdKI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index 229460e55723..b4e8cc5afa62 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { "setuptools_scm" ]; - # check in passhtru.tests.pytest to escape infinite recursion on pytest + # check in passthru.tests.pytest to escape infinite recursion on pytest doCheck = false; passthru.tests = { diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix new file mode 100644 index 000000000000..a8b5f077b9ed --- /dev/null +++ b/pkgs/development/python-modules/web3/default.nix @@ -0,0 +1,83 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, eth-abi +, eth-account +, eth-hash +, eth-typing +, eth-utils +, eth-rlp +, hexbytes +, ipfshttpclient +, jsonschema +, lru-dict +, protobuf +, requests +, typing-extensions +, websockets +# , eth-tester +# , py-geth +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "web3"; + version = "5.30.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "web3.py"; + rev = "v${version}"; + sha256 = "sha256-HajumvOG18r7TslkmCfI0iiLsEddevGrRZQFWICGeYE="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "eth-account>=0.5.7,<0.6.0" "eth-account>=0.5.7,<0.7" \ + --replace "eth-utils>=1.9.5,<2.0.0" "eth-utils>=1.9.5,<3" \ + --replace "eth-rlp<0.3" "eth-rlp<0.4" \ + --replace "websockets>=9.1,<10" "websockets>=9.1,<11" \ + --replace "eth-abi>=2.0.0b6,<3.0.0" "eth-abi>=2.0.0b6,<4" \ + --replace "eth-typing>=2.0.0,<3.0.0" "eth-typing>=2.0.0,<4" + ''; + + propagatedBuildInputs = [ + aiohttp + eth-abi + eth-account + eth-hash + eth-hash.optional-dependencies.pycryptodome + eth-rlp + eth-typing + eth-utils + hexbytes + ipfshttpclient + jsonschema + lru-dict + protobuf + requests + websockets + ] ++ lib.optional (pythonOlder "3.8") [ typing-extensions ]; + + # TODO: package eth-tester + #checkInputs = [ + # eth-tester + # eth-tester.optional-dependencies.py-evm + # py-geth + # pytestCheckHook + #]; + + doCheck = false; + + pythonImportsCheck = [ "web3" ]; + + meta = with lib; { + description = "Web3 library for interactions"; + homepage = "https://github.com/ethereum/web3"; + license = licenses.mit; + maintainers = with maintainers; [ raitobezarius ]; + }; +} diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index b8cef88f71a1..f7af7912304d 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-hZINmKzLB0nFVVP8eXK2ghe4Emmuq55w0vDwLw8XuJk="; + sha256 = "sha256-vxu0QLZ6ERNV1lTH0/c0yR6FT/im5rn85oqQeRvdt6M="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 238bc728b047..a66f32f6db0c 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-paNr9aiRG6NP6DIGUojl7VPPPMTeJRpDW8ThDNOQhWM="; + sha256 = "sha256-Ga+1xz7gsLoHA0G4UOiJf331hrBVoeB93Pjd0PyATB4="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 7020be669dee..fdb0bfde7d40 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.7"; + version = "2.13.8"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-0XoC6PF4p880A+PJ7fuQrToWKOIKoLUTFAiuR/ci8I0="; + sha256 = "sha256-selZV5smB5CTCyDzx6p877ikDg3oDUp3fCv3jGs1PcE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index 41b343cdf1c5..e05e61f60339 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -5,8 +5,10 @@ libelf, libiberty, zlib, - libbfd, - libopcodes, + # Once https://gitlab.com/eztrace/eztrace/-/issues/41 + # is released we can switch to latest binutils. + libbfd_2_38, + libopcodes_2_38, buildPackages, autoreconfHook }: @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ gfortran autoreconfHook ]; - buildInputs = [ libelf libiberty zlib libbfd libopcodes ]; + buildInputs = [ libelf libiberty zlib libbfd_2_38 libopcodes_2_38 ]; meta = with lib; { description = "Tool that aims at generating automatically execution trace from HPC programs"; diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index b4621feeb31f..5a02a1022d59 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -1,15 +1,20 @@ { lib, stdenv -, libopcodes, libbfd, elfutils, readline +, libopcodes, libopcodes_2_38 +, libbfd, libbfd_2_38 +, elfutils, readline , linuxPackages_latest, zlib , python3, bison, flex }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bpftools"; inherit (linuxPackages_latest.kernel) version src; nativeBuildInputs = [ python3 bison flex ]; - buildInputs = [ libopcodes libbfd elfutils zlib readline ]; + buildInputs = (if (lib.versionAtLeast version "5.20") + then [ libopcodes libbfd ] + else [ libopcodes_2_38 libbfd_2_38 ]) + ++ [ elfutils zlib readline ]; preConfigure = '' patchShebangs scripts/bpf_doc.py diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py index d0f8c77c783f..8b40088756e1 100755 --- a/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p "python38.withPackages (ps: [ps.PyGithub])" git gnupg +#! nix-shell -i python -p "python3.withPackages (ps: [ps.PyGithub])" git gnupg # This is automatically called by ../update.sh. @@ -201,7 +201,7 @@ for filename in os.listdir(NIXPKGS_KERNEL_PATH): (callPackage {NIXPKGS_KERNEL_PATH / filename} {{}}).version """ kernel_version_json = run( - "nix-instantiate", "--eval", "--json", "--expr", nix_version_expr, + "nix-instantiate", "--eval", "--system", "x86_64-linux", "--json", "--expr", nix_version_expr, ).stdout kernel_version = parse_version(json.loads(kernel_version_json)) if kernel_version < MIN_KERNEL_VERSION: diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index d481eea7e753..dcb1c4e9dcc1 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchpatch, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils-unwrapped -, libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl +, libiberty, audit, libbfd, libbfd_2_38, libopcodes, libopcodes_2_38, openssl, systemtap, numactl , zlib , withGtk ? false, gtk2 , withZstd ? true, zstd @@ -45,9 +45,12 @@ stdenv.mkDerivation { flex bison libiberty audit makeWrapper pkg-config python3 ]; buildInputs = [ - elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl - libopcodes python3 perl - ] ++ lib.optional withGtk gtk2 + elfutils newt slang libunwind zlib openssl systemtap.stapBuild numactl + python3 perl + ] ++ (if (lib.versionAtLeast kernel.version "5.19") + then [ libbfd libopcodes ] + else [ libbfd_2_38 libopcodes_2_38 ]) + ++ lib.optional withGtk gtk2 ++ (if (lib.versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]) ++ lib.optional withZstd zstd ++ lib.optional withLibcap libcap; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index ba93b068fddc..50cecbec3039 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,19 +8,20 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.17.0"; + version = "2.17.2"; pname = "openvswitch"; src = fetchurl { - url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-4Dv6t8qC2Bp9OjbeTzkKO1IQ4/OWV2cfkih3zU6m3HM="; + url = "https://www.openvswitch.org/releases/openvswitch-${version}.tar.gz"; + sha256 = "sha256-ai4NtCutuMvK9/O+vVtemicBMZ3x0EKU6aennpRQTWk="; }; kernel = optional (_kernel != null) _kernel.dev; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ util-linux openssl libcap_ng pythonEnv - perl procps which ]; + buildInputs = [ + util-linux openssl libcap_ng pythonEnv perl procps which + ]; configureFlags = [ "--localstatedir=/var" diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 1855ac1af54d..b989959b6255 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -1,6 +1,6 @@ # The actual Plex package that we run is a FHS userenv of the "raw" package. { stdenv -, buildFHSUserEnv +, buildFHSUserEnvBubblewrap , writeScript , plexRaw @@ -9,10 +9,16 @@ , dataDir ? "/var/lib/plex" }: -buildFHSUserEnv { +buildFHSUserEnvBubblewrap { name = "plexmediaserver"; + inherit (plexRaw) meta; + # Plex does some magic to detect if it is already running. + # The separate PID namespace somehow breaks this and Plex is thinking it's already + # running and refuses to start. + unsharePid = false; + # This script is run when we start our Plex binary runScript = writeScript "plex-run-script" '' #!${stdenv.shell} diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 706188b40305..672354051d40 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -94,6 +94,10 @@ commonOptions = packageSettings: rec { # attributes common to both builds # to pass in java explicitly. "-DCONNECT_WITH_JDBC=OFF" "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # revisit this if nixpkgs supports any architecture whose stack grows upwards + "-DSTACK_DIRECTION=-1" + "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" ]; postInstall = '' @@ -211,10 +215,6 @@ in stdenv.mkDerivation (common // { "-DPLUGIN_AUTH_PAM_V1=NO" "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_PLUGIN_S3=1" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - # revisit this if nixpkgs supports any architecture whose stack grows upwards - "-DSTACK_DIRECTION=-1" - "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" ]; preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' @@ -234,6 +234,7 @@ in stdenv.mkDerivation (common // { ''; CXXFLAGS = lib.optionalString stdenv.hostPlatform.isi686 "-fpermissive"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; }); in { mariadb_104 = mariadbPackage { diff --git a/pkgs/tools/admin/hedgedoc-cli/default.nix b/pkgs/tools/admin/hedgedoc-cli/default.nix index 8f68e50ebcf8..0af64919e746 100644 --- a/pkgs/tools/admin/hedgedoc-cli/default.nix +++ b/pkgs/tools/admin/hedgedoc-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, wget, jq, curl }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, wget, jq, curl }: let version = "1.0"; @@ -14,15 +14,16 @@ stdenv.mkDerivation { sha256 = "uz+lkRRUTRr8WR295esNEbgjlZ/Em7mBk6Nx0BWLfg4="; }; - buildInputs = [ - wget - jq - curl + nativeBuildInputs = [ + makeWrapper ]; installPhase = '' runHook preInstall - install -Dm0755 -t $out/bin $src/bin/codimd + mkdir -p $out/bin + cp $src/bin/codimd $out/bin + wrapProgram $out/bin/codimd \ + --prefix PATH : ${lib.makeBinPath [ jq wget curl ]} ln -s $out/bin/codimd $out/bin/hedgedoc-cli runHook postInstall ''; diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 7ffca4203bbc..adfd0b42e399 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -33,13 +33,15 @@ python3.pkgs.buildPythonApplication rec { setuptools-scm # docs - sphinx + sphinxHook guzzle_sphinx_theme # shell completions installShellFiles ]; + sphinxBuilders = [ "singlehtml" "man" ]; + buildInputs = [ libb2 lz4 @@ -67,14 +69,6 @@ python3.pkgs.buildPythonApplication rec { ]; postInstall = '' - make -C docs singlehtml - mkdir -p $out/share/doc/borg - cp -R docs/_build/singlehtml $out/share/doc/borg/html - - make -C docs man - mkdir -p $out/share/man - cp -R docs/_build/man $out/share/man/man1 - installShellCompletion --cmd borg \ --bash scripts/shell_completions/bash/borg \ --fish scripts/shell_completions/fish/borg.fish \ diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix new file mode 100644 index 000000000000..1302c10ea8c1 --- /dev/null +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -0,0 +1,105 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, asciidoc +, dbus +, cryptsetup +, util-linux +, udev +, systemd +, xfsprogs +, thin-provisioning-tools +, clevis +, jose +, jq +, curl +, tpm2-tools +, coreutils +, clevisSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "stratisd"; + version = "3.2.2"; + + src = fetchFromGitHub { + owner = "stratis-storage"; + repo = pname; + rev = "v${version}"; + hash = "sha256-dNbbKGRLSYVnPdKfxlLIwXNEf7P6EvGbOp8sfpaw38g="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-tJT0GKLpZtiQ/AZACkNeC3zgso54k/L03dFI0m1Jbls="; + }; + + patches = [ + # Allow overriding BINARIES_PATHS with environment variable at compile time + ./paths.patch + ]; + + postPatch = '' + substituteInPlace udev/61-stratisd.rules \ + --replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \ + --replace stratis-str-cmp "$out/lib/udev/stratis-str-cmp" + + substituteInPlace systemd/stratis-fstab-setup \ + --replace stratis-min "$out/bin/stratis-min" \ + --replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \ + --replace sleep "${coreutils}/bin/sleep" \ + --replace udevadm "${udev}/bin/udevadm" + ''; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + bindgenHook + rust.cargo + rust.rustc + pkg-config + asciidoc + ]; + + buildInputs = [ + dbus + cryptsetup + util-linux + udev + ]; + + BINARIES_PATHS = lib.makeBinPath ([ + xfsprogs + thin-provisioning-tools + udev + ] ++ lib.optionals clevisSupport [ + clevis + jose + jq + cryptsetup + curl + tpm2-tools + coreutils + ]); + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + buildFlags = [ "release" "release-min" "docs/stratisd.8" ]; + + doCheck = true; + checkTarget = "test"; + + # remove files for supporting dracut + postInstall = '' + rm -r "$out/lib/dracut" + rm -r "$out/lib/systemd/system-generators" + ''; + + meta = with lib; { + description = "Easy to use local storage management for Linux"; + homepage = "https://stratis-storage.github.io"; + license = licenses.mpl20; + maintainers = with maintainers; [ nickcao ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/filesystems/stratisd/paths.patch b/pkgs/tools/filesystems/stratisd/paths.patch new file mode 100644 index 000000000000..c63c9eb4a22c --- /dev/null +++ b/pkgs/tools/filesystems/stratisd/paths.patch @@ -0,0 +1,42 @@ +diff --git a/src/engine/strat_engine/cmd.rs b/src/engine/strat_engine/cmd.rs +index daaff70f..ed528f7f 100644 +--- a/src/engine/strat_engine/cmd.rs ++++ b/src/engine/strat_engine/cmd.rs +@@ -39,8 +39,6 @@ use crate::{ + // The maximum allowable size of the thinpool metadata device + const MAX_META_SIZE: MetaBlocks = MetaBlocks(255 * ((1 << 14) - 64)); + +-const BINARIES_PATHS: [&str; 4] = ["/usr/sbin", "/sbin", "/usr/bin", "/bin"]; +- + /// Find the binary with the given name by looking in likely locations. + /// Return None if no binary was found. + /// Search an explicit list of directories rather than the user's PATH +@@ -49,7 +47,7 @@ const BINARIES_PATHS: [&str; 4] = ["/usr/sbin", "/sbin", "/usr/bin", "/bin"]; + fn find_binary(name: &str) -> Option { + BINARIES_PATHS + .iter() +- .map(|pre| [pre, name].iter().collect::()) ++ .map(|pre| [pre, &name.into()].iter().collect::()) + .find(|path| path.exists()) + } + +@@ -147,6 +145,10 @@ lazy_static! { + .and_then(|mut hm| hm + .remove(CLEVIS) + .and_then(|c| hm.remove(JOSE).map(|j| (c, j)))); ++ static ref BINARIES_PATHS: Vec = match std::option_env!("BINARIES_PATHS") { ++ Some(paths) => std::env::split_paths(paths).collect(), ++ None => ["/usr/sbin", "/sbin", "/usr/bin", "/bin"].iter().map(|p| p.into()).collect(), ++ }; + } + + /// Verify that all binaries that the engine might invoke are available at some +@@ -160,7 +162,7 @@ pub fn verify_binaries() -> StratisResult<()> { + name, + BINARIES_PATHS + .iter() +- .map(|p| format!("\"{}\"", p)) ++ .map(|p| format!("\"{}\"", p.display())) + .collect::>() + .join(", "), + ))), diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 88498f9b5dff..c0746613157f 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.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-7hhg54x8EZ3x40a8kaOUzhyHDF0CJ5dZibGVvcFF9zk="; + sha256 = "sha256-ZPIxJ8D8yxaL7RKIVKIIlqwUXBbVM0JprE5TSTGkhfI="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-fbNP89xg0Di/p/y78C9kar3UKOqkAJ94rJqZOWK3Rp0="; + cargoSha256 = "sha256-dgAyxSVNe+UKuT0UJqPvYcrLolKtC2+EN/okSvzkhcA="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa0dd5ef4959..b65c1b12fa6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3483,6 +3483,8 @@ with pkgs; cucumber = callPackage ../development/tools/cucumber {}; + cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { }; + dabet = callPackage ../tools/misc/dabet { }; dabtools = callPackage ../applications/radio/dabtools { }; @@ -5849,6 +5851,8 @@ with pkgs; soupault = callPackage ../tools/typesetting/soupault { }; + stratisd = callPackage ../tools/filesystems/stratisd { }; + strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { @@ -7271,6 +7275,8 @@ with pkgs; hackertyper = callPackage ../tools/misc/hackertyper { }; + hackneyed = callPackage ../data/icons/hackneyed { }; + haveged = callPackage ../tools/security/haveged { }; habitat = callPackage ../applications/networking/cluster/habitat { }; @@ -9880,9 +9886,8 @@ with pkgs; inherit (callPackage ../servers/plik { }) plik plikd; - plex = callPackage ../servers/plex { - buildFHSUserEnv = buildFHSUserEnvBubblewrap; - }; + plex = callPackage ../servers/plex { }; + plexRaw = callPackage ../servers/plex/raw.nix { }; psitransfer = callPackage ../servers/psitransfer { }; @@ -10201,6 +10206,8 @@ with pkgs; qmk = callPackage ../tools/misc/qmk { }; + qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { }; + qodem = callPackage ../tools/networking/qodem { }; qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; @@ -18396,7 +18403,7 @@ with pkgs; # these things are only used for tests, they don't get into the closure shared-mime-info = shared-mime-info.override { glib = glib-untested; }; desktop-file-utils = desktop-file-utils.override { glib = glib-untested; }; - dbus = dbus.override { systemd = null; }; + dbus = dbus.override { enableSystemd = false; }; }); glibmm = callPackage ../development/libraries/glibmm { }; @@ -21765,10 +21772,7 @@ with pkgs; utmps = skawarePackages.utmps; - ucommon = callPackage ../development/libraries/ucommon { - openssl = null; - zlib = null; - }; + ucommon = callPackage ../development/libraries/ucommon { }; v8 = callPackage ../development/libraries/v8 { }; @@ -26754,6 +26758,8 @@ with pkgs; darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { }; + darkman = callPackage ../applications/misc/darkman { }; + darktable = callPackage ../applications/graphics/darktable { lua = lua5_4; pugixml = pugixml.override { shared = true; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd61c326a318..e9c527bf12f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1306,6 +1306,8 @@ in { betamax-serializers = callPackage ../development/python-modules/betamax-serializers { }; + betterproto = callPackage ../development/python-modules/betterproto { }; + bibtexparser = callPackage ../development/python-modules/bibtexparser { }; bidict = callPackage ../development/python-modules/bidict { }; @@ -1587,6 +1589,8 @@ in { inherit (self) python numpy boost; }); + cairo-lang = callPackage ../development/python-modules/cairo-lang { }; + cairocffi = callPackage ../development/python-modules/cairocffi { }; cairosvg = callPackage ../development/python-modules/cairosvg { }; @@ -11525,6 +11529,8 @@ in { weasyprint = callPackage ../development/python-modules/weasyprint { }; + web3 = callPackage ../development/python-modules/web3 { }; + webargs = callPackage ../development/python-modules/webargs { }; webassets = callPackage ../development/python-modules/webassets { };