diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4de9fa56a8a9..7de5fc1ad45c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3660,6 +3660,10 @@ github = "expipiplus1"; githubId = 857308; name = "Ellie Hermaszewska"; + keys = [{ + longkeyid = "rsa4096/0xC8116E3A0C1CA76A"; + fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; + }]; }; extends = { email = "sharosari@gmail.com"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 7193429601bf..b5a3e27ab91e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -479,6 +479,16 @@ RandomX benchmark. + + + Auto nice daemons + ananicy + and + ananicy-cpp. + Available as + services.ananicy. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index d8807e85a68a..d4ff576fecf0 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -139,6 +139,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [xmrig](https://github.com/xmrig/xmrig), a high performance, open source, cross platform RandomX, KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and RandomX benchmark. +- Auto nice daemons [ananicy](https://github.com/Nefelim4ag/Ananicy) and [ananicy-cpp](https://gitlab.com/ananicy-cpp/ananicy-cpp/). Available as [services.ananicy](#opt-services.ananicy.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix`, now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c5f0b211ff84..c19dcd3293b6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -485,6 +485,7 @@ ./services/mail/roundcube.nix ./services/mail/sympa.nix ./services/mail/nullmailer.nix + ./services/misc/ananicy.nix ./services/misc/airsonic.nix ./services/misc/ankisyncd.nix ./services/misc/apache-kafka.nix diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 6fc09682e0c0..23d3574ae27c 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -294,7 +294,7 @@ in }; submissionOptions = mkOption { - type = types.attrs; + type = with types; attrsOf str; default = { smtpd_tls_security_level = "encrypt"; smtpd_sasl_auth_enable = "yes"; @@ -312,7 +312,7 @@ in }; submissionsOptions = mkOption { - type = types.attrs; + type = with types; attrsOf str; default = { smtpd_sasl_auth_enable = "yes"; smtpd_client_restrictions = "permit_sasl_authenticated,reject"; diff --git a/nixos/modules/services/misc/ananicy.nix b/nixos/modules/services/misc/ananicy.nix new file mode 100644 index 000000000000..f76f534fb450 --- /dev/null +++ b/nixos/modules/services/misc/ananicy.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ananicy; + configFile = pkgs.writeText "ananicy.conf" (generators.toKeyValue { } cfg.settings); + extraRules = pkgs.writeText "extraRules" cfg.extraRules; + servicename = if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then "ananicy-cpp" else "ananicy"; +in +{ + options = { + services.ananicy = { + enable = mkEnableOption "Ananicy, an auto nice daemon"; + + package = mkOption { + type = types.package; + default = pkgs.ananicy; + defaultText = literalExpression "pkgs.ananicy"; + example = literalExpression "pkgs.ananicy-cpp"; + description = '' + Which ananicy package to use. + ''; + }; + + settings = mkOption { + type = with types; attrsOf (oneOf [ int bool str ]); + default = { }; + example = { + apply_nice = false; + }; + description = '' + See + ''; + }; + + extraRules = mkOption { + type = types.str; + default = ""; + description = '' + Extra rules in json format on separate lines. See: + + + ''; + example = literalExpression '' + ''' + { "name": "eog", "type": "Image-View" } + { "name": "fdupes", "type": "BG_CPUIO" } + ''' + ''; + + }; + }; + }; + + config = mkIf cfg.enable { + environment = { + systemPackages = [ cfg.package ]; + etc."ananicy.d".source = pkgs.runCommandLocal "ananicyfiles" { } '' + mkdir -p $out + # ananicy-cpp does not include rules or settings on purpose + cp -r ${pkgs.ananicy}/etc/ananicy.d/* $out + rm $out/ananicy.conf + cp ${configFile} $out/ananicy.conf + ${optionalString (cfg.extraRules != "") "cp ${extraRules} $out/nixRules.rules"} + ''; + }; + + # ananicy and ananicy-cpp have different default settings + services.ananicy.settings = + let + mkOD = mkOptionDefault; + in + { + cgroup_load = mkOD true; + type_load = mkOD true; + rule_load = mkOD true; + apply_nice = mkOD true; + apply_ioclass = mkOD true; + apply_ionice = mkOD true; + apply_sched = mkOD true; + apply_oom_score_adj = mkOD true; + apply_cgroup = mkOD true; + } // (if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then { + # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/blob/master/src/config.cpp#L12 + loglevel = mkOD "warn"; # default is info but its spammy + cgroup_realtime_workaround = mkOD true; + } else { + # https://github.com/Nefelim4ag/Ananicy/blob/master/ananicy.d/ananicy.conf + check_disks_schedulers = mkOD true; + check_freq = mkOD 5; + }); + + systemd = { + # https://gitlab.com/ananicy-cpp/ananicy-cpp/#cgroups applies to both ananicy and -cpp + enableUnifiedCgroupHierarchy = mkDefault false; + packages = [ cfg.package ]; + services."${servicename}" = { + wantedBy = [ "default.target" ]; + }; + }; + }; + + meta = { + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/nixos/modules/services/x11/clight.nix b/nixos/modules/services/x11/clight.nix index 873f425fb8be..d994a658cbaa 100644 --- a/nixos/modules/services/x11/clight.nix +++ b/nixos/modules/services/x11/clight.nix @@ -71,6 +71,14 @@ in { }; config = mkIf cfg.enable { + assertions = let + inRange = v: l: r: v >= l && v <= r; + in [ + { assertion = config.location.provider == "manual" -> + inRange config.location.latitude (-90) 90 && inRange config.location.longitude (-180) 180; + message = "You must specify a valid latitude and longitude if manually providing location"; } + ]; + boot.kernelModules = [ "i2c_dev" ]; environment.systemPackages = with pkgs; [ clight clightd ]; services.dbus.packages = with pkgs; [ clight clightd ]; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 1c9a5f978c54..9a7532b47641 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -146,7 +146,7 @@ in }; background = mkOption { - type = types.path; + type = types.either types.path (types.strMatching "^#[0-9]\{6\}$"); # Manual cannot depend on packages, we are actually setting the default in config below. defaultText = literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath"; description = '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 39b4be0b4f7d..4c28b552679e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -403,6 +403,7 @@ in samba-wsdd = handleTest ./samba-wsdd.nix {}; sanoid = handleTest ./sanoid.nix {}; sddm = handleTest ./sddm.nix {}; + seafile = handleTest ./seafile.nix {}; searx = handleTest ./searx.nix {}; service-runner = handleTest ./service-runner.nix {}; shadow = handleTest ./shadow.nix {}; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 0299f66191ed..d2b6ba07d2eb 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,7 +1,10 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr +, pulseaudioSupport ? false, libpulseaudio , nixosTests }: +assert pulseaudioSupport -> libpulseaudio != null; + let dependency = { name, version, sha256 }: @@ -50,7 +53,7 @@ stdenv.mkDerivation rec { boost17x alsa-lib asio avahi flac libogg libvorbis aixlog popl soxr - ]; + ] ++ lib.optional pulseaudioSupport libpulseaudio; # Upstream systemd unit files are pretty awful, so we provide our own in a # NixOS module. It might make sense to get that upstreamed... diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 7a0237ed2b15..7253d3dff377 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -5,6 +5,7 @@ , pkg-config , util-linux , hexdump +, autoSignDarwinBinariesHook , wrapQtAppsHook ? null , boost , libevent @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { [ autoreconfHook pkg-config ] ++ optionals stdenv.isLinux [ util-linux ] ++ optionals stdenv.isDarwin [ hexdump ] + ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] ++ optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 4b53c91edf28..0c2776778b53 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "10p815dv86775ky90m96l11026xkhjwvrrhvviqw6g6hsayjqhia"; - x86_64-darwin = "1b8d7iw9v172viczdbcdxhf51dyshmx2665prv2pm0ygsy8yii3p"; - aarch64-linux = "155sbsmnapnzhkzkaggm80bkarh4l7dbqyhgy40mmdgqpyp3gx1v"; - aarch64-darwin = "1pnqjih37r4xqfjfrf8mhsbvmn62358rmf50rackqh5as50siwa2"; - armv7l-linux = "00k2fmivbsp8fyh9cy6vr6sq031f6marz4sbj1nrlzdl40wd30bi"; + x86_64-linux = "0dwpczbxqy3rsqprdiakmqv6s3jzcg2wqxnf1znarx2qffb4ii9x"; + x86_64-darwin = "0si76v80r0vhl76gbdwbykk6acifhifz8sb8wiyiiywkinlxs19w"; + aarch64-linux = "0nwgdvvsblh2r72ys2ng5b084wizkdjd00mm73506mgbs8pzcky4"; + aarch64-darwin = "0qivq4077g5a4gwkskvvzxaa60w1gpgl67pmdyqn81rina04rdqs"; + armv7l-linux = "0myf96s1vdpllnw0vz0rpmyv2pfirv3p8pqgxxnpw860s2c26f2f"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.1"; + version = "1.62.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index c7048014bdcf..11623945c726 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1xblrp4xyw2pcifmzjmlbnmk7lhmlj002sfk28kyf1k5wdp54yv9"; - x86_64-darwin = "0ivvdxc4hmv9sh8ap0qy8yciz9pjkm1p1j60dh57y4ll6fdzbbrd"; - aarch64-linux = "0ssm27i12d7gkq31d1zma4zx5n5mgg0a8pj3sdk9jjjsa68b3pyr"; - armv7l-linux = "029shxcwnap28ys6lxml3yiiavw4lhnizf35f0a664vdzy1x5dpv"; + x86_64-linux = "19r4883qa73b23xw0fz21bnp9vcvsbn1q77n6pcm1achwpxscrg6"; + x86_64-darwin = "0gv4208vcr75wyp6vji1cg6644f5yfwgkgkiav37218v1wjzb4r0"; + aarch64-linux = "00jzjapyj96bqqq6pz4mdlihwa5g1izkqcp4lqml7hqvmcqrjyrs"; + armv7l-linux = "0daji52lfbgz0by11idai55ip0m859s35vbyvgv655s21aakrs50"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.1"; + version = "1.62.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix index d0d39e299aa2..dd440dfffdac 100644 --- a/pkgs/applications/gis/qmapshack/default.nix +++ b/pkgs/applications/gis/qmapshack/default.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake -, qtscript, qtwebengine, gdal, proj, routino, quazip }: +{ mkDerivation, lib, fetchFromGitHub, cmake, substituteAll +, qtscript, qttranslations, qtwebengine, gdal, proj, routino, quazip }: mkDerivation rec { pname = "qmapshack"; @@ -12,6 +12,14 @@ mkDerivation rec { sha256 = "1yzgkdjxwyg8ggbxyjwr0zjrx99ckrbz2p2524iii9i7qqn8wfsx"; }; + patches = [ + # See https://github.com/NixOS/nixpkgs/issues/86054 + (substituteAll { + src = ./fix-qttranslations-path.patch; + inherit qttranslations; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ qtscript qtwebengine gdal proj routino quazip ]; diff --git a/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch b/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch new file mode 100644 index 000000000000..f91f4228d2ce --- /dev/null +++ b/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch @@ -0,0 +1,74 @@ +diff --git i/src/qmapshack/setup/CAppSetupLinux.cpp w/src/qmapshack/setup/CAppSetupLinux.cpp +index 63ea06c0..3a03b816 100644 +--- i/src/qmapshack/setup/CAppSetupLinux.cpp ++++ w/src/qmapshack/setup/CAppSetupLinux.cpp +@@ -30,7 +30,7 @@ void CAppSetupLinux::initQMapShack() + prepareGdal("", ""); + + // setup translators +- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); ++ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); + QString translationPath = QCoreApplication::applicationDirPath(); + translationPath.replace(QRegExp("bin$"), "share/qmapshack/translations"); + prepareTranslator(resourceDir, "qt_"); +diff --git i/src/qmapshack/setup/CAppSetupMac.cpp w/src/qmapshack/setup/CAppSetupMac.cpp +index ad9b21e9..9dca8a1e 100644 +--- i/src/qmapshack/setup/CAppSetupMac.cpp ++++ w/src/qmapshack/setup/CAppSetupMac.cpp +@@ -63,7 +63,7 @@ void CAppSetupMac::initQMapShack() + + // setup translators + QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); +- prepareTranslator(translationPath, "qt_"); ++ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); + prepareTranslator(translationPath, "qmapshack_"); + + // load and apply style sheet +diff --git i/src/qmaptool/setup/CAppSetupLinux.cpp w/src/qmaptool/setup/CAppSetupLinux.cpp +index dea1c4f3..8da95574 100644 +--- i/src/qmaptool/setup/CAppSetupLinux.cpp ++++ w/src/qmaptool/setup/CAppSetupLinux.cpp +@@ -29,7 +29,7 @@ void CAppSetupLinux::initQMapTool() + prepareGdal("", ""); + + // setup translators +- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); ++ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); + QString translationPath = QCoreApplication::applicationDirPath(); + translationPath.replace(QRegExp("bin$"), "share/qmaptool/translations"); + prepareTranslator(resourceDir, "qt_"); +diff --git i/src/qmaptool/setup/CAppSetupMac.cpp w/src/qmaptool/setup/CAppSetupMac.cpp +index 02b27e07..fae27748 100644 +--- i/src/qmaptool/setup/CAppSetupMac.cpp ++++ w/src/qmaptool/setup/CAppSetupMac.cpp +@@ -64,7 +64,7 @@ void CAppSetupMac::initQMapTool() + + // setup translators + QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); +- prepareTranslator(translationPath, "qt_"); ++ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); + prepareTranslator(translationPath, "qmaptool_"); + + migrateDirContent(defaultCachePath()); +diff --git i/src/qmt_rgb2pct/main.cpp w/src/qmt_rgb2pct/main.cpp +index 21267d03..d539cec8 100644 +--- i/src/qmt_rgb2pct/main.cpp ++++ w/src/qmt_rgb2pct/main.cpp +@@ -50,7 +50,7 @@ static void prepareTranslator(QString translationPath, QString translationPrefix + static void loadTranslations() + { + #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(Q_OS_CYGWIN) +- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); ++ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); + QString translationPath = QCoreApplication::applicationDirPath(); + translationPath.replace(QRegExp("bin$"), "share/" APP_STR "/translations"); + prepareTranslator(resourceDir, "qt_"); +@@ -61,7 +61,7 @@ static void loadTranslations() + // os x + static QString relTranslationDir = "Resources/translations"; // app + QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); +- prepareTranslator(translationPath, "qt_"); ++ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); + prepareTranslator(translationPath, APP_STR "_"); + #endif + diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a96be344b3d4..a991d7c0d13d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -27,21 +27,20 @@ mkDerivation rec { pname = "calibre"; - version = "5.30.0"; + version = "5.31.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "058dqqxhc3pl4is1idlnc3pz80k4r681d5aj4a26v9acp8j7zy4f"; + sha256 = "sha256-3LGEWuHms54ji9GWSyLl8cFWIRBqHY1Jf/CNPJOywrU="; }; - # https://sources.debian.org/patches/calibre/5.30.0+dfsg-1 + # https://sources.debian.org/patches/calibre/5.31.1+dfsg-1 patches = [ # allow for plugin update check, but no calibre version check (fetchpatch { - name = "0001_only_plugin_update.patch"; - url = - "https://sources.debian.org/data/main/c/calibre/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; - sha256 = "sha256-aGT8rJ/eQKAkmyHBWdY0ouZuWvDwtLVJU5xY6d3hY3k="; + name = "0001-only-plugin-update.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; + sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index 932fa588d271..12f8935797c8 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -19,9 +19,8 @@ python3.pkgs.buildPythonApplication rec { # /etc/ in check phase. postPatch = '' substituteInPlace Makefile \ - --replace \ - "dbus-run-session" \ - "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" + --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" \ + --replace '-p $(relpassstore)' '-p $(PASSWORD_STORE_DIR)' ''; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/misc/sfm/default.nix index 808e64cdcce5..800ea9419cbe 100644 --- a/pkgs/applications/misc/sfm/default.nix +++ b/pkgs/applications/misc/sfm/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; + makeFlags = [ "CC:=$(CC)" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a36b160c5f94..624dde9e1702 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "96.0.4664.35", - "sha256": "047zc1hl5iwhrgnypl7r5ga2cx1yz26lf1x5cnvdqmarmmkq380m", - "sha256bin64": "1cw89fafxxhr85x4vzhxv3jkmqfnxjisc7gj9v8y2ixqpn190hjl", + "version": "96.0.4664.45", + "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", + "sha256bin64": "1vaazcrlx0999xd9yp25i9kzb8y8g0yqd28xssw7jqwrhz033wgr", "deps": { "gn": { "version": "2021-09-24", diff --git a/pkgs/applications/networking/browsers/gmni/default.nix b/pkgs/applications/networking/browsers/gmni/default.nix index 7baca62e6732..4bc4e360120f 100644 --- a/pkgs/applications/networking/browsers/gmni/default.nix +++ b/pkgs/applications/networking/browsers/gmni/default.nix @@ -1,24 +1,24 @@ -{ stdenv, lib, fetchFromSourcehut, pkg-config, bearssl, scdoc }: +{ stdenv, lib, fetchFromSourcehut, bearssl, scdoc }: stdenv.mkDerivation rec { pname = "gmni"; - version = "unstable-2021-03-26"; + version = "1.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "gmni"; - rev = "77b73efbcd3ea7ed9e3e4c0aa19d9247e21d3c87"; - sha256 = "1wvnzyv7vyddcd39y6q5aflpnnsdl4k4y5aj5ssb7vgkld0h1b7r"; + rev = version; + sha256 = "sha256-3MFNAI/SfFigNfitfFs3o9kkz7JeEflMHiH7iJpLfi4="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ bearssl scdoc ]; + nativeBuildInputs = [ scdoc ]; + buildInputs = [ bearssl ]; meta = with lib; { description = "A Gemini client"; homepage = "https://git.sr.ht/~sircmpwn/gmni"; license = licenses.gpl3Only; maintainers = with maintainers; [ bsima jb55 ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 3eddad8c823c..38b6467857b8 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -69,6 +69,6 @@ buildGoModule rec { downloadPage = "https://github.com/argoproj/argo-cd"; homepage = "https://argo-cd.readthedocs.io/en/stable/"; license = licenses.asl20; - maintainers = with maintainers; [ shahrukh330 ]; + maintainers = with maintainers; [ shahrukh330 bryanasdev000 ]; }; } diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/applications/networking/cluster/terranix/default.nix index 4338dddb49f9..a8541336b3de 100644 --- a/pkgs/applications/networking/cluster/terranix/default.nix +++ b/pkgs/applications/networking/cluster/terranix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, jq, nix, ... }: +{ stdenv, lib, fetchFromGitHub, jq, nix, makeWrapper }: stdenv.mkDerivation rec { pname = "terranix"; @@ -11,29 +11,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-HDiyJGgyDUoLnpL8N+wDm3cM/vEfYYc/p4N1kKH/kLk="; }; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p $out/{bin,core,modules,lib} mv bin core modules lib $out/ - mv $out/bin/terranix-doc-json $out/bin/.wrapper_terranix-doc-json - - # manual wrapper because makeWrapper expectes executables - wrapper=$out/bin/terranix-doc-json - cat <$wrapper - #!/usr/bin/env bash - export PATH=$PATH:${jq}/bin:${nix}/bin - $out/bin/.wrapper_terranix-doc-json "\$@" - EOF - chmod +x $wrapper + wrapProgram $out/bin/terranix-doc-json \ + --prefix PATH : ${lib.makeBinPath [ jq nix ]} ''; meta = with lib; { description = "A NixOS like terraform-json generator"; homepage = "https://terranix.org"; license = licenses.gpl3; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; maintainers = with maintainers; [ mrVanDalo ]; }; - } - diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index eee449de53e3..cd8d1f703d2d 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.22.9"; + version = "0.22.15"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h19Cj4ztgypT/j1gB+PbvgDJ7jlJ3CYPEbK62tJeMss="; + sha256 = "sha256-Aim80bg1vGRkiIlVqDa4qOFQ+mwSOL75HOPYQYovYlE="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 05ba66f93703..a1c63cc9837f 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.2"; + version = "5.6.3"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-8rB7SnaIaeCXAaKELNO1CnxpV8TyeKRCVamwpATeia4="; + sha256 = "sha256-cfX3x0ZRxT6sxMm20uL8lKhMbrI/yiCHVrBTPKIlDSE="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index dd9bcd878d9d..bd6febeaf9d1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell +{ callPackage, stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell , gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss , nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn , lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl @@ -93,7 +93,7 @@ let unwrapped = stdenv.mkDerivation rec { }; in if plugins == [] then unwrapped - else import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; + else callPackage ./wrapper.nix { + inherit plugins; pidgin = unwrapped; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index 095f838fe981..d5641c24fb07 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, pidgin, makeWrapper, plugins }: +{ lib, symlinkJoin, pidgin, makeWrapper, plugins }: let extraArgs = map (x: x.wrapArgs or "") plugins; @@ -11,10 +11,10 @@ in symlinkJoin { postBuild = '' wrapProgram $out/bin/pidgin \ - --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${lib.versions.major pidgin.version} $out/lib/pidgin" \ ${toString extraArgs} wrapProgram $out/bin/finch \ - --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion}" \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${lib.versions.major pidgin.version}" \ ${toString extraArgs} ''; } diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 4e61f39cac58..0d5355a1eb4d 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -1,25 +1,26 @@ { fetchFromGitHub , lib , stdenv -, gtkmm3 -, webkitgtk , cmake -, pkg-config -, libappindicator-gtk3 +, glib-networking , gst_all_1 +, gtkmm3 +, libappindicator-gtk3 , pcre +, pkg-config +, webkitgtk , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "whatsapp-for-linux"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "eneshecan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dEJRufOqlY+DnJdUaG5WP9hR1qO7KxR6MjKWq1SJB8A="; + sha256 = "sha256-VdkCjzmZqP/ZVY1H9FxBGe5rN0nZEPZbMp3MVKL6WLc="; }; nativeBuildInputs = [ @@ -29,14 +30,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtkmm3 - webkitgtk - libappindicator-gtk3 + glib-networking + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav + gtkmm3 + libappindicator-gtk3 pcre + webkitgtk ]; meta = with lib; { diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 732e97b9b095..0434bfe120c8 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -11,13 +11,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "10.5"; + version = "11.2"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "1bgdkmsp6pwq3b6nxxkimrdmz71wqr8qi25gdzwpcv9wmcf1q27v"; + sha256 = "sha256-leEcUSjpiP13l65K9WKN2GXTtTa8vvK/MFxR2zH6Xno="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 3cd991796989..1c3203354873 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -5,9 +5,9 @@ } : let - version = "21.06"; + version = "21.10"; # The tag keeps moving, fix a hash instead - gitLabRev = "dd982ad4bc94dec8ac1e3e99cb6a7dd249ff71de"; + gitLabRev = "117305462bac932106e8e3a0347238b768bcb058"; python = python3.withPackages (ps : with ps; [ six pyparsing ]); @@ -19,7 +19,7 @@ in stdenv.mkDerivation { owner = "Molcas"; repo = "OpenMolcas"; rev = gitLabRev; - sha256 = "07dm73n0s7ckif561yb3s9yqxsv39a73kb9qwny4yp39wdvv52hz"; + sha256 = "sha256-GMi2dsNBog+TmpmP6fhQcp6Z5Bh2LelV//MqLnvRP5c="; }; patches = [ @@ -56,7 +56,9 @@ in stdenv.mkDerivation { "-DOPENBLASROOT=${openblas.dev}" ]; - GAROOT=globalarrays; + preConfigure = '' + export GAROOT=${globalarrays}; + ''; postConfigure = '' # The Makefile will install pymolcas during the build grrr. diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 21e3c47b323d..7cbd9354a372 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -1,22 +1,35 @@ { lib -, python3Packages +, fetchFromGitHub +, git +, nodejs +, python3 }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20210628163208"; + version = "3.1.20211104071347"; + format = "setuptools"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "21b885f725420413d2f87eadc5e81c08a9c91beceda89b35d1a702ec4df47e52"; + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "common-workflow-language"; + repo = pname; + rev = version; + sha256 = "sha256-tp4SdilW2PKav7b3/BchXYl33W9U0aQH6FPdOhHSvIQ="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'prov == 1.5.1' 'prov' + --replace 'prov == 1.5.1' 'prov' \ + --replace "setup_requires=PYTEST_RUNNER," "" ''; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = [ + git + ]; + + propagatedBuildInputs = with python3.pkgs; [ argcomplete bagit coloredlogs @@ -24,18 +37,41 @@ python3Packages.buildPythonApplication rec { prov psutil pydot + rdflib + requests + ruamel-yaml schema-salad shellescape typing-extensions ]; - doCheck = false; # hard to setup - pythonImportsCheck = [ "cwltool" ]; + checkInputs = with python3.pkgs; [ + mock + nodejs + pytest-mock + pytest-xdist + pytestCheckHook + ]; + + disabledTests = [ + "test_content_types" + "test_env_filtering" + "test_http_path_mapping" + ]; + + disabledTestPaths = [ + "tests/test_udocker.py" + "tests/test_provenance.py" + ]; + + pythonImportsCheck = [ + "cwltool" + ]; meta = with lib; { + description = "Common Workflow Language reference implementation"; homepage = "https://www.commonwl.org"; license = with licenses; [ asl20 ]; - description = "Common Workflow Language reference implementation"; maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 35aada8b870f..decd3c51a392 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -21,7 +21,6 @@ python3Packages.buildPythonApplication rec { description = "Tool for visualization of Git repositories"; homepage = "https://github.com/git-big-picture/git-big-picture"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; maintainers = [ lib.maintainers.nthorne ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index d256e212ecae..ff781f471485 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,22 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.4.10"; + version = "1.5.1"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5yv0RZfGLS/cxOxettHQHSPldcq+xa+TNj6dDIAmzOM="; + sha256 = "sha256-AVHMDDvrSLg0OwoG4I5/W2ttWgBwzOG7553gr9bCDFs="; }; - cargoSha256 = "sha256-xG7aic7NCcltz9YmQ4V40/h3OR8Vt5IgApp4yoDbPuc="; + cargoSha256 = "sha256-vBzy4gnlJMQwvVieuWuiVOm/HAr6rHkHcLmzY7eklT4="; # tests require it to be in a git repository preCheck = '' git init ''; + # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context + checkFlags = [ "--skip" "runs_correctly" ]; + meta = with lib; { description = "A git wrapper that allows you to compress multiple commands into one"; homepage = "https://github.com/milo123459/glitter"; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 279d17937ec2..004560bff995 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.4.1", - "repo_hash": "0sm44iyn32frc7njg6ypgbcip77mj5c3agn3cihk3lz7z5kr48lm", + "version": "14.4.2", + "repo_hash": "0zhac96b6p7p9vpj083ajfsj5a2fwkv602zxv79cjvpd924c5ws2", "yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.4.1-ee", + "rev": "v14.4.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.4.1", + "GITALY_SERVER_VERSION": "14.4.2", "GITLAB_PAGES_VERSION": "1.46.0", "GITLAB_SHELL_VERSION": "13.21.1", - "GITLAB_WORKHORSE_VERSION": "14.4.1" + "GITLAB_WORKHORSE_VERSION": "14.4.2" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 347151b1a7f9..c386add243e2 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin krav talyz yuka ]; + maintainers = with maintainers; [ fpletz globin krav talyz yayayayaka yuka ]; } // (if gitlabEnterprise then { license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 2993d1a013fc..41e5908c629d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,7 +21,7 @@ let }; }; - version = "14.4.1"; + version = "14.4.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -33,7 +33,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-bATqaB7q3MlyacEiBXdcEDs+xsJUbULVnYTSpEznxFg="; + sha256 = "sha256-MzYUSoG+HjW9o2zn6Q9Pd5NfI7hZkw1xFXOXHbbxJvo="; }; vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 6614e3913b8e..eaae6eacf44f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.4.1"; + version = "14.4.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index 440b10044f0f..16dfd694ed3d 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -3,7 +3,7 @@ attrsOrig @ { baseName , version -, buildInputs ? [] +, nativeBuildInputs ? [] , xBuildFiles ? [ ] , xBuildFlags ? [ "/p:Configuration=Release" ] , outputFiles ? [ "bin/Release/*" ] @@ -19,12 +19,12 @@ attrsOrig @ attrs = { name = "${baseName}-${version}"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - mono - dotnetbuildhelpers + nativeBuildInputs = [ + pkg-config makeWrapper - ] ++ buildInputs; + dotnetbuildhelpers + mono + ] ++ nativeBuildInputs; configurePhase = '' runHook preConfigure @@ -87,7 +87,7 @@ attrsOrig @ then echo "$dll already exported by a buildInputs, not re-exporting" else - ${dotnetbuildhelpers}/bin/create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" + create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" fi done done @@ -113,4 +113,4 @@ attrsOrig @ ''; }; in - stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "buildInputs" ] )) + stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "nativeBuildInputs" ] )) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 791aa6534d28..7d850ef71667 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.13"; + version = "0.2.16"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "v${version}"; - sha256 = "0ggp65xgkf9y7jamncm65lkm84wapsa47abf133pcb702875v8jz"; + sha256 = "14rrdamkmhrykff8ln07fq9cm8zwj3k113lzwjcy0lgz23g51jyl"; }; postPatch = '' diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index d23733fb0312..2a729c7aa2fc 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wireless-regdb"; - version = "2021.07.14"; + version = "2021.08.28"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Li3SFqXxoxC4SXdK9j5jCdlMIgfDR3GlNMR64YsWJ0I="; + sha256 = "sha256-z/NwxBDR5tMWrgp/qKxieP3x78pdPWZKynz9Kq+lREY="; }; dontBuild = true; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 533be220633f..3efc0f1ceab3 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "101"; + version = "102"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "sha256-rNiZQIQqNbc1P2A6UTn0dRHeT3BS+nv1o81aPaJy+5U="; + sha256 = "sha256-UlktpY9tyjYNkmiBZM42QGg67kcPo7VDy2B4Ty1YIew="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/dhall-modules/dhall-grafana.nix b/pkgs/development/dhall-modules/dhall-grafana.nix index e1ac161a1533..f06a994a9a4c 100644 --- a/pkgs/development/dhall-modules/dhall-grafana.nix +++ b/pkgs/development/dhall-modules/dhall-grafana.nix @@ -4,8 +4,8 @@ buildDhallGitHubPackage { name = "grafana"; owner = "weeezes"; repo = "dhall-grafana"; - # 2021-11-06 - rev = "9ee0bb643f01db6d9935cf7df1914c32a92730b4"; - sha256 = "0a123r5a33p8kaqs68rx2ycjr72xvxcpcmvpqxgb2jb05mnjj540"; + # 2021-11-12 + rev = "d5630dc55deacf5100a99802a4df1d9680b263b3"; + sha256 = "01320hpqgr5r4grsydmdl9yznmly1ssnlc9gcwa8rj1ah0a8xlgz"; dependencies = [ dhallPackages.Prelude ]; } diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 70b6cfe3d9c8..c401240f7d50 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.63.0"; + version = "1.64.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "1511jh38h7nmn4dpyi1vfxvhybcacc6gavwfifxvb5npirphziga"; + sha256 = "04a1ncikapx53jjrx0ac1qi907wlj6javylz4aksg4nfbph6y9j4"; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0hfp2k84mvq11h7q96hkcj3k6f3sxw8wx89acg4hy6lbh8xpy6ai"; + sha256 = "0skrzxn99c1gqil7z0dv0xhg883k98v6mh96nycf7whl2d25965x"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 79e28cc7bb4a..ef55541ed777 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,28 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, gtest, zlib }: stdenv.mkDerivation rec { pname = "lucene++"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "luceneplusplus"; repo = "LucenePlusPlus"; rev = "rel_${version}"; - sha256 = "06b37fly6l27zc6kbm93f6khfsv61w792j8xihfagpcm9cfz2zi1"; + sha256 = "12v7r62f7pqh5h210pb74sfx6h70lj4pgfpva8ya2d55fn0qxrr2"; }; - postPatch = '' - sed -i -e '/Subversion *REQUIRED/d' \ - -e '/include.*CMakeExternal/d' \ - CMakeLists.txt - ''; - - cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost gtest ]; + buildInputs = [ boost gtest zlib ]; doCheck = true; - checkTarget = "test"; + + postPatch = '' + substituteInPlace src/test/CMakeLists.txt \ + --replace "add_subdirectory(gtest)" "" + ''; + + checkPhase = '' + runHook preCheck + LD_LIBRARY_PATH=$PWD/src/contrib:$PWD/src/core \ + src/test/lucene++-tester + runHook postCheck + ''; + + postInstall = '' + mv $out/include/pkgconfig $out/lib/ + ''; meta = { description = "C++ port of the popular Java Lucene search engine"; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index c91d4e2bd0c2..d2fe9a84ac37 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2"; + url = "mirror://sourceforge/project/pcre/pcre/${version}/pcre-${version}.tar.bz2"; sha256 = "0v9nk51wh55pcbnf2jr36yarz8ayajn6d7ywiq2wagivn9c8c40r"; }; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d8f2e3bd5599..be41526c4f23 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; }; - separateDebugInfo = true; + separateDebugInfo = !stdenv.hostPlatform.isStatic; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index 338101b80b56..eeb1d14b910a 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -22,11 +22,12 @@ stdenv.mkDerivation { sha256 = "14vm0b162jh8399pgpsikbwq4z5lkrw9vfzy3drqykw09n6nc53z"; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config ]; - propagatedBuildInputs = [ zlib ] - ++ lib.optional mpiSupport mpi + propagatedNativeBuildInputs = lib.optional mpiSupport mpi ++ lib.optional isOpenmpi openssh ; + propagatedBuildInputs = [ zlib ]; inherit debugEnable mpiSupport; postPatch = '' diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix index 68c71ab59be1..c38b0d623bac 100644 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ b/pkgs/development/libraries/science/math/p4est/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { sha256 = "0vffnf48rzw6d0as4c3x1f31b4kapmdzr1hfj5rz5ngah72gqrph"; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ p4est-sc ]; buildInputs = lib.optional withMetis metis; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index cbd5fa879ee7..1bffb41806c5 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -28,10 +28,12 @@ stdenv.mkDerivation rec { mpiSupport = !withp4est || p4est.mpiSupport; withp4est = petsc-withp4est; - nativeBuildInputs = [ python3 gfortran ]; - buildInputs = [ blas lapack ] + strictDeps = true; + nativeBuildInputs = [ python3 gfortran ] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh + ; + buildInputs = [ blas lapack ] ++ lib.optional withp4est p4est ; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 71674a6c3886..bb8950ca1ec9 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , nixosTests , substituteAll , autoreconfHook @@ -38,6 +39,12 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit flatpak; }) + # Fixes the issue in https://github.com/flatpak/xdg-desktop-portal/issues/636 + # Remove it when the next stable release arrives + (fetchpatch { + url = "https://github.com/flatpak/xdg-desktop-portal/commit/d7622e15ff8fef114a6759dde564826d04215a9f.patch"; + sha256 = "sha256-vmfxK4ddG6Xon//rpiz6OiBsDLtT0VG5XyBJG3E4PPs="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix index 5633e90f4bb0..046f9ffe24f8 100644 --- a/pkgs/development/misc/resholve/source.nix +++ b/pkgs/development/misc/resholve/source.nix @@ -3,7 +3,7 @@ }: rec { - version = "0.6.6"; + version = "0.6.8"; rSrc = # local build -> `make ci`; `make clean` to restore # return to remote source @@ -14,6 +14,6 @@ rec { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-bupf3c9tNPAEMzFEDcvg483bSiwZFuB3ZqveG89dgkE="; + hash = "sha256-1bb22GcOIzmQ31ULZuNNCJ8Vcz4Y0+qAhsJ9PhbqnDM="; }; } diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index dd847462420b..2c17cf2ea038 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -21,10 +21,17 @@ , rSrc , runDemo ? false , binlore +, sqlite +, util-linux +, gawk +, rlwrap +, gnutar +, bc }: let - + default_packages = [ bash file findutils gettext ]; + parsed_packages = [ coreutils sqlite util-linux gnused gawk findutils rlwrap gnutar bc ]; in rec { re_shunit2 = with shunit2; @@ -56,9 +63,6 @@ rec { "/usr/bin/od" = true; }; keep = { - # dynamically defined in shunit2:_shunit_mktempFunc - eval = [ "shunit_condition_" "_shunit_test_" "_shunit_prepForSourcing" ]; - # variables invoked as commands; long-term goal is to # resolve the *variable*, but that is complexish, so # this is where we are... @@ -166,13 +170,14 @@ rec { # LOGLEVEL="DEBUG"; # default path - RESHOLVE_PATH = "${lib.makeBinPath [ bash file findutils gettext ]}"; + RESHOLVE_PATH = "${lib.makeBinPath default_packages}"; # but separate packages for combining as needed PKG_FILE = "${lib.makeBinPath [ file ]}"; PKG_FINDUTILS = "${lib.makeBinPath [ findutils ]}"; PKG_GETTEXT = "${lib.makeBinPath [ gettext ]}"; PKG_COREUTILS = "${lib.makeBinPath [ coreutils ]}"; - RESHOLVE_LORE = "${binlore.collect { drvs = [ bash file findutils gettext coreutils ]; } }"; + RESHOLVE_LORE = "${binlore.collect { drvs = default_packages ++ [ coreutils ] ++ parsed_packages; } }"; + PKG_PARSED = "${lib.makeBinPath parsed_packages}"; # explicit interpreter for demo suite; maybe some better way... INTERP = "${bash}/bin/bash"; diff --git a/pkgs/development/nim-packages/python/default.nix b/pkgs/development/nim-packages/python/default.nix new file mode 100644 index 000000000000..38002c15c939 --- /dev/null +++ b/pkgs/development/nim-packages/python/default.nix @@ -0,0 +1,25 @@ +{ lib, buildNimPackage, fetchFromGitHub, python27 }: + +buildNimPackage rec { + pname = "python"; + version = "1.2"; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = pname; + rev = "b7c3b2c447a69fdb0a974ba149062e52182fda08"; + hash = "sha256-Wl4on0rf4zbNxmwmq/ZkNiPIFCZY+1BdokPQoba2EVI="; + }; + postPatch = let pythonLib = "${python27}/lib/libpython2.7.so"; + in '' + substituteInPlace src/python.nim \ + --replace 'items(LibNames)' "[\"${pythonLib}\"]" \ + --replace 'dynlib: dllname' 'dynlib: "${pythonLib}"' + ''; + doCheck = true; + meta = with lib; + src.meta // { + description = "Nim wrapper for the Python 2 programming language"; + license = [ licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/rocksdb/default.nix b/pkgs/development/nim-packages/rocksdb/default.nix new file mode 100644 index 000000000000..1ad32a086a05 --- /dev/null +++ b/pkgs/development/nim-packages/rocksdb/default.nix @@ -0,0 +1,20 @@ +{ lib, buildNimPackage, fetchFromGitHub, rocksdb, stew, tempfile }: + +buildNimPackage rec { + pname = "rocksdb"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "status-im"; + repo = "nim-${pname}"; + rev = "5b1307cb1f4c85bb72ff781d810fb8c0148b1183"; + hash = "sha256-gjMCB9kpWVi9Qv73/jhoAYw857OmQpry//bDQCtyJo0="; + }; + buildInputs = [ stew tempfile ]; + propagatedBuildInputs = [ rocksdb ]; + doCheck = false; + meta = with lib; + src.meta // { + description = "Nim wrapper for RocksDB"; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/snappy/config.patch b/pkgs/development/nim-packages/snappy/config.patch new file mode 100644 index 000000000000..ffcec7032ca9 --- /dev/null +++ b/pkgs/development/nim-packages/snappy/config.patch @@ -0,0 +1,7 @@ +diff --git a/tests/config.nims b/tests/config.nims +index 46348f1..fbe9f5e 100644 +--- a/tests/config.nims ++++ b/tests/config.nims +@@ -1 +1,2 @@ + switch("path", "..") ++switch("passL", "-lsnappy") diff --git a/pkgs/development/nim-packages/snappy/default.nix b/pkgs/development/nim-packages/snappy/default.nix new file mode 100644 index 000000000000..4e0282cd23cc --- /dev/null +++ b/pkgs/development/nim-packages/snappy/default.nix @@ -0,0 +1,25 @@ +{ lib, buildNimPackage, fetchFromGitHub, snappy }: + +buildNimPackage rec { + pname = "snappy"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "jangko"; + repo = pname; + rev = "d13e2ccb2acaa4e8dedce4f25e8dbf28e19278a6"; + hash = "sha256-18CFRuDK+E701MHrCixx22QSVmglTc0EJwrMCsKwayM="; + }; + propagatedBuildInputs = [ snappy ]; + patches = [ ./config.patch ]; + doCheck = true; + preCheck = '' + mkdir $NIX_BUILD_TOP/nimcache/ + mv -v tests/data $NIX_BUILD_TOP/nimcache/data + ''; # test standards, please + meta = with lib; + src.meta // { + description = "Nim implementation of snappy compression algorithm"; + license = [ lib.licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/spry/default.nix b/pkgs/development/nim-packages/spry/default.nix new file mode 100644 index 000000000000..497431be1e86 --- /dev/null +++ b/pkgs/development/nim-packages/spry/default.nix @@ -0,0 +1,23 @@ +{ lib, buildNimPackage, fetchFromGitHub, python, rocksdb, snappy, spryvm, stew +, tempfile, ui }: + +buildNimPackage rec { + pname = "spry"; + version = "0.9.0"; + src = fetchFromGitHub { + owner = "gokr"; + repo = pname; + rev = "098da7bb34a9113d5db5402fecfc76b1c3fa3b36"; + hash = "sha256-PfWBrG2Z16tLgcN8JYpHaNMysBbbYX812Lkgk0ItMwE="; + }; + buildInputs = [ python rocksdb snappy spryvm stew tempfile ui ]; + patches = [ ./nil.patch ]; + doCheck = true; + meta = with lib; + src.meta // { + description = + "A Smalltalk and Rebol inspired language implemented as an AST interpreter in Nim"; + license = [ licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/spry/nil.patch b/pkgs/development/nim-packages/spry/nil.patch new file mode 100644 index 000000000000..beea30357235 --- /dev/null +++ b/pkgs/development/nim-packages/spry/nil.patch @@ -0,0 +1,35 @@ +diff --git a/src/ispry.nim b/src/ispry.nim +index 23ad6c3..dc38a9d 100644 +--- a/src/ispry.nim ++++ b/src/ispry.nim +@@ -134,8 +134,8 @@ proc main() = + #discard spry.setBinding(newEvalWord("@"), result) + var output = $result + # Print any result +- if output.isNil: +- output = if suspended: "nil" else: "" ++ if output == "" and suspended: ++ output = "nil" + stdout.write(output & "\n") + # except: + # echo "Oops, sorry about that: " & getCurrentExceptionMsg() & "\n" +diff --git a/src/spry.nim b/src/spry.nim +index 670a280..d81bb4c 100644 +--- a/src/spry.nim ++++ b/src/spry.nim +@@ -87,13 +87,13 @@ for kind, key, val in getopt(): + of cmdEnd: assert(false) # cannot happen + + if eval: +- if filename == nil: ++ if filename == "": + writeHelp() + else: + code = filename + else: + code = +- if filename == nil: ++ if filename == "": + # no filename has been given, so we use stdin + readAll stdin + else: diff --git a/pkgs/development/nim-packages/spryvm/default.nix b/pkgs/development/nim-packages/spryvm/default.nix new file mode 100644 index 000000000000..7ee6537b3a2b --- /dev/null +++ b/pkgs/development/nim-packages/spryvm/default.nix @@ -0,0 +1,21 @@ +{ lib, buildNimPackage, fetchFromGitHub, sqlite }: + +buildNimPackage rec { + pname = "spryvm"; + version = "0.9.3"; + src = fetchFromGitHub { + owner = "gokr"; + repo = pname; + rev = "36c2b56bb194902d33de7bcf70d3041703e107ab"; + hash = "sha256-OxB49ef6qPvSXLsyVl5g2ic/P9MMbF3jRYDWrxNJ0Iw="; + }; + propagatedBuildInputs = [ sqlite ]; + patches = [ ./nil.patch ]; + doCheck = true; + meta = with lib; + src.meta // { + description = "Spry virtual machine"; + license = [ licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/spryvm/nil.patch b/pkgs/development/nim-packages/spryvm/nil.patch new file mode 100644 index 000000000000..82d42b597fdb --- /dev/null +++ b/pkgs/development/nim-packages/spryvm/nil.patch @@ -0,0 +1,21 @@ +diff --git a/spryvm/spryui.nim b/spryvm/spryui.nim +index 37f5329..50440e9 100644 +--- a/spryvm/spryui.nim ++++ b/spryvm/spryui.nim +@@ -140,14 +140,14 @@ proc addUI*(spry: Interpreter) = + nimMeth("openFile"): + var win = WindowNode(evalArgInfix(spry)) + var path = openFile(Window(win.widget)) +- if path.isNil: ++ if path == "": + spry.nilVal + else: + newValue($path) + nimMeth("saveFile"): + var win = WindowNode(evalArgInfix(spry)) + var path = saveFile(Window(win.widget)) +- if path.isNil: ++ if path == "": + spry.nilVal + else: + newValue($path) diff --git a/pkgs/development/nim-packages/stew/default.nix b/pkgs/development/nim-packages/stew/default.nix new file mode 100644 index 000000000000..d494e5f879ef --- /dev/null +++ b/pkgs/development/nim-packages/stew/default.nix @@ -0,0 +1,20 @@ +{ lib, buildNimPackage, fetchFromGitHub, snappy }: + +buildNimPackage rec { + pname = "stew"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "status-im"; + repo = "nim-${pname}"; + rev = "478cc6efdefaabadf0666a3351fb959b78009bcc"; + hash = "sha256-txlTF0zNV5kV4KfE744oB3aVLCfWS9BdoKxUmTQTTRY="; + }; + doCheck = false; + meta = with lib; + src.meta // { + description = + "Backports, standard library candidates and small utilities that don't yet deserve their own repository"; + license = [ lib.licenses.asl20 ]; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/tempfile/default.nix b/pkgs/development/nim-packages/tempfile/default.nix new file mode 100644 index 000000000000..2d151bad8e80 --- /dev/null +++ b/pkgs/development/nim-packages/tempfile/default.nix @@ -0,0 +1,19 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "tempfile"; + version = "0.1.7"; + src = fetchFromGitHub { + owner = "OpenSystemsLab"; + repo = "${pname}.nim"; + rev = version; + hash = "sha256-08vvHXVxL1mAcpMzosaHd2FupTJrKJP5JaVcgxN4oYE="; + }; + doCheck = false; # impure + meta = with lib; + src.meta // { + description = "Temporary files and folders"; + license = [ lib.licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/ui/default.nix b/pkgs/development/nim-packages/ui/default.nix new file mode 100644 index 000000000000..de7ef09b5012 --- /dev/null +++ b/pkgs/development/nim-packages/ui/default.nix @@ -0,0 +1,24 @@ +{ lib, buildNimPackage, fetchFromGitHub, libui, pkg-config }: + +buildNimPackage rec { + pname = "ui"; + version = "0.9.4"; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = pname; + rev = "547e1cea8e9fb68c138c422b77af0a3152e50210"; + hash = "sha256-rcvC0TO1r2zU7WEYfcsi/qX+nRITwKj7Fkqd4fHgTwU="; + }; + propagatedBuildInputs = [ libui ]; + propagatedNativeBuildInputs = [ pkg-config ]; + postPatch = '' + echo {.passL: r\"$(pkg-config --libs libui)\".} >> ui/rawui.nim + ''; + doCheck = true; + meta = with lib; + src.meta // { + description = "Nim bindings to libui"; + license = [ licenses.mit ]; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2cf74b0aa290..9d0ca77437bc 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -151,7 +151,7 @@ , "insect" , "intelephense" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v10.3.1.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v11.0.1.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 9bc77311e62b..2e8f941eb44e 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1300.1" = { + "@angular-devkit/architect-0.1300.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1300.1"; + version = "0.1300.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1300.1.tgz"; - sha512 = "D6R2kYnZlKIpVx+lnuC8MRu8ZUqq2dkpeNJ1yP2IgkRdRktXWOOc2xj8utZ6NVCn8m/9kdOceQDlceVz/XT0+g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1300.2.tgz"; + sha512 = "cCTPFKZlR+Szt+X/l/eo4KBYnRba2NiCpFNPVsujitm7JqCXkjab7NDlf+2XMVD8vZl/kR1hfyF6O9ywYmhEFA=="; }; }; "@angular-devkit/core-12.2.10" = { @@ -67,13 +67,13 @@ let sha512 = "0qhmS7Qvl0hiRVTHxEC/ipFAfzYofPstw0ZITDpEMw+pgHlOZolOlnFrv8LyOXWNqlSIH5fS9D3WF7Hpm7ApYA=="; }; }; - "@angular-devkit/core-13.0.1" = { + "@angular-devkit/core-13.0.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.0.1.tgz"; - sha512 = "RfhpPw7vU5ok7ICUwEx4Lic+HCHrMjKnj/Tbk+CfSqONTFtqDaMoC8itQE2risLugT4mzO+3Cy95eccpf282kQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.0.2.tgz"; + sha512 = "I4co4GH+iu0tns+UXfMtjJISO+cLpaUuiEH6kf0wF5cqjaIeluA9UjIRnxuNbdTW8iE2xVj/UWhQfHe/Ncp76w=="; }; }; "@angular-devkit/schematics-12.2.10" = { @@ -85,13 +85,13 @@ let sha512 = "oQ2EWdkEDE+eAttHeviXsvBi85PsntQT+IffjKUZdbQU+Leuk/pKUpTeea1YosU1p4Cz3PKYF+P/Nl5Jy3B7IQ=="; }; }; - "@angular-devkit/schematics-13.0.1" = { + "@angular-devkit/schematics-13.0.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.0.1.tgz"; - sha512 = "WEhotd5H82W8LHo9tgTh547A1pxwmcKDHLhlsko5dg/HuHHhEYuxUxlLaBs1yHl+VVPG+Cwnf3pEbVhWGHVS3Q=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.0.2.tgz"; + sha512 = "qrTe1teQptgP8gmVy6QX0T4dNfnNipEv+cM2cr7JXOmkPpwF+6oBDrTRIJ55t6rziqrXHJ3rxjKm1aHAxFrIEQ=="; }; }; "@angular-devkit/schematics-cli-12.2.10" = { @@ -220,13 +220,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/client-3.5.0" = { + "@apollo/client-3.5.2" = { name = "_at_apollo_slash_client"; packageName = "@apollo/client"; - version = "3.5.0"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/client/-/client-3.5.0.tgz"; - sha512 = "q86EZKTdPFcfFa2PstqE0xf+/7VhREdq3nSlpmJ9q9thQIuwnKcOQDYO+r+wHs4NGjxVGtYlfiUCycpe2op7Jg=="; + url = "https://registry.npmjs.org/@apollo/client/-/client-3.5.2.tgz"; + sha512 = "STC7ZQthcOGU+MXRIzcb3s1ULW9QQFEhXFEIUaK3Jdwy0RxncxYkg2LpwxXV0FqlYUjKEW92f+NUIZ2FhpKGug=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -400,13 +400,13 @@ let sha512 = "9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ=="; }; }; - "@babel/helper-compilation-targets-7.16.0" = { + "@babel/helper-compilation-targets-7.16.3" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.16.0"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz"; - sha512 = "S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz"; + sha512 = "vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA=="; }; }; "@babel/helper-create-class-features-plugin-7.16.0" = { @@ -598,13 +598,13 @@ let sha512 = "VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g=="; }; }; - "@babel/helpers-7.16.0" = { + "@babel/helpers-7.16.3" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.16.0"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.0.tgz"; - sha512 = "dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz"; + sha512 = "Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w=="; }; }; "@babel/highlight-7.16.0" = { @@ -634,13 +634,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.16.2" = { + "@babel/parser-7.16.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.2"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz"; - sha512 = "RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.3.tgz"; + sha512 = "dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" = { @@ -1210,13 +1210,13 @@ let sha512 = "fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg=="; }; }; - "@babel/plugin-transform-parameters-7.16.0" = { + "@babel/plugin-transform-parameters-7.16.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.16.0"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.0.tgz"; - sha512 = "XgnQEm1CevKROPx+udOi/8f8TiGhrUWiHiaUCIp47tE0tpFDjzXNTZc9E5CmCwxNjXTWEVqvRfWZYOTFvMa/ZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz"; + sha512 = "3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w=="; }; }; "@babel/plugin-transform-property-literals-7.16.0" = { @@ -1444,13 +1444,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.16.0" = { + "@babel/runtime-7.16.3" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.16.0"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.0.tgz"; - sha512 = "Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz"; + sha512 = "WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ=="; }; }; "@babel/runtime-7.9.0" = { @@ -1462,22 +1462,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.16.0" = { + "@babel/runtime-corejs3-7.16.3" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.16.0"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz"; - sha512 = "Oi2qwQ21X7/d9gn3WiwkDTJmq3TQtYNz89lRnoFy8VeZpWlsyXvzSwiRrRZ8cXluvSwqKxqHJ6dBd9Rv+p0ZGQ=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.3.tgz"; + sha512 = "IAdDC7T0+wEB4y2gbIL0uOXEYpiZEeuFUTVbdGq+UwCcF35T/tS8KrmMomEwEc5wBbyfH3PJVpTSUqrhPDXFcQ=="; }; }; - "@babel/standalone-7.16.2" = { + "@babel/standalone-7.16.3" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.16.2"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.16.2.tgz"; - sha512 = "Cc0b/YJapYV1o+lhevV2FCr0lkbGbejA/iRWH5S5aZCF/AeAVVRcIS491omYMNbf+Z9SCDgczUu8Kx8WGCnr2g=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.16.3.tgz"; + sha512 = "hoStDfHl2+EYUv1LNHhZTysa+lMSwIEkkT4HnDNX+F0zqvPdoE2QLF7qtkd45cgCGOwQjrvwe2mOKcX3f6Wr8A=="; }; }; "@babel/template-7.16.0" = { @@ -1489,13 +1489,13 @@ let sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="; }; }; - "@babel/traverse-7.16.0" = { + "@babel/traverse-7.16.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.0"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.0.tgz"; - sha512 = "qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz"; + sha512 = "eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag=="; }; }; "@babel/types-7.13.12" = { @@ -2542,22 +2542,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-6.0.6" = { + "@expo/config-6.0.7" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "6.0.6"; + version = "6.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-6.0.6.tgz"; - sha512 = "GPI8EIdMAtZ5VaB4p5GcfuX50xyfGFdpEqLi0QmcfrCfTsGry1/j/Qy28hovHM1oJYHlaZylTcbGy+1ET+AO2w=="; + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.7.tgz"; + sha512 = "aOsm+ZSqCgQrDf+UPHM62QGIpNdt+D3NJSFdHECnTUS6vWiTXhdVS23VQ4ris2thQS0ZRKKlX90S8CBUU49fIg=="; }; }; - "@expo/config-plugins-4.0.6" = { + "@expo/config-plugins-4.0.7" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.0.6.tgz"; - sha512 = "K/KQaw/CU8uLQgk7sFnZC54YGHoGucKFfdjYeZx5ds2eyzbuMAiKzGFcxZ/S+1dVBZ8QHzwowsVBW3kuYhnQ3Q=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.0.7.tgz"; + sha512 = "m160Y039LJcI8Q4arzA9edWNRPPnLnTe5tB41812Mn1BAmtoZy9OMs4Rj78OKFkMx6A9JJKUTWMnP/FVAbeMiw=="; }; }; "@expo/config-types-43.0.1" = { @@ -2569,22 +2569,22 @@ let sha512 = "EtllpCGDdB/UdwAIs5YXJwBLpbFQNdlLLrxIvoILA9cXrpQMWkeDCT9lQPJzFRMFcLUaMuGvkzX2tR4tx5EQFQ=="; }; }; - "@expo/dev-server-0.1.93" = { + "@expo/dev-server-0.1.94" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.93"; + version = "0.1.94"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.93.tgz"; - sha512 = "htfrAz8j0HVN0KhXwTHHgflQP1WNJPoXxeDGysuhuje1x6ik0lhjTuvfXm70DJ8Ve0oX/rviYYd+YMnGtRFr+Q=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.94.tgz"; + sha512 = "WHInk1uB/vNNGdtDxRqrkdYFhuLE4hADKgEgwNBSkcWBWnJIvdXtp/EWbh8zVWF8atvPrtM9JrBtMV3LVIf84g=="; }; }; - "@expo/dev-tools-0.13.128" = { + "@expo/dev-tools-0.13.129" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.128"; + version = "0.13.129"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.128.tgz"; - sha512 = "vm0XPnJYDAPo81xr7H/MANTiBw+eCDapvzTE1GbY3TjDd38B0z1yNng9uYgygBzFqImlSdRioc4BNo3FNr8X/A=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.129.tgz"; + sha512 = "4VLVxI05z65fbuNn5pi3cY+o/4e7Lnw6JmbtImVq/cknCGY0aCnWJWZB1KUZOvvpobI3zga/QAb/6poTtQy09w=="; }; }; "@expo/devcert-1.0.0" = { @@ -2614,13 +2614,13 @@ let sha512 = "CDnhjdirUs6OdN5hOSTJ2y3i9EiJMk7Z5iDljC5xyCHCrUex7oyI8vbRsZEojAahxZccgL/PrO+CjakiFFWurg=="; }; }; - "@expo/metro-config-0.2.8" = { + "@expo/metro-config-0.3.0" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.2.8"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.2.8.tgz"; - sha512 = "8g0QrHfvSgTLzryuE4JXRwFwBZ7EmqE55zR39Yy7jEVR3epYL0JbBK0/IDFmf6auwsDFtMjAZjFL4WEhRN5bEQ=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.0.tgz"; + sha512 = "bwpxqrcziDuqLvSzJ18N/c3+VOVI03gZ4ZWZQ8N6s7OVJrRjUMcSlFzjKlrJNm1t9m44Xl5mzhJYGFK2WsdI+Q=="; }; }; "@expo/osascript-2.0.30" = { @@ -2650,13 +2650,13 @@ let sha512 = "LDxiS0KNZAGJu4fIJhbEKczmb+zeftl1NU0LE0tj0mozoMI5HSKdMUchgvnBm35bwBl8ekKkAfJJ0ONxljWQjQ=="; }; }; - "@expo/prebuild-config-3.0.6" = { + "@expo/prebuild-config-3.0.7" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.0.6.tgz"; - sha512 = "KmPCi/Qhlx+jhmgDlMYNAhD64njDP3P9MWSKOl2YzpdDopk6+EGGBgI9Km6rQ1F3ESkqhuZN0uGYmABw6AoYYA=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.0.7.tgz"; + sha512 = "0lcgbqC5EP5f+SXu7jY0krLqqKfIbpp4LuDKJBpB7+ytM5W6VOURcCJA7BmwYD42kxsj9JOz/qjU1+OLr3g1qQ=="; }; }; "@expo/results-1.0.0" = { @@ -2704,13 +2704,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.16.6" = { + "@expo/webpack-config-0.16.7" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.16.6"; + version = "0.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.6.tgz"; - sha512 = "xGovzj52z/rsF+cRD4iEqFykp9YYLDnF2l86XQemXxIB7L89owXI/zd4oi5X8kaLfJLPlTq/F8A4NaoztLxxjQ=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.7.tgz"; + sha512 = "/dph1dMDcxb7BJwUERD5LQLSjo16KWhephcjarH4T3dqRAFIR/RihFLI/suPM7dg4g7gFN9/qXYNpsZ75fvaxw=="; }; }; "@expo/xcpretty-4.0.0" = { @@ -2767,13 +2767,13 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/react-7.179.1" = { + "@fluentui/react-7.179.2" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.179.1"; + version = "7.179.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.179.1.tgz"; - sha512 = "2Hc7o5UsNpw9fsYRbLYsf9c2pR/yxqjwmiofW+TfuZvFyy60djy8gIbCVG2QtxLoY264zj6wfJcBEbPwhdHebA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.179.2.tgz"; + sha512 = "II+ChNZC6Ds5JTk7rNWyErERdhgVvpvhk4GsUUvTnmZvnrtnmVQs4HGuq6J+EHDhfKSymlONcvNePACw5j/f+g=="; }; }; "@fluentui/react-focus-7.18.1" = { @@ -2983,13 +2983,13 @@ let sha512 = "Q240kcUszhXiAYudjuJgNuLgy9CryDP3wp83NOZQezfA6h3ByYKU7xI6DiKrdjyVaGpYN3ppUmdj0uf5GaXzMA=="; }; }; - "@graphql-tools/mock-8.4.2" = { + "@graphql-tools/mock-8.4.3" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.4.2"; + version = "8.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.4.2.tgz"; - sha512 = "2v4v99mWUB1by+6Bk01PoJCUVnYoNSOT0E5VvFRf5oMwJPaRKLAbC+IjZaRoen1tWpVrg+3Coub7co8jyhvm/Q=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.4.3.tgz"; + sha512 = "jj7obzDz4FAfmIGSh1Mo6cUs9d8MSaN6TH/iju3Qyuz6CZ6NLuJrWOg50ysEUgkT4Y/Aey8SlWOf/U15Z7qWYw=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -5710,13 +5710,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-13.0.1" = { + "@schematics/angular-13.0.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.0.1.tgz"; - sha512 = "Qs3vcpSmBpzIxyaihDP3rtc6ge13t8dhqq9vXzE0MCq+HRUptAPmsx7JOUiB0/3T33XGNC9ICKdpGD+6xNltgw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.0.2.tgz"; + sha512 = "qdzgd/CT6Y3U/98f/n66pnIMY5RuLW7WAmz+KQiuqaLgYWZNUbqYtAoxFI5ABTSKQoZSjjfescWL2R3XN9g3Xw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5746,13 +5746,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.17.2" = { + "@serverless/components-3.18.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.17.2"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.17.2.tgz"; - sha512 = "7iFkhwLKPD1iqSYr3ppF5CsJ08KYKVCCV6DoiG7ek2Aiy+JtqZkTn9GMCEbrGqZtxDMiRfaYuaOt19F19JqTlQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.18.0.tgz"; + sha512 = "/mg+A9HACedGD3qJ0MxepmmBwFi3hwUYFNEDJi7Z63pkHvXg+jLEeHtbAx2HdqxY1SHH/LtRzZR4GBcFCaY+Og=="; }; }; "@serverless/core-1.1.2" = { @@ -6781,6 +6781,15 @@ let sha512 = "3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA=="; }; }; + "@types/express-serve-static-core-4.17.25" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.25"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.25.tgz"; + sha512 = "OUJIVfRMFijZukGGwTpKNFprqCCXk5WjNGvUgB/CxxBR40QWSjsNK86+yvGKlCOGc7sbwfHLaXhkG+NsytwBaQ=="; + }; + }; "@types/fancy-log-1.3.0" = { name = "_at_types_slash_fancy-log"; packageName = "@types/fancy-log"; @@ -11893,13 +11902,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1024.0" = { + "aws-sdk-2.1027.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1024.0"; + version = "2.1027.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1024.0.tgz"; - sha512 = "FgGvRtxTzgU7iBXG/+hCGqdE2U2gF/NqVDQsTBjrLIbOMiNNheL8uzxcmIKKZ49lFlWwVkM0HNmpEmA5hiLinw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1027.0.tgz"; + sha512 = "j3UjPV9hzyCvkmfcbhRscMggdmrPqlhvo8QzkXCGFfPXjZMh1OJd4HkCEH2NaunzLOyF2Y3QzxKrGOLMT7sNzg=="; }; }; "aws-sdk-2.920.0" = { @@ -12010,13 +12019,13 @@ let sha512 = "j2hHu0asf6HxacVmGJKFSsrfoG8nC0JEjujIpsmRVkr74nC6o5gs6YF6AQD3e7YyJ8PaKuA7k2uSL9A2mAG9Og=="; }; }; - "b4a-1.1.1" = { + "b4a-1.1.2" = { name = "b4a"; packageName = "b4a"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/b4a/-/b4a-1.1.1.tgz"; - sha512 = "f2d+E1G7eiejlPpPe6RPBaW5tnbI0rsHp7ZyN3nr+kvwWGVnUwh7Kr5P+NtJ2B7+lZe0B1vcWz4HNnvdG1N9eg=="; + url = "https://registry.npmjs.org/b4a/-/b4a-1.1.2.tgz"; + sha512 = "mL0ZchJqyNLojO7XxJ7VYk5lws0RVFvjDiLilAbJTsClbpIE1ESUOBNKQaRIXmlZgoU8ckusIEeOrWEbFuDymg=="; }; }; "babel-code-frame-6.26.0" = { @@ -13135,13 +13144,13 @@ let sha512 = "j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="; }; }; - "big-integer-1.6.50" = { + "big-integer-1.6.51" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.50"; + version = "1.6.51"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz"; - sha512 = "+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz"; + sha512 = "GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="; }; }; "big.js-3.2.0" = { @@ -14152,6 +14161,15 @@ let sha512 = "zgmaRvT6AN1JpPPV+S0a1/FAtoxSreYDccZGIqEMSvZl9DMe70mJ7MFzpxa1X+gHVdkToE2haRUHHMiW1OdejA=="; }; }; + "bplist-parser-0.3.1" = { + name = "bplist-parser"; + packageName = "bplist-parser"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz"; + sha512 = "PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA=="; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -15485,13 +15503,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001278" = { + "caniuse-lite-1.0.30001279" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001278"; + version = "1.0.30001279"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001278.tgz"; - sha512 = "mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001279.tgz"; + sha512 = "VfEHpzHEXj6/CxggTwSFoZBBYGQfQv9Cf42KPlO79sWXCD1QNKWKsKzFeWL7QpZHJQYAvocqV6Rty1yJMkqWLQ=="; }; }; "canvas-2.8.0" = { @@ -15638,6 +15656,15 @@ let sha512 = "H5WTjQYgyHQI0VrCmbyQBOPy1353MjmUi/r3DbPib4U13vuyqm7es9Mfpe8G58bN/mCdRlJWkiCrPl1uM1wAlg=="; }; }; + "cbor-8.1.0" = { + name = "cbor"; + packageName = "cbor"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cbor/-/cbor-8.1.0.tgz"; + sha512 = "DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg=="; + }; + }; "ccount-1.1.0" = { name = "ccount"; packageName = "ccount"; @@ -15647,22 +15674,22 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.1.27" = { + "cdk8s-1.1.30" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.1.27"; + version = "1.1.30"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.27.tgz"; - sha512 = "48iS6dNZGqFFdVxgLosc/SyrjTwKN/M4D3XKfuHPp++7iYarq4ygiHpKnfYVrLSjKNNzcn4abwLAZ+K17D+dPw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.30.tgz"; + sha512 = "vD5tJrvGFX0ON2ywTOOlMWXrWxqVQsrv9nkClMUAVjzZQCLjlQh5iljN/WPf3spIrKM59ydVnnCibPzG+rPkNw=="; }; }; - "cdk8s-plus-22-1.0.0-beta.35" = { + "cdk8s-plus-22-1.0.0-beta.37" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.35"; + version = "1.0.0-beta.37"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.35.tgz"; - sha512 = "80m1VRISl2qAyzLq1Esh63vVEt/xWm62UgyJSiApvLOg8Qbc8R+xd9Ev48Vc/xBnb4TkC3jyqZKAjb+PasHYfA=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.37.tgz"; + sha512 = "nKhTqF9V2262HKknBtJ9RedS/5gjKYQ9Cx4F/jPFjdlZZ+ixD2AJop258S8lMpXEeR+E7MAQRwc1Nx0hkHf7gw=="; }; }; "cdktf-0.7.0" = { @@ -17861,6 +17888,15 @@ let sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; }; }; + "common-tags-1.8.1" = { + name = "common-tags"; + packageName = "common-tags"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.1.tgz"; + sha512 = "uOZd85rJqrdEIE/JjhW5YAeatX8iqjjvVzIyfx7JL7G5r9Tep6YpYT9gEJWhWpVyDQEyzukWd6p2qULpJ8tmBw=="; + }; + }; "commondir-1.0.1" = { name = "commondir"; packageName = "commondir"; @@ -18420,13 +18456,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.45.0" = { + "contentful-management-7.45.2" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.45.0"; + version = "7.45.2"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.45.0.tgz"; - sha512 = "EV61fjenq9ym38Sn45g2xoKdh2Tfup3fYekglNLhxPOpNkdmJPyGmsk1fo5STYTynyN/njbRjj1Rtdla0sKebQ=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.45.2.tgz"; + sha512 = "NFAkV6mxqOW4SIx8pAhraQq234Gl8+Np8cxaw7+bB9DCelpxmWvySyaoDczAaYmXLZcejeOFt/NS+Rhp7hPvJA=="; }; }; "contentful-sdk-core-6.10.3" = { @@ -19185,13 +19221,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-2.1.0" = { + "create-gatsby-2.1.1" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.1.0.tgz"; - sha512 = "tGBabM9/jUPfHvJ5NyLdLtfGlq5OFpkMgxn+yVYAXyFTf/PqdZ+TauG+YAxAUaVGcP3/BmP64IJLANspJrsWRQ=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.1.1.tgz"; + sha512 = "TyTrJD5Wa2WTa5PVY3ng1aIo7vqyR3rmQJuGRNPNeRZIfrYBrMGILWIh8TV+pofTKiZsRhPPMmHlpDD62tqPcw=="; }; }; "create-graphback-1.0.1" = { @@ -19932,6 +19968,15 @@ let sha512 = "r45M92nLnGP246ot0Yo5RvbiiMF5Bw/OTIdWJ3OQ4Vbv4hpOeoXVIPxdSmUw+fPJlQOseY+iigJyLSfPMIrddQ=="; }; }; + "csv-stream-0.2.0" = { + name = "csv-stream"; + packageName = "csv-stream"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-stream/-/csv-stream-0.2.0.tgz"; + sha512 = "K9kh9wWGsJrvdaDSb3TdSgwVHCky8fRW7/USBq906xsk2+IGA3X+j/BbN9c5xcedhIIlWKQtk1xtVdhNyfIDrA=="; + }; + }; "csv-streamify-3.0.4" = { name = "csv-streamify"; packageName = "csv-streamify"; @@ -21183,13 +21228,13 @@ let sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ=="; }; }; - "deasync-0.1.23" = { + "deasync-0.1.24" = { name = "deasync"; packageName = "deasync"; - version = "0.1.23"; + version = "0.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.23.tgz"; - sha512 = "CGZSokFwidI50GOAmkz/7z3QdMzTQqAiUOzt95PuhKgi6VVztn9D03ZCzzi93uUWlp/v6A9osvNWpIvqHvKjTA=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.24.tgz"; + sha512 = "i98vg42xNfRZCymummMAN0rIcQ1gZFinSe3btvPIvy6JFTaeHcumeKybRo2HTv86nasfmT0nEgAn2ggLZhOCVA=="; }; }; "death-1.1.0" = { @@ -23550,22 +23595,22 @@ let sha512 = "JrrLcBP15KGrPj0cZ/ALKGmaQ4gJkn3mocf0E3bRKdR3kxKWYcDRpCvdhksYDXw/r3I6tMEcZ7XzyApWFXdVpw=="; }; }; - "electron-rebuild-3.2.3" = { + "electron-rebuild-3.2.5" = { name = "electron-rebuild"; packageName = "electron-rebuild"; - version = "3.2.3"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.3.tgz"; - sha512 = "9oxNmKlDCaf651c+yJWCDIBpF6A9aY+wQtasLEeR5AsPYPuOKEX6xHnC2+WgCLOC94JEpCZznecyC84fbwZq4A=="; + url = "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.5.tgz"; + sha512 = "U9dKi10V9w/BdIVB8a8dTKYLK3Q1d2WZ+Yo5qfM3XX/O4jI7KpnwgvWgGoVv0jTWPC2NlebF00ffWS/8NfUAtA=="; }; }; - "electron-to-chromium-1.3.891" = { + "electron-to-chromium-1.3.895" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.891"; + version = "1.3.895"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.891.tgz"; - sha512 = "3cpwR82QkIS01CN/dup/4Yr3BiOiRLlZlcAFn/5FbNCunMO9ojqDgEP9JEo1QNLflu3pEnPWve50gHOEKc7r6w=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.895.tgz"; + sha512 = "9Ww3fB8CWctjqHwkOt7DQbMZMpal2x2reod+/lU4b9axO1XJEDUpPMBxs7YnjLhhqpKXIIB5SRYN/B4K0QpvyQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25604,13 +25649,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.101" = { + "expo-pwa-0.0.102" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.101"; + version = "0.0.102"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.101.tgz"; - sha512 = "VuePnFnyHWUfb4D0axkvRmRHeGzznDY5EBxqhQG7MLa7M+d3gtpjmJ2tkkVBg7gtTvaU9OdELT71ayKy8Itftg=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.102.tgz"; + sha512 = "8vqf+hXpQhzDvEj0Wxx3bD4ZtZTU200F4qGO7QFv16Ji5yGPYgb7bAPokUU5v2DF6q0gsDgEF0WtqCU67lScgQ=="; }; }; "express-2.5.11" = { @@ -27179,13 +27224,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.2.2" = { + "flatted-3.2.4" = { name = "flatted"; packageName = "flatted"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz"; - sha512 = "JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; + sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; }; }; "flatten-0.0.1" = { @@ -27215,13 +27260,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.163.0" = { + "flow-parser-0.164.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.163.0"; + version = "0.164.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.163.0.tgz"; - sha512 = "txOsBcZ1nKsKtoAsBFnArFdq0cnPCmEHI5S2jQIgU1ZO1xtWpg64TsZSRktsaOyoWLpAvVxPap4Qbdd/TCJ3FQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.164.0.tgz"; + sha512 = "aJWAhnazcz0o8xIbCW5LBTf+tnsAtLwaMSCcRqA15UTkPBY1Vq1vy1WEPKwcWsve5tos5kkOeCXgd/Nal+LUUQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28160,31 +28205,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.1.0" = { + "gatsby-core-utils-3.1.2" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.1.0.tgz"; - sha512 = "ErgJr5xgjUoorhCVeyMyNfnZhxBTA33KRB/aFtFWNeTXFsUNlDZBqheSp2XAaD3+gvAmDqbz2m+jKF1sI8vLAg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.1.2.tgz"; + sha512 = "l3LUdGNDlM3fLrdxRUGnsd/Szu9e8yLEL/pZIV2LuhTHMNwjOStiycEQivezsUhHNPobep1r5t4yWzP6r2cw/Q=="; }; }; - "gatsby-recipes-1.1.0" = { + "gatsby-recipes-1.1.2" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-1.1.0.tgz"; - sha512 = "9eRkQSZZK574J7Wg8nrt1MKrcoZ63sfMVk6MXAnipBTxb+YCzSfkTWmNC81HxVeHbsVB2XcVnSQGEb/Ho2m4MQ=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-1.1.2.tgz"; + sha512 = "r6FSPM2eKH+rlC6JX0SgVYBFxBXJW5J/MwFtsP8N+C6Yvr7Cosi9OlMreMx/SBza4HYMXxIoDBYvX68qbBQrhg=="; }; }; - "gatsby-telemetry-3.1.0" = { + "gatsby-telemetry-3.1.2" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.1.0.tgz"; - sha512 = "XoKh80BROhmtqbFXDhKxr66vYqxt23PfANqUhyFugHFfW+ETx33kTOS8t9IY23icrsqoo780vcx0nVFRjidWEg=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.1.2.tgz"; + sha512 = "uz8J+cGkQ1vgIc5BCrR5Jm/cF/kKF+Ys+tqXofn4ah95ezT94U+g+m3FPPB49cut7H4OZsONCXeLyLRzdIx7EQ=="; }; }; "gauge-1.2.7" = { @@ -29403,13 +29448,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.28.0" = { + "google-gax-2.28.1" = { name = "google-gax"; packageName = "google-gax"; - version = "2.28.0"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.28.0.tgz"; - sha512 = "kuqc8a4+CTCMBcF3tlOL7Sa74JWkTzcZxatAQTCVK35WToXkHnJ0qncFOJuegUv3EbV9IQY4j/+NZdFLv+lbTA=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.28.1.tgz"; + sha512 = "2Xjd3FrjlVd6Cmw2B2Aicpc/q92SwTpIOvxPUlnRg9w+Do8nu7UR+eQrgoKlo2FIUcUuDTvppvcx8toND0pK9g=="; }; }; "google-p12-pem-3.1.2" = { @@ -29700,13 +29745,13 @@ let sha512 = "bVddVO8YFJPwuACn+3pgmrEg6I8iBuYLuwvxiE+lcQQ7POotVZxm2rgGw0PvVYmWWf3DT7nTVDZ5ROh/ALp8mA=="; }; }; - "graphql-language-service-interface-2.9.0" = { + "graphql-language-service-interface-2.9.1" = { name = "graphql-language-service-interface"; packageName = "graphql-language-service-interface"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.9.0.tgz"; - sha512 = "FrfmEJCgYo9zz97VBs6093uGIHxxpb+z6dRi5MLV+spQYdEhfWy7BFJ7XjHPreDvxekK8SFtbVCYypETSGYe7w=="; + url = "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.9.1.tgz"; + sha512 = "yGsE67fxJBXxY82+rLDMvUpmzpOUM8XFB+k+xOTUyABWs27osKaoGiuDDXAVGg1adhm+cpunWbipe763ZJkAVA=="; }; }; "graphql-language-service-parser-1.10.0" = { @@ -29718,13 +29763,13 @@ let sha512 = "cLExv0EjqT2hsKdwVTPmKU6eMfjZAjxqywgCPnWD48eJn6tyuePMyG7ye+jpX1PRPPx/cDHfFJGf8sUclchvng=="; }; }; - "graphql-language-service-types-1.8.2" = { + "graphql-language-service-types-1.8.3" = { name = "graphql-language-service-types"; packageName = "graphql-language-service-types"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.2.tgz"; - sha512 = "Sj07RHnMwAhEvAt7Jdt1l/x56ZpoNh+V6g+T58CF6GiYqI5l4vXqqRB4d4xHDcNQX98GpJfnf3o8BqPgP3C5Sw=="; + url = "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.3.tgz"; + sha512 = "m+RHnlGkKDcesW/gC4M7I2pSmWJB84uWS6LtnjplO/07JN312nJCJYCwV/DBny2m1fmSOxN7H/o+JW0l56KwBA=="; }; }; "graphql-language-service-utils-2.5.1" = { @@ -29736,6 +29781,15 @@ let sha512 = "Lzz723cYrYlVN4WVzIyFGg3ogoe+QYAIBfdtDboiIILoy0FTmqbyC2TOErqbmWKqO4NK9xDA95cSRFbWiHYj0g=="; }; }; + "graphql-language-service-utils-2.6.0" = { + name = "graphql-language-service-utils"; + packageName = "graphql-language-service-utils"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-language-service-utils/-/graphql-language-service-utils-2.6.0.tgz"; + sha512 = "idqwmbREixhDuQMcYp8WH0btQT02xZny8MO/HduNTVjnPrmTYnZUbpZ9AejdflmaKoS0o8nNvgXQ0GpIOzbG5g=="; + }; + }; "graphql-subscriptions-1.2.1" = { name = "graphql-subscriptions"; packageName = "graphql-subscriptions"; @@ -33796,13 +33850,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.20.5" = { + "is-my-json-valid-2.20.6" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.20.5"; + version = "2.20.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz"; - sha512 = "VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz"; + sha512 = "1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw=="; }; }; "is-natural-number-4.0.1" = { @@ -35516,13 +35570,13 @@ let sha512 = "AjJ0tlrnBatJB7OJ/cn9sFaLpM4Ra7fSkxLlHNWsVE1KFAUnCLIcDloXaytaDmBXY/emxi3/XbWwGUIqbjbCIw=="; }; }; - "jsii-srcmak-0.1.392" = { + "jsii-srcmak-0.1.395" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.392"; + version = "0.1.395"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.392.tgz"; - sha512 = "HXFXdUYf2IOD6esJj3s6re3vO4Jcmn+v1mXlQFdiCqJcAiMDhJMtzq5m37toui1lG0NJy5o3yxfBInG9b9rT7A=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.395.tgz"; + sha512 = "bes1vFd0qC/R7Ef/iuLdQgJ9yNVASh3HFPhfGHubJ1urDOBZN3XcNdE6cBuRradItVBrzBWovHabfW1DiEvz+g=="; }; }; "json-bigint-1.0.0" = { @@ -35669,13 +35723,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-0.3.0" = { + "json-schema-0.4.0" = { name = "json-schema"; packageName = "json-schema"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.3.0.tgz"; - sha512 = "TYfxx36xfl52Rf1LU9HyWSLGPdYLL+SQ8/E/0yVyKG8wCCDaSrhPap0vEdlsZWRaS6tnKKLPGiEJGiREVC8kxQ=="; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; + sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; }; }; "json-schema-deref-sync-0.13.0" = { @@ -35813,13 +35867,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.45" = { + "json2jsii-0.2.48" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.45"; + version = "0.2.48"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.45.tgz"; - sha512 = "1Ks3P15asuqxCNaCQlE+HQssI3FXwVVr9qXQIpA29c/VqYgibTtaZuNBQDf+3S7Htj0ufLiif8HGx7OYc1ElxQ=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.48.tgz"; + sha512 = "7quEqt8IUcyUQWCMFHdFkWvrMEe52MmLpAihdeW8YRxYXGlasqioL8MqDffHQLNhyrr7EYVW9Xkl1AJcCj667g=="; }; }; "json3-3.2.6" = { @@ -36038,13 +36092,13 @@ let sha512 = "e0Jtg4KAzDJKKwzbLaUtinCn0RZseWBVRTRGihSpvFlM3wTR7ExSp+PTdeTsDrLNJUe7L7JYJe8mblHX5SCT6A=="; }; }; - "jsonpointer-4.1.0" = { + "jsonpointer-5.0.0" = { name = "jsonpointer"; packageName = "jsonpointer"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz"; - sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz"; + sha512 = "PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="; }; }; "jsonschema-1.4.0" = { @@ -37298,6 +37352,15 @@ let sha512 = "4pKOAp86o0298Vt7aZRXr0UH7ymq2zRIB+wZlUUoHAZ36rKpeBhsMb1DPDZCh0ntcocYaedkCIXjbz/a5sALVA=="; }; }; + "lightning-4.14.1" = { + name = "lightning"; + packageName = "lightning"; + version = "4.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-4.14.1.tgz"; + sha512 = "k8PINVBXEhrpsAM5cnxMCWVBqI1FyoAE/HbkwfWzzcEhLdshGzJEnwmi2MxhNqhTnBBZBuDgtZakCifkZVj41g=="; + }; + }; "lightning-4.5.0" = { name = "lightning"; packageName = "lightning"; @@ -37514,6 +37577,15 @@ let sha512 = "pRzU5i1aG9tn5bjH9vtS2/IngL3ZFmSKNdbLuw1QDvUE0VTkethL2hST7cJCNFpiPftuM65eNtT10woBXgYBfQ=="; }; }; + "ln-service-52.15.0" = { + name = "ln-service"; + packageName = "ln-service"; + version = "52.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.15.0.tgz"; + sha512 = "7HjeyEMrcIGP9Q6LdRyVD7qFWu+gQbWkwuOpnFJYoodKsLqhWFykAZ7wS2OjXlvw/8+/ASQcxe5o2gVm501lLw=="; + }; + }; "ln-service-52.4.0" = { name = "ln-service"; packageName = "ln-service"; @@ -37532,13 +37604,13 @@ let sha512 = "5Djy5IUeM9jT6r0s6ptnaKjJZxHTQxVATYcK+Y7vdvQ4vf15sRY+sSSPqL1uYpbUWLo5hUSwLcGuLeBYgEUDlg=="; }; }; - "ln-sync-2.1.1" = { + "ln-sync-3.0.0" = { name = "ln-sync"; packageName = "ln-sync"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-2.1.1.tgz"; - sha512 = "cvulVA2d4P0bLP6SWy+HjkVQgK+iJeCGz4fFAAKoskjpT6C50v8dcDOmtElJzPcW93j2SssLyx6Z9vYnIZHIkA=="; + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.0.0.tgz"; + sha512 = "j+QGoRwJietE0LpYu/1pKXxM2EpHGFKr+9YG5jM2k7RQvKh3ND3pciNWbhGiGBDdANES9aDuy6aTA/12505ZaQ=="; }; }; "ln-telegram-3.4.0" = { @@ -41538,13 +41610,13 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-db-1.50.0" = { + "mime-db-1.51.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.50.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz"; - sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; "mime-types-2.1.18" = { @@ -41565,13 +41637,13 @@ let sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; - "mime-types-2.1.33" = { + "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.33"; + version = "2.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz"; - sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; "mimic-fn-1.2.0" = { @@ -42024,13 +42096,13 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mobx-6.3.6" = { + "mobx-6.3.7" = { name = "mobx"; packageName = "mobx"; - version = "6.3.6"; + version = "6.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.3.6.tgz"; - sha512 = "TeCp8BTco5cmXKY7Zt5VSL5fHBEAHTSA6xs+KWmcxi3cFN1C+Xqs2m3giyGT/e6TSjtdDysVX5+cCZZhEyiJmA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.3.7.tgz"; + sha512 = "X7yU7eOEyxIBk4gjIi2UIilwdw48gXh0kcZ5ex3Rc+COJsJmJ4SNpf42uYea3aUqb1hedTv5xzJrq5Q55p0P5g=="; }; }; "mobx-react-7.2.1" = { @@ -42186,6 +42258,15 @@ let sha512 = "PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w=="; }; }; + "moment-timezone-0.5.34" = { + name = "moment-timezone"; + packageName = "moment-timezone"; + version = "0.5.34"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz"; + sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; + }; + }; "monotonic-timestamp-0.0.9" = { name = "monotonic-timestamp"; packageName = "monotonic-timestamp"; @@ -43555,6 +43636,15 @@ let sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; }; + "node-abi-3.3.0" = { + name = "node-abi"; + packageName = "node-abi"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.3.0.tgz"; + sha512 = "/+2sCVPXmj07GY/l0ggRr7+trqzX7F9d4QVfSArqIVYmRzc/LkXKr5FlRO6U8uZ/gVVclDDaBxBNITj1z1Z/Zw=="; + }; + }; "node-addon-api-1.7.2" = { name = "node-addon-api"; packageName = "node-addon-api"; @@ -44420,15 +44510,6 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; - "npm-7.24.2" = { - name = "npm"; - packageName = "npm"; - version = "7.24.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.24.2.tgz"; - sha512 = "120p116CE8VMMZ+hk8IAb1inCPk4Dj3VZw29/n2g6UI77urJKVYb7FZUDW8hY+EBnfsjI/2yrobBgFyzo7YpVQ=="; - }; - }; "npm-bundled-1.1.2" = { name = "npm-bundled"; packageName = "npm-bundled"; @@ -45069,6 +45150,15 @@ let sha512 = "YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA=="; }; }; + "object-sizeof-1.6.1" = { + name = "object-sizeof"; + packageName = "object-sizeof"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-sizeof/-/object-sizeof-1.6.1.tgz"; + sha512 = "gNKGcRnDRXwEpAdwUY3Ef+aVZIrcQVXozSaVzHz6Pv4JxysH8vf5F+nIgsqW5T/YNwZNveh0mIW7PEH1O2MrDw=="; + }; + }; "object-to-arguments-0.0.8" = { name = "object-to-arguments"; packageName = "object-to-arguments"; @@ -45258,13 +45348,13 @@ let sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; }; }; - "office-ui-fabric-react-7.179.1" = { + "office-ui-fabric-react-7.179.2" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.179.1"; + version = "7.179.2"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.179.1.tgz"; - sha512 = "htornECbfcBrAG9AgDVFccZfdFTEgqNiXvGq2FoNvFD4oMbgd+h2Klr4sTjXJ8yTEcweMTKvltMrG5z7/HdROA=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.179.2.tgz"; + sha512 = "OIErGO8lLKOBbQPa/dfTXsWQR+Jp41ruSqA7kEcp6F2cBMzKS862Y8bIr0/SpUUzRhGLsaFIIc/UbCflOn1L5w=="; }; }; "omggif-1.0.10" = { @@ -46563,13 +46653,13 @@ let sha512 = "+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw=="; }; }; - "p-transform-1.2.0" = { + "p-transform-1.3.0" = { name = "p-transform"; packageName = "p-transform"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-transform/-/p-transform-1.2.0.tgz"; - sha512 = "FtuSF5RB0UFHPawWyHVU3z3QdRfNIVbdwQ6iwGQl1ixCKszVhxax0JAgmBbM+UpwDIYm2i1MWyiLDyJqm8Gwmw=="; + url = "https://registry.npmjs.org/p-transform/-/p-transform-1.3.0.tgz"; + sha512 = "UJKdSzgd3KOnXXAtqN5+/eeHcvTn1hBkesEmElVgvO/NAYcxAvmjzIGmnNd3Tb/gRAvMBdNRFD4qAWdHxY6QXg=="; }; }; "p-try-1.0.0" = { @@ -51478,13 +51568,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.185" = { + "pyright-1.1.186" = { name = "pyright"; packageName = "pyright"; - version = "1.1.185"; + version = "1.1.186"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.185.tgz"; - sha512 = "IJeRSdZv8Rl/GB8Bpws8XEf7YgVLH+taEOMXSVhqKFrerW29rn9vW7sPkNy2o3IkjEF3CxZyqf5UBewTbnah2g=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.186.tgz"; + sha512 = "W5Ke8Lqop4HpabSMOTWRd6bRQx1i+PTAHENoa5RQHMsGV50y8WwmNOGcxeFixdz64UfXPO2Ye2XoR5wEz3JU8w=="; }; }; "q-0.9.7" = { @@ -58876,13 +58966,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.7.1" = { + "ssb-db2-2.7.2" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.7.1.tgz"; - sha512 = "B7eRhvMm+LDPxXu60fEXuaNbadaXYQDvSATPd5J88PLRKJZwwmv2bOV2xtHT07nL7TwwBEUXmkoFlkc5Df86VQ=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.7.2.tgz"; + sha512 = "TJ1N2Sf39DlQHyT7E8KoQ8Oft+73SuoP75cVlCeyDxCUhNKVUKL+7Eu7ln2YOZsOF0DnZfw3VZ55l+iJwtvLiQ=="; }; }; "ssb-ebt-5.6.7" = { @@ -59182,13 +59272,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.121" = { + "sscaff-1.2.124" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.121"; + version = "1.2.124"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.121.tgz"; - sha512 = "Cwo/cLml9cD0ltNPncb1a0Ow1zYr78aJQqu4P8Cw3KxERok+O2Byz95EI2YYZGSSwmZh7K8H+oOMfwQd4/11LA=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.124.tgz"; + sha512 = "9w+/QdBri6GlYngG+KiQvr9yPthYlGrimxPc/eTJVDgnm630/2Ip9dTbuhKRD0HsgObUvZX4nHpXJ+fybOhkIA=="; }; }; "ssh-config-1.1.6" = { @@ -59677,6 +59767,15 @@ let sha512 = "y+ChhCov2A5nDqC2aZ6HKXs3OvDlvAp0Ps3BF1P/Iv8tUZJQQsMVaSzk0WryVTVoGITKv01UYahCXMpAs7I0lQ=="; }; }; + "stream-json-1.7.3" = { + name = "stream-json"; + packageName = "stream-json"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-json/-/stream-json-1.7.3.tgz"; + sha512 = "Y6dXn9KKWSwxOqnvHGcdZy1PK+J+7alBwHCeU3W9oRqm4ilLRA0XSPmd1tWwhg7tv9EIxJTMWh7KF15tYelKJg=="; + }; + }; "stream-meter-1.0.4" = { name = "stream-meter"; packageName = "stream-meter"; @@ -61216,13 +61315,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.9.9" = { + "systeminformation-5.9.10" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.9.9"; + version = "5.9.10"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.9.tgz"; - sha512 = "xciy6NKCLfs4dqMD1Tdlo7v1/g0NfdA1EKsIptUQjlcVvpwHyjifAbNOF7ppFezGSMXxYE8me+l2+RlFF4lyTg=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.10.tgz"; + sha512 = "xTHXxuK3pZv7k744+xH86Y08xvmsoEn9/D+QkIZD7k8k4hMvq3LfFy8wnpWwy+W/c0og1BwlrOrcwVvSAPju0Q=="; }; }; "sywac-1.3.0" = { @@ -63710,6 +63809,15 @@ let sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="; }; }; + "type-fest-2.5.3" = { + name = "type-fest"; + packageName = "type-fest"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-2.5.3.tgz"; + sha512 = "7VNmE7FlsrdcWjKbtuRuynZz96Gmf35p5DvoR2tbceNP0vd58ISx87PvUUInlhtRC49vSX6qlxEKc7AoiHRirg=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -63782,13 +63890,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.4.3" = { + "typegram-3.5.1" = { name = "typegram"; packageName = "typegram"; - version = "3.4.3"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.4.3.tgz"; - sha512 = "pH0TQJzCWM2+7y6yiBoQVNt7PO9ZvAu/lQukVx4sm68FIBBZEBWI+2MzuMcdbwrD5mD5NrEMAyml9N6DupUZag=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.5.1.tgz"; + sha512 = "cDCj4KMycgpdoDihK9LbJbLBBrZdDDQskR4aeoLawyk6YS2GXmr4jncGQGvu6Wav1iNTGvSDwr4b3ipLHh1edA=="; }; }; "typescript-2.9.2" = { @@ -67842,13 +67950,13 @@ let sha512 = "3S6e9Vo1W2ijk4F4PPWRIu6D/uGgqaPmqw+av3W3jLDujuNkdxX5h5c+RQ6GkjVR+WwIPOfgY8av+j5j4tMqJw=="; }; }; - "webpack-5.62.1" = { + "webpack-5.64.0" = { name = "webpack"; packageName = "webpack"; - version = "5.62.1"; + version = "5.64.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.62.1.tgz"; - sha512 = "jNLtnWChS2CMZ7vqWtztv0G6fYB5hz11Zsadp5tE7e4/66zVDj7/KUeQZOsOl8Hz5KrLJH1h2eIDl6AnlyE12Q=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.64.0.tgz"; + sha512 = "UclnN24m054HaPC45nmDEosX6yXWD+UGC12YtUs5i356DleAUGMDC9LBAw37xRRfgPKYIdCYjGA7RZ1AA+ZnGg=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -69048,13 +69156,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.2.12" = { + "xdl-59.2.13" = { name = "xdl"; packageName = "xdl"; - version = "59.2.12"; + version = "59.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.2.12.tgz"; - sha512 = "3/9RWQ3BxskXSN6YjvFMiIQtab19tWzEodA2MP3FtwDX1Yj/k6l2YW1v8z7mw8vbwx1gdhhf9VX0V9DuVsn8uA=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.2.13.tgz"; + sha512 = "GDfdIAKWP4ZcjNOne6bzCcCm+BVPJB2L3KuQj6PizXo5Tx9cmvROVzEd/YNQcn8hTSliCmZ1RXexSIx3xfJ5Sg=="; }; }; "xenvar-0.5.1" = { @@ -69994,13 +70102,13 @@ let sha512 = "9Ni+uXWeFix9+1t7s1q40zZdbcpdi/OwgD4N4cVaqI+bppPciOOXQ/RSggannwZu8m8zrSWELn6/93G7308jgg=="; }; }; - "yeoman-environment-3.7.0" = { + "yeoman-environment-3.8.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.7.0.tgz"; - sha512 = "33MxBYO3XAU9AVnDeDj+FY4IUyf6o5zQmYK4GtPGzaDZIiLHtt1f9qzHLFfuZWrvV4ynN+3pa3hOYJKzgL6DHA=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.8.0.tgz"; + sha512 = "BPo3btCxefe8NzDMk59QRDNBXMC4Ra6SHhFfEsV2DTmAp/6ZoovMANlJiWrXu41rtFQBmjH/rT2tSiHGowt38w=="; }; }; "yeoman-generator-5.4.2" = { @@ -70198,15 +70306,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-13.0.1.tgz"; - sha512 = "QLrG4FCwqeRePQvZkpx0GsrXm9a+2YmqPr+1Qwfl0RWJpb/3YtqHnmDk7cT7jpqyx9BY2M7YP2Rb27Rgdy4Alg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.0.2.tgz"; + sha512 = "eFEVZR56q1zCCBfp7e7sqmrqbHhdDd/1QGv9FYD+2HoC1VHYQf5w+NyWofQhx7a+tnGGqoR28LYzSsL7fFW8pw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1300.1" - sources."@angular-devkit/core-13.0.1" - sources."@angular-devkit/schematics-13.0.1" + sources."@angular-devkit/architect-0.1300.2" + sources."@angular-devkit/core-13.0.2" + sources."@angular-devkit/schematics-13.0.2" sources."@gar/promisify-1.1.2" sources."@npmcli/fs-1.0.0" sources."@npmcli/git-2.1.0" @@ -70215,7 +70323,7 @@ in sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-2.0.0" - sources."@schematics/angular-13.0.1" + sources."@schematics/angular-13.0.2" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -70647,8 +70755,8 @@ in sources."map-obj-4.3.0" sources."marky-1.2.2" sources."matcher-2.1.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -70856,8 +70964,8 @@ in sources."lodash-4.17.21" sources."lowdb-1.0.0" sources."lunr-2.3.9" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" @@ -71197,7 +71305,7 @@ in sources."array-lru-1.1.1" sources."atomic-batcher-1.0.2" sources."await-lock-2.1.0" - sources."b4a-1.1.1" + sources."b4a-1.1.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" @@ -71683,7 +71791,7 @@ in sha512 = "7EpRhhrJqICbMGjLkdthQYLLGMXNCsrsq8/xxYX1cdRiNwoGb84yjL1WFBrnQtaM8rXShOvhf4lrM2W0K9m4lQ=="; }; dependencies = [ - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@medable/mdctl-api-1.0.62" sources."@medable/mdctl-core-1.0.62" sources."@medable/mdctl-core-schemas-1.0.62" @@ -72126,8 +72234,8 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-2.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -72772,7 +72880,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -72791,7 +72899,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -72883,8 +72991,8 @@ in sources."magic-string-0.25.7" sources."memfs-3.3.0" sources."merge-stream-2.0.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -73110,7 +73218,7 @@ in sources."@babel/generator-7.16.0" sources."@babel/helper-annotate-as-pure-7.16.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" - sources."@babel/helper-compilation-targets-7.16.0" + sources."@babel/helper-compilation-targets-7.16.3" sources."@babel/helper-create-class-features-plugin-7.16.0" sources."@babel/helper-create-regexp-features-plugin-7.16.0" sources."@babel/helper-define-polyfill-provider-0.2.4" @@ -73131,9 +73239,9 @@ in sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.16.0" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" sources."@babel/plugin-proposal-async-generator-functions-7.16.0" @@ -73189,7 +73297,7 @@ in sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.0" sources."@babel/plugin-transform-new-target-7.16.0" sources."@babel/plugin-transform-object-super-7.16.0" - sources."@babel/plugin-transform-parameters-7.16.0" + sources."@babel/plugin-transform-parameters-7.16.3" sources."@babel/plugin-transform-property-literals-7.16.0" sources."@babel/plugin-transform-regenerator-7.16.0" sources."@babel/plugin-transform-reserved-words-7.16.0" @@ -73212,9 +73320,9 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.16.0" + sources."@babel/runtime-7.16.3" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -73249,7 +73357,7 @@ in sources."@types/cors-2.8.10" sources."@types/ejs-2.7.0" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.24" + sources."@types/express-serve-static-core-4.17.25" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.2.0" sources."@types/http-assert-1.5.3" @@ -73406,7 +73514,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -73533,7 +73641,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -73616,7 +73724,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.163.0" + sources."flow-parser-0.164.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -73829,8 +73937,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -74434,7 +74542,7 @@ in sources."@babel/generator-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/template-7.16.0" sources."@babel/types-7.16.0" sources."@webassemblyjs/ast-1.11.1" @@ -74522,7 +74630,7 @@ in sources."source-map-0.5.7" ]; }) - sources."@babel/helper-compilation-targets-7.16.0" + sources."@babel/helper-compilation-targets-7.16.3" sources."@babel/helper-function-name-7.16.0" sources."@babel/helper-get-function-arity-7.16.0" sources."@babel/helper-hoist-variables-7.16.0" @@ -74535,11 +74643,11 @@ in sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" @@ -74548,7 +74656,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.17.6" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -74558,7 +74666,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -74688,8 +74796,8 @@ in }; dependencies = [ sources."browserslist-4.17.6" - sources."caniuse-lite-1.0.30001278" - sources."electron-to-chromium-1.3.891" + sources."caniuse-lite-1.0.30001279" + sources."electron-to-chromium-1.3.895" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-2.0.1" @@ -74724,7 +74832,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1024.0" // { + (sources."aws-sdk-2.1027.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -75345,10 +75453,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.8.2"; + version = "11.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.8.2.tgz"; - sha512 = "SIqq7aHaNJ9mL3C8hhEJAiC32IXGiDMejQQgck3LoEAJkhFxv/RVIH5wBr/8bcVdV0zrikJEjrUUwIujQITs0w=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.10.0.tgz"; + sha512 = "PJeibrVjtgeG/62w+QFw0bqxZj8FaRmRKHai5wewC3MAO1fxLDcIrTJP7jADRpC5O9ALzpO0yvtu5DvG76iK8A=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -75379,7 +75487,7 @@ in sources."@types/caseless-0.12.2" sources."@types/connect-3.4.35" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.24" + sources."@types/express-serve-static-core-4.17.25" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/node-10.12.18" @@ -75483,7 +75591,7 @@ in sources."colorette-1.4.0" ]; }) - sources."cbor-8.0.2" + sources."cbor-8.1.0" sources."cert-info-1.5.1" (sources."chalk-1.1.3" // { dependencies = [ @@ -75588,6 +75696,8 @@ in dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."cbor-8.0.2" + sources."ln-service-52.14.3" ]; }) sources."got-9.6.0" @@ -75677,11 +75787,27 @@ in dependencies = [ sources."@types/node-16.11.6" sources."bn.js-5.2.0" + sources."cbor-8.0.2" + ]; + }) + (sources."ln-accounting-5.0.4" // { + dependencies = [ + sources."ln-service-52.14.3" + ]; + }) + (sources."ln-service-52.15.0" // { + dependencies = [ + sources."@grpc/grpc-js-1.4.4" + sources."@types/node-16.11.7" + sources."bn.js-5.2.0" + sources."lightning-4.14.1" + ]; + }) + (sources."ln-sync-3.0.0" // { + dependencies = [ + sources."cbor-8.0.2" ]; }) - sources."ln-accounting-5.0.4" - sources."ln-service-52.14.3" - sources."ln-sync-2.1.1" (sources."ln-telegram-3.4.0" // { dependencies = [ sources."@grpc/grpc-js-1.3.7" @@ -75803,8 +75929,8 @@ in sources."methods-1.1.2" sources."micromist-1.1.0" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -75859,6 +75985,7 @@ in dependencies = [ sources."@types/node-16.11.6" sources."bn.js-5.2.0" + sources."cbor-8.0.2" sources."lightning-4.12.2" sources."ln-service-52.14.2" ]; @@ -75875,6 +76002,7 @@ in sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."bolt09-0.1.5" + sources."cbor-8.0.2" (sources."invoices-2.0.0" // { dependencies = [ sources."bolt07-1.7.3" @@ -76005,7 +76133,7 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.4.3" + sources."typegram-3.5.1" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { @@ -76154,8 +76282,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -76465,7 +76593,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.50.0" + sources."mime-db-1.51.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -76893,8 +77021,8 @@ in sources."lodash.isfinite-3.3.2" sources."micromatch-4.0.4" sources."mime-1.4.1" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."mitt-1.2.0" sources."ms-2.0.0" @@ -77026,7 +77154,7 @@ in sources."@babel/code-frame-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/types-7.16.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -77276,8 +77404,8 @@ in sources."merkle-lib-2.0.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."min-indent-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -77669,8 +77797,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -78492,10 +78620,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.25"; + version = "1.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.25.tgz"; - sha512 = "E6HT4E8xjy9CFBEyN2jMil7zo9tRTghupgEda0ZxoT2B7TKxK6z9h2uDVXZH6iFb+ahIpGjbqoxmjKIyJyJtCA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.27.tgz"; + sha512 = "9aRymmTyDNObl8goYyGdxJu9q62rJ+rexNY5GnAzj5CAzcKKqyYaht270eriCVdoKG3/oFQ6rKvzmGZJ3AgF+w=="; }; dependencies = [ sources."@jsii/check-node-1.43.0" @@ -78510,8 +78638,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.1.27" - sources."cdk8s-plus-22-1.0.0-beta.35" + sources."cdk8s-1.1.30" + sources."cdk8s-plus-22-1.0.0-beta.37" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -78604,14 +78732,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.392" // { + (sources."jsii-srcmak-0.1.395" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) - sources."json-schema-0.3.0" + sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.45" + sources."json2jsii-0.2.48" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -78649,7 +78777,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.121" + sources."sscaff-1.2.124" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -78706,7 +78834,7 @@ in sha512 = "N0U5YgquMYZTqfO+SSIdP6K/EAnFqS5gHj8eISvP2ZjrphfSFM7hs4VO0bVvzNoMe/ByBbUtQMHXCs5r1XdB9Q=="; }; dependencies = [ - sources."@apollo/client-3.5.0" + sources."@apollo/client-3.5.2" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -78727,7 +78855,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/template-7.16.0" sources."@babel/types-7.16.0" sources."@cdktf/hcl2cdk-0.7.0" @@ -78753,7 +78881,7 @@ in sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/mock-8.4.2" // { + (sources."@graphql-tools/mock-8.4.3" // { dependencies = [ sources."@graphql-tools/utils-8.5.3" ]; @@ -79175,8 +79303,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -79187,7 +79315,6 @@ in sources."no-case-3.0.4" sources."node-fetch-2.6.6" sources."normalize-path-2.1.1" - sources."npm-7.24.2" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" sources."object-inspect-1.11.0" @@ -79291,7 +79418,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.121" + sources."sscaff-1.2.124" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -80024,7 +80151,7 @@ in sources."async-2.6.3" sources."await-semaphore-0.1.3" sources."balanced-match-1.0.2" - sources."big-integer-1.6.50" + sources."big-integer-1.6.51" sources."binary-0.3.0" sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" @@ -80312,7 +80439,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -80364,7 +80491,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."commander-2.20.3" - sources."common-tags-1.8.0" + sources."common-tags-1.8.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" (sources."configstore-3.1.5" // { @@ -80410,7 +80537,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -80529,7 +80656,7 @@ in sources."fill-range-2.2.4" sources."find-up-2.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" @@ -81214,7 +81341,7 @@ in sha512 = "scmrgeDh1nXAevfgiflyDLIykXJp9q1gi6uHGViO2m7Qu/L0SGTClT3Y7pA46SFXMxeKq/f8lBvUltvPzksWXg=="; }; dependencies = [ - sources."pyright-1.1.185" + sources."pyright-1.1.186" ]; buildInputs = globalBuildInputs; meta = { @@ -81368,7 +81495,7 @@ in sources."@babel/compat-data-7.16.0" sources."@babel/core-7.16.0" sources."@babel/generator-7.16.0" - sources."@babel/helper-compilation-targets-7.16.0" + sources."@babel/helper-compilation-targets-7.16.3" sources."@babel/helper-function-name-7.16.0" sources."@babel/helper-get-function-arity-7.16.0" sources."@babel/helper-hoist-variables-7.16.0" @@ -81381,15 +81508,15 @@ in sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" (sources."@babel/highlight-7.16.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -81424,7 +81551,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -81461,7 +81588,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -81478,7 +81605,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -81939,7 +82066,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -82804,7 +82931,7 @@ in sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.50" + sources."big-integer-1.6.51" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" @@ -83106,8 +83233,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -83825,8 +83952,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."ms-2.1.3" @@ -84101,7 +84228,7 @@ in sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" sources."gensequence-3.1.1" @@ -84232,7 +84359,7 @@ in sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."b4a-1.1.1" + sources."b4a-1.1.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -84544,8 +84671,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" sources."mime-2.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" @@ -84900,7 +85027,7 @@ in }) sources."@babel/helper-annotate-as-pure-7.16.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" - sources."@babel/helper-compilation-targets-7.16.0" + sources."@babel/helper-compilation-targets-7.16.3" sources."@babel/helper-create-class-features-plugin-7.16.0" sources."@babel/helper-create-regexp-features-plugin-7.16.0" sources."@babel/helper-define-polyfill-provider-0.2.4" @@ -84921,9 +85048,9 @@ in sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.16.0" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" sources."@babel/plugin-proposal-async-generator-functions-7.16.0" @@ -84977,7 +85104,7 @@ in sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.0" sources."@babel/plugin-transform-new-target-7.16.0" sources."@babel/plugin-transform-object-super-7.16.0" - sources."@babel/plugin-transform-parameters-7.16.0" + sources."@babel/plugin-transform-parameters-7.16.3" sources."@babel/plugin-transform-property-literals-7.16.0" sources."@babel/plugin-transform-react-display-name-7.16.0" sources."@babel/plugin-transform-react-jsx-7.16.0" @@ -84995,9 +85122,9 @@ in sources."@babel/preset-env-7.16.0" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.16.0" - sources."@babel/runtime-7.16.0" + sources."@babel/runtime-7.16.3" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@blueprintjs/colors-4.0.0-beta.2" sources."@blueprintjs/core-3.51.3" @@ -85082,7 +85209,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -85149,7 +85276,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.6.1" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -85310,8 +85437,8 @@ in }) sources."memoize-one-5.2.1" sources."micromatch-3.1.10" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -85724,10 +85851,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.75.0"; + version = "6.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.75.0.tgz"; - sha512 = "rtsvE6YecxETO/Nx5YQnFX9CtyLUIcDeWd7Xn/v/6I4cnaBYEuYPdvKsHE9cQKpVrQdinmgRk1JlciLNHvjRVg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.76.0.tgz"; + sha512 = "U9hs4hm0UzpfjHV1+SKxdH01dVxRByfkffRvnDNMIt84v94eZXhctjywAO3kqRHpq30oCXY6N6/+kKd/QM9G9A=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -85799,8 +85926,8 @@ in sources."lodash.uniq-4.5.0" sources."lossless-json-1.0.5" sources."method-missing-1.2.4" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" @@ -86067,7 +86194,7 @@ in sources."fs-extra-9.1.0" ]; }) - sources."electron-rebuild-3.2.3" + sources."electron-rebuild-3.2.5" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -86254,8 +86381,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -86272,11 +86399,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.2" sources."nice-try-1.0.5" - (sources."node-abi-2.30.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."node-abi-3.3.0" sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" sources."node-fetch-2.6.6" @@ -86548,7 +86671,7 @@ in }) sources."@babel/generator-7.16.0" sources."@babel/helper-annotate-as-pure-7.16.0" - (sources."@babel/helper-compilation-targets-7.16.0" // { + (sources."@babel/helper-compilation-targets-7.16.3" // { dependencies = [ sources."semver-6.3.0" ]; @@ -86566,17 +86689,17 @@ in sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/plugin-proposal-object-rest-spread-7.16.0" sources."@babel/plugin-syntax-jsx-7.16.0" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.16.0" - sources."@babel/plugin-transform-parameters-7.16.0" + sources."@babel/plugin-transform-parameters-7.16.3" sources."@babel/plugin-transform-react-jsx-7.16.0" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" @@ -86602,7 +86725,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -86631,7 +86754,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -86875,7 +86998,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.179.1" + sources."@fluentui/react-7.179.2" sources."@fluentui/react-focus-7.18.1" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -86909,7 +87032,7 @@ in sources."@types/connect-3.4.35" sources."@types/engine.io-3.1.7" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.24" + sources."@types/express-serve-static-core-4.17.25" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.2.0" sources."@types/hls.js-0.13.1" @@ -87752,8 +87875,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -87918,7 +88041,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.179.1" + sources."office-ui-fabric-react-7.179.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -88612,7 +88735,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.2.0" @@ -88756,7 +88879,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.2.0" @@ -88857,10 +88980,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.12.12"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.12.12.tgz"; - sha512 = "b2bl6nMohgRQTV8DqLkqPnORmIgnhYyVW6LbyfnOJYJZJEJucMalESQnctBiNZC+9mFdWdCy5zJdtxxan8DGZw=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.13.0.tgz"; + sha512 = "C7dfk2yleC7mdOoo9KzphfYz7F+I881VLb8UVgKCqGokwEyxhceKZCImX3D4zsR7bsKJEyjjEvx1XNIp4LV+Ew=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -88882,20 +89005,20 @@ in sources."@babel/helper-simple-access-7.16.0" sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" (sources."@babel/highlight-7.16.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/runtime-7.9.0" (sources."@babel/template-7.16.0" // { dependencies = [ sources."@babel/code-frame-7.16.0" ]; }) - (sources."@babel/traverse-7.16.0" // { + (sources."@babel/traverse-7.16.3" // { dependencies = [ sources."@babel/code-frame-7.16.0" ]; @@ -88903,15 +89026,15 @@ in sources."@babel/types-7.16.0" sources."@expo/apple-utils-0.0.0-alpha.26" sources."@expo/bunyan-4.0.0" - sources."@expo/config-6.0.6" - (sources."@expo/config-plugins-4.0.6" // { + sources."@expo/config-6.0.7" + (sources."@expo/config-plugins-4.0.7" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-43.0.1" - sources."@expo/dev-server-0.1.93" - sources."@expo/dev-tools-0.13.128" + sources."@expo/dev-server-0.1.94" + sources."@expo/dev-tools-0.13.129" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -88927,7 +89050,7 @@ in ]; }) sources."@expo/json-file-8.2.33" - sources."@expo/metro-config-0.2.8" + sources."@expo/metro-config-0.3.0" sources."@expo/osascript-2.0.30" (sources."@expo/package-manager-0.0.47" // { dependencies = [ @@ -88941,7 +89064,7 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-3.0.6" + sources."@expo/prebuild-config-3.0.7" sources."@expo/results-1.0.0" sources."@expo/rudder-sdk-node-1.1.0" (sources."@expo/schemer-1.3.31" // { @@ -88953,7 +89076,7 @@ in }) sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.16.6" // { + (sources."@expo/webpack-config-0.16.7" // { dependencies = [ sources."is-wsl-2.2.0" ]; @@ -89153,7 +89276,7 @@ in sources."base64url-3.0.1" sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.50" + sources."big-integer-1.6.51" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" @@ -89225,7 +89348,7 @@ in }) sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -89483,7 +89606,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -89557,7 +89680,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.101" // { + (sources."expo-pwa-0.0.102" // { dependencies = [ sources."commander-2.20.0" ]; @@ -89982,8 +90105,8 @@ in ]; }) sources."mime-2.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" (sources."mini-css-extract-plugin-0.5.0" // { @@ -91023,9 +91146,9 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.2.12" // { + (sources."xdl-59.2.13" // { dependencies = [ - sources."bplist-parser-0.3.0" + sources."bplist-parser-0.3.1" sources."chownr-1.1.4" sources."fs-minipass-1.2.7" sources."minipass-2.9.0" @@ -91091,7 +91214,7 @@ in sources."@babel/core-7.16.0" sources."@babel/generator-7.16.0" sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-compilation-targets-7.16.0" + sources."@babel/helper-compilation-targets-7.16.3" sources."@babel/helper-function-name-7.16.0" sources."@babel/helper-get-function-arity-7.16.0" sources."@babel/helper-hoist-variables-7.16.0" @@ -91105,17 +91228,17 @@ in sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/plugin-proposal-object-rest-spread-7.16.0" sources."@babel/plugin-syntax-jsx-7.16.0" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.16.0" - sources."@babel/plugin-transform-parameters-7.16.0" + sources."@babel/plugin-transform-parameters-7.16.3" sources."@babel/plugin-transform-react-jsx-7.16.0" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@types/minimist-1.2.2" sources."@types/node-16.11.7" @@ -91145,7 +91268,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -91169,7 +91292,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -91358,22 +91481,23 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.12.6"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.6.tgz"; - sha512 = "8EB7YEcbD6jmmK9oYe1R/UR8q3Akb0PrDUbROCZ66LQlBiFKrwGbf1CCZ+RAFZOYyYGmQIEp1QQE0vX6FsZzbg=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.13.0.tgz"; + sha512 = "v+BnCDJ3lla19bPcPfrMhPLjDlite6sdejhz9lhUck0dO1cFeSDtSw3+4Nbo18BzHFOEm3GN3GCwHeUyQtwipQ=="; }; dependencies = [ (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."strip-ansi-5.2.0" ]; }) - sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -91384,40 +91508,54 @@ in }) (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."globby-11.0.4" sources."tslib-2.3.1" ]; }) (sources."@oclif/core-0.5.41" // { dependencies = [ - sources."chalk-4.1.2" (sources."cli-ux-5.6.3" // { dependencies = [ sources."fs-extra-8.1.0" - sources."supports-color-8.1.1" ]; }) sources."fs-extra-9.1.0" - sources."globby-11.0.4" sources."has-flag-4.0.0" sources."jsonfile-6.1.0" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) sources."@oclif/errors-1.3.5" sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.5" + (sources."@oclif/parser-3.8.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + ]; + }) (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."debug-3.2.7" + sources."escape-string-regexp-1.0.5" sources."fs-extra-6.0.1" ]; }) (sources."@oclif/plugin-help-1.2.11" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."indent-string-3.2.0" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" @@ -91436,27 +91574,13 @@ in sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" sources."array-union-2.1.0" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."arrify-1.0.1" sources."asn1-0.2.6" sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" (sources."bl-4.1.0" // { @@ -91467,52 +91591,27 @@ in sources."bluebird-3.7.2" (sources."boxen-5.1.2" // { dependencies = [ - sources."chalk-4.1.2" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" sources."type-fest-0.20.2" ]; }) - sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."btoa-lite-1.0.0" sources."buffer-5.7.1" - sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ sources."lowercase-keys-1.0.0" ]; }) - sources."call-me-maybe-1.0.1" sources."camelcase-6.2.0" sources."cardinal-2.1.1" sources."caseless-0.12.0" - (sources."chalk-2.4.2" // { + (sources."chalk-4.1.2" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."chardet-0.7.0" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" @@ -91528,9 +91627,11 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."extract-stack-1.0.0" sources."fs-extra-7.0.1" sources."has-flag-2.0.0" @@ -91545,14 +91646,10 @@ in sources."clone-1.0.4" sources."clone-response-1.0.2" sources."co-4.6.0" - sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.4.0" sources."combined-stream-1.0.8" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.3" (sources."cross-fetch-3.1.4" // { dependencies = [ @@ -91564,13 +91661,13 @@ in sources."semver-5.7.1" ]; }) + sources."csv-stream-0.2.0" sources."dashdash-1.14.1" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-is-0.1.4" sources."defaults-1.0.3" - sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."dotenv-8.6.0" @@ -91584,39 +91681,8 @@ in sources."esutils-2.0.3" sources."event-target-shim-5.0.1" sources."execa-0.10.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."external-editor-3.1.0" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) sources."extract-stack-2.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -91624,13 +91690,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" - (sources."faunadb-4.4.1" // { - dependencies = [ - sources."chalk-4.1.2" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."faunadb-4.4.1" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -91638,50 +91698,15 @@ in }) sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" - sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" sources."get-package-type-0.1.0" sources."get-stream-3.0.0" - sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.3.0" - (sources."globby-8.0.2" // { - dependencies = [ - sources."@nodelib/fs.stat-1.1.3" - sources."array-union-1.0.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."dir-glob-2.0.0" - sources."fast-glob-2.2.7" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."glob-parent-3.1.0" - sources."ignore-3.3.10" - sources."is-glob-3.1.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - sources."path-type-3.0.0" - sources."slash-1.0.0" - sources."to-regex-range-2.1.1" - ]; - }) + sources."globby-11.0.4" sources."got-8.3.2" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" @@ -91689,24 +91714,15 @@ in sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) (sources."heroku-cli-util-8.0.12" // { dependencies = [ sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."strip-ansi-4.0.0" ]; }) @@ -91718,23 +91734,11 @@ in sources."ieee754-1.2.1" sources."ignore-5.1.9" sources."indent-string-4.0.0" - sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.2.0" // { - dependencies = [ - sources."chalk-4.1.2" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."inquirer-8.2.0" sources."into-stream-3.1.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -91742,16 +91746,13 @@ in sources."is-number-7.0.0" sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" - sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" sources."isstream-0.1.2" sources."isurl-1.0.0" sources."js-yaml-3.14.1" @@ -91763,39 +91764,23 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."keyv-3.0.0" - sources."kind-of-6.0.3" sources."levn-0.3.0" sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."chalk-4.1.2" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."log-symbols-4.1.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."moment-2.29.1" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" (sources."netrc-parser-3.1.6" // { dependencies = [ @@ -91808,52 +91793,27 @@ in sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) + sources."object-sizeof-1.6.1" sources."object-treeify-1.1.33" - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.4.0" sources."onetime-5.1.2" sources."opn-3.0.3" sources."optionator-0.8.3" - (sources."ora-5.4.1" // { - dependencies = [ - sources."chalk-4.1.2" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-cancelable-0.4.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" sources."p-timeout-2.0.1" - sources."pascalcase-0.1.1" (sources."password-prompt-1.1.2" // { dependencies = [ sources."ansi-escapes-3.2.0" ]; }) - sources."path-dirname-1.0.2" - sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" sources."pify-3.0.0" - sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."prettier-2.4.1" @@ -91869,16 +91829,11 @@ in ]; }) sources."redeyed-2.1.1" - sources."regex-not-1.0.2" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" sources."request-2.88.2" sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" - sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" - sources."ret-0.1.15" sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" @@ -91888,74 +91843,19 @@ in ]; }) sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."semver-7.3.5" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.5" sources."slash-3.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."sort-keys-2.0.0" sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" - sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."stealthy-require-1.1.1" + sources."stream-chain-2.2.4" + sources."stream-json-1.7.3" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { @@ -91975,12 +91875,6 @@ in sources."through-2.3.8" sources."timed-out-4.0.1" sources."tmp-0.0.33" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-0.0.3" @@ -91990,23 +91884,10 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."type-fest-0.21.3" - sources."union-value-1.0.1" sources."universalify-0.1.2" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) sources."uri-js-4.4.1" - sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" - sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" (sources."verror-1.10.0" // { @@ -92021,7 +91902,6 @@ in sources."widest-line-3.1.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -92144,7 +92024,7 @@ in }) sources."basic-auth-connect-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.50" + sources."big-integer-1.6.51" sources."bignumber.js-9.0.1" sources."binary-0.3.0" sources."binary-extensions-2.2.0" @@ -92433,7 +92313,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.28.0" // { + (sources."google-gax-2.28.1" // { dependencies = [ sources."google-auth-library-7.10.2" ]; @@ -92606,8 +92486,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -93341,8 +93221,8 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."md5.js-1.3.5" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -93933,10 +93813,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.1.0"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.1.0.tgz"; - sha512 = "OTXkUHYdv8af4rQm4AJy6fnKyGNVLol3h3vfFESa7+h/7xgXHdO/2lQukMfvvzkTIPhqbvSqab/thd3xJhgKGw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.1.3.tgz"; + sha512 = "GKOKnNXNMCJ/FDTieZ0eAVbOWoDRzSbbUU1+QQzbSvWl2fBtWXvpz9Grrk66gkHlu1KtqzuN9zR11AIa12dEzw=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -93958,7 +93838,7 @@ in ]; }) sources."@babel/helper-annotate-as-pure-7.16.0" - (sources."@babel/helper-compilation-targets-7.16.0" // { + (sources."@babel/helper-compilation-targets-7.16.3" // { dependencies = [ sources."semver-6.3.0" ]; @@ -93977,24 +93857,24 @@ in sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" (sources."@babel/highlight-7.16.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.16.0" sources."@babel/plugin-syntax-jsx-7.16.0" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-transform-parameters-7.16.0" + sources."@babel/plugin-transform-parameters-7.16.3" sources."@babel/plugin-transform-react-jsx-7.16.0" - sources."@babel/runtime-7.16.0" - sources."@babel/standalone-7.16.2" + sources."@babel/runtime-7.16.3" + sources."@babel/standalone-7.16.3" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" @@ -94093,7 +93973,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -94133,7 +94013,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" - sources."common-tags-1.8.0" + sources."common-tags-1.8.1" sources."concat-map-0.0.1" sources."configstore-5.0.1" (sources."content-disposition-0.5.3" // { @@ -94142,9 +94022,9 @@ in ]; }) sources."content-type-1.0.4" - (sources."contentful-management-7.45.0" // { + (sources."contentful-management-7.45.2" // { dependencies = [ - sources."type-fest-0.21.3" + sources."type-fest-2.5.3" ]; }) sources."contentful-sdk-core-6.10.3" @@ -94157,7 +94037,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-2.1.0" + sources."create-gatsby-2.1.1" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -94198,7 +94078,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -94270,13 +94150,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.1.0" - (sources."gatsby-recipes-1.1.0" // { + sources."gatsby-core-utils-3.1.2" + (sources."gatsby-recipes-1.1.2" // { dependencies = [ sources."strip-ansi-6.0.1" ]; }) - (sources."gatsby-telemetry-3.1.0" // { + (sources."gatsby-telemetry-3.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -94459,8 +94339,8 @@ in sources."micromark-util-symbol-1.0.0" sources."micromark-util-types-1.0.1" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -95069,11 +94949,11 @@ in sources."ip-1.1.5" sources."is-canonical-base64-1.1.1" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.5" + sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-valid-domain-0.0.20" sources."json-buffer-2.0.11" - sources."jsonpointer-4.1.0" + sources."jsonpointer-5.0.0" sources."kvgraph-0.1.0" sources."kvset-1.0.0" sources."libsodium-0.7.9" @@ -95081,8 +94961,8 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" @@ -95309,8 +95189,8 @@ in sources."li-1.3.0" sources."log-symbols-5.0.0" sources."lowercase-keys-2.0.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."normalize-url-6.1.0" @@ -96115,8 +95995,8 @@ in sources."merge2-1.4.1" sources."meros-1.1.4" sources."micromatch-4.0.4" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -96436,9 +96316,13 @@ in sources."globby-11.0.4" sources."graceful-fs-4.2.8" sources."graphql-15.4.0" - sources."graphql-language-service-interface-2.9.0" + (sources."graphql-language-service-interface-2.9.1" // { + dependencies = [ + sources."graphql-language-service-utils-2.6.0" + ]; + }) sources."graphql-language-service-parser-1.10.0" - sources."graphql-language-service-types-1.8.2" + sources."graphql-language-service-types-1.8.3" sources."graphql-language-service-utils-2.5.1" sources."has-flag-3.0.0" sources."http-errors-1.6.3" @@ -96474,8 +96358,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.4.1" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."ms-2.1.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" @@ -96710,8 +96594,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -96875,7 +96759,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.9.9" + sources."systeminformation-5.9.10" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -97818,8 +97702,8 @@ in sources."is-dotfile-1.0.3" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."node-fetch-2.6.6" sources."once-1.4.0" @@ -98078,7 +97962,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1024.0" + sources."aws-sdk-2.1027.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -98181,12 +98065,12 @@ in sources."lodash.some-4.6.0" sources."lodash.uniq-4.5.0" sources."marked-2.1.3" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" - sources."moment-timezone-0.5.33" + sources."moment-timezone-0.5.34" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."named-regexp-0.1.1" @@ -98428,8 +98312,8 @@ in sources."longest-1.0.1" sources."lowercase-keys-1.0.1" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -98825,8 +98709,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" @@ -99073,8 +98957,8 @@ in sources."macos-release-2.5.0" sources."methods-1.1.2" sources."mime-2.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -99211,14 +99095,14 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v10.3.1.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v11.0.1.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "10.3.1"; + version = "11.0.1"; src = fetchurl { - name = "iosevka-10.3.1.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v10.3.1"; - sha256 = "c92931d145fc90542fccaf9d22a9a49fa0551b8b0cd1e8bf92719c5a5092ac2a"; + name = "iosevka-11.0.1.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v11.0.1"; + sha256 = "5f19c33cf90a4d4b0e6b14aa5866a81fa724042e934811b618d5f4e74e310043"; }; dependencies = [ sources."@iarna/toml-2.2.5" @@ -99608,7 +99492,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1024.0" // { + (sources."aws-sdk-2.1027.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -99989,8 +99873,8 @@ in sources."md5-file-4.0.0" sources."mdurl-1.0.1" sources."mermaid-8.13.3" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -100371,7 +100255,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -100534,8 +100418,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.11.0" @@ -100686,8 +100570,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -101066,8 +100950,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -101550,8 +101434,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."moment-2.29.1" sources."ms-2.1.2" @@ -101740,8 +101624,8 @@ in }) sources."media-typer-0.3.0" sources."mime-2.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -101833,7 +101717,7 @@ in }) sources."@babel/generator-7.16.0" sources."@babel/helper-annotate-as-pure-7.16.0" - (sources."@babel/helper-compilation-targets-7.16.0" // { + (sources."@babel/helper-compilation-targets-7.16.3" // { dependencies = [ sources."semver-6.3.0" ]; @@ -101851,15 +101735,15 @@ in sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" sources."@babel/node-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/plugin-syntax-jsx-7.16.0" sources."@babel/plugin-transform-react-jsx-7.16.0" sources."@babel/register-7.16.0" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@tootallnate/once-1.1.2" sources."@xmpp/base64-0.12.1" @@ -101926,7 +101810,7 @@ in sources."bytes-3.1.0" sources."bytesish-0.4.4" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-1.4.0" @@ -101977,7 +101861,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -102098,8 +101982,8 @@ in sources."merge-options-3.0.4" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -102454,8 +102338,8 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -102704,8 +102588,8 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."log-symbols-2.2.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -103321,8 +103205,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -103835,8 +103719,8 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" @@ -104231,8 +104115,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -104533,7 +104417,7 @@ in sources."@babel/generator-7.16.0" sources."@babel/helper-annotate-as-pure-7.16.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" - sources."@babel/helper-compilation-targets-7.16.0" + sources."@babel/helper-compilation-targets-7.16.3" sources."@babel/helper-create-class-features-plugin-7.16.0" sources."@babel/helper-create-regexp-features-plugin-7.16.0" sources."@babel/helper-define-polyfill-provider-0.2.4" @@ -104554,13 +104438,13 @@ in sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.16.0" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" (sources."@babel/highlight-7.16.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" sources."@babel/plugin-external-helpers-7.8.3" @@ -104616,7 +104500,7 @@ in sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.0" sources."@babel/plugin-transform-new-target-7.16.0" sources."@babel/plugin-transform-object-super-7.16.0" - sources."@babel/plugin-transform-parameters-7.16.0" + sources."@babel/plugin-transform-parameters-7.16.3" sources."@babel/plugin-transform-property-literals-7.16.0" sources."@babel/plugin-transform-regenerator-7.16.0" sources."@babel/plugin-transform-reserved-words-7.16.0" @@ -104631,9 +104515,9 @@ in sources."@babel/preset-env-7.16.0" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.16.0" + sources."@babel/runtime-7.16.3" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" @@ -104828,7 +104712,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -104951,7 +104835,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -105213,8 +105097,8 @@ in sources."bn.js-4.12.0" ]; }) - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -106080,8 +105964,8 @@ in sources."lodash-4.17.21" sources."markdown-link-extractor-1.3.0" sources."marked-2.1.3" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."ms-2.1.3" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" @@ -106167,8 +106051,8 @@ in sources."isstream-0.1.2" sources."lodash-4.17.21" sources."log4js-3.0.6" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.3" @@ -106379,7 +106263,7 @@ in sources."is-core-module-2.8.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.5" + sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-resolvable-1.1.0" sources."is-typedarray-1.0.0" @@ -106393,7 +106277,7 @@ in sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.0" - sources."jsonpointer-4.1.0" + sources."jsonpointer-5.0.0" sources."jsprim-1.4.1" sources."levn-0.3.0" sources."lodash-4.17.21" @@ -106415,8 +106299,8 @@ in sources."lodash.templatesettings-3.1.1" sources."mastodon-api-1.3.0" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -106895,8 +106779,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.11.0" @@ -107243,7 +107127,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.50" + sources."big-integer-1.6.51" sources."block-stream-0.0.9" sources."body-parser-1.19.0" sources."boom-2.10.1" @@ -107355,8 +107239,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -107612,7 +107496,7 @@ in sha512 = "IRpc8+1CR3jeZQOSX+iAE7ggu/sRfVsv6Cp/flRElIyhuZeFanbsU319KOIPnfuqF4ijwPiwWFj2zjtDllN++Q=="; }; dependencies = [ - sources."@babel/runtime-7.16.0" + sources."@babel/runtime-7.16.3" sources."@mapbox/node-pre-gyp-1.0.6" sources."@node-red/editor-api-2.1.3" sources."@node-red/editor-client-2.1.3" @@ -107849,8 +107733,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -108089,8 +107973,8 @@ in sources."jsonfile-1.0.1" sources."jsprim-1.4.1" sources."lru-cache-6.0.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.5" @@ -108205,10 +108089,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.14"; + version = "2.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.14.tgz"; - sha512 = "frcpDx+PviKEQRSYzwhckuO2zoHcBYLHI754RE9z5h1RGtrngerc04mLpQQCPWBkH/2ObrX7We9YiwVSYZpFJQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.15.tgz"; + sha512 = "gdHMNx47Gw7b3kWxJV64NI+Q5nfl0y5DgDbiVtShiwa7Z0IZ07Ll4RLFo6AjrhzMtoEZn5PDE3/c2AbVsiCkpA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -108904,10 +108788,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "12.0.1"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.0.1.tgz"; - sha512 = "4CmLtohgLR3o06vvtiFXtiCxKa+13/ZqGmwvvk1nruvzwmTmFCucgJlraLO3CSL0tr+3F1owAV0fSpWkOnooFA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.0.2.tgz"; + sha512 = "VzMNuUXqRta1qpBkFiE0hKfpOGP2FbYwpBBTcJXoJWppOPBSi/paWFVhPVWf7PgRoDWegK+PDAWKhIvhyrBrIg=="; }; dependencies = [ sources."@gar/promisify-1.1.2" @@ -109322,8 +109206,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -109467,7 +109351,7 @@ in }) sources."@babel/helper-annotate-as-pure-7.16.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" - (sources."@babel/helper-compilation-targets-7.16.0" // { + (sources."@babel/helper-compilation-targets-7.16.3" // { dependencies = [ sources."semver-6.3.0" ]; @@ -109496,9 +109380,9 @@ in sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.16.0" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" sources."@babel/plugin-proposal-async-generator-functions-7.16.0" @@ -109554,7 +109438,7 @@ in sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.0" sources."@babel/plugin-transform-new-target-7.16.0" sources."@babel/plugin-transform-object-super-7.16.0" - sources."@babel/plugin-transform-parameters-7.16.0" + sources."@babel/plugin-transform-parameters-7.16.3" sources."@babel/plugin-transform-property-literals-7.16.0" sources."@babel/plugin-transform-react-jsx-7.16.0" sources."@babel/plugin-transform-regenerator-7.16.0" @@ -109572,9 +109456,9 @@ in ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.16.0" + sources."@babel/runtime-7.16.3" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -109697,7 +109581,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -109779,7 +109663,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."deasync-0.1.23" + sources."deasync-0.1.24" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.4" @@ -109834,7 +109718,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110070,8 +109954,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -110621,8 +110505,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -110850,7 +110734,7 @@ in sources."base64-js-0.0.8" sources."bencode-2.0.2" sources."bep53-range-1.1.1" - sources."big-integer-1.6.50" + sources."big-integer-1.6.51" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -111332,8 +111216,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -111836,7 +111720,7 @@ in sources."mkdirp-1.0.4" sources."module-details-from-path-1.0.3" sources."moment-2.29.1" - sources."moment-timezone-0.5.33" + sources."moment-timezone-0.5.34" sources."ms-2.1.2" sources."mute-stream-0.0.8" (sources."needle-2.4.0" // { @@ -111897,7 +111781,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.9.9" + sources."systeminformation-5.9.10" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.1" @@ -111933,10 +111817,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.20.4"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.20.4.tgz"; - sha512 = "t50posttANTjAqBfEapojvrD4JKPTcOiPOHxKIGLlcMYke4mKbOhDY+4asSToZI6e7fwQfQpPDPGFI+/qz7Z4A=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.21.0.tgz"; + sha512 = "Emhpjbr7MiINYUP6d/X5c2vPa5ltkA1EhJ0wmGotrYZs7DCFvy6SW+RKTGNddedqLhL14LTK+4pE1rHWcQnnfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -112133,10 +112017,10 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.4.1.tgz"; - sha512 = "APws/xRa1wYd064KV7hByQzWiBMUy/yQ501XXrsRZegXAQ/j1obG2HCk34MEbgn8IqLSRLaXyhCYz4R4HwRmMQ=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.4.2.tgz"; + sha512 = "wOD1lni7MfH/Qkp5SAkUthLKG+pQcpD31Nm8nAKj9ESgqId/dy+JDSTYOuk/pySvFyby/A+bsAPWIaVmo7qqhQ=="; }; dependencies = [ sources."@prisma/engines-3.4.1-2.57771c0558568c7d08bd34c7248af5244ae16bd9" @@ -112551,8 +112435,8 @@ in sources."log-update-3.4.0" sources."lru-cache-5.1.1" sources."merge-stream-2.0.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -112797,10 +112681,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.185"; + version = "1.1.186"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.185.tgz"; - sha512 = "IJeRSdZv8Rl/GB8Bpws8XEf7YgVLH+taEOMXSVhqKFrerW29rn9vW7sPkNy2o3IkjEF3CxZyqf5UBewTbnah2g=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.186.tgz"; + sha512 = "W5Ke8Lqop4HpabSMOTWRd6bRQx1i+PTAHENoa5RQHMsGV50y8WwmNOGcxeFixdz64UfXPO2Ye2XoR5wEz3JU8w=="; }; buildInputs = globalBuildInputs; meta = { @@ -113167,7 +113051,7 @@ in sources."@babel/generator-7.16.0" sources."@babel/helper-annotate-as-pure-7.16.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" - (sources."@babel/helper-compilation-targets-7.16.0" // { + (sources."@babel/helper-compilation-targets-7.16.3" // { dependencies = [ sources."semver-6.3.0" ]; @@ -113196,9 +113080,9 @@ in sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.16.0" - sources."@babel/helpers-7.16.0" + sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" + sources."@babel/parser-7.16.3" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" sources."@babel/plugin-proposal-async-generator-functions-7.16.0" @@ -113254,7 +113138,7 @@ in sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.0" sources."@babel/plugin-transform-new-target-7.16.0" sources."@babel/plugin-transform-object-super-7.16.0" - sources."@babel/plugin-transform-parameters-7.16.0" + sources."@babel/plugin-transform-parameters-7.16.3" sources."@babel/plugin-transform-property-literals-7.16.0" sources."@babel/plugin-transform-react-display-name-7.16.0" sources."@babel/plugin-transform-react-jsx-7.16.0" @@ -113283,9 +113167,9 @@ in sources."@babel/preset-react-7.16.0" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.16.0" - sources."@babel/runtime-7.16.0" + sources."@babel/runtime-7.16.3" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" @@ -113484,7 +113368,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -113708,7 +113592,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -114111,8 +113995,8 @@ in ]; }) sources."mime-2.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -115019,8 +114903,8 @@ in sources."is-potential-custom-element-name-1.0.1" sources."jsdom-18.0.1" sources."levn-0.3.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."ms-2.1.2" sources."nwsapi-2.2.0" sources."optionator-0.8.3" @@ -115087,10 +114971,10 @@ in sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.2" - sources."@babel/runtime-7.16.0" + sources."@babel/parser-7.16.3" + sources."@babel/runtime-7.16.3" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.0" + sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" @@ -115248,7 +115132,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.3.6" + sources."mobx-6.3.7" sources."mobx-react-7.2.1" sources."mobx-react-lite-3.2.2" sources."ms-2.1.2" @@ -115652,7 +115536,7 @@ in sources."asynckit-0.4.0" sources."azure-devops-node-api-11.0.1" sources."balanced-match-1.0.2" - sources."big-integer-1.6.50" + sources."big-integer-1.6.51" sources."binary-0.3.0" sources."binary-extensions-2.2.0" sources."bluebird-3.4.7" @@ -115805,7 +115689,7 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -115870,8 +115754,8 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -116287,8 +116171,8 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" @@ -116345,10 +116229,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.65.0"; + version = "2.66.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.65.0.tgz"; - sha512 = "EpqX2+R6fIyLLiG/tNf+TvsoO03CKdyOTC4MBwuuQ0E5/7hty1ig4s9/OQ9blcZzD7lxo47IzwA6FneGGrNWdQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.66.1.tgz"; + sha512 = "Swf5aHivSfU0fKuvV4FY0WmMNBZVx7cVK3FcxWLX1lFuzUQ+5D/bpunHW4lmg4tKmGtjBnQ0oQ+4N2MHE3wPrg=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -116381,7 +116265,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.17.2" // { + (sources."@serverless/components-3.18.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -116500,7 +116384,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1024.0" // { + (sources."aws-sdk-2.1027.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -116908,8 +116792,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -117357,8 +117241,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.7.0" @@ -117864,10 +117748,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.757.0"; + version = "1.760.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.757.0.tgz"; - sha512 = "COB9DYQI/loKY5QQbvFWaIuWkKgP0FyC9JOLK0s9lKm9JeDmcSLCjQnCpH0CaUjqz9gPr8+sZ27iXbevzRPppg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.760.0.tgz"; + sha512 = "pVH3AbY30zNerW+F+okULIRYVj0r8Ksvd8WW+beMddghOH31ZePpAWjK5F+D6d3Dy3WJ3n/JyAywxiTS+2d6kQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -117901,8 +117785,8 @@ in sources."debug-4.3.2" sources."engine.io-6.0.1" sources."engine.io-parser-5.0.1" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" @@ -118160,7 +118044,7 @@ in sources."atomic-file-rw-0.2.2" sources."attach-ware-1.1.1" sources."available-typed-arrays-1.0.5" - sources."b4a-1.1.1" + sources."b4a-1.1.2" sources."bail-1.0.5" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -118871,7 +118755,7 @@ in ]; }) sources."ssb-db-19.2.0" - (sources."ssb-db2-2.7.1" // { + (sources."ssb-db2-2.7.2" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -119139,7 +119023,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1024.0" // { + (sources."aws-sdk-2.1027.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -119401,7 +119285,7 @@ in }) sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.5" + sources."is-my-json-valid-2.20.6" sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-regex-1.1.4" @@ -119430,7 +119314,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-1.0.1" - sources."jsonpointer-4.1.0" + sources."jsonpointer-5.0.0" sources."jspath-0.3.4" (sources."jsprim-1.4.1" // { dependencies = [ @@ -119497,8 +119381,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" @@ -119974,7 +119858,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stdin-8.0.0" @@ -120664,8 +120548,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -121036,8 +120920,8 @@ in sources."locate-path-3.0.0" sources."long-4.0.0" sources."mime-2.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."module-alias-2.2.2" sources."moment-2.29.1" @@ -121076,7 +120960,7 @@ in sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."typegram-3.4.3" + sources."typegram-3.5.1" sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -122860,8 +122744,8 @@ in sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lru-cache-6.0.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -123210,10 +123094,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.6.5"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.6.5.tgz"; - sha512 = "gcNm+rxgehKU6Vy+UWwWOHjPAtyqsxAquslzlS1JdmvsRb//nzFXbwIsGRZ8DDaZ5mijfH7PR2BCTysg2nBAIQ=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.7.1.tgz"; + sha512 = "pxPFvsDQolUTJTBdr8e9Qo+SBCYU8RIUO0l8eODMjBDvG9rTl6NTME+OEzMiR8LQ8siZ2jdQUq4K+6a/+20JCQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -123251,6 +123135,7 @@ in sources."is-path-inside-3.0.3" sources."is-stream-2.0.1" sources."jsonfile-6.1.0" + sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."minimatch-3.0.4" @@ -123264,6 +123149,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" + sources."semver-7.3.5" sources."slash-3.0.0" sources."temp-dir-2.0.0" sources."tempy-1.0.1" @@ -123278,6 +123164,7 @@ in sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-1.0.8" sources."wrappy-1.0.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -123479,8 +123366,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -124214,7 +124101,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -124580,7 +124467,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -124620,7 +124507,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.2" sources."domutils-2.8.0" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" @@ -124712,8 +124599,8 @@ in sources."merge-stream-2.0.0" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -124829,7 +124716,7 @@ in sources."vscode-debugadapter-testsupport-1.50.0" sources."vscode-debugprotocol-1.50.1" sources."watchpack-2.2.0" - sources."webpack-5.62.1" + sources."webpack-5.64.0" (sources."webpack-cli-4.9.1" // { dependencies = [ sources."commander-7.2.0" @@ -125041,8 +124928,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -125333,7 +125220,7 @@ in }) sources."comma-separated-tokens-1.0.8" sources."commander-2.20.3" - sources."common-tags-1.8.0" + sources."common-tags-1.8.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -126115,7 +126002,7 @@ in sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.16.0" + sources."@babel/runtime-corejs3-7.16.3" sources."@mapbox/node-pre-gyp-1.0.6" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -126225,8 +126112,8 @@ in sources."semver-6.3.0" ]; }) - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -126559,7 +126446,7 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" sources."flatstr-1.0.12" - sources."flatted-3.2.2" + sources."flatted-3.2.4" sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -126694,8 +126581,8 @@ in sources."marky-1.2.2" sources."mem-5.1.1" sources."merge-stream-2.0.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -126925,10 +126812,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.62.1"; + version = "5.64.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.62.1.tgz"; - sha512 = "jNLtnWChS2CMZ7vqWtztv0G6fYB5hz11Zsadp5tE7e4/66zVDj7/KUeQZOsOl8Hz5KrLJH1h2eIDl6AnlyE12Q=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.64.0.tgz"; + sha512 = "UclnN24m054HaPC45nmDEosX6yXWD+UGC12YtUs5i356DleAUGMDC9LBAw37xRRfgPKYIdCYjGA7RZ1AA+ZnGg=="; }; dependencies = [ sources."@types/eslint-7.28.2" @@ -126959,10 +126846,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.17.6" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001278" + sources."caniuse-lite-1.0.30001279" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.891" + sources."electron-to-chromium-1.3.895" sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -126984,8 +126871,8 @@ in sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" sources."merge-stream-2.0.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."neo-async-2.6.2" sources."node-releases-2.0.1" sources."picocolors-1.0.0" @@ -127252,8 +127139,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" @@ -127395,10 +127282,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "9.0.1"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz"; - sha512 = "14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz"; + sha512 = "rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -127429,7 +127316,6 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."normalize-path-3.0.0" - sources."p-limit-3.1.0" sources."path-type-4.0.0" sources."picomatch-2.3.0" sources."punycode-2.1.1" @@ -127443,7 +127329,6 @@ in sources."slash-3.0.0" sources."to-regex-range-5.0.1" sources."uri-js-4.4.1" - sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -127550,7 +127435,7 @@ in sources."clone-2.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."common-tags-1.8.0" + sources."common-tags-1.8.1" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -127848,10 +127733,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.1.1.tgz"; - sha512 = "YevHn6Y3gAUfh98KynXQYclU8oh1Kk+JYX/oZxqKUK2Y6P16+8v8sYg+3H0vXw2D0gjzXaorwJnPoU6a9Ft/7A=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.2.0.tgz"; + sha512 = "ZsQ2uONwleQbFJFdKWBicHmM21jxkzfLI3gLmr7qKBnnRI3ZG4r3gsGbMPASnKTBLBW3l+e8c7KfzS7H3iAQMQ=="; }; dependencies = [ sources."jsonc-parser-3.0.0" @@ -127963,7 +127848,7 @@ in sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ - sources."@babel/runtime-7.16.0" + sources."@babel/runtime-7.16.3" sources."@gar/promisify-1.1.2" sources."@isaacs/string-locale-compare-1.1.0" sources."@nodelib/fs.scandir-2.1.5" @@ -128378,8 +128263,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -128499,7 +128384,7 @@ in }) sources."p-some-4.1.0" sources."p-timeout-2.0.1" - (sources."p-transform-1.2.0" // { + (sources."p-transform-1.3.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -128812,7 +128697,7 @@ in ]; }) sources."yeoman-doctor-5.0.0" - (sources."yeoman-environment-3.7.0" // { + (sources."yeoman-environment-3.8.0" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -128941,8 +128826,8 @@ in sources."map-stream-0.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."node-fetch-2.6.6" sources."path-type-4.0.0" diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index b284f7ef5eba..1a23a4d3e131 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,30 +1,50 @@ -{ lib, buildDunePackage, fetchFromGitHub, ppx_deriving -, alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }: +{ lib +, buildDunePackage +, fetchurl +, ppx_deriving +, bppsuite +, alcotest +, angstrom-unix +, biocaml +, core +, gsl +, lacaml +, menhir +, menhirLib +, printbox +}: buildDunePackage rec { pname = "phylogenetics"; - version = "unstable-2020-11-23"; + version = "0.0.0"; useDune2 = true; - src = fetchFromGitHub { - owner = "biocaml"; - repo = pname; - rev = "e6e10efa0a3a8fd61bf4ab69e91a09549cc1ded6"; - sha256 = "0pmypzp0rvlpzm8zpbcfkphwnhrpyfwfv44kshvx2f8nslmksh8c"; + src = fetchurl { + url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "sha256:0knfh2s0jfnsc0vsq5yw5xla7m7i98xd0qv512dyh3jhkh7m00l9"; }; - minimumOCamlVersion = "4.08"; # e.g., uses Float.min + minimalOCamlVersion = "4.08"; - checkInputs = [ alcotest ]; + checkInputs = [ alcotest bppsuite ]; buildInputs = [ menhir ]; - propagatedBuildInputs = [ angstrom-unix biocaml gnuplot gsl lacaml owl ppx_deriving printbox ]; + propagatedBuildInputs = [ + angstrom-unix + biocaml + core + gsl + lacaml + menhirLib + ppx_deriving + printbox + ]; - doCheck = false; # many tests require bppsuite + doCheck = true; meta = with lib; { - inherit (src.meta) homepage; - description = "Bioinformatics library for Ocaml"; + homepage = "https://github.com/biocaml/phylogenetics"; + description = "Algorithms and datastructures for phylogenetics"; maintainers = [ maintainers.bcdarwin ]; license = licenses.cecill-b; }; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 70c2a93d46bd..17e304b6802c 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,19 +6,25 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.17.1"; + version = "3.17.2"; + format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-M+0q1u/ZcAg2Pii/B2n0v+rw/zIAjeVej/VThi9NLwI="; + sha256 = "sha256-IA846zNFmBqSUc0oXJ0eA5wj6PzQ28jxO22z5WNOT24="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; # Project has not published tests yet doCheck = false; - pythonImportsCheck = [ "adafruit_platformdetect" ]; + + pythonImportsCheck = [ + "adafruit_platformdetect" + ]; meta = with lib; { description = "Platform detection for use by Adafruit libraries"; diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix index 867b08e28a3d..c7b0dcb45b31 100644 --- a/pkgs/development/python-modules/adax/default.nix +++ b/pkgs/development/python-modules/adax/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "adax"; - version = "0.1.1"; + version = "0.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyadax"; rev = version; - sha256 = "sha256-ekpI5GTLbKjlbWH9GSmpp/3URurc7UN+agxMfyGxrVA="; + sha256 = "sha256-EMSX2acklwWOYiEeLHYG5mwdiGnWAUo5dGMiHCmZrko="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index c204261644c5..c19e39bcd48f 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -1,12 +1,21 @@ -{ lib, isPy3k, fetchFromGitHub, buildPythonPackage -, attrs, atpublic }: +{ lib +, atpublic +, attrs +, buildPythonPackage +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, pythonOlder +, typing-extensions +}: buildPythonPackage rec { pname = "aiosmtpd"; version = "1.4.2"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; - # Release not published to Pypi src = fetchFromGitHub { owner = "aio-libs"; repo = pname; @@ -15,19 +24,34 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - atpublic attrs + atpublic + attrs + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # Tests need network access - doCheck = false; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + disabledTests = [ + # Requires git + "test_ge_master" + # Seems to be a sandbox issue + "test_byclient" + ]; + + pythonImportsCheck = [ + "aiosmtpd" + ]; meta = with lib; { - homepage = "https://aiosmtpd.readthedocs.io/en/latest/"; description = "Asyncio based SMTP server"; + homepage = "https://aiosmtpd.readthedocs.io/"; longDescription = '' This is a server for SMTP and related protocols, similar in utility to the - standard library's smtpd.py module, but rewritten to be based on asyncio for - Python 3. + standard library's smtpd.py module. ''; license = licenses.asl20; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index a8aaec9f45b2..bc776e42f07b 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -1,27 +1,36 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +}: buildPythonPackage rec { pname = "anybadge"; - version = "1.7.0"; + version = "1.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jongracecox"; repo = pname; rev = "v${version}"; - sha256 = "1d02fnig04zlrhfqqcf4505vy4p51whl2ifilnx3mkhis9lcwrmr"; + sha256 = "sha256-xKHIoV/8qsNMcU5fd92Jjh7d7jTeYN5xakMEjR6qPX8="; }; # setup.py reads its version from the TRAVIS_TAG environment variable TRAVIS_TAG = "v${version}"; - pythonImportsCheck = [ "anybadge" ]; + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "anybadge" + ]; meta = with lib; { - description = "A Python project for generating badges for your projects, with a focus on simplicity and flexibility"; - license = licenses.mit; + description = "Python tool for generating badges for your projects"; homepage = "https://github.com/jongracecox/anybadge"; - maintainers = [ maintainers.fabiangd ]; + license = licenses.mit; + maintainers = with maintainers; [ fabiangd ]; }; } diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index f043936f7d72..8565f7d7dd5d 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.3.1"; + version = "3.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-JQf+OWHV2Vok5FmP7mlzeqbKUlxB+FC1c3ruX2aQEEs="; + sha256 = "sha256-XBIrFb/XDneaOf/TeHxyeEfyQ7qQcWO7LJF0k1f4Ark="; }; preBuild = '' diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 4d96bcbe26b5..8bf81556770a 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -1,6 +1,8 @@ -{ lib, isPy3k, pythonOlder, fetchPypi, buildPythonPackage -, pytest -, pytest-cov +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder , sybil , typing-extensions }: @@ -8,7 +10,9 @@ buildPythonPackage rec { pname = "atpublic"; version = "2.3"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -20,25 +24,25 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest pytest-cov sybil + pytestCheckHook + sybil ]; - checkPhase = '' - pytest + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=public" "" ''; + pythonImportsCheck = [ + "public" + ]; + meta = with lib; { - homepage = "https://public.readthedocs.io/en/latest/"; - description = "A decorator and function which populates a module's __all__ and globals"; + description = "Python decorator and function which populates a module's __all__ and globals"; + homepage = "https://public.readthedocs.io/"; longDescription = '' This is a very simple decorator and function which populates a module's __all__ and optionally the module globals. - - This provides both a pure-Python implementation and a C implementation. It is - proposed that the C implementation be added to builtins_ for Python 3.6. - - This proposal seems to have been rejected, for more information see - https://bugs.python.org/issue26632. ''; license = licenses.asl20; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 472e6a470779..337d6951faf3 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -9,7 +9,8 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.7.21"; + version = "0.7.22"; + format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - sha256 = "sha256-98K7FRB//WyCu6NPG0x4ViA8UdMuiANDXshLjx/Yehg="; + sha256 = "sha256-tAkgOZvf9nyrAfFRxGkp7O/2oIAdBx+hNZbK9den+5c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index d66b80d00c71..f428dc788bf9 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.1.0"; + version = "1.2.1"; disabled = !isPy3k; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "370e8e44a0bac4ebbedb7e62570be3a75a7a3807a297d6e82a94301b4681fc22"; + sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579"; }; buildInputs = [ boost ]; diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 7a124bae2ec7..d074183e79d7 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -6,19 +6,22 @@ , mock , msgpack , pytestCheckHook +, pythonOlder , requests }: buildPythonPackage rec { pname = "cachecontrol"; - version = "0.12.8"; + version = "0.12.10"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "ionrock"; repo = pname; rev = "v${version}"; - sha256 = "0y15xbaqw2lxidwbyrgpy42v3cxgv4ys63fx2586h1szlrd4f3p4"; + sha256 = "sha256-mgvL0q10UbPHY1H3tJprke5p8qNl3HNYoeLAERZTcTs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/crownstone-core/default.nix b/pkgs/development/python-modules/crownstone-core/default.nix index 35289cf1956c..be23d054a4eb 100644 --- a/pkgs/development/python-modules/crownstone-core/default.nix +++ b/pkgs/development/python-modules/crownstone-core/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crownstone-core"; - version = "3.0.1"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-core"; rev = version; - sha256 = "138lignv7c8kkqbqfkdcfpg39gm9x44h7r2j403m4ib7gq420hsn"; + sha256 = "sha256-ujS4ho9io7KcoK5w1SCn7UPFg1ho3dgW0HS5HfsYsuU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix index fd1c2094335c..b8ed7721f064 100644 --- a/pkgs/development/python-modules/crownstone-uart/default.nix +++ b/pkgs/development/python-modules/crownstone-uart/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crownstone-uart"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-uart"; rev = version; - sha256 = "0sdz131vmrfp6hrm9iwqw8mj9qazsxg7b85yadib1122w9f3b1zc"; + sha256 = "sha256-5K7NzJ7fKOW4Uh1XIlicVkRZuM84qTM5RQc/DfP9OEc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index cdbb1738b9b4..aec7d975a77c 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "0.11.0"; + version = "0.11.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FNEtVTcmVyhAri55GjlzQbg21YByAJjmKQvWaYh3xRw="; + sha256 = "sha256-+Gu9WaGC2R5TC8XSqDNSJ3t7aMS69IeeKTzytYFcHvE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 6ee0cd019128..d0c072901c35 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -1,26 +1,28 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub , aiohttp -, poetry-core -, yarl , aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic , pytest-asyncio , pytestCheckHook +, pythonOlder +, yarl }: buildPythonPackage rec { pname = "elgato"; - version = "2.1.1"; - disabled = pythonOlder "3.8"; + version = "2.2.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "frenck"; repo = "python-elgato"; rev = "v${version}"; - sha256 = "19z568jjyww7vi8s44anrb66qjz5l22nz4jqcz49ybhf22warmff"; + sha256 = "sha256-xsIglJSnvtd3NKqwoRAonPRN+C9KWyar0mrYcC3hPpw="; }; nativeBuildInputs = [ @@ -29,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pydantic yarl ]; @@ -45,7 +48,9 @@ buildPythonPackage rec { --replace "--cov" "" ''; - pythonImportsCheck = [ "elgato" ]; + pythonImportsCheck = [ + "elgato" + ]; meta = with lib; { description = "Python client for Elgato Key Lights"; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index d0483864ff85..ac5c3700bb56 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , substituteAll , graphviz +, xdg-utils , makeFontsConf , freefont_ttf , mock @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.17"; + version = "0.18"; disabled = pythonOlder "3.6"; @@ -22,13 +23,14 @@ buildPythonPackage rec { owner = "xflr6"; repo = "graphviz"; rev = version; - sha256 = "sha256-K6z2C7hQH2A9bqgRR4MRqxVAH/k2NQBEelb2/6KDUr0="; + sha256 = "sha256-K98CwG+V+EFwzyawVjRwVhbX2FVfoX7dCAD5PXAWTq8="; }; patches = [ (substituteAll { - src = ./hardcode-graphviz-path.patch; + src = ./paths.patch; inherit graphviz; + xdgutils = xdg-utils; }) ]; diff --git a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch deleted file mode 100644 index ba25d54e3703..000000000000 --- a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/graphviz/backend.py b/graphviz/backend.py -index b66e616..3da4ef0 100644 ---- a/graphviz/backend.py -+++ b/graphviz/backend.py -@@ -124,7 +124,7 @@ def command(engine: str, format_: str, filepath=None, - raise ValueError(f'unknown formatter: {formatter!r}') - - output_format = [f for f in (format_, renderer, formatter) if f is not None] -- cmd = ['dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)] -+ cmd = ['@graphviz@/bin/dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)] - - if filepath is None: - rendered = None -@@ -297,7 +297,7 @@ def unflatten(source: str, - if fanout and stagger is None: - raise RequiredArgumentError('fanout given without stagger') - -- cmd = ['unflatten'] -+ cmd = ['@graphviz@/bin/unflatten'] - if stagger is not None: - cmd += ['-l', str(stagger)] - if fanout: -@@ -332,7 +332,7 @@ def version() -> typing.Tuple[int, ...]: - Graphviz Release version entry format: - https://gitlab.com/graphviz/graphviz/-/blob/f94e91ba819cef51a4b9dcb2d76153684d06a913/gen_version.py#L17-20 - """ -- cmd = ['dot', '-V'] -+ cmd = ['@graphviz@/bin/dot', '-V'] - out, _ = run(cmd, check=True, encoding='ascii', - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) -diff --git a/tests/test_backend.py b/tests/test_backend.py -index e0a0e1c..681f178 100644 ---- a/tests/test_backend.py -+++ b/tests/test_backend.py -@@ -54,7 +54,7 @@ def test_run_encoding_mocked(mocker, Popen, input='sp\xe4m', encoding='utf-8'): - m.decode.assert_called_once_with(encoding) - - --@pytest.mark.exe -+@pytest.mark.skip(reason='empty $PATH has no effect') - @pytest.mark.usefixtures('empty_path') - @pytest.mark.parametrize('func, args', [ - (render, ['dot', 'pdf', 'nonfilepath']), -@@ -148,7 +148,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803 - - assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf' - -- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - cwd=None, startupinfo=mocker.ANY) -@@ -211,7 +211,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, Popen, quiet): # noqa: N803 - assert e.value.stdout is out - e.value.stdout = mocker.sentinel.new_stdout - assert e.value.stdout is mocker.sentinel.new_stdout -- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, -@@ -231,7 +231,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 - - assert pipe('dot', 'png', b'nongraph', quiet=quiet) == b'stdout' - -- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, -@@ -259,7 +259,7 @@ def test_unflatten_mocked(capsys, mocker, Popen): - proc.communicate.return_value = (b'nonresult', b'') - - assert unflatten('nonsource') == 'nonresult' -- Popen.assert_called_once_with(['unflatten'], -+ Popen.assert_called_once_with(['@graphviz@/bin/unflatten'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, -@@ -290,7 +290,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803 - with pytest.raises(RuntimeError, match=r'nonversioninfo'): - version() - -- Popen.assert_called_once_with(['dot', '-V'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - startupinfo=mocker.ANY) -@@ -312,7 +312,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803 - - assert version() == expected - -- Popen.assert_called_once_with(['dot', '-V'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - startupinfo=mocker.ANY) diff --git a/pkgs/development/python-modules/graphviz/paths.patch b/pkgs/development/python-modules/graphviz/paths.patch new file mode 100644 index 000000000000..2808cb0bdb48 --- /dev/null +++ b/pkgs/development/python-modules/graphviz/paths.patch @@ -0,0 +1,89 @@ +diff --git a/graphviz/backend/dot_command.py b/graphviz/backend/dot_command.py +index d1903e6..6470d11 100644 +--- a/graphviz/backend/dot_command.py ++++ b/graphviz/backend/dot_command.py +@@ -10,7 +10,7 @@ from . import parameters + __all__ = ['command'] + + #: :class:`pathlib.Path` of layout command (``Path('dot')``). +-DOT_BINARY = pathlib.Path('dot') ++DOT_BINARY = pathlib.Path('@graphviz@/bin/dot') + + + def command(engine: str, format_: str, *, +diff --git a/graphviz/backend/unflattening.py b/graphviz/backend/unflattening.py +index 5ed25d6..8d2faf8 100644 +--- a/graphviz/backend/unflattening.py ++++ b/graphviz/backend/unflattening.py +@@ -11,7 +11,7 @@ from . import execute + __all__ = ['unflatten'] + + #: :class:`pathlib.Path` of unflatten command (``Path('unflatten')``). +-UNFLATTEN_BINARY = pathlib.Path('unflatten') ++UNFLATTEN_BINARY = pathlib.Path('@graphviz@/bin/unflatten') + + + def unflatten(source: str, +diff --git a/graphviz/backend/viewing.py b/graphviz/backend/viewing.py +index 6d4a4d1..2cc6cd8 100644 +--- a/graphviz/backend/viewing.py ++++ b/graphviz/backend/viewing.py +@@ -54,7 +54,7 @@ def view_darwin(filepath, *, quiet: bool) -> None: + @tools.attach(view, 'freebsd') + def view_unixoid(filepath, *, quiet: bool) -> None: + """Open filepath in the user's preferred application (linux, freebsd).""" +- cmd = ['xdg-open', filepath] ++ cmd = ['@xdgutils@/bin/xdg-open', filepath] + log.debug('view: %r', cmd) + kwargs = {'stderr': subprocess.DEVNULL} if quiet else {} + subprocess.Popen(cmd, **kwargs) +diff --git a/tests/_common.py b/tests/_common.py +index ab93461..7eaca89 100644 +--- a/tests/_common.py ++++ b/tests/_common.py +@@ -10,7 +10,7 @@ __all__ = ['EXPECTED_DOT_BINARY', 'EXPECTED_DEFAULT_ENCODING', + 'as_cwd', + 'check_startupinfo', 'StartupinfoMatcher'] + +-EXPECTED_DOT_BINARY = pathlib.Path('dot') ++EXPECTED_DOT_BINARY = pathlib.Path('@graphviz@/bin/dot') + + EXPECTED_DEFAULT_ENCODING = 'utf-8' + +diff --git a/tests/backend/test_execute.py b/tests/backend/test_execute.py +index 05d6525..78484cb 100644 +--- a/tests/backend/test_execute.py ++++ b/tests/backend/test_execute.py +@@ -57,6 +57,7 @@ def test_run_check_input_lines_mocked(mocker, sentinel, mock_popen, + mock_sys_stderr.flush.assert_called_once_with() + + ++@pytest.mark.skip(reason='empty $PATH has no effect') + @pytest.mark.usefixtures('empty_path') + @pytest.mark.parametrize( + 'func, args', +diff --git a/tests/backend/test_unflattening.py b/tests/backend/test_unflattening.py +index 033a4d2..7d52689 100644 +--- a/tests/backend/test_unflattening.py ++++ b/tests/backend/test_unflattening.py +@@ -8,7 +8,7 @@ import graphviz + + import _common + +-EXPECTED_UNFLATTEN_BINARY = pathlib.Path('unflatten') ++EXPECTED_UNFLATTEN_BINARY = pathlib.Path('@graphviz@/bin/unflatten') + + + @pytest.mark.exe +diff --git a/tests/backend/test_viewing.py b/tests/backend/test_viewing.py +index f5acddb..6b34884 100644 +--- a/tests/backend/test_viewing.py ++++ b/tests/backend/test_viewing.py +@@ -25,6 +25,6 @@ def test_view(mocker, mock_platform, mock_popen, mock_startfile, quiet): + if mock_platform == 'darwin': + mock_popen.assert_called_once_with(['open', 'nonfilepath'], **kwargs) + elif mock_platform in ('linux', 'freebsd'): +- mock_popen.assert_called_once_with(['xdg-open', 'nonfilepath'], **kwargs) ++ mock_popen.assert_called_once_with(['@xdgutils@/bin/xdg-open', 'nonfilepath'], **kwargs) + else: + raise RuntimeError diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index 872798c6ced8..f19c7a9dd39f 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; homepage = "https://github.com/hugapi/hug"; license = licenses.mit; + # Missing support for later falcon releases + broken = true; }; - } diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index ab3cdd6e6d06..50faf89d600a 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -59,6 +59,9 @@ buildPythonPackage rec { "test_alpha_is_080" "test_face_and_lines_at_half_visibility" "test_polygon_fully_inside_image__no_rectangular_shape" + # flaky due to timing-based assertions + "test_imap_batches_output_buffer_size" + "test_imap_batches_unordered_output_buffer_size" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index f4eb9190aa4b..23b858e8905b 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,9 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, bash +, buildPythonPackage +, chardet , docker +, entrypoints , escapism +, fetchFromGitHub +, iso8601 , jinja2 , pkgs-docker , python-json-logger +, pythonOlder , pyyaml , ruamel_yaml , semver @@ -12,18 +19,24 @@ }: buildPythonPackage rec { - version = "2021.8.0"; + version = "2021.08.0"; pname = "jupyter-repo2docker"; - disabled = pythonOlder "3.4"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9d1b3c3ec7944ea6b0a234d6fa77293a2d1ed1c080eba8466aba94f811b3465d"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jupyterhub"; + repo = "repo2docker"; + rev = version; + sha256 = "10hcdag7ivyqyiqrmr9c48zynp8d81ic3px1ffgnaysih7lvkwb6"; }; propagatedBuildInputs = [ docker + entrypoints escapism + iso8601 jinja2 pkgs-docker python-json-logger @@ -33,7 +46,7 @@ buildPythonPackage rec { traitlets ]; - # tests not packaged with pypi release + # Tests require a running Docker instance doCheck = false; pythonImportsCheck = [ @@ -44,9 +57,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://repo2docker.readthedocs.io/en/latest/"; - description = "Repo2docker: Turn code repositories into Jupyter enabled Docker Images"; + description = "Turn code repositories into Jupyter enabled Docker Images"; + homepage = "https://repo2docker.readthedocs.io/"; license = licenses.bsdOriginal; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 2d3ec976d64b..649d8d4cf3df 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -5,6 +5,7 @@ , mock , nose2 , python +, pythonOlder , requests , zope_interface }: @@ -14,6 +15,8 @@ buildPythonPackage rec { version = "1.1.0"; format = "setuptools"; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx"; diff --git a/pkgs/development/python-modules/mill-local/default.nix b/pkgs/development/python-modules/mill-local/default.nix new file mode 100644 index 000000000000..9d00bb71c8bc --- /dev/null +++ b/pkgs/development/python-modules/mill-local/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mill-local"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyMillLocal"; + rev = version; + sha256 = "0q0frwj9yxdmqi5axl7gxirfflgn8xh1932c6lhp9my2v1d0gdrk"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "mill_local" + ]; + + meta = with lib; { + description = "Python module to communicate locally with Mill heaters"; + homepage = "https://github.com/Danielhiversen/pyMillLocal"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index e47af565bdc3..b6cfbc51cac0 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.4"; + version = "0.5.8"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6c8ad36a28edad4562580847f9f1636fe5316a51a323ed85a24a4ad37d4aefce"; + sha256 = "sha256-NPUsycuDGl2MzXAxU341THXcYaJEh/mYcS0Sid4yCiU="; }; inherit doCheck; @@ -22,5 +22,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/nbclient"; description = "A client library for executing notebooks"; license = licenses.bsd3; + maintainers = [ maintainers.erictapen ]; }; } diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 6142972c0c94..ad591163f081 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,14 +12,16 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.1.1"; - disabled = pythonOlder "3.6"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE="; + sha256 = "sha256-KPgBbYGbKpKEPMxywgRvJcSCEYSUQkiPEFqj+bB0g1s="; }; propagatedBuildInputs = [ @@ -41,7 +43,9 @@ buildPythonPackage rec { --replace "--cov --cov-report term-missing " "" ''; - pythonImportsCheck = [ "nettigo_air_monitor" ]; + pythonImportsCheck = [ + "nettigo_air_monitor" + ]; meta = with lib; { description = "Python module to get air quality data from Nettigo Air Monitor devices"; diff --git a/pkgs/development/python-modules/open-garage/default.nix b/pkgs/development/python-modules/open-garage/default.nix index 87d524845751..0cb71a86fe57 100644 --- a/pkgs/development/python-modules/open-garage/default.nix +++ b/pkgs/development/python-modules/open-garage/default.nix @@ -8,15 +8,16 @@ buildPythonPackage rec { pname = "open-garage"; - version = "0.1.6"; + version = "0.2.0"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyOpenGarage"; rev = version; - sha256 = "sha256-vm51Fjej0OQ7LftisS/tsnxZxa5c/j7eGIROMsEcXNE="; + sha256 = "sha256-iJ7HcJhpTceFpHTUdNZOYDuxUWZGWPmZ9lxD3CyGvk8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 8b8d2ed488b9..98750a917ca1 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.22.0"; + version = "1.22.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c5172252fc92142ec104cd5e7231be4580a1a0a814403707bafbf7bb8383a29a"; + sha256 = "sha256-/WmtWvJ4HllgjLP02WayNNlhxi8JPt0xlKxF32W40dQ="; }; propagatedBuildInputs = [ @@ -23,7 +25,10 @@ buildPythonPackage rec { # Tests require a running PostgreSQL instance doCheck = false; - pythonImportsCheck = [ "pg8000" ]; + + pythonImportsCheck = [ + "pg8000" + ]; meta = with lib; { description = "Python driver for PostgreSQL"; diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix new file mode 100644 index 000000000000..3c290b843941 --- /dev/null +++ b/pkgs/development/python-modules/pybalboa/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pybalboa"; + version = "0.13"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "garbled1"; + repo = pname; + rev = version; + sha256 = "0aw5jxpsvzyx05y1mg8d63lxx1i607yb6x19n9jil5wfis95m8pd"; + }; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "pybalboa" + ]; + + meta = with lib; { + description = " Python module to interface with a Balboa Spa"; + homepage = "https://github.com/garbled1/pybalboa"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix new file mode 100644 index 000000000000..d6ad5480ddd3 --- /dev/null +++ b/pkgs/development/python-modules/pylaunches/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pylaunches"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "0mczxkwczyh9kva4xzpmnawy0hjha1fdrwj6igip9w5z1q48zs49"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytestCheckHook + pytest-asyncio + ]; + + postPatch = '' + # Upstream doesn't set version in the repo + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' \ + --replace ', "pytest-runner"' "" + ''; + + pythonImportsCheck = [ + "pylaunches" + ]; + + meta = with lib; { + description = "Python module to get information about upcoming space launches"; + homepage = "https://github.com/ludeeus/pylaunches"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 0115893700ac..f3dcdf6c45a7 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymetno"; - version = "0.8.3"; + version = "0.9.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyMetno"; rev = version; - sha256 = "sha256-dvZz+wv9B07yKM4E4fQ9VQOgeil9KxZxcGk6D0kWY4g="; + sha256 = "sha256-2LNDFQObGqxrzswnqbmvCGLxEI0j+cIdv8o+RZM/7sM="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { "metno" ]; - # no tests + # Project has no tests doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index af57357d11c9..a21ee97eca5d 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -1,36 +1,18 @@ -{ lib, fetchpatch, fetchFromGitHub, buildPythonPackage, isPy3k, +{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, isodate, lxml, xmlsec, freezegun }: buildPythonPackage rec { pname = "python3-saml"; - version = "1.10.1"; + version = "1.12.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "onelogin"; repo = "python3-saml"; rev = "v${version}"; - sha256 = "1yk02xq90bm7p6k091av6gapb5h2ccxzgrbm03sj2x8h0wff9s8k"; + sha256 = "sha256-VPUsjuo4FIes8ti0tkR0kT3J3RdUt1wtl4QEahVsc2c="; }; - # Remove both patches on update - patches = [ - # Remove the dependency on defusedxml - # - # This patch is already merged upstream and does not introduce any - # functionality changes. - (fetchpatch { - url = "https://github.com/onelogin/python3-saml/commit/4b6c4b1f2ed3f6eab70ff4391e595b808ace168c.patch"; - sha256 = "sha256-KHyAoX3our3Rz2z4xo0lTBB1XOGuC3Pe+lUDCzK5WQI="; - }) - - # Update expiry dates for test response XMLs - (fetchpatch { - url = "https://github.com/onelogin/python3-saml/commit/05611bbf6d7d8313adb9c77ff88a9210333ccc38.patch"; - sha256 = "sha256-62TwgCXDFYsZIAeqAysJRziMvhUVhGzta/C2wS3v4HY="; - }) - ]; - propagatedBuildInputs = [ isodate lxml xmlsec ]; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 4e778054875e..a5fd59fb60fa 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -1,4 +1,5 @@ { lib +, black , buildPythonPackage , fetchPypi , cachecontrol @@ -8,15 +9,19 @@ , rdflib-jsonld , ruamel_yaml , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "schema-salad"; - version = "8.2.20210918131710"; + version = "8.2.20211104054942"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "464180407f49a3533cd5a5bc7db9254769bc77595ea00562bbe4a50493f7f445"; + sha256 = "sha256-1crKyAON8iZBYxP6bhj0MxV3fSpnCh3Lqp8x91KLBT8="; }; propagatedBuildInputs = [ @@ -28,13 +33,20 @@ buildPythonPackage rec { ruamel_yaml ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + black + pytestCheckHook + ]; + disabledTests = [ # setup for these tests requires network access "test_secondaryFiles" "test_outputBinding" ]; - pythonImportsCheck = [ "schema_salad" ]; + + pythonImportsCheck = [ + "schema_salad" + ]; meta = with lib; { description = "Semantic Annotations for Linked Avro Data"; diff --git a/pkgs/development/python-modules/scikit-image/add-testing-data.patch b/pkgs/development/python-modules/scikit-image/add-testing-data.patch new file mode 100644 index 000000000000..60f9287f8b1c --- /dev/null +++ b/pkgs/development/python-modules/scikit-image/add-testing-data.patch @@ -0,0 +1,17 @@ +diff --git a/skimage/data/setup.py b/skimage/data/setup.py +index 528e9c284ce..ba0e155559c 100644 +--- a/skimage/data/setup.py ++++ b/skimage/data/setup.py +@@ -11,7 +11,11 @@ def configuration(parent_package='', top_path=None): + # further notice. + # Testing data and additional datasets should only + # be made available via pooch +- config.add_data_files(*legacy_datasets) ++ # Nix patch: add ALL images to facilitate testing of a fully-built package ++ from pathlib import Path ++ config.add_data_files( ++ *(path.name for path in Path(__file__).parent.glob("*") if path.suffix != ".py") ++ ) + # It seems hard to create a consistent hash for README.txt since + # the line endings keep getting converted + config.add_data_files('README.txt') diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index b34d3ff7b8de..9c3583fe365a 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -1,6 +1,7 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage +, python , cython , numpy , scipy @@ -11,20 +12,26 @@ , pywavelets , dask , cloudpickle -, pytest , imageio , tifffile +, pytestCheckHook }: -buildPythonPackage rec { +let + installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; +in buildPythonPackage rec { pname = "scikit-image"; version = "0.18.3"; - src = fetchPypi { - inherit pname version; - sha256 = "ecae99f93f4c5e9b1bf34959f4dc596c41f2f6b2fc407d9d9ddf85aebd3137ca"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh"; }; + patches = [ ./add-testing-data.patch ]; + nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ @@ -41,14 +48,51 @@ buildPythonPackage rec { tifffile ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - # No tests in archive - doCheck = false; + # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; + # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; + # (3) Therefore, tests should be run on the installed package in nix store. + + # See e.g. https://discourse.nixos.org/t/cant-import-cythonized-modules-at-checkphase/14207 on why the following is needed. + preCheck = '' + rm -r skimage + ''; + + disabledTestPaths = [ + # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error). + "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py" + ]; + pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) [ + # These tests require network access + "skimage/data/test_data.py::test_skin" + "skimage/data/tests/test_data.py::test_skin" + "skimage/io/tests/test_io.py::test_imread_http_url" + "skimage/restoration/tests/test_rolling_ball.py::test_ndim" + ]; + + # Check cythonized modules + pythonImportsCheck = [ + "skimage" + "skimage._shared" + "skimage.draw" + "skimage.feature" + "skimage.restoration" + "skimage.filters" + "skimage.future.graph" + "skimage.graph" + "skimage.io" + "skimage.measure" + "skimage.morphology" + "skimage.transform" + "skimage.util" + "skimage.segmentation" + ]; meta = { description = "Image processing routines for SciPy"; homepage = "https://scikit-image.org"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yl3dy ]; }; } diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index cf3ec977d0ea..313e408ca50d 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,14 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.5"; + version = "2.7.7"; + format = "setuptools"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "1s5q3gzd69syk8khlyy7ap8gpymvhgqrlv3vp6vdmwnaafjvvyy3"; + sha256 = "sha256-KEJ0lAg6Zi2vps+ZPTkT6ts87qnIBL9pFe1tPEzviCI="; }; propagatedBuildInputs = [ @@ -23,7 +24,10 @@ buildPythonPackage rec { # Tests are interacting with the Twitter API doCheck = false; - pythonImportsCheck = [ "TwitterAPI" ]; + + pythonImportsCheck = [ + "TwitterAPI" + ]; meta = with lib; { description = "Python wrapper for Twitter's REST and Streaming APIs"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 49343c544a41..7a6ced8b3062 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.566"; + version = "2.0.568"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-Eah4dK23jdHK7s0VF8FLd6KJzHP5YpdLGcM7IXgB880="; + sha256 = "sha256-V1YHD0+gXx5wLfhrfze6kAgF1egxXbjf4c2zEc/oT1A="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 5d747317e453..3137679cc324 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { "riscv32-linux" "riscv64-linux" "alpha-linux" ]; - broken = stdenv.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2 + broken = stdenv.isDarwin || stdenv.hostPlatform.isStatic; # https://hydra.nixos.org/build/128521440/nixlog/2 }; } diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index abf9c7ebf54a..7914af6ec808 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "buf"; - version = "1.0.0-rc7"; + version = "1.0.0-rc8"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ufXz9+WI4NARkQg36mPhGncL7G9fWjDX9Ka/EJdsTvk="; + sha256 = "sha256-Oye+nYvKdT9t36hAMJSAJZCOQ2L3rHSjhjIu9gU2MWo="; }; - vendorSha256 = "sha256-wycrRCL7Mjx0QR5Y64WylpmDtKNh010mNxWAg6ekrds="; + vendorSha256 = "sha256-aZv44ZPW/bJ8TEXU79ExREj2DH6j7J1+E/E1yh13Hvc="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 36f7ffb8a5d3..4400cd190a28 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -617,7 +617,9 @@ stdenv.mkDerivation rec { ./bazel_src/output/bazel-complete.fish ''; - doInstallCheck = true; + # Install check fails on `aarch64-darwin` + # https://github.com/NixOS/nixpkgs/issues/145587 + doInstallCheck = stdenv.hostPlatform.system != "aarch64-darwin"; installCheckPhase = '' export TEST_TMPDIR=$(pwd) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 62d350593b16..eca59819ba09 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,37 +1,85 @@ -{ lib, stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev -, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, utilmacros, gtk-doc, openssl, peg, elfutils +{ lib +, stdenv +, fetchurl +, pkg-config +, libdrm +, libpciaccess +, cairo +, xorgproto +, udev +, libX11 +, libXext +, libXv +, libXrandr +, glib +, bison +, libunwind +, python3 +, kmod +, procps +, utilmacros +, gtk-doc +, docbook_xsl +, openssl +, peg +, elfutils +, meson +, ninja +, valgrind +, xmlrpc_c +, gsl +, alsa-lib +, curl +, json_c +, liboping +, flex +, docutils }: stdenv.mkDerivation rec { pname = "intel-gpu-tools"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-${version}.tar.xz"; - sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0"; + sha256 = "1dwvxh1yplsh1a7h3gpp40g91v12cfxy6yy99s1v9yr2kwxikm1n"; }; - nativeBuildInputs = [ pkg-config utilmacros ]; - buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod - libXext libXv libXrandr glib bison libunwind python3 procps - gtk-doc openssl peg elfutils ]; + nativeBuildInputs = [ pkg-config utilmacros meson ninja flex bison gtk-doc docutils docbook_xsl ]; + buildInputs = [ + libdrm + libpciaccess + cairo + xorgproto + udev + libX11 + kmod + libXext + libXv + libXrandr + glib + libunwind + python3 + procps + openssl + peg + elfutils + valgrind + xmlrpc_c + gsl + alsa-lib + curl + json_c + liboping + ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ]; preConfigure = '' - ./autogen.sh + patchShebangs tests man ''; - preBuild = '' - patchShebangs tests - - patchShebangs debugger/system_routine/pre_cpp.py - substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' - substituteInPlace tests/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' - ''; - - enableParallelBuilding = true; + hardeningDisable = [ "bindnow" ]; meta = with lib; { homepage = "https://01.org/linuxgraphics/"; diff --git a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh index 25ced7b95fd3..4e4291a55602 100755 --- a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh +++ b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p msbuild -p jq -p xmlstarlet -p curl +#!nix-shell -I nixpkgs=../../../../.. -i bash -p msbuild dotnet-sdk_3 jq xmlstarlet curl set -euo pipefail cat << EOL @@ -20,7 +20,6 @@ mapfile -t repos < <( msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ -p:RestoreNoCache=true -p:RestoreForce=true \ - -p:NuGetPackageVersion=5.9.1-rc.8 \ src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2 cd "$tmpdir" diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 25f7ce4e7aa6..e2d3b236cdc5 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -68,26 +68,23 @@ let in stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.37.12"; + version = "1.37.15"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "0gyy49v3pslr0l0q6h8hzah4s0iwkhkyckyrj3g2cg08w20b10gw"; + sha256 = "070wqs667si3f78fy6w4rrfm8qncnabg0yckjhll0yv1pzbj9q42"; }; nativeBuildInputs = [ makeWrapper msbuild ]; - # NuGetPackageVersion is overridden to be to be compatible with msbuild 16.10, - # it needs to be kept in sync with ./create-deps.sh buildPhase = '' runHook preBuild HOME=$(pwd)/fake-home msbuild -r \ -p:Configuration=Release \ -p:RestoreConfigFile=${nuget-config} \ - -p:NuGetPackageVersion=5.9.1-rc.8 \ src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj runHook postBuild diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index e90424dd781b..305246ce984d 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -49,10 +49,10 @@ } { name = "mcmaster.extensions.commandlineutils"; - version = "2.2.4"; + version = "3.1.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/mcmaster.extensions.commandlineutils/2.2.4/mcmaster.extensions.commandlineutils.2.2.4.nupkg"; - sha256 = "0hy45iacm9zlrj6p2j2i2gkbs4k52mncnlnjvwgh6b6523p9msfy"; + url = "https://api.nuget.org/v3-flatcontainer/mcmaster.extensions.commandlineutils/3.1.0/mcmaster.extensions.commandlineutils.3.1.0.nupkg"; + sha256 = "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"; }; } { @@ -87,6 +87,14 @@ sha256 = "196swfxaz7l26hiyfv1mix0y80amhlq48krc4g5p9894wx1az3c3"; }; } + { + name = "microsoft.aspnetcore.app.ref"; + version = "3.1.10"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; + sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; + }; + } { name = "microsoft.bcl.asyncinterfaces"; version = "1.1.0"; @@ -177,82 +185,82 @@ } { name = "microsoft.codeanalysis.common"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-2.21322.50/microsoft.codeanalysis.common.4.0.0-2.21322.50.nupkg"; - sha256 = "1j9yl7m0lr03fjklzjyiac1lrgs8541frqmi4xlldn8a2sx3h97x"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-4.21427.11/microsoft.codeanalysis.common.4.0.0-4.21427.11.nupkg"; + sha256 = "15q6a2z3ms2vyrfk4y7biniygy0brr3ddb8mn700zg4sl84vphcz"; }; } { name = "microsoft.codeanalysis.csharp"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.4.0.0-2.21322.50.nupkg"; - sha256 = "1mmcl4rj3n1q7zh1n9b9ph3lvm8i51sdm87q3sgiczv2pxrihzs6"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.4.0.0-4.21427.11.nupkg"; + sha256 = "0x3l774higkpbbk4f1naf57c039g8qvvdvb3963m7g54qn4zhvdh"; }; } { name = "microsoft.codeanalysis.csharp.features"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.features.4.0.0-2.21322.50.nupkg"; - sha256 = "11pzbswlznz71m248c1p4fi4i3zzvpc4a71px9j2lhnm57zy2lvy"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.features.4.0.0-4.21427.11.nupkg"; + sha256 = "0w0wrssv0ix4z9609a34k6a5kc4p85gy76p676fdg6hyf6pzd78m"; }; } { name = "microsoft.codeanalysis.csharp.scripting"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.scripting.4.0.0-2.21322.50.nupkg"; - sha256 = "0piiyg1l27cy6s4ii80phrdsyhl8zvwbj9aljqkg53gki520x19p"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.scripting.4.0.0-4.21427.11.nupkg"; + sha256 = "0lmfbkxqp8p52wg2lsyxpavabk318s6ci02cxzgmxydc2pd9r70v"; }; } { name = "microsoft.codeanalysis.csharp.workspaces"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.workspaces.4.0.0-2.21322.50.nupkg"; - sha256 = "0q6jkgjh1dylmjx8a79ighgbai1jr2fhls9m7khi87anzc3wdcl2"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.workspaces.4.0.0-4.21427.11.nupkg"; + sha256 = "0j5c9v4nfahvnasz895czk1cp46b2d98px1gdar2ik9c5630vxwi"; }; } { name = "microsoft.codeanalysis.externalaccess.omnisharp"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-2.21322.50.nupkg"; - sha256 = "1rv5qsj8lsfqxdzd6zazrzwzaxwmj6szd9hv2ckbb4lypkn8ifs8"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-4.21427.11.nupkg"; + sha256 = "0qy8xiv1j8awmbbgy16b2y9rhymxhx8kcmfylhxi1ryqql4mrpg2"; }; } { name = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-2.21322.50.nupkg"; - sha256 = "0ygp7hnm6mn9khh6z573avhvbcx5459fmyz4z657dx9p2v1f0fs0"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-4.21427.11.nupkg"; + sha256 = "0mp1gkfdrdjcryqdj76ilpmjh0w8z4h313djjplcawwk76369mnc"; }; } { name = "microsoft.codeanalysis.features"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-2.21322.50/microsoft.codeanalysis.features.4.0.0-2.21322.50.nupkg"; - sha256 = "1grkql2wcqsqlmqnfchw6wxynwpz4x9wgqd00zpc1g04z9lqimq6"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-4.21427.11/microsoft.codeanalysis.features.4.0.0-4.21427.11.nupkg"; + sha256 = "03vclmmxch3jrjamr9lg899s9wsfxw9yf53p9yfwvcr8wml4cwpz"; }; } { name = "microsoft.codeanalysis.scripting.common"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-2.21322.50/microsoft.codeanalysis.scripting.common.4.0.0-2.21322.50.nupkg"; - sha256 = "1c14bg99ywxdvlp5zc08ijc030rxmpb3171kz2z6f5kr02vf296x"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-4.21427.11/microsoft.codeanalysis.scripting.common.4.0.0-4.21427.11.nupkg"; + sha256 = "15fkbw651v9lliqdmg1k61dqzasrssahyhrhwg24m111rgh86fbn"; }; } { name = "microsoft.codeanalysis.workspaces.common"; - version = "4.0.0-2.21322.50"; + version = "4.0.0-4.21427.11"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-2.21322.50/microsoft.codeanalysis.workspaces.common.4.0.0-2.21322.50.nupkg"; - sha256 = "1c0m5pg156x8zh50x7rp25p8cn09gbv50wpbz2p1nc5ff5dyavf5"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-4.21427.11/microsoft.codeanalysis.workspaces.common.4.0.0-4.21427.11.nupkg"; + sha256 = "0k4qjkkg4mllizialzm463ssm3faqcqjnw19kbcnrzm5cd72i7cy"; }; } { @@ -544,35 +552,11 @@ }; } { - name = "microsoft.netcore.app"; - version = "2.1.0"; + name = "microsoft.netcore.app.ref"; + version = "3.1.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app/2.1.0/microsoft.netcore.app.2.1.0.nupkg"; - sha256 = "1qgw6njwz30l5cwkvgf2fbsjqkc9vy0w3939c24iabmvjnzjr6a4"; - }; - } - { - name = "microsoft.netcore.dotnetapphost"; - version = "2.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnetapphost/2.1.0/microsoft.netcore.dotnetapphost.2.1.0.nupkg"; - sha256 = "10hnhkix2av0c7djp2q88pw407m8gk3im4r06x762a3cs6f2jprd"; - }; - } - { - name = "microsoft.netcore.dotnethostpolicy"; - version = "2.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnethostpolicy/2.1.0/microsoft.netcore.dotnethostpolicy.2.1.0.nupkg"; - sha256 = "1xh8ij7zyfkrk20rgpwqs00mxdy2qiwr7qar2xk397zk2bh2d90n"; - }; - } - { - name = "microsoft.netcore.dotnethostresolver"; - version = "2.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnethostresolver/2.1.0/microsoft.netcore.dotnethostresolver.2.1.0.nupkg"; - sha256 = "1384k3cg4sjcn3hyalcm43fhmlfj5pnywpzd9zpgc4jsr2c16x76"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; + sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }; } { @@ -599,14 +583,6 @@ sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }; } - { - name = "microsoft.netcore.platforms"; - version = "2.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.0/microsoft.netcore.platforms.2.1.0.nupkg"; - sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; - }; - } { name = "microsoft.netcore.platforms"; version = "2.1.2"; @@ -639,14 +615,6 @@ sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }; } - { - name = "microsoft.netcore.targets"; - version = "2.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/2.1.0/microsoft.netcore.targets.2.1.0.nupkg"; - sha256 = "1dav8x5551nwdqfigxf9zfsml5l9lakg86x38s9dvps81xs5d9zq"; - }; - } { name = "microsoft.netframework.referenceassemblies"; version = "1.0.0"; @@ -705,10 +673,10 @@ } { name = "microsoft.visualstudio.debugger.contracts"; - version = "17.2.0-beta.21262.1"; + version = "17.2.0-beta.21417.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21262.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21262.1.nupkg"; - sha256 = "148gb4k28fch1rhh6kr82dajl7qnvjxvkxvc8igy7zra70nvbx74"; + url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21417.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21417.1.nupkg"; + sha256 = "14v8d0hp6p1jn4i6b12r6vx4cvxycpb37a0zh0amz0qkg4afr12d"; }; } { @@ -783,6 +751,14 @@ sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }; } + { + name = "microsoft.win32.systemevents"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/4.7.0/microsoft.win32.systemevents.4.7.0.nupkg"; + sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; + }; + } { name = "nerdbank.streams"; version = "2.6.81"; @@ -831,6 +807,14 @@ sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }; } + { + name = "nuget.common"; + version = "5.10.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.10.0/nuget.common.5.10.0.nupkg"; + sha256 = "0qy6blgppgvxpfcricmvva3qzddk18dza5vy851jrbqshvf9g7kx"; + }; + } { name = "nuget.common"; version = "5.2.0"; @@ -840,11 +824,11 @@ }; } { - name = "nuget.common"; - version = "5.9.1-rc.8"; + name = "nuget.configuration"; + version = "5.10.0"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/5.9.1-rc.8/nuget.common.5.9.1-rc.8.nupkg"; - sha256 = "056b1h4fvik6z2qc2s6qzz0s4acbipc50af14fbr7hd9h2fxya4c"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.10.0/nuget.configuration.5.10.0.nupkg"; + sha256 = "0xb1n94lrwa6k83i9xcsq68202086p2gj74gzlbhlvb8c2pw6lbb"; }; } { @@ -856,11 +840,11 @@ }; } { - name = "nuget.configuration"; - version = "5.9.1-rc.8"; + name = "nuget.dependencyresolver.core"; + version = "5.10.0"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/5.9.1-rc.8/nuget.configuration.5.9.1-rc.8.nupkg"; - sha256 = "0x8vigf0sfp6kf1i98xcr4k84vci596x16hmajdm0zgv3p1w2kvk"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.10.0/nuget.dependencyresolver.core.5.10.0.nupkg"; + sha256 = "0dhhclm281ihpfsjzxw34l6zlw49nwzyjiynkmsbcj9icfkp3y4r"; }; } { @@ -871,14 +855,6 @@ sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; }; } - { - name = "nuget.dependencyresolver.core"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/5.9.1-rc.8/nuget.dependencyresolver.core.5.9.1-rc.8.nupkg"; - sha256 = "1q9a97s1z3a6fb4p82ag2lqnzl53895prbqwlbvckdw9c3rpz3gc"; - }; - } { name = "nuget.frameworks"; version = "5.0.0"; @@ -887,6 +863,14 @@ sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }; } + { + name = "nuget.frameworks"; + version = "5.10.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.10.0/nuget.frameworks.5.10.0.nupkg"; + sha256 = "0gb6n8rg2jpjp52icgpb3wjdfs3qllh5vbcz8hbcix3l7dncy3v2"; + }; + } { name = "nuget.frameworks"; version = "5.2.0"; @@ -896,11 +880,11 @@ }; } { - name = "nuget.frameworks"; - version = "5.9.1-rc.8"; + name = "nuget.librarymodel"; + version = "5.10.0"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/5.9.1-rc.8/nuget.frameworks.5.9.1-rc.8.nupkg"; - sha256 = "1n3mp9ns79yq4dwgj7h2av3b485mzgsw0qlj8z7p47krwlzp5hiv"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.10.0/nuget.librarymodel.5.10.0.nupkg"; + sha256 = "0b6mmq2mqfr06ypc772dmcd8bz55gkyfrgn0j3nrgkcdww4fzf9q"; }; } { @@ -912,11 +896,11 @@ }; } { - name = "nuget.librarymodel"; - version = "5.9.1-rc.8"; + name = "nuget.packaging"; + version = "5.10.0"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/5.9.1-rc.8/nuget.librarymodel.5.9.1-rc.8.nupkg"; - sha256 = "0sy8422c94wcg8ka85lnawq26mpixl79avk9m6y44lshrpga5v4v"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.10.0/nuget.packaging.5.10.0.nupkg"; + sha256 = "11g0v061axhp0nisclq5cm2mc92d69z92giz9l40ih478c5nishw"; }; } { @@ -928,19 +912,19 @@ }; } { - name = "nuget.packaging"; - version = "5.9.1-rc.8"; + name = "nuget.packaging.core"; + version = "5.10.0"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/5.9.1-rc.8/nuget.packaging.5.9.1-rc.8.nupkg"; - sha256 = "0x9c3v741nn6m2xgidna88fa4xj5avhv6asj73hqv4pzpdprlrhv"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/5.10.0/nuget.packaging.core.5.10.0.nupkg"; + sha256 = "1frxwwl583qwsj84rjgvd7il6icgxzxxps6yng75qx8ppf99dsr6"; }; } { - name = "nuget.packaging.core"; - version = "5.9.1-rc.8"; + name = "nuget.projectmodel"; + version = "5.10.0"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/5.9.1-rc.8/nuget.packaging.core.5.9.1-rc.8.nupkg"; - sha256 = "0vsaixmla4zh277xpn5ngbmi2f52hb26aqzr0z9l4a3mlpi4l5nx"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.10.0/nuget.projectmodel.5.10.0.nupkg"; + sha256 = "1cqg319n986wciskrqsfawfhqp1d7a7i2qjd0qplpckyw8msng2i"; }; } { @@ -952,11 +936,11 @@ }; } { - name = "nuget.projectmodel"; - version = "5.9.1-rc.8"; + name = "nuget.protocol"; + version = "5.10.0"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/5.9.1-rc.8/nuget.projectmodel.5.9.1-rc.8.nupkg"; - sha256 = "1xjh7isw467nkc7dkfj3wlw69vi2cns66z152jrzjdmxmia3i3pv"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.10.0/nuget.protocol.5.10.0.nupkg"; + sha256 = "0cs9qp169zx6g2w5bzrlhxv0q1i8mb8dxlb2nkiq7pkvah86rxkc"; }; } { @@ -968,11 +952,11 @@ }; } { - name = "nuget.protocol"; - version = "5.9.1-rc.8"; + name = "nuget.versioning"; + version = "5.10.0"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/5.9.1-rc.8/nuget.protocol.5.9.1-rc.8.nupkg"; - sha256 = "1rnrxzaciqhhgwd4by0dhkvfrm1h161vvmkvlcwaz2589sqq2dzq"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.10.0/nuget.versioning.5.10.0.nupkg"; + sha256 = "10vvw6vjpx0c26rlxh7dnpyp4prahn25717ccd8bzkjmyzhm90cs"; }; } { @@ -983,14 +967,6 @@ sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; }; } - { - name = "nuget.versioning"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/5.9.1-rc.8/nuget.versioning.5.9.1-rc.8.nupkg"; - sha256 = "1vv7z122ilsk2rsvjm6j3hpifb45g8wa1mgnq1kwi9k8b2dbb6vv"; - }; - } { name = "omnisharp.extensions.jsonrpc"; version = "0.19.0"; @@ -1407,6 +1383,22 @@ sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }; } + { + name = "system.drawing.common"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.drawing.common/4.7.0/system.drawing.common.4.7.0.nupkg"; + sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; + }; + } + { + name = "system.formats.asn1"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.formats.asn1/5.0.0/system.formats.asn1.5.0.0.nupkg"; + sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; + }; + } { name = "system.globalization"; version = "4.0.11"; @@ -2231,14 +2223,6 @@ sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }; } - { - name = "system.valuetuple"; - version = "4.4.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.valuetuple/4.4.0/system.valuetuple.4.4.0.nupkg"; - sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; - }; - } { name = "system.valuetuple"; version = "4.5.0"; @@ -2247,6 +2231,14 @@ sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }; } + { + name = "system.windows.extensions"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.windows.extensions/4.7.0/system.windows.extensions.4.7.0.nupkg"; + sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; + }; + } { name = "system.xml.readerwriter"; version = "4.3.0"; diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 05caaaed63e7..5a35ac51754c 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -11,23 +11,23 @@ let if stdenv.isAarch64 then "armv8" else "unknown"; - nnueFile = "nn-3475407dc199.nnue"; + nnueFile = "nn-13406b1dcbe0.nnue"; nnue = fetchurl { name = nnueFile; url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - sha256 = "sha256-NHVAfcGZc+pERnZ4Y0zOAj1iDkGXcMERzIk3/maJ7Ic="; + sha256 = "sha256-E0BrHcvgo238XgfaUdjbOLekXX2kMHjsJadiTCuDI28="; }; in stdenv.mkDerivation rec { pname = "stockfish"; - version = "14"; + version = "14.1"; src = fetchFromGitHub { owner = "official-stockfish"; repo = "Stockfish"; rev = "sf_${version}"; - sha256 = "sha256-fX0Tr1yqjmNRSxmisFRKUY1E5//qF3zAfJ8innAeyxA="; + sha256 = "sha256-bb62yezHKXu0J7NKavX8xhHghaUjUFYNG5U6dh/D+Co="; }; # This addresses a linker issue with Darwin @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [ luispedro siraben ]; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; - license = licenses.gpl2; + license = licenses.gpl3Only; }; } diff --git a/pkgs/misc/ananicy-cpp/default.nix b/pkgs/misc/ananicy-cpp/default.nix new file mode 100644 index 000000000000..25bcaec13267 --- /dev/null +++ b/pkgs/misc/ananicy-cpp/default.nix @@ -0,0 +1,46 @@ +{ lib +, gcc11Stdenv +, fetchFromGitLab +, makeWrapper +, cmake +, spdlog +, nlohmann_json +, systemd +}: + +gcc11Stdenv.mkDerivation rec { + pname = "ananicy-cpp"; + version = "unstable-2021-10-13"; + + src = fetchFromGitLab { + owner = "ananicy-cpp"; + repo = "ananicy-cpp"; + rev = "6a14fe7353221c89347eddbbcafb35cf5fee4758"; + sha256 = "sha256-V0QPXC17ZD2c4MK3DAkzoPgKOU5V5BjfQKUk7I6f8WM="; + }; + + nativeBuildInputs = [ + makeWrapper + cmake + ]; + + buildInputs = [ + spdlog + nlohmann_json + systemd + ]; + + cmakeFlags = [ + "-DUSE_EXTERNAL_JSON=yON" + "-DUSE_EXTERNAL_SPDLOG=ON" + "-DUSE_EXTERNAL_FMTLIB=ON" + ]; + + meta = with lib; { + homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp"; + description = "Rewrite of ananicy in c++ for lower cpu and memory usage"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/misc/ananicy/default.nix b/pkgs/misc/ananicy/default.nix new file mode 100644 index 000000000000..3c2392df731d --- /dev/null +++ b/pkgs/misc/ananicy/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, schedtool, sysctl, util-linux, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "ananicy"; + version = "unstable-2021-11-05"; + + src = fetchFromGitHub { + owner = "nefelim4ag"; + repo = "ananicy"; + rev = "b8968e9b32b0e4e6a01dc2314e43de8fee9da691"; + sha256 = "sha256-tlPY81xdUpZrDYdApXooZ0Mst0n7ARVHyUrmymqg0rk="; + }; + + patches = [ + # https://github.com/Nefelim4ag/Ananicy/pull/437 + # fix makefile destinations + (fetchpatch { + url = "https://github.com/Nefelim4ag/Ananicy/commit/dbda0f50670de3f249991706ef1cc107c5197a2f.patch"; + sha256 = "sha256-vMcJxekg2QUbm253CLAv3tmo5kedSlw+/PI/LamNWwc="; + # only used for debian packaging. lets exclude it so the patch applies even when that file is changed + excludes = [ "package.sh" ]; + }) + # https://github.com/Nefelim4ag/Ananicy/pull/439 + # fix syntax error + (fetchpatch { + url = "https://github.com/Nefelim4ag/Ananicy/commit/0f8b809298ccfd88d0e2ab952d6e4131865246da.patch"; + sha256 = "sha256-PWE4F0G97gecgc9HnG7ScA78+QVc8u8aF9u74qVChX0="; + }) + ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + + makeFlags = [ + "PREFIX=$(out)" + "SYSCONFDIR=${placeholder "out"}/etc" + ]; + + dontConfigure = true; + dontBuild = true; + + postInstall = '' + wrapProgram $out/bin/ananicy \ + --prefix PATH : ${lib.makeBinPath [ schedtool util-linux ]} + + substituteInPlace $out/lib/systemd/system/ananicy.service \ + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" \ + --replace "/usr/bin/ananicy" "$out/bin/ananicy" + ''; + + meta = with lib; { + homepage = "https://github.com/Nefelim4ag/Ananicy"; + description = "Another auto nice daemon, with community rules support"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 06b1221dccb8..d5133c8618d7 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib @@ -8,18 +8,7 @@ # - Inputs used for Darwin , CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: -let - desktopItem = makeDesktopItem { - name = "dolphin-emu-master"; - exec = "dolphin-emu-master"; - icon = "dolphin-emu"; - comment = "A Wii/GameCube Emulator"; - desktopName = "Dolphin Emulator (master)"; - genericName = "Wii/GameCube Emulator"; - categories = "Game;Emulator;"; - startupNotify = "false"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "dolphin-emu"; version = "5.0-15260"; @@ -57,6 +46,9 @@ in stdenv.mkDerivation rec { qtWrapperArgs = lib.optionals stdenv.isLinux [ "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + # https://bugs.dolphin-emu.org/issues/11807 + # The .desktop file should already set this, but Dolphin may be launched in other ways + "--set QT_QPA_PLATFORM xcb" ]; # - Allow Dolphin to use nix-provided libraries instead of building them @@ -68,10 +60,7 @@ in stdenv.mkDerivation rec { CMakeLists.txt ''; - postInstall = '' - cp -r ${desktopItem}/share/applications $out/share - ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master - '' + lib.optionalString stdenv.hostPlatform.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules ''; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 81f37b0bc41a..b90f75f6a042 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { "--with-app-defaults=${placeholder "out"}/share/xscreensaver/app-defaults" ]; + # "marbling" has NEON code that mixes signed and unsigned vector types + NIX_CFLAGS_COMPILE = lib.optional (with stdenv.hostPlatform; isAarch64 || isAarch32) "-flax-vector-conversions"; + postInstall = '' for bin in $out/bin/*; do wrapProgram "$bin" \ diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a2bbd5299c05..f1f61212f24d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-11-09"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "8b3b16d71c4c683da6f3ca39662d207a3e894901"; - sha256 = "1mdxgiin61630fimxm2l0zcr30br4q2ipp84l3iqxjbs0fqg11s5"; + rev = "76c2293e68a6cad3b192062743d25b8daa082205"; + sha256 = "1fcc3qy425fp5qrhcgi8gagl2b33wa5m8r9xzqqawk47rkpjx5d0"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -351,6 +351,18 @@ final: prev: meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/"; }; + blueballs-neovim = buildVimPluginFrom2Nix { + pname = "blueballs-neovim"; + version = "2021-09-09"; + src = fetchFromGitHub { + owner = "blueballs-theme"; + repo = "blueballs-neovim"; + rev = "e0d73d553f663a12539682d89130d71df2db9099"; + sha256 = "02x374wgbw3fmqlyrlxspf1n3ajik5y53g232r44y6093ly8wsw1"; + }; + meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/"; + }; + bracey-vim = buildVimPluginFrom2Nix { pname = "bracey.vim"; version = "2021-08-20"; @@ -461,12 +473,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-11-11"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "8bf4553d1000b2c9189f1893ac5c737b61572791"; - sha256 = "1jk795a6r8yzbjbyx121qn65njs4j3l947x3n937kygqpb7paflm"; + rev = "ba07c14d05f08853a1055c06f71ce5dec60a669f"; + sha256 = "1ncac73d20sh0d8z0cbp5bv6xy98bm1zpld0164rdw626bmh5gx3"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -809,12 +821,12 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-10-23"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "9fc34a66e6744f52769bb0b95cba851723964faf"; - sha256 = "0lhvaygicayqpabgmdya6fq7yybch5nd7myjydmcdnpmivzh7mk8"; + rev = "60828294b9ba846c78893389d4772021043d2fa1"; + sha256 = "1y7rslksa558fdh3m4m626vpvs424pvxkkk70mr57is47cminm3m"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -1122,12 +1134,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-10-28"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "86b9aecfaeaed5db9064b58115ff6dc67b318f7e"; - sha256 = "10gjlxnga52f21r558xz7pqv63pbqqfw01yl71i0z46y33jnpy14"; + rev = "91112aff209866d679fc89ca7d0697938f80e59f"; + sha256 = "0gp0a56zd1pf31z99yzwjrjq8zhinr68izqx9klj70r0h61hsm2z"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1628,12 +1640,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-10-22"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "d4ee04c9eb8951dcf1aa83d7a896bededfc68228"; - sha256 = "0wfrbhnal7y82bhrf446igc6g9avavk2jx0idk5sbv24bqhi9b60"; + rev = "a38306ddf893b95b55c6cd881605b3232c658e42"; + sha256 = "1c55zhxzf3zps7fzqs4vsd81z9la2x3blvjwh45abs93rnqik8nx"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2003,12 +2015,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-11-10"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "7d4a4c4e57b7aabb9e7d1f591c29e6d5e7e382e4"; - sha256 = "19z6yjdd7q9hydzx3bw2w8c573y0xjn9s7n780w65n34iirjbh7i"; + rev = "05bfa7681b8f11b664fab657001c2efb6f3ec85e"; + sha256 = "1133f32q4g990mmvdrbnjxggk8y96w0c5zlvh553cz9j626a4zks"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2375,12 +2387,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2021-10-27"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "526439a61a859936fe85da27fffa927e2dccdb83"; - sha256 = "1zlvrfyas257j2iqanf4i2kvxa5cdj2n3kg9xk6g8bzsjcsqw4cw"; + rev = "dc7c63320c523997610ced545007935c72d81942"; + sha256 = "16nvlli0vmqxdbcx2d8p2nsl0865444l1d3ji23z9cbz4i171rsw"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2603,12 +2615,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-11-08"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "bc8372815506066f3ca7885baca717cb986957be"; - sha256 = "0svhinr5qmhcskvakl71yykzxhm6m0ydymx7dp5w0jwsdcv9nnrx"; + rev = "9f663d31d4ee0672f24cd5b26ca3863665048a25"; + sha256 = "1lzdi3pgw9hf8pkmh3y8w3lrl27kac18hq4ryk0mghqyb8saabzw"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2908,8 +2920,8 @@ final: prev: src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "27a9bba67bc9114ba9a6f48686ac983f301dd4be"; - sha256 = "1vcd1i2w9vnkmlhan62s0raa8gigxpdyyzqvn2qqv1rifxzigpfw"; + rev = "f8f64e9d6af3f054c1044831e689ee96a31ef3fb"; + sha256 = "10jkibn2gzkzyvmib8zfsy5220hssk4f0rkgliqyjvbsnv1mxka6"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4012,20 +4024,20 @@ final: prev: src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "a07b754552008012f2d7d3602b7a233a29d92c66"; - sha256 = "19ffxpmq82f9qxbnb2lw2hvc9gqc1vfyvf553wpc439rpi98mxja"; + rev = "e940b57f30f6035df690fb24b1e5c93ae6aafcd6"; + sha256 = "0nvg3zsgqbk0gs978gzfkc57xn3wcn1mcsf6qrgc1xz4jxdd582m"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-11-11"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "2bf885dda0ecb669ef66d1c757287c98f6c16500"; - sha256 = "1303gpdr5yzxznx0djn5q09p1vibh15d0nmj1j6n2zqbjdx6bhfw"; + rev = "8a99a75a1cf3243ebec09b1fa13be51ea56151ec"; + sha256 = "1c2s3vp10km5x3q5n63ljlgyc7cmf72mjd31ybqzknfy8pfk7g6z"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4092,12 +4104,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-11-03"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "3ef30d2a754f6b47d6c696add0276519f9a8a2cf"; - sha256 = "1rd18r4113fpg7ihw87l7xprh5dpddx8s7g68qazbrxgmf1xbmd7"; + rev = "257b3ab8b78df52b2dc7f2ba3806a9bf2f1c4c08"; + sha256 = "0crmb6prvyy6fnjf1axm9mqm282xhypmkvfzwyw508rm9xq3g7yk"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4260,24 +4272,24 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-11-10"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "14653c92c93b2e00a8cc742ee109f510350afc2a"; - sha256 = "13i1pyd5ibmczyw3r2wrhrislkych994487iv5202zv0jn6jaglm"; + rev = "6ccc6b7853e24f1ba987c61e7a9dd7f1046b2af8"; + sha256 = "1740xic22cd1lrpz1d6y55ab6s1phvqfp7iwg9bwj26x8x8gi392"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-11-06"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "61773fc76e0d78c1223f158605f1cd698dc83a94"; - sha256 = "1p3hz5ap16yf3720l682sclal4ycqmqa4kaiw5ljz57jg070ckz8"; + rev = "c0f6d68ea245fd2efb527fe1b7874c48084d8150"; + sha256 = "1nai09x1sc9wvz2m5j4rj6wjpdhwk88v4sapdmvb5pqvrqqylg60"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -4344,12 +4356,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-11-11"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "edca6c107027111ed02abe17a231d1cf0d353adf"; - sha256 = "13abx9r8p9admskallw3y1dqia288xm6l3l6idshih6wbmkx2jk2"; + rev = "98db21bbd4ef6f2bcd30903e32529976c1db33c5"; + sha256 = "18jnrnf6sgqmvsmql27yd8zi7n0plh69fiycw3gv7qf5fy29gvif"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5113,12 +5125,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-11-11"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "c3fea5e8b377b07cd744579f8ca65e3f805ddaad"; - sha256 = "0rbn1mnyn9dhxv48qngs71n8pw25fmyaaffqgrk3qxfc1rxihf4a"; + rev = "2fbbae64c6c27dfab5c9fae2e520bef9f778bdd8"; + sha256 = "02mi4jbpiya3sdx1f69wyhilmjis5w7bqx562335xmw7z84ksmz7"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5233,12 +5245,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-11-04"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "488a79a053525fd1b3ceacb9b0675ebd0ed95dc0"; - sha256 = "13vks86lswp9xl934nqmgsdwx2jkjyz4qzm806ln2mz0mwmjk7zx"; + rev = "edbaeefde4f1619e51c73a4d5126b09caf66c4e6"; + sha256 = "0qzbbsqa1yxvldl3lw29pc4lwkylq4g2iymw9myfc2665b6ax4xb"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5655,12 +5667,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2021-11-10"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "fd74d2a9d2a384a530eba3a9771a5396b4ddad26"; - sha256 = "190mf9w344db5civ122l7zdr63l811qcqf7shh89zx4qfrsllf43"; + rev = "10bb37c82e94122be082651ee6ee58b5b2e51cb5"; + sha256 = "0667yh9yprym7vakm83x174srb2x2ch9q97137qlj28acks3wnqh"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -6666,12 +6678,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-11-11"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "47bf6b1716d599fa19756ce094309a3d551fac73"; - sha256 = "1c2sqkyd0zha9pchh1lbyww7v281rr488ff5b1c2rkc6inya9lcd"; + rev = "4b96f58902a34abda87fd3105e9d47a08801a891"; + sha256 = "05fn2485098kml90n5wc0qla7wwjcrz0lkhkr9qgdv4bvc9g3hyn"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7127,7 +7139,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; + sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -10366,12 +10378,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-11-02"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "065cf18295fa8d08ab2d458c67ea6281c81bbd26"; - sha256 = "0l0zp64jzhdyrlgfplqkpsl0jbpxkr4sijymqsiabjiyvc8p6qc7"; + rev = "be9cd2c8cd007088f69019f18fb61aff457adb8c"; + sha256 = "1r2wvkgziil4bik3g7b19cscg17skhx98pgsvm2m00czrrfdxq6v"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -10594,12 +10606,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2021-09-22"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "2c915b6de918c073fbd83809e51343651f00f9a8"; - sha256 = "05jdjmpyczcgqsm5mznyb79bq10ianv7v3rhxy9wrklkama3jrgs"; + rev = "7e3819a91a7710ce561a9c11a22a82b9437a2533"; + sha256 = "0hx5ar663ai25jj7p44sl2nn2n0jj2iif5ybx5ic7cxz4qy477wn"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -10859,12 +10871,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-11-11"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c63adb6958458b62a7b9c0e4156d11a5da5f1a9f"; - sha256 = "07q4wmckz2a1x2l11pa1m5dqbk8wz0slk28p7wcapwfn5lxf48jq"; + rev = "8dad88059f7d712c1f6ff83c6aaa2ef9645a3787"; + sha256 = "0z9smsl20fag4h7iv7jsbh8sshkc97d53r2whl4hyllq04w1jjr7"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ba6b140f29af..938f02e1640b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -47,6 +47,7 @@ bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion bling/vim-bufferline +blueballs-theme/blueballs-neovim blueyed/vim-diminactive bogado/file-line bohlender/vim-smt2 diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index ca3e38c2e707..6cc22c25602b 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -20,17 +20,17 @@ let in stdenv.mkDerivation rec { pname = "displaylink"; - version = "5.4.0-55.153"; + version = "5.4.1-55.174"; src = requireFile rec { name = "displaylink.zip"; - sha256 = "1m2l3bnlfwfp94w7khr05npsbysg9mcyi7hi85n78xkd0xdcxml8"; + sha256 = "1biswvjz91gmx7xf9g05h3ra463hf2yv9mr2nkxclyrd283iiiqc"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.synaptics.com/node/3751 + https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.4.1 Once you have downloaded the file, please use the following commands and re-run the installation: diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index 94693f1559e5..4e3693aba6f1 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iptstate"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068"; + sha256 = "sha256-iW3wYCiFRWomMfeV1jT8ITEeUF+MkQNI5jEoYPIJeVU="; }; buildInputs = [ libnetfilter_conntrack ncurses ]; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 11a6f2755d4c..0f9f26c8c5b0 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; - nativeBuildInputs = [ bison flex pkg-config ]; + strictDeps = true; + + nativeBuildInputs = [ bison flex pkg-config ] ++ optional enablePython swig; buildInputs = [ libsepol libselinux bzip2 audit ] - ++ optionals enablePython [ swig python ]; + ++ optional enablePython python; makeFlags = [ "PREFIX=$(out)" @@ -26,6 +28,7 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "PYTHON=python" + "PYPREFIX=python" "PYTHONLIBDIR=$(py)/${python.sitePackages}" "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf" ]; @@ -42,6 +45,8 @@ stdenv.mkDerivation rec { installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; + enableParallelBuilding = true; + meta = removeAttrs libsepol.meta ["outputsToInstall"] // { description = "Policy management tools for SELinux"; license = lib.licenses.lgpl21; diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index e3b4179fcf59..8d8ad16e7849 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -2,15 +2,20 @@ stdenv.mkDerivation rec { pname = "gmnisrv"; - version = "unstable-2021-05-16"; + version = "1.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "gmnisrv"; - rev = "b9a92193e96bbe621ebc8430d8308d45a5b86cef"; - sha256 = "sha256-eMKsoq3Y+eS20nxI7EoDLbdwdoB6shbGt6p8wS+uoPc="; + rev = version; + sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ="; }; + postPatch = '' + substituteInPlace config.sh \ + --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" + ''; + MIMEDB = "${mime-types}/etc/mime.types"; nativeBuildInputs = [ pkg-config scdoc ]; buildInputs = [ openssl mime-types ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c46248d93963..dbd447a41f8a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.11.2"; + version = "2021.11.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -448,7 +448,7 @@ "lametric" = ps: with ps; [ lmnotify ]; "lannouncer" = ps: with ps; [ ]; "lastfm" = ps: with ps; [ pylast ]; - "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches + "launch_library" = ps: with ps; [ pylaunches ]; "lcn" = ps: with ps; [ pypck ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 652b0f3d2bcc..40aa8a338bff 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -37,6 +37,19 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") + (self: super: { + huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { + version = "1.4.18"; + src = fetchFromGitHub { + owner = "Salamek"; + repo = "huawei-lte-api"; + rev = version; + sha256 = "1qaqxmh03j10wa9wqbwgc5r3ays8wfr7bldvsm45fycr3qfyn5fg"; + }; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.dicttoxml ]; + }); + }) + # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged (self: super: { @@ -127,7 +140,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.11.2"; + hassVersion = "2021.11.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -144,7 +157,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "13212h67ijvir8rlr4gpd2945xx5f5c2lj3bwg7ncw55r23h6hma"; + sha256 = "sha256-HycMb29niuUp7flRdWgrKSOcnr0l3PqjULCrgrwLrFw="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index e073cf2fe1de..bf614a11e027 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20211108.0"; + version = "20211109.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cMCjBhtPi73AB9bplUH8ZNQMt5WJ/NZFW4qLuHHo3+g="; + sha256 = "sha256-DXL+D58kS8q4we6/r6iRuXA/d9NOoYUp9A3vsHQ0KVg="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index ecd3063e0934..4bd1ea3d63e0 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -45,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.27.0-70"; + version = "4.27.2-72"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm"; - sha256 = "sha256-12EMKkMMMcQZwgvK0YjuHknv2JLqU3REcJUTPUmYZ6A="; + sha256 = "sha256-oCZS68n9R6Hm6lltcL6zQhPaU9FRqtB59DrstRNjnH8="; }; unpackPhase = '' diff --git a/pkgs/servers/http/ran/default.nix b/pkgs/servers/http/ran/default.nix index 5d58506be3ff..087e23b29873 100644 --- a/pkgs/servers/http/ran/default.nix +++ b/pkgs/servers/http/ran/default.nix @@ -42,6 +42,5 @@ buildGoModule rec { description = "Ran is a simple web server for serving static files"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index d807f7f797c0..57df52d0a0a6 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "postorius"; # Note: Mailman core must be on the latest version before upgrading Postorious. # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L2ApUGQNvR0UVvodVM+wMzjYLZkegI4fT4yUiU/cibU="; + sha256 = "0f23c6542bf0f6e6364d678c094ee5804acfe59ecbcc0e944bc4c13834e24e80"; }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 6af262567720..92fe6e0403a2 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "sha256-UHMj0g17P3BfSc+MB9Q3xtgJC+0H4Vo8DsQF7a1Up9Q="; + sha256 = "1g5ii5vvcr87qkabsbyg3n7kzy1g5k2n5gwa8468w5d0ava424hg"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 8b59ae54265d..b6b2cd1ea65d 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -51,8 +51,8 @@ in { }; nextcloud22 = generic { - version = "22.2.0"; - sha256 = "07ryvynws65k42n6ca20nni1vqr90fsrd2dpx2bvh09mwhyblg97"; + version = "22.2.1"; + sha256 = "sha256-0BtQt7siUYGiEVGkUYmd0gjfccq4kIhCVaOTR9frvys="; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 25fb5268c146..37d76779b2c8 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "reproxy"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "umputun"; repo = pname; rev = "v${version}"; - hash = "sha256-zwQZr6BbvJ2Ol5pCLkZ49j0j5KWTK0N8BybvTr8PPeg="; + hash = "sha256-z10KfDwIwitiR6ei1xV9//zhH7DLTow1giEYyjh8FIg="; }; postPatch = '' diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index edf89b78398d..ffb4bc0c7e82 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-846"; + version = "1.8-850"; src = let @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-BoHvODaAcK5b4/syOm3vpOTpq9ETovpWKUqG+UGr2e0="; + sha256 = "sha256-NSNaL0ERYTSYn9ETjWcQiuI4hY+w/lWVOz3n9lt6O+4="; }; buildInputs = [ diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 8ab301eeb38c..fd02e7ea418e 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -99,6 +99,11 @@ in stdenv.mkDerivation rec { mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud ln -s $out/share/bash-completion/completions/gcloud $out/share/bash-completion/completions/gsutil + # setup zsh completion + mkdir -p $out/share/zsh/site-functions + mv $out/google-cloud-sdk/completion.zsh.inc $out/share/zsh/site-functions/_gcloud + ln -s $out/share/zsh/site-functions/_gcloud $out/share/zsh/site-functions/_gsutil + # This directory contains compiled mac binaries. We used crcmod from # nixpkgs instead. rm -r $out/google-cloud-sdk/platform/gsutil/third_party/crcmod \ diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 83d16c3eb772..cec4f2981298 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lego"; - version = "4.5.2"; + version = "4.5.3"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ytU1G0kT8/sx9kR8yrrGqUta+vi96aCovoABit0857g="; + sha256 = "sha256-xvTV6jZmQWs6g8Oq+IrwPZVS3fzY1/adg7IWh189ftU="; }; vendorSha256 = "sha256-EK2E2YWdk2X1awdUhMOJh+qr+jnnftnKuPPpiHzXZHk="; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 63e603353409..8d23b3a5c3c3 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -1,47 +1,48 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook }: +{ stdenv, lib, fetchurl, p7zip }: -let platform = if stdenv.isi686 then "x86" - else if stdenv.isx86_64 then "x64" - else if stdenv.isAarch32 then "arm" - else if stdenv.isAarch64 then "arm64" - else throw "Unsupported architecture"; - - url = "https://7-zip.org/a/7z2101-linux-${platform}.tar.xz"; - - hashes = { - x86 = "0k6vg85ld8i2pcv5sv3xbvf3swqh9qj8hf2jcpadssys3yyidqyj"; - x64 = "1yfanx98fizj8d2s87yxgsy30zydx7h5w9wf4wy3blgsp0vkbjb3"; - arm = "04iah9vijm86r8rbkhxig86fx3lpag4xi7i3vq7gfrlwkymclhm1"; - arm64 = "0a26ginpb22aydcyvffxpbi7lxh4sgs9gb6cj96qqx7cnf7bk2ri"; - }; - sha256 = hashes."${platform}"; - -in stdenv.mkDerivation { +# https://sourceforge.net/p/sevenzip/discussion/45797/thread/7fe6c21efa/ +stdenv.mkDerivation rec { pname = "7zz"; - version = "21.01"; + version = "21.04"; - src = fetchurl { inherit url sha256; }; - sourceRoot = "."; + src = fetchurl { + url = "https://7-zip.org/a/7z${lib.replaceStrings ["." ] [""] version}-src.7z"; + sha256 = "sha256-XmuEyIJAJQM0ZbgrW02lQ2rp4KFDBjLXKRaTfY+VCOg="; + }; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + sourceRoot = "CPP/7zip/Bundles/Alone2"; - dontBuild = true; + # we need https://github.com/nidud/asmc/tree/master/source/asmc/linux in order + # to build with the optimized assembler but that doesn't support building with + # GCC: https://github.com/nidud/asmc/issues/8 + makefile = "../../cmpl_gcc.mak"; # "../../cmpl_gcc_x64.mak"; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ]; + + nativeBuildInputs = [ p7zip ]; + + enableParallelBuilding = true; installPhase = '' runHook preInstall - install -D -t $out/bin 7zz + + install -Dm555 -t $out/bin b/g/7zz + install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt + runHook postInstall ''; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/7zz --help | grep ${version} + ''; + meta = with lib; { description = "Command line archiver utility"; - homepage = "https://www.7-zip.org"; - - # source not released yet. will be under LGPL 2.1+ with RAR exception - license = licenses.unfree; - - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; - maintainers = with maintainers; [ anna328p ]; + homepage = "https://7zip.org"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ anna328p peterhoeg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index f3f7b32e1192..5ce51fb0134e 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, gnustep, bzip2, zlib, icu, openssl, wavpack }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, gnustep +, bzip2 +, zlib +, icu +, openssl +, wavpack +, xcbuildHook +, Foundation +, AppKit +}: stdenv.mkDerivation rec { pname = "unar"; @@ -12,35 +25,54 @@ stdenv.mkDerivation rec { sha256 = "0p846q1l66k3rnd512sncp26zpv411b8ahi145sghfcsz9w8abc4"; }; - postPatch = '' - for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do - substituteInPlace $f \ - --replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \ - --replace "= g++" "=${stdenv.cc.targetPrefix}c++" \ - --replace "-DGNU_RUNTIME=1" "" \ - --replace "-fgnu-runtime" "-fobjc-nonfragile-abi" - done + postPatch = + if stdenv.isDarwin then '' + substituteInPlace "./XADMaster.xcodeproj/project.pbxproj" \ + --replace "libstdc++.6.dylib" "libc++.1.dylib" + '' else '' + for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do + substituteInPlace $f \ + --replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \ + --replace "= g++" "=${stdenv.cc.targetPrefix}c++" \ + --replace "-DGNU_RUNTIME=1" "" \ + --replace "-fgnu-runtime" "-fobjc-nonfragile-abi" + done - # we need to build inside this directory as well, so we have to make it writeable - chmod +w ../UniversalDetector -R - ''; + # we need to build inside this directory as well, so we have to make it writeable + chmod +w ../UniversalDetector -R + ''; - buildInputs = [ gnustep.base bzip2 icu openssl wavpack zlib ]; + buildInputs = [ bzip2 icu openssl wavpack zlib ] ++ + lib.optionals stdenv.isLinux [ gnustep.base ] ++ + lib.optionals stdenv.isDarwin [ Foundation AppKit ]; - nativeBuildInputs = [ gnustep.make installShellFiles ]; + nativeBuildInputs = [ installShellFiles ] ++ + lib.optionals stdenv.isLinux [ gnustep.make ] ++ + lib.optionals stdenv.isDarwin [ xcbuildHook ]; + + xcbuildFlags = lib.optionals stdenv.isDarwin [ + "-target unar" + "-target lsar" + "-configuration Release" + "MACOSX_DEPLOYMENT_TARGET=10.12" + # Fix "ld: file not found: /nix/store/*-clang-7.1.0/lib/arc/libarclite_macosx." error + # Disabling ARC may leak memory, however since this program is generally not used for + # long periods of time, it shouldn't be an issue + "CLANG_LINK_OBJC_RUNTIME=NO" + ]; + + makefile = lib.optionalString (!stdenv.isDarwin) "Makefile.linux"; enableParallelBuilding = true; dontConfigure = true; - makefile = "Makefile.linux"; - sourceRoot = "./source/XADMaster"; installPhase = '' runHook preInstall - install -Dm555 -t $out/bin lsar unar + install -Dm555 -t $out/bin ${lib.optionalString stdenv.isDarwin "Products/Release/"}{lsar,unar} for f in lsar unar; do installManPage ./Extra/$f.? installShellCompletion --bash --name $f ./Extra/$f.bash_completion @@ -60,7 +92,7 @@ stdenv.mkDerivation rec { ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg thiagokokada ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 0f28ad144169..04774e851b3e 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -239,12 +239,14 @@ in rec { }; ceph-client = runCommand "ceph-client-${version}" { - meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices"; + meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs"; } '' - mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions} + mkdir -p $out/{bin,sbin,etc,${sitePackages},share/bash-completion/completions} cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin cp -r ${ceph}/bin/rbd-replay* $out/bin + cp -r ${ceph}/sbin/mount.ceph $out/sbin + cp -r ${ceph}/sbin/mount.fuse.ceph $out/sbin cp -r ${ceph}/${sitePackages} $out/${sitePackages} cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index d165f404f6cb..385806e444c0 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libiconv, skktools }: +{ lib, stdenv, fetchurl, buildPackages, libiconv, skktools }: let # kana to kanji @@ -33,6 +33,8 @@ stdenv.mkDerivation { srcs = [ small medium large edict assoc ]; nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; + strictDeps = true; + dontUnpack = true; installPhase = '' @@ -47,28 +49,30 @@ stdenv.mkDerivation { for src in $srcs; do dst=$out/share/$(dictname $src) echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line - iconv -f EUC-JP -t UTF-8 $src |\ - ${skktools}/bin/skkdic-expr2 >> $dst + ${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv \ + -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst done # combine .L .edict and .assoc for convenience dst=$out/share/SKK-JISYO.combined echo ";;; -*- coding: utf-8 -*-" > $dst - ${skktools}/bin/skkdic-expr2 \ + skkdic-expr2 \ $out/share/$(dictname ${large}) + \ $out/share/$(dictname ${edict}) + \ $out/share/$(dictname ${assoc}) >> $dst ''; - meta = { + enableParallelBuilding = true; + + meta = with lib; { description = "A collection of standard SKK dictionaries"; longDescription = '' This package provides a collection of standard kana-to-kanji dictionaries for the SKK Japanese input method. ''; homepage = "https://github.com/skk-dev/dict"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ yuriaisaka ]; - platforms = with lib.platforms; linux ++ darwin; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ yuriaisaka ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 03465d593ff4..4c227cbe3f96 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , gcc9Stdenv , installShellFiles , lib @@ -20,11 +21,18 @@ gcc9Stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = [ libftdi1 libusb1 ] - # https://github.com/flashrom/flashrom/issues/125 - ++ lib.optional (!gcc9Stdenv.isAarch64) pciutils + buildInputs = [ libftdi1 libusb1 pciutils ] ++ lib.optional jlinkSupport libjaylink; + patches = [ + # remove when updating from 1.2 + (fetchpatch { + name = "fix-aarch64-build.patch"; + url = "https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d.patch"; + sha256 = "sha256-fXYDXgT/ik+qtxxFEyJ7/axtycbwLkEg0UD+hzsYEwg="; + }) + ]; + postPatch = '' substituteInPlace util/z60_flashrom.rules \ --replace "plugdev" "flashrom" diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix new file mode 100644 index 000000000000..ac3c6bcf1ad0 --- /dev/null +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub, lib, rustPlatform, pkg-config, dbus }: + +rustPlatform.buildRustPackage rec { + pname = "Lighthouse"; + version = "unstable-2021-03-28"; + + src = fetchFromGitHub { + owner = "ShayBox"; + repo = "Lighthouse"; + rev = "a090889077557fe92610ca503979b5cfc0724d61"; + sha256 = "0vfl4y61cdrah98x6xcnb3cyi8rwhlws8ps6vfdlmr3dv30mbnbb"; + }; + + cargoSha256 = "0aqd9ixszwq6qmj751gxx453gwbhwqi16m72bkbkj9s6nfyqihql"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ dbus ]; + + meta = with lib; { + description = "VR Lighthouse power state management"; + homepage = "https://github.com/ShayBox/Lighthouse"; + license = licenses.mit; + maintainers = with maintainers; [ expipiplus1 ]; + }; +} + diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 1508e6f93cd6..82851e8aad97 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -41,13 +41,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2021.3"; + version = "2021.4"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-D6Wjnww+WMIEATPkIpyyhmDGG5eM1KKj0vbpfvTI0LM="; + sha256 = "sha256-21zgGhYGrzRm7HcjZwD1OmPOIOSYSlSdDquj9mo9k2E="; }; patches = [ diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix new file mode 100644 index 000000000000..9ecbbcba37af --- /dev/null +++ b/pkgs/tools/misc/topicctl/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "topicctl"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "segmentio"; + repo = "topicctl"; + rev = "v${version}"; + sha256 = "sha256-LsMt2BHfO0I5N2C247fmoOgQ5EXMgk/3Kj/lI+vTRV0="; + }; + + vendorSha256 = "sha256-ur7qMm7l1CocQwX58fTL1PpdgIEJyRAzSlNJM1WTvM0="; + + ldflags = [ + "-X main.BuildVersion=${version}" + "-X main.BuildCommitSha=unknown" + "-X main.BuildDate=unknown" + ]; + + # needs a kafka server + doCheck = false; + + meta = with lib; { + description = "A tool for easy, declarative management of Kafka topics"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ eskytthe srhb ]; + }; +} diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index 9d3e4025a991..2e6683ef4ea3 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "curlie"; - version = "1.6.2"; + version = "1.6.7"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2CZpqc1MnAY6M1UFakKLaqGjaifw+7bN4hxc0jWgSps="; + sha256 = "sha256-uWLJWhsqJaLji2JSuVX8Vu929AdozhtAPwsqXdpEt84="; }; vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 7f500b2c09fc..e050b68ca2d5 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -10,15 +10,15 @@ let in buildGoModule rec { pname = "datadog-agent"; - version = "7.30.2"; + version = "7.31.0"; src = fetchFromGitHub { inherit owner repo; rev = version; - sha256 = "17ahrxhb87sj7f04wg44xv4k9wrlvf04j92ac5936a6maygp01rd"; + sha256 = "sha256-APwR3/bvCHNnJWxRPSLLe4lHYv39wfw3WhGDEkxAku8="; }; - vendorSha256 = "06ryy501vibc6n14qwg94394c76l060525y6qg261qb748mbi8qi"; + vendorSha256 = "sha256-CNQJvnNnB29duALEXPguEJsoRHdieAiPFbwXa89jxUk="; subPackages = [ "cmd/agent" diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index cf63342fbb65..608a7379ef9a 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "tonarino"; - repo = pname; + repo = "innernet"; rev = "v${version}"; - sha256 = "sha256-9oL91jacfUADaPvdTTvvXhpwzr9OnNnVLwy1okORss4="; + sha256 = "1ja7khvc4cy317ckglnlf11wfmin62ihic061phdp6rmfv95cza0"; }; - cargoSha256 = "sha256-jHWt7Jqv4B7u6Mvo3q69Omcn8kdnXGJSyzod1lDzvKE="; + cargoSha256 = "18xpwav48xv7xm7r3w9qplmv2i18cg09pkahyvs5l4akdjgxyw10"; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 7344b12180e6..d86eb8c88657 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-nr5qvo/SLzQ16B/83lCzlQ5zduPGxOhfqWat/Grsf/Q="; + sha256 = "sha256-Itq06zE2AVQ1HSUEQdNUuvEazfU56Hs86T0DEVuF8d4="; }; preConfigure = '' diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 960667e72def..ed7f19065f05 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -1,14 +1,13 @@ { lib, fetchFromGitHub, python2Packages, hping }: -let - rev = "bf14bbff"; -in python2Packages.buildPythonApplication rec { - pname = "knockknock-r"; - version = rev; + +python2Packages.buildPythonApplication rec { + pname = "knockknock"; + version = "unstable-2012-09-17"; src = fetchFromGitHub { - inherit rev; owner = "moxie0"; repo = "knockknock"; + rev = "bf14bbffc5f1d2105cd1d955dabca26b3faa0db4"; sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4"; }; @@ -17,7 +16,7 @@ in python2Packages.buildPythonApplication rec { # No tests doCheck = false; - patchPhase = '' + postPatch = '' sed -i '/build\//d' setup.py substituteInPlace setup.py --replace "/etc" "$out/etc" substituteInPlace knockknock.py --replace 'existsInPath("hping3")' '"${hping}/bin/hping3"' @@ -25,10 +24,10 @@ in python2Packages.buildPythonApplication rec { meta = with lib; { description = "Simple, secure port knocking daemon and client written in Python"; - homepage = "http://www.thoughtcrime.org/software/knockknock/"; - license = licenses.gpl3; + homepage = "https://github.com/moxie0/knockknock"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index a191ea300470..e68980cc9659 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.130"; + version = "1.0.131"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NZqIqqDusfWMDLVtcdFAVOuIGMxr+I2xnNB3ckBI/cY="; + sha256 = "sha256-DcReo4pTdI8ssWH1IqD8gDUm4jQ0jBBJ+ltxSpdkxQE="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-cOxjsujlpRbdw4098eMHe2oNAJXWGjKbPeYpKt0DCp8="; + vendorSha256 = "sha256-SxJnYJyKFed1c+zgeeXQQhsKHlaDevJGMwqA5gPef3s="; ldflags = [ "-s" diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 0c6318dc4353..d1e114e32450 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.13" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.14" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index a080cfa68df9..27690111611c 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 643afb56f7f86a858e3da144fd367575a2f0b2c6 - ref: refs/tags/6.1.13 + revision: 2c47df62b425e4083f4816d71405fed1c0e8b35b + ref: refs/tags/6.1.14 specs: - metasploit-framework (6.1.13) + metasploit-framework (6.1.14) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,13 +128,13 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.525.0) - aws-sdk-core (3.122.0) + aws-partitions (1.528.0) + aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.277.0) + aws-sdk-ec2 (1.279.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.63.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index c3cf57bc2ae8..674418693c75 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.13"; + version = "6.1.14"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ncmLizpX1yEtr8biUoWVVK4Ziv3QMiKWsj694yubA1M="; + sha256 = "sha256-ySQOc/k+kvdSj5g88ujm4e2apvPVbiaspzSbCdEQ4ZA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 411be2a11277..7c1947ddb4d9 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "181a2xf9zs0hz77jkpmxidvkjzs65vsyqv1a31fcali7f0kvh4h9"; + sha256 = "1awcpdvfk6dlb9n5wiksq8vhqwdpmkybv4ga8drmlx6x9li3my5k"; type = "gem"; }; - version = "1.525.0"; + version = "1.528.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krx8cfajc72gv6mpyb67vnhd2m2iya19846jgipgfris194gjm2"; + sha256 = "07cdd2jiydn663xgqv5fykd9zfiv96ma3j4k2khwf06czy40cvwq"; type = "gem"; }; - version = "3.122.0"; + version = "3.122.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qy318swkl3393gl5031n634z8msb7rghhp7zdnawvs39c0fbmxd"; + sha256 = "1cvf70lj99r59wn35pqxg5c6c2qkgnir0b8fqgi8h757xz6b9m72"; type = "gem"; }; - version = "1.277.0"; + version = "1.279.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "643afb56f7f86a858e3da144fd367575a2f0b2c6"; - sha256 = "0lq3kcmy7g9ynab24cnhzn51kbjljn2m5qn6mwnj3msp7a5qpjcx"; + rev = "2c47df62b425e4083f4816d71405fed1c0e8b35b"; + sha256 = "1471238hk6rllyn2cvnmyfk9mvg1wvlg4g4qix9gg4iyz5rhw969"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.13"; + version = "6.1.14"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix index 6787d68991d3..3562d40bc3e3 100644 --- a/pkgs/tools/text/cmigemo/default.nix +++ b/pkgs/tools/text/cmigemo/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, gzip, libiconv, nkf, perl, skk-dicts, which }: +{ lib, stdenv, fetchFromGitHub, fetchurl, buildPackages +, gzip, libiconv, nkf, perl, which +, skk-dicts +}: stdenv.mkDerivation { pname = "cmigemo"; @@ -21,7 +24,11 @@ stdenv.mkDerivation { makeFlags = [ "INSTALL=install" ]; - buildPhase = if stdenv.isDarwin then "make osx-all" else "make gcc-all"; + preBuild = '' + makeFlagsArray+=(FILTER_UTF8="${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv -t utf-8 -f cp932") + ''; + + buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ]; installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ]; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index c53f521fddc4..4c45e5dbeea9 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "--without-cpprest" "--with-boost-libdir=${boost.out}/lib" "CPPFLAGS=-I${nlohmann_json}/include/nlohmann/" + "LDFLAGS=-llucene++" ]; preFixup = '' diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 0e2c8b824f5e..92fde60c23c0 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: +{ lib, stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "basex"; - version = "9.4.3"; + version = "9.6.3"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-IZhRg2JcYQXQKU/lYZpLLcsSdjZZO+toY5yvk+RKUCY="; + hash = "sha256-OlIAyGUQKrl+Zu79p6cahHpx59zLozGkUDAEvykGN6Y="; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip copyDesktopItems ]; buildInputs = [ jre ]; - desktopItem = makeDesktopItem { + desktopItems = lib.optional (!stdenv.isDarwin) (makeDesktopItem { name = "basex"; exec = "basexgui %f"; icon = "${./basex.svg}"; # icon copied from Ubuntu basex package @@ -21,22 +21,21 @@ stdenv.mkDerivation rec { genericName = "XML database tool"; categories = "Development;Utility;Database"; mimeType = "text/xml"; - }; + }); dontBuild = true; installPhase = '' + runHook preInstall + # Remove Windows batch files (unclutter $out/bin) rm ./bin/*.bat - mkdir -p "$out/share/basex" "$out/share/applications" + mkdir -p "$out/share/basex" cp -R bin etc lib webapp src BaseX.jar "$out" cp -R readme.txt webapp "$out/share/basex" - # Install desktop file - cp "$desktopItem"/share/applications/* "$out/share/applications/" - # Use substitutions instead of wrapper scripts for file in "$out"/bin/*; do sed -i -e "s|/usr/bin/env bash|${stdenv.shell}|" \ @@ -47,6 +46,8 @@ stdenv.mkDerivation rec { -e "s|echo|${coreutils}/bin/echo|" \ "$file" done + + runHook postInstall ''; meta = with lib; { @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://basex.org/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 48d1c21445fd..62efca5b8d00 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -202,6 +202,8 @@ mapAliases ({ dnnl = oneDNN; # added 2020-04-22 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25 + dolphinEmu = dolphin-emu; # added 2021-11-10 + dolphinEmuMaster = dolphin-emu-beta; # added 2021-11-10 dotnet-netcore = dotnet-runtime; # added 2021-10-07 double_conversion = double-conversion; # 2017-11-22 docker_compose = docker-compose; # 2018-11-10 @@ -472,6 +474,7 @@ mapAliases ({ linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_14 = linuxKernel.packages.linux_5_14; + linuxPackages_5_15 = linuxKernel.packages.linux_5_15; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -488,6 +491,7 @@ mapAliases ({ linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; linux_5_14 = linuxKernel.kernels.linux_5_14; + linux_5_15 = linuxKernel.kernels.linux_5_15; # added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e86df5030d7d..d2241133672a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -984,6 +984,8 @@ with pkgs; tnat64 = callPackage ../tools/networking/tnat64 { }; + topicctl = callPackage ../tools/misc/topicctl { }; + veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; @@ -4578,8 +4580,8 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; - dolphinEmuMaster = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { + dolphin-emu = callPackage ../misc/emulators/dolphin-emu { }; + dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -9471,7 +9473,9 @@ with pkgs; snallygaster = callPackage ../tools/security/snallygaster { }; - snapcast = callPackage ../applications/audio/snapcast { }; + snapcast = callPackage ../applications/audio/snapcast { + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + }; snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { }; @@ -10676,7 +10680,10 @@ with pkgs; inherit (chickenPackages_4) eggDerivation fetchegg; }; - unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; }; + unar = callPackage ../tools/archivers/unar { + inherit (darwin.apple_sdk.frameworks) Foundation AppKit; + stdenv = clangStdenv; + }; unp = callPackage ../tools/archivers/unp { }; @@ -19619,13 +19626,13 @@ with pkgs; sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec { name = "sqlite-${version}"; version = "3.27.2+replication3"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "CanonicalLtd"; repo = "sqlite"; rev = "version-${version}"; sha256 = "1aw1naa5y25ial251f74h039pgcz92p4b3994jvfzqpjlz06qwvw"; }; - nativeBuildInputs = [ pkgs.tcl ]; + nativeBuildInputs = [ tcl ]; configureFlags = oldAttrs.configureFlags ++ [ "--enable-replication" "--disable-amalgamation" @@ -20236,9 +20243,7 @@ with pkgs; lucene = callPackage ../development/libraries/java/lucene { }; - lucenepp = callPackage ../development/libraries/lucene++ { - boost = boost155; - }; + lucenepp = callPackage ../development/libraries/lucene++ { }; mockobjects = callPackage ../development/libraries/java/mockobjects { }; @@ -20421,7 +20426,7 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; - apacheHttpd = pkgs.apacheHttpd_2_4; + apacheHttpd = apacheHttpd_2_4; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; @@ -20459,7 +20464,7 @@ with pkgs; subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; }; - apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4); + apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor apacheHttpd_2_4 apacheHttpdPackages_2_4); apacheHttpdPackages = apacheHttpdPackages_2_4; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; @@ -20803,18 +20808,18 @@ with pkgs; mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; # Backwards compatibility. - mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; - mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; - mod_python = pkgs.apacheHttpdPackages.mod_python; - mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; - mod_ca = pkgs.apacheHttpdPackages.mod_ca; - mod_crl = pkgs.apacheHttpdPackages.mod_crl; - mod_csr = pkgs.apacheHttpdPackages.mod_csr; - mod_ocsp = pkgs.apacheHttpdPackages.mod_ocsp; - mod_scep = pkgs.apacheHttpdPackages.mod_scep; - mod_spkac = pkgs.apacheHttpdPackages.mod_spkac; - mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12; - mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp; + mod_dnssd = apacheHttpdPackages.mod_dnssd; + mod_fastcgi = apacheHttpdPackages.mod_fastcgi; + mod_python = apacheHttpdPackages.mod_python; + mod_wsgi = apacheHttpdPackages.mod_wsgi; + mod_ca = apacheHttpdPackages.mod_ca; + mod_crl = apacheHttpdPackages.mod_crl; + mod_csr = apacheHttpdPackages.mod_csr; + mod_ocsp = apacheHttpdPackages.mod_ocsp; + mod_scep = apacheHttpdPackages.mod_scep; + mod_spkac = apacheHttpdPackages.mod_spkac; + mod_pkcs12 = apacheHttpdPackages.mod_pkcs12; + mod_timestamp = apacheHttpdPackages.mod_timestamp; inherit (callPackages ../servers/mpd { stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; @@ -21218,7 +21223,7 @@ with pkgs; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; - postgresql13Packages = pkgs.postgresqlPackages; + postgresql13Packages = postgresqlPackages; postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -21374,7 +21379,7 @@ with pkgs; enableMDNS = true; enableDomainController = true; enableRegedit = true; - enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64; + enableCephFS = !stdenv.hostPlatform.isAarch64; }); sambaFull = samba4Full; @@ -21815,7 +21820,7 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; ffado = libsForQt5.callPackage ../os-specific/linux/ffado { - inherit (pkgs.linuxPackages) kernel; + inherit (linuxPackages) kernel; }; libffado = ffado; @@ -22027,11 +22032,11 @@ with pkgs; # This serves as a test for linuxPackages_custom linuxPackages_custom_tinyconfig_kernel = let - base = pkgs.linuxPackages.kernel; + base = linuxPackages.kernel; tinyLinuxPackages = linuxKernel.customPackage { inherit (base) version src; allowImportFromDerivation = false; - configfile = pkgs.linuxConfig { + configfile = linuxConfig { makeTarget = "tinyconfig"; src = base.src; }; @@ -22525,7 +22530,7 @@ with pkgs; sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; - }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor + }; # sysdig is a client, for a driver look at linuxPackagesFor sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; @@ -22788,6 +22793,10 @@ with pkgs; anarchism = callPackage ../data/documentation/anarchism { }; + ananicy = callPackage ../misc/ananicy { }; + + ananicy-cpp = callPackage ../misc/ananicy-cpp { }; + andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -24411,7 +24420,7 @@ with pkgs; djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; djview = libsForQt5.callPackage ../applications/graphics/djview { }; - djview4 = pkgs.djview; + djview4 = djview; dmenu = callPackage ../applications/misc/dmenu { }; dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { }; @@ -25052,7 +25061,7 @@ with pkgs; filezilla = callPackage ../applications/networking/ftp/filezilla { }; firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { - callPackage = pkgs.newScope { + callPackage = newScope { inherit (rustPackages) cargo rustc; libpng = libpng_apng; gnused = gnused_422; @@ -26335,6 +26344,8 @@ with pkgs; lighthouse = callPackage ../applications/misc/lighthouse { }; + lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { }; + lighttable = callPackage ../applications/editors/lighttable {}; libdsk = callPackage ../misc/emulators/libdsk { }; @@ -26541,7 +26552,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - mercurialFull = appendToName "full" (pkgs.mercurial.override { fullBuild = true; }); + mercurialFull = appendToName "full" (mercurial.override { fullBuild = true; }); merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; @@ -28158,7 +28169,7 @@ with pkgs; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) subversion_1_10 subversion; - subversionClient = appendToName "client" (pkgs.subversion.override { + subversionClient = appendToName "client" (subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; @@ -28343,7 +28354,7 @@ with pkgs; thonny = callPackage ../applications/editors/thonny { }; thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { - callPackage = pkgs.newScope { + callPackage = newScope { inherit (rustPackages) cargo rustc; libpng = libpng_apng; gnused = gnused_422; @@ -28657,7 +28668,7 @@ with pkgs; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { - gtk = pkgs.gtk3; + gtk = gtk3; }; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; @@ -29477,13 +29488,17 @@ with pkgs; balanceofsatoshis = nodePackages.balanceofsatoshis; bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { + boost = boost17x; miniupnpc = miniupnpc_2; withGui = true; + inherit (darwin) autoSignDarwinBinariesHook; }; bitcoind = callPackage ../applications/blockchains/bitcoin { + boost = boost17x; miniupnpc = miniupnpc_2; withGui = false; + inherit (darwin) autoSignDarwinBinariesHook; }; bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; }; @@ -29811,9 +29826,9 @@ with pkgs; chocolateDoom = callPackage ../games/chocolate-doom { }; - clonehero-unwrapped = pkgs.callPackage ../games/clonehero { }; + clonehero-unwrapped = callPackage ../games/clonehero { }; - clonehero = pkgs.callPackage ../games/clonehero/fhs-wrapper.nix { }; + clonehero = callPackage ../games/clonehero/fhs-wrapper.nix { }; crispyDoom = callPackage ../games/crispy-doom { }; @@ -30790,7 +30805,7 @@ with pkgs; inherit (cinnamon) mint-x-icons mint-y-icons; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { - callPackage = newScope pkgs.enlightenment; + callPackage = newScope enlightenment; }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); @@ -30847,7 +30862,7 @@ with pkgs; }; arcan = recurseIntoAttrs (callPackage ../desktops/arcan { - callPackage = newScope pkgs.arcan; + callPackage = newScope arcan; }); xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); @@ -32382,8 +32397,8 @@ with pkgs; nixos = configuration: let - c = import (pkgs.path + "/nixos/lib/eval-config.nix") { - inherit (pkgs.stdenv.hostPlatform) system; + c = import (path + "/nixos/lib/eval-config.nix") { + inherit (stdenv.hostPlatform) system; modules = [( { lib, ... }: { @@ -32433,7 +32448,7 @@ with pkgs; */ nixosTesting = (import ../../nixos/lib/testing-python.nix { - inherit (pkgs.stdenv.hostPlatform) system; + inherit (stdenv.hostPlatform) system; inherit pkgs; extraConfigurations = [( { lib, ... }: { @@ -32447,7 +32462,7 @@ with pkgs; loadedTest = if builtins.typeOf test == "path" then import test else test; - calledTest = if pkgs.lib.isFunction loadedTest + calledTest = if lib.isFunction loadedTest then callPackage loadedTest {} else loadedTest; in @@ -32691,7 +32706,7 @@ with pkgs; redprl = callPackage ../applications/science/logic/redprl { }; - renderizer = pkgs.callPackage ../development/tools/renderizer {}; + renderizer = callPackage ../development/tools/renderizer {}; retroarchBare = callPackage ../misc/emulators/retroarch { inherit (darwin) libobjc; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 1ca8621b7114..f0fcef733837 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -6,7 +6,6 @@ , fetchFromGitHub , fetchNuGet , glib -, pkg-config , mono , overrides ? {} }: diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index 5d45b0c5eca9..6c8c5ff7cc70 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -48,22 +48,41 @@ lib.makeScope newScope (self: pixie = callPackage ../development/nim-packages/pixie { }; + python = callPackage ../development/nim-packages/python { }; + redis = callPackage ../development/nim-packages/redis { }; redpool = callPackage ../development/nim-packages/redpool { }; regex = callPackage ../development/nim-packages/regex { }; + rocksdb = callPackage ../development/nim-packages/rocksdb { + inherit (pkgs) rocksdb; + }; + sass = callPackage ../development/nim-packages/sass { }; sdl2 = callPackage ../development/nim-packages/sdl2 { }; segmentation = callPackage ../development/nim-packages/segmentation { }; + snappy = + callPackage ../development/nim-packages/snappy { inherit (pkgs) snappy; }; + + spry = callPackage ../development/nim-packages/spry { }; + + spryvm = callPackage ../development/nim-packages/spryvm { }; + + stew = callPackage ../development/nim-packages/stew { }; + supersnappy = callPackage ../development/nim-packages/supersnappy { }; + tempfile = callPackage ../development/nim-packages/tempfile { }; + typography = callPackage ../development/nim-packages/typography { }; + ui = callPackage ../development/nim-packages/ui { inherit (pkgs) libui; }; + unicodedb = callPackage ../development/nim-packages/unicodedb { }; unicodeplus = callPackage ../development/nim-packages/unicodeplus { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 38604bf4ac42..b40caccc4978 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3501,10 +3501,10 @@ let CompressRawBzip2 = buildPerlPackage { pname = "Compress-Raw-Bzip2"; - version = "2.096"; + version = "2.101"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.096.tar.gz"; - sha256 = "1glcjnbqksaviwyrprh9i4dybsb12kzfy0bx932l0xya9riyfr55"; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.101.tar.gz"; + sha256 = "1n5q01akpsw1skn59c3nivwjfqcn00wzdj8gx4q0wac8sd7i76qc"; }; # Don't build a private copy of bzip2. @@ -3540,11 +3540,11 @@ let CompressRawZlib = buildPerlPackage { pname = "Compress-Raw-Zlib"; - version = "2.096"; + version = "2.101"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.096.tar.gz"; - sha256 = "04jrqvqsa2c655idw7skv5rhb9vx9997h4n9if5p99srq4hblk6d"; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.101.tar.gz"; + sha256 = "1cmb39dw928jssa3fzk4pxb7sw8q1zyx3yikgq01nz17x0ara6wx"; }; preConfigure = '' @@ -10994,10 +10994,10 @@ let IOCompress = buildPerlPackage { pname = "IO-Compress"; - version = "2.096"; + version = "2.102"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.096.tar.gz"; - sha256 = "9d219fd5df4b490b5d2f847921e3cb1c3392758fa0bae9b05a8992b3620ba572"; + url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.102.tar.gz"; + sha256 = "193jvi4800cbcac5n1swj9zgwwqck9c47g0g592ldr7fbfd7zynn"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68039eac66fd..ee1258aa64a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4748,6 +4748,8 @@ in { milksnake = callPackage ../development/python-modules/milksnake { }; + mill-local = callPackage ../development/python-modules/mill-local { }; + millheater = callPackage ../development/python-modules/millheater { }; miniaudio = callPackage ../development/python-modules/miniaudio { }; @@ -6151,6 +6153,8 @@ in { pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; + pybalboa = callPackage ../development/python-modules/pybalboa { }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; pybids = callPackage ../development/python-modules/pybids { }; @@ -6570,6 +6574,8 @@ in { pylatexenc = callPackage ../development/python-modules/pylatexenc { }; + pylaunches = callPackage ../development/python-modules/pylaunches { }; + PyLD = callPackage ../development/python-modules/PyLD { }; pylev = callPackage ../development/python-modules/pylev { };