From 06371f3868489810f773a149f42f47f7b47f88cc Mon Sep 17 00:00:00 2001 From: Smitty Date: Fri, 26 Nov 2021 12:31:43 -0500 Subject: [PATCH 001/329] pngoptimizer: init at 2.7 --- pkgs/tools/graphics/pngoptimizer/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/graphics/pngoptimizer/default.nix diff --git a/pkgs/tools/graphics/pngoptimizer/default.nix b/pkgs/tools/graphics/pngoptimizer/default.nix new file mode 100644 index 000000000000..c75ba0fb1015 --- /dev/null +++ b/pkgs/tools/graphics/pngoptimizer/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, gtk3, pkg-config }: + +stdenv.mkDerivation rec { + pname = "pngoptimizer"; + version = "2.7"; + + src = fetchFromGitHub { + owner = "hadrien-psydk"; + repo = "pngoptimizer"; + rev = "v${version}"; + sha256 = "1hbgf91vzx46grslfdx86smdvm6gs6lq9hpa3bax9xfbsknxi0i7"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ]; + + makeFlags = [ "CONFIG=release" "DESTDIR=$(out)" ]; + + postInstall = '' + mv $out/usr/bin $out/bin + mv $out/usr/share $out/share + rmdir $out/usr + ''; + + meta = with lib; { + homepage = "https://psydk.org/pngoptimizer"; + description = "PNG optimizer and converter"; + # https://github.com/hadrien-psydk/pngoptimizer#license-information + license = with licenses; [ gpl2Only lgpl21Only zlib ]; + maintainers = with maintainers; [ smitop ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d87ecde6eec..87fa0dad3343 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8659,6 +8659,8 @@ with pkgs; pngnq = callPackage ../tools/graphics/pngnq { }; + pngoptimizer = callPackage ../tools/graphics/pngoptimizer { }; + pngtoico = callPackage ../tools/graphics/pngtoico { libpng = libpng12; }; From 0098ccb8f8251cc8b277eddfbd9c270b3adde52c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Feb 2022 21:45:15 +0000 Subject: [PATCH 002/329] rocm-device-libs: 4.5.2 -> 5.0.0 --- pkgs/development/libraries/rocm-device-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 13a326581117..d8e4715f7410 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "4.5.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-UeunsDRLhmsDOzesiEgYIzYotwecehB6VswshzdRwjw="; + hash = "sha256-CEpI0vX5kUbSmpe/ZTCFnfDuy6i9D+UsCZiX4/U0X8g="; }; nativeBuildInputs = [ cmake ]; From 805bf551c22b106373e03cf5b121b7b35f5a93f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Feb 2022 01:46:30 +0000 Subject: [PATCH 003/329] vcluster: 0.5.3 -> 0.6.0 --- pkgs/applications/networking/cluster/vcluster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index b41e443ba327..7f1476d7fbf8 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+rLDRVfB6wZ1wYoLE2wwRxzS6GmI6KYtOKdXZd+LnnU="; + sha256 = "sha256-kY12bsZyDb36KE2dWx6RVYlKTbJh+XFQcBpFXoCLgEM="; }; vendorSha256 = null; From 39bbf55f4f8314f3003414a94c152b3c5afbc2c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Feb 2022 19:56:44 +0000 Subject: [PATCH 004/329] rocminfo: 4.5.2 -> 5.0.1 --- pkgs/development/tools/rocminfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 2734cfa09317..60ca0a51d265 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -7,13 +7,13 @@ # compilers to determine the desired target. , defaultTargets ? []}: stdenv.mkDerivation rec { - version = "4.5.2"; + version = "5.0.1"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; rev = "rocm-${version}"; - sha256 = "sha256-VIlHYiGLen4xmdP7kpmObj5wKy6Qq7iupJFtPa4Zd98="; + sha256 = "sha256-H9JdrDS/pbvYMKkayu/1rrXusHeXBH1CO9jYArsbCNI="; }; enableParallelBuilding = true; From fce058c80e63d5f5be712717ee245426a5fa7d84 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 14 Feb 2022 21:24:23 +0000 Subject: [PATCH 005/329] guile_3_0: 3.0.7 -> 3.0.8 While at it added trivial updater script. Changes: https://git.savannah.gnu.org/cgit/guile.git/tree/NEWS?h=v3.0.8#n8 Had to disable LTO on darwin as toolchain can't link executables there. --- pkgs/development/interpreters/guile/3.0.nix | 24 ++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 76aa0c4404fc..67c0e2b20649 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -14,6 +14,7 @@ , pkg-config , pkgsBuildBuild , readline +, writeScript }: let @@ -24,11 +25,11 @@ let in builder rec { pname = "guile"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9X2GxwYgJxv863qb4MgXRKAz8IrcfOuoMsmRerPmkbc="; + sha256 = "sha256-2qcGClbygE6bdMjX5/6L7tErQ6qyeJo4WFGD/MF7ihM="; }; outputs = [ "out" "dev" "info" ]; @@ -102,7 +103,10 @@ builder rec { ] # Disable JIT on Apple Silicon, as it is not yet supported # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44505"; - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no"; + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no" + # At least on x86_64-darwin '-flto' autodetection is not correct: + # https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028 + ++ lib.optional (stdenv.isDarwin) "--disable-lto"; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -126,6 +130,20 @@ builder rec { setupHook = ./setup-hook-3.0.sh; + passthru = { + updateScript = writeScript "update-guile-3" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of '"https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz"' + new_version="$(curl -s https://www.gnu.org/software/guile/download/ | + pcregrep -o1 '"https://ftp.gnu.org/gnu/guile/guile-(3[.0-9]+).tar.gz"')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { homepage = "https://www.gnu.org/software/guile/"; description = "Embeddable Scheme implementation"; From 4e9cfefb8a495b1dc8ab7793731aef2b5048efa0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 15 Feb 2022 08:00:16 +0000 Subject: [PATCH 006/329] pkgsLLVM.guile, pkgsLLVM.guile_3_0: avoid -lgcc_s on clang, not just darwin Otherwise pkgsLLVM.guile / pkgsLLVM.guile_3_0 fails early on linux. --- pkgs/development/interpreters/guile/2.2.nix | 4 ++-- pkgs/development/interpreters/guile/3.0.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 19ef0e608485..04c60e80e8fc 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -83,9 +83,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 67c0e2b20649..99f3f84829c7 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -82,9 +82,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" From c13e6e30d729ff4b70b8445458ec72fc5ab79b13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 11:53:37 +0000 Subject: [PATCH 007/329] rocm-runtime: 4.5.2 -> 5.0.1 --- pkgs/development/libraries/rocm-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 54ecd4f59b8d..aff0475c4a53 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "4.5.2"; + version = "5.0.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-DJDlEHnXhegcenO8BIY/8GnZdHldVs0GFLrQy4Z6heY="; + hash = "sha256-KOzVZNHtpwEOn7lZ36c4BGrImrq8dkUWRiHqGm+UTDk="; }; sourceRoot = "source/src"; From 4ba9b2d1987f8fddc4690072be631882d365b339 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 22 Feb 2022 21:02:08 -0300 Subject: [PATCH 008/329] lean: 3.39.2 -> 3.40.0 --- pkgs/applications/science/logic/lean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 22e755bd852e..315090d1b569 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.39.2"; + version = "3.40.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "402f41cdedbd46a368fb7807bebe83550d887631"; - sha256 = "0jddakr07ixspw19xblpj1882vxxaljg3fflhn4myvigwzkav334"; + rev = "82216a493580a309a04b02c2b6eb5f82f0aef192"; + sha256 = "0cdk124riz8g43n54yx4qyjn7n6qxj5zgn9r4znqs7iyb3djs286"; }; nativeBuildInputs = [ cmake ]; From 8071235c3debd37714416e74e7e534e455232fc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 09:42:51 +0000 Subject: [PATCH 009/329] juju: 2.9.11 -> 2.9.25 --- pkgs/applications/networking/juju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index 1adb61b89347..6810dbe679fb 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.11"; + version = "2.9.25"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-KcvlnEfDzwhFzwaWLYuRGa8nh6MkjqZ+u+qJSJZl13U="; + sha256 = "sha256-h4w12dmGEviV2N0BWXQKt1eUVxdbgwRKLQghnd6bLFI="; }; - vendorSha256 = "sha256-0KGeMJDv1BdqM1/uMk+mKpK+Nejz9PiCAfRy96pu3OQ="; + vendorSha256 = "sha256-AATK4tDg2eW8Bt8gU88tIk6I+qp5ZeUtXzD74/59c7w="; # Disable tests because it attempts to use a mongodb instance doCheck = false; From 5cee9c9ef2f6b640c7dd48d7f68e87e2d24478c1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 28 Feb 2022 16:49:30 +0100 Subject: [PATCH 010/329] prometheus-dmarc-exporter: init at 0.5.1 --- .../monitoring/prometheus/exporters.nix | 1 + .../monitoring/prometheus/exporters/dmarc.nix | 117 ++++ .../prometheus/dmarc-exporter/default.nix | 48 ++ .../dmarc-exporter/poetry-git-overlay.nix | 14 + .../prometheus/dmarc-exporter/poetry.lock | 503 ++++++++++++++++++ .../prometheus/dmarc-exporter/pyproject.toml | 14 + .../prometheus/dmarc-exporter/update | 5 + pkgs/top-level/all-packages.nix | 1 + 8 files changed, 703 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix create mode 100644 pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix create mode 100644 pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix create mode 100644 pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock create mode 100644 pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml create mode 100755 pkgs/servers/monitoring/prometheus/dmarc-exporter/update diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index d29d50706ef6..76912ae3778d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -29,6 +29,7 @@ let "blackbox" "buildkite-agent" "collectd" + "dmarc" "dnsmasq" "domain" "dovecot" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix b/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix new file mode 100644 index 000000000000..330610a15d9e --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix @@ -0,0 +1,117 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.dmarc; + + json = builtins.toJSON { + inherit (cfg) folders port; + listen_addr = cfg.listenAddress; + storage_path = "$STATE_DIRECTORY"; + imap = (builtins.removeAttrs cfg.imap [ "passwordFile" ]) // { password = "$IMAP_PASSWORD"; use_ssl = true; }; + poll_interval_seconds = cfg.pollIntervalSeconds; + deduplication_max_seconds = cfg.deduplicationMaxSeconds; + logging = { + version = 1; + disable_existing_loggers = false; + }; + }; +in { + port = 9797; + extraOpts = { + imap = { + host = mkOption { + type = types.str; + default = "localhost"; + description = '' + Hostname of IMAP server to connect to. + ''; + }; + port = mkOption { + type = types.port; + default = 993; + description = '' + Port of the IMAP server to connect to. + ''; + }; + username = mkOption { + type = types.str; + example = "postmaster@example.org"; + description = '' + Login username for the IMAP connection. + ''; + }; + passwordFile = mkOption { + type = types.str; + example = "/run/secrets/dovecot_pw"; + description = '' + File containing the login password for the IMAP connection. + ''; + }; + }; + folders = { + inbox = mkOption { + type = types.str; + default = "INBOX"; + description = '' + IMAP mailbox that is checked for incoming DMARC aggregate reports + ''; + }; + done = mkOption { + type = types.str; + default = "Archive"; + description = '' + IMAP mailbox that successfully processed reports are moved to. + ''; + }; + error = mkOption { + type = types.str; + default = "Invalid"; + description = '' + IMAP mailbox that emails are moved to that could not be processed. + ''; + }; + }; + pollIntervalSeconds = mkOption { + type = types.ints.unsigned; + default = 60; + description = '' + How often to poll the IMAP server in seconds. + ''; + }; + deduplicationMaxSeconds = mkOption { + type = types.ints.unsigned; + default = 604800; + defaultText = "7 days (in seconds)"; + description = '' + How long individual report IDs will be remembered to avoid + counting double delivered reports twice. + ''; + }; + debug = mkOption { + type = types.bool; + default = false; + description = '' + Whether to declare enable --debug. + ''; + }; + }; + serviceOpts = { + path = with pkgs; [ envsubst coreutils ]; + serviceConfig = { + StateDirectory = "prometheus-dmarc-exporter"; + WorkingDirectory = "/var/lib/prometheus-dmarc-exporter"; + ExecStart = "${pkgs.writeShellScript "setup-cfg" '' + export IMAP_PASSWORD="$(<${cfg.imap.passwordFile})" + envsubst \ + -i ${pkgs.writeText "dmarc-exporter.json.template" json} \ + -o ''${STATE_DIRECTORY}/dmarc-exporter.json + + exec ${pkgs.prometheus-dmarc-exporter}/bin/prometheus-dmarc-exporter \ + --configuration /var/lib/prometheus-dmarc-exporter/dmarc-exporter.json \ + ${optionalString cfg.debug "--debug"} + ''}"; + }; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix new file mode 100644 index 000000000000..ebd567557b11 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix @@ -0,0 +1,48 @@ +{ poetry2nix, pkgs, lib }: + +let + inherit (poetry2nix.mkPoetryPackages { + projectDir = ./.; + overrides = [ + poetry2nix.defaultPoetryOverrides + (import ./poetry-git-overlay.nix { inherit pkgs; }) + (self: super: { + more-properties = super.more-properties.overridePythonAttrs (old: { + src = pkgs.fetchFromGitHub { + owner = "madman-bob"; + repo = "python-more-properties"; + rev = old.version; + sha256 = "sha256-dKG97rw5IG19m7u3ZDBM2yGScL5cFaKBvGZxPVJaUTE="; + }; + postPatch = '' + sed -i -e '/dataclasses/d' requirements.txt + cp ./pypi_upload/setup.py setup.py + substituteInPlace setup.py \ + --replace "parents[1]" "parents[0]" + ''; + }); + dataclasses-serialization = super.dataclasses-serialization.overridePythonAttrs (old: { + src = pkgs.fetchFromGitHub { + owner = "madman-bob"; + repo = "python-dataclasses-serialization"; + rev = old.version; + sha256 = "sha256-jLMR2D01KgzHHRP0zduMBJt8xgBmIquWLCjZYLo2/AA="; + }; + postPatch = '' + sed -i -e '/dataclasses/d' requirements.txt + cp ./pypi_upload/setup.py setup.py + substituteInPlace setup.py \ + --replace "parents[1]" "parents[0]" + ''; + }); + dataclasses = null; + }) + ]; + }) python; + env = python.withPackages (p: [ p.dmarc-metrics-exporter ]); +in + +pkgs.writeShellScriptBin "prometheus-dmarc-exporter" '' + export PYTHONPATH="${env}/lib/${env.libPrefix}/site-packages''${PYTHONPATH:+:}''${PYTHONPATH}" + exec ${env}/bin/python3 -m dmarc_metrics_exporter "$@" +'' diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix new file mode 100644 index 000000000000..cb8d7170a190 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix @@ -0,0 +1,14 @@ +{ pkgs }: +self: super: { + + dmarc-metrics-exporter = super.dmarc-metrics-exporter.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/jgosmann/dmarc-metrics-exporter.git"; + rev = "3f1a0161d7ed51b9de48c056dcbc545b6375e872"; + sha256 = "18sndv32ig0xq7s42hvkdxbb9qxvycmnrawm3x22cp7zfidgfkh2"; + }; + } + ); + +} diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock new file mode 100644 index 000000000000..80b99127b0c8 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock @@ -0,0 +1,503 @@ +[[package]] +name = "asgiref" +version = "3.5.0" +description = "ASGI specs, helper code, and adapters" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] + +[[package]] +name = "bite-parser" +version = "0.1.1" +description = "Asynchronous parser taking incremental bites out of your byte input stream." +category = "main" +optional = false +python-versions = ">=3.7,<=3.10" + +[[package]] +name = "click" +version = "8.0.4" +description = "Composable command line interface toolkit" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + +[[package]] +name = "colorama" +version = "0.4.4" +description = "Cross-platform colored terminal text." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "dataclasses" +version = "0.6" +description = "A backport of the dataclasses module for Python 3.6" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "dataclasses-serialization" +version = "1.3.1" +description = "Serialize/deserialize Python dataclasses to various other data formats" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +dataclasses = "*" +more-properties = ">=1.1.0" +toolz = "*" +toposort = "*" +typing-inspect = "*" + +[[package]] +name = "dmarc-metrics-exporter" +version = "0.5.1" +description = "Export Prometheus metrics from DMARC reports." +category = "main" +optional = false +python-versions = "^3.7,<3.10" +develop = false + +[package.dependencies] +bite-parser = "^0.1.1" +dataclasses-serialization = "^1.3.1" +prometheus_client = "^0.11.0" +typing-extensions = "^4.0.1" +uvicorn = {version = "^0.15.0", extras = ["standard"]} +xsdata = "^21.9" + +[package.source] +type = "git" +url = "https://github.com/jgosmann/dmarc-metrics-exporter.git" +reference = "v0.5.1" +resolved_reference = "3f1a0161d7ed51b9de48c056dcbc545b6375e872" + +[[package]] +name = "h11" +version = "0.13.0" +description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + +[[package]] +name = "httptools" +version = "0.2.0" +description = "A collection of framework independent HTTP protocol utils." +category = "main" +optional = false +python-versions = "*" + +[package.extras] +test = ["Cython (==0.29.22)"] + +[[package]] +name = "importlib-metadata" +version = "4.11.1" +description = "Read metadata from Python packages" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} +zipp = ">=0.5" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +perf = ["ipython"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "importlib-resources (>=1.3)"] + +[[package]] +name = "more-properties" +version = "1.1.1" +description = "A collection of property variants" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +dataclasses = "*" + +[[package]] +name = "mypy-extensions" +version = "0.4.3" +description = "Experimental type system extensions for programs checked with the mypy typechecker." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "prometheus-client" +version = "0.11.0" +description = "Python client for the Prometheus monitoring system." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.extras] +twisted = ["twisted"] + +[[package]] +name = "python-dotenv" +version = "0.19.2" +description = "Read key-value pairs from a .env file and set them as environment variables" +category = "main" +optional = false +python-versions = ">=3.5" + +[package.extras] +cli = ["click (>=5.0)"] + +[[package]] +name = "pyyaml" +version = "6.0" +description = "YAML parser and emitter for Python" +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "toolz" +version = "0.11.2" +description = "List processing tools and functional utilities" +category = "main" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "toposort" +version = "1.7" +description = "\"Implements a topological sort algorithm.\"" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "typing-extensions" +version = "4.1.1" +description = "Backported and Experimental Type Hints for Python 3.6+" +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "typing-inspect" +version = "0.7.1" +description = "Runtime inspection utilities for typing module." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +mypy-extensions = ">=0.3.0" +typing-extensions = ">=3.7.4" + +[[package]] +name = "uvicorn" +version = "0.15.0" +description = "The lightning-fast ASGI server." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +asgiref = ">=3.4.0" +click = ">=7.0" +colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} +h11 = ">=0.8" +httptools = {version = ">=0.2.0,<0.3.0", optional = true, markers = "extra == \"standard\""} +python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} +PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} +websockets = {version = ">=9.1", optional = true, markers = "extra == \"standard\""} + +[package.extras] +standard = ["websockets (>=9.1)", "httptools (>=0.2.0,<0.3.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] + +[[package]] +name = "uvloop" +version = "0.16.0" +description = "Fast implementation of asyncio event loop on top of libuv" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +dev = ["Cython (>=0.29.24,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] +docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)"] +test = ["aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] + +[[package]] +name = "watchgod" +version = "0.7" +description = "Simple, modern file watching and code reload in python." +category = "main" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "websockets" +version = "10.2" +description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" +category = "main" +optional = false +python-versions = ">=3.7" + +[[package]] +name = "xsdata" +version = "21.12" +description = "Python XML Binding" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +cli = ["click (>=5.0)", "click-default-group (>=1.2)", "docformatter", "jinja2 (>=2.10)", "toposort (>=1.5)"] +docs = ["furo", "sphinx", "sphinx-autobuild", "sphinx-autodoc-typehints", "sphinx-copybutton", "sphinx-inline-tabs"] +lxml = ["lxml (>=4.4.1)"] +soap = ["requests"] +test = ["codecov", "pre-commit", "pytest", "pytest-benchmark", "pytest-cov", "tox"] + +[[package]] +name = "zipp" +version = "3.7.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] + +[metadata] +lock-version = "1.1" +python-versions = "^3.7,<3.10" +content-hash = "60bf34673c42fc90f369a810cb542b1b03c8e52cd019e7a9e86650de19544d01" + +[metadata.files] +asgiref = [ + {file = "asgiref-3.5.0-py3-none-any.whl", hash = "sha256:88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9"}, + {file = "asgiref-3.5.0.tar.gz", hash = "sha256:2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0"}, +] +bite-parser = [ + {file = "bite-parser-0.1.1.tar.gz", hash = "sha256:8021100bfbd6cc6056605361e763a3591efdea38014b3d8aa76c74c74de4ead4"}, + {file = "bite_parser-0.1.1-py3-none-any.whl", hash = "sha256:96803e7d63112e81544c9747fbd50cca61097dcf5973ae6cc710f3a96646600a"}, +] +click = [ + {file = "click-8.0.4-py3-none-any.whl", hash = "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1"}, + {file = "click-8.0.4.tar.gz", hash = "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"}, +] +colorama = [ + {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, + {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, +] +dataclasses = [ + {file = "dataclasses-0.6-py3-none-any.whl", hash = "sha256:454a69d788c7fda44efd71e259be79577822f5e3f53f029a22d08004e951dc9f"}, + {file = "dataclasses-0.6.tar.gz", hash = "sha256:6988bd2b895eef432d562370bb707d540f32f7360ab13da45340101bc2307d84"}, +] +dataclasses-serialization = [ + {file = "dataclasses_serialization-1.3.1-py3-none-any.whl", hash = "sha256:34294b1a68944c8d8ac00d2a53aecb8499301401aec6d024ba829ac3931e3b2a"}, + {file = "dataclasses_serialization-1.3.1.tar.gz", hash = "sha256:7f9cf6b11e0650ab89691b1a0050dcce3aef4d389dd4540a53316c4151485921"}, +] +dmarc-metrics-exporter = [] +h11 = [ + {file = "h11-0.13.0-py3-none-any.whl", hash = "sha256:8ddd78563b633ca55346c8cd41ec0af27d3c79931828beffb46ce70a379e7442"}, + {file = "h11-0.13.0.tar.gz", hash = "sha256:70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06"}, +] +httptools = [ + {file = "httptools-0.2.0-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:79dbc21f3612a78b28384e989b21872e2e3cf3968532601544696e4ed0007ce5"}, + {file = "httptools-0.2.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:78d03dd39b09c99ec917d50189e6743adbfd18c15d5944392d2eabda688bf149"}, + {file = "httptools-0.2.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:a23166e5ae2775709cf4f7ad4c2048755ebfb272767d244e1a96d55ac775cca7"}, + {file = "httptools-0.2.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:3ab1f390d8867f74b3b5ee2a7ecc9b8d7f53750bd45714bf1cb72a953d7dfa77"}, + {file = "httptools-0.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a7594f9a010cdf1e16a58b3bf26c9da39bbf663e3b8d46d39176999d71816658"}, + {file = "httptools-0.2.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:01b392a166adcc8bc2f526a939a8aabf89fe079243e1543fd0e7dc1b58d737cb"}, + {file = "httptools-0.2.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:80ffa04fe8c8dfacf6e4cef8277347d35b0442c581f5814f3b0cf41b65c43c6e"}, + {file = "httptools-0.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d5682eeb10cca0606c4a8286a3391d4c3c5a36f0c448e71b8bd05be4e1694bfb"}, + {file = "httptools-0.2.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:a289c27ccae399a70eacf32df9a44059ca2ba4ac444604b00a19a6c1f0809943"}, + {file = "httptools-0.2.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:813871f961edea6cb2fe312f2d9b27d12a51ba92545380126f80d0de1917ea15"}, + {file = "httptools-0.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:cc9be041e428c10f8b6ab358c6b393648f9457094e1dcc11b4906026d43cd380"}, + {file = "httptools-0.2.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:b08d00d889a118f68f37f3c43e359aab24ee29eb2e3fe96d64c6a2ba8b9d6557"}, + {file = "httptools-0.2.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fd3b8905e21431ad306eeaf56644a68fdd621bf8f3097eff54d0f6bdf7262065"}, + {file = "httptools-0.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:200fc1cdf733a9ff554c0bb97a4047785cfaad9875307d6087001db3eb2b417f"}, + {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, +] +importlib-metadata = [ + {file = "importlib_metadata-4.11.1-py3-none-any.whl", hash = "sha256:e0bc84ff355328a4adfc5240c4f211e0ab386f80aa640d1b11f0618a1d282094"}, + {file = "importlib_metadata-4.11.1.tar.gz", hash = "sha256:175f4ee440a0317f6e8d81b7f8d4869f93316170a65ad2b007d2929186c8052c"}, +] +more-properties = [ + {file = "more_properties-1.1.1-py3-none-any.whl", hash = "sha256:0992c49041cb2600e5ff4d8414bdf5761551f5404d00a4e553ced4f14d34b0bb"}, + {file = "more_properties-1.1.1.tar.gz", hash = "sha256:47b136857d89c72b53def0fade2f2e0a23a95071c3eb87d5a77cfc91554f106c"}, +] +mypy-extensions = [ + {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, + {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, +] +prometheus-client = [ + {file = "prometheus_client-0.11.0-py2.py3-none-any.whl", hash = "sha256:b014bc76815eb1399da8ce5fc84b7717a3e63652b0c0f8804092c9363acab1b2"}, + {file = "prometheus_client-0.11.0.tar.gz", hash = "sha256:3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86"}, +] +python-dotenv = [ + {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"}, + {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"}, +] +pyyaml = [ + {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, + {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, + {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, + {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, + {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, + {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, + {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, + {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, + {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, + {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, + {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, + {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, + {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, + {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, +] +toolz = [ + {file = "toolz-0.11.2-py3-none-any.whl", hash = "sha256:a5700ce83414c64514d82d60bcda8aabfde092d1c1a8663f9200c07fdcc6da8f"}, + {file = "toolz-0.11.2.tar.gz", hash = "sha256:6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33"}, +] +toposort = [ + {file = "toposort-1.7-py2.py3-none-any.whl", hash = "sha256:8ed8e109e96ae30bf66da2d2155e4eb9989d9c5c743c837e37d9774a4eddd804"}, + {file = "toposort-1.7.tar.gz", hash = "sha256:ddc2182c42912a440511bd7ff5d3e6a1cabc3accbc674a3258c8c41cbfbb2125"}, +] +typing-extensions = [ + {file = "typing_extensions-4.1.1-py3-none-any.whl", hash = "sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2"}, + {file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"}, +] +typing-inspect = [ + {file = "typing_inspect-0.7.1-py2-none-any.whl", hash = "sha256:b1f56c0783ef0f25fb064a01be6e5407e54cf4a4bf4f3ba3fe51e0bd6dcea9e5"}, + {file = "typing_inspect-0.7.1-py3-none-any.whl", hash = "sha256:3cd7d4563e997719a710a3bfe7ffb544c6b72069b6812a02e9b414a8fa3aaa6b"}, + {file = "typing_inspect-0.7.1.tar.gz", hash = "sha256:047d4097d9b17f46531bf6f014356111a1b6fb821a24fe7ac909853ca2a782aa"}, +] +uvicorn = [ + {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"}, + {file = "uvicorn-0.15.0.tar.gz", hash = "sha256:d9a3c0dd1ca86728d3e235182683b4cf94cd53a867c288eaeca80ee781b2caff"}, +] +uvloop = [ + {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6224f1401025b748ffecb7a6e2652b17768f30b1a6a3f7b44660e5b5b690b12d"}, + {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:30ba9dcbd0965f5c812b7c2112a1ddf60cf904c1c160f398e7eed3a6b82dcd9c"}, + {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bd53f7f5db562f37cd64a3af5012df8cac2c464c97e732ed556800129505bd64"}, + {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:772206116b9b57cd625c8a88f2413df2fcfd0b496eb188b82a43bed7af2c2ec9"}, + {file = "uvloop-0.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b572256409f194521a9895aef274cea88731d14732343da3ecdb175228881638"}, + {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04ff57aa137230d8cc968f03481176041ae789308b4d5079118331ab01112450"}, + {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a19828c4f15687675ea912cc28bbcb48e9bb907c801873bd1519b96b04fb805"}, + {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e814ac2c6f9daf4c36eb8e85266859f42174a4ff0d71b99405ed559257750382"}, + {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bd8f42ea1ea8f4e84d265769089964ddda95eb2bb38b5cbe26712b0616c3edee"}, + {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:647e481940379eebd314c00440314c81ea547aa636056f554d491e40503c8464"}, + {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0d26fa5875d43ddbb0d9d79a447d2ace4180d9e3239788208527c4784f7cab"}, + {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6ccd57ae8db17d677e9e06192e9c9ec4bd2066b77790f9aa7dede2cc4008ee8f"}, + {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:089b4834fd299d82d83a25e3335372f12117a7d38525217c2258e9b9f4578897"}, + {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98d117332cc9e5ea8dfdc2b28b0a23f60370d02e1395f88f40d1effd2cb86c4f"}, + {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e5f2e2ff51aefe6c19ee98af12b4ae61f5be456cd24396953244a30880ad861"}, + {file = "uvloop-0.16.0.tar.gz", hash = "sha256:f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"}, +] +watchgod = [ + {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, + {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, +] +websockets = [ + {file = "websockets-10.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d5396710f86a306cf52f87fd8ea594a0e894ba0cc5a36059eaca3a477dc332aa"}, + {file = "websockets-10.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b22bdc795e62e71118b63e14a08bacfa4f262fd2877de7e5b950f5ac16b0348f"}, + {file = "websockets-10.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5b04270b5613f245ec84bb2c6a482a9d009aefad37c0575f6cda8499125d5d5c"}, + {file = "websockets-10.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5c335dc0e7dc271ef36df3f439868b3c790775f345338c2f61a562f1074187b"}, + {file = "websockets-10.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6a009eb551c46fd79737791c0c833fc0e5b56bcd1c3057498b262d660b92e9cd"}, + {file = "websockets-10.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a10c0c1ee02164246f90053273a42d72a3b2452a7e7486fdae781138cf7fbe2d"}, + {file = "websockets-10.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7b38a5c9112e3dbbe45540f7b60c5204f49b3cb501b40950d6ab34cd202ab1d0"}, + {file = "websockets-10.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:2aa9b91347ecd0412683f28aabe27f6bad502d89bd363b76e0a3508b1596402e"}, + {file = "websockets-10.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b7fe45ae43ac814beb8ca09d6995b56800676f2cfa8e23f42839dc69bba34a42"}, + {file = "websockets-10.2-cp310-cp310-win32.whl", hash = "sha256:cef40a1b183dcf39d23b392e9dd1d9b07ab9c46aadf294fff1350fb79146e72b"}, + {file = "websockets-10.2-cp310-cp310-win_amd64.whl", hash = "sha256:c21a67ab9a94bd53e10bba21912556027fea944648a09e6508415ad14e37c325"}, + {file = "websockets-10.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cb316b87cbe3c0791c2ad92a5a36bf6adc87c457654335810b25048c1daa6fd5"}, + {file = "websockets-10.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f14bd10e170abc01682a9f8b28b16e6f20acf6175945ef38db6ffe31b0c72c3f"}, + {file = "websockets-10.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:fa35c5d1830d0fb7b810324e9eeab9aa92e8f273f11fdbdc0741dcded6d72b9f"}, + {file = "websockets-10.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:71a4491cfe7a9f18ee57d41163cb6a8a3fa591e0f0564ca8b0ed86b2a30cced4"}, + {file = "websockets-10.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:6193bbc1ee63aadeb9a4d81de0e19477401d150d506aee772d8380943f118186"}, + {file = "websockets-10.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8beac786a388bb99a66c3be4ab0fb38273c0e3bc17f612a4e0a47c4fc8b9c045"}, + {file = "websockets-10.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c67d9cacb3f6537ca21e9b224d4fd08481538e43bcac08b3d93181b0816def39"}, + {file = "websockets-10.2-cp37-cp37m-win32.whl", hash = "sha256:a03a25d95cc7400bd4d61a63460b5d85a7761c12075ee2f51de1ffe73aa593d3"}, + {file = "websockets-10.2-cp37-cp37m-win_amd64.whl", hash = "sha256:f8296b8408ec6853b26771599990721a26403e62b9de7e50ac0a056772ac0b5e"}, + {file = "websockets-10.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:7bb9d8a6beca478c7e9bdde0159bd810cc1006ad6a7cb460533bae39da692ca2"}, + {file = "websockets-10.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:05f6e9757017270e7a92a2975e2ae88a9a582ffc4629086fd6039aa80e99cd86"}, + {file = "websockets-10.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1c9031e90ebfc486e9cdad532b94004ade3aa39a31d3c46c105bb0b579cd2490"}, + {file = "websockets-10.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82bc33db6d8309dc27a3bee11f7da2288ad925fcbabc2a4bb78f7e9c56249baf"}, + {file = "websockets-10.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:24b879ba7db12bb525d4e58089fcbe6a3df3ce4666523183654170e86d372cbe"}, + {file = "websockets-10.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cf931c33db9c87c53d009856045dd524e4a378445693382a920fa1e0eb77c36c"}, + {file = "websockets-10.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:669e54228a4d9457abafed27cbf0e2b9f401445c4dfefc12bf8e4db9751703b8"}, + {file = "websockets-10.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:bffc65442dd35c473ca9790a3fa3ba06396102a950794f536783f4b8060af8dd"}, + {file = "websockets-10.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d4d110a84b63c5cfdd22485acc97b8b919aefeecd6300c0c9d551e055b9a88ea"}, + {file = "websockets-10.2-cp38-cp38-win32.whl", hash = "sha256:117383d0a17a0dda349f7a8790763dde75c1508ff8e4d6e8328b898b7df48397"}, + {file = "websockets-10.2-cp38-cp38-win_amd64.whl", hash = "sha256:0b66421f9f13d4df60cd48ab977ed2c2b6c9147ae1a33caf5a9f46294422fda1"}, + {file = "websockets-10.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:ac081aa0307f263d63c5ff0727935c736c8dad51ddf2dc9f5d0c4759842aefaa"}, + {file = "websockets-10.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b4059e2ccbe6587b6dc9a01db5fc49ead9a884faa4076eea96c5ec62cb32f42a"}, + {file = "websockets-10.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9ca2ca05a4c29179f06cf6727b45dba5d228da62623ec9df4184413d8aae6cb9"}, + {file = "websockets-10.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97950c7c844ec6f8d292440953ae18b99e3a6a09885e09d20d5e7ecd9b914cf8"}, + {file = "websockets-10.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:98f57b3120f8331cd7440dbe0e776474f5e3632fdaa474af1f6b754955a47d71"}, + {file = "websockets-10.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a72b92f96e5e540d5dda99ee3346e199ade8df63152fa3c737260da1730c411f"}, + {file = "websockets-10.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:038afef2a05893578d10dadbdbb5f112bd115c46347e1efe99f6a356ff062138"}, + {file = "websockets-10.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f09f46b1ff6d09b01c7816c50bd1903cf7d02ebbdb63726132717c2fcda835d5"}, + {file = "websockets-10.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2349fa81b6b959484bb2bda556ccb9eb70ba68987646a0f8a537a1a18319fb03"}, + {file = "websockets-10.2-cp39-cp39-win32.whl", hash = "sha256:bef03a51f9657fb03d8da6ccd233fe96e04101a852f0ffd35f5b725b28221ff3"}, + {file = "websockets-10.2-cp39-cp39-win_amd64.whl", hash = "sha256:1c1f3b18c8162e3b09761d0c6a0305fd642934202541cc511ef972cb9463261e"}, + {file = "websockets-10.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5a38a0175ae82e4a8c4bac29fc01b9ee26d7d5a614e5ee11e7813c68a7d938ce"}, + {file = "websockets-10.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c6e56606842bb24e16e36ae7eb308d866b4249cf0be8f63b212f287eeb76b124"}, + {file = "websockets-10.2-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0f73cb2526d6da268e86977b2c4b58f2195994e53070fe567d5487c6436047e6"}, + {file = "websockets-10.2-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0cd02f36d37e503aca88ab23cc0a1a0e92a263d37acf6331521eb38040dcf77b"}, + {file = "websockets-10.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:56d48eebe9e39ce0d68701bce3b21df923aa05dcc00f9fd8300de1df31a7c07c"}, + {file = "websockets-10.2.tar.gz", hash = "sha256:8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098"}, +] +xsdata = [ + {file = "xsdata-21.12-py3-none-any.whl", hash = "sha256:857ef5d1c1fdee09f7f1a0a0e8f2771c0469dcc60b28f9b2a7b2a0d2aba3a58f"}, + {file = "xsdata-21.12.tar.gz", hash = "sha256:baba44a2909fc928f783b0cdde4e1a96d5c632414588b9934aa8adf5f60002e8"}, +] +zipp = [ + {file = "zipp-3.7.0-py3-none-any.whl", hash = "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375"}, + {file = "zipp-3.7.0.tar.gz", hash = "sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"}, +] diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml b/pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml new file mode 100644 index 000000000000..f3b95e154eef --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml @@ -0,0 +1,14 @@ +[tool.poetry] +name = "dmarc-metrics-exporter-env" +version = "0.5.1" +description = "" +authors = [] + +[tool.poetry.dependencies] +python = "^3.7,<3.10" +dmarc-metrics-exporter = {git="https://github.com/jgosmann/dmarc-metrics-exporter.git", tag = "v0.5.1"} +bite-parser = "0.1.1" + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/update b/pkgs/servers/monitoring/prometheus/dmarc-exporter/update new file mode 100755 index 000000000000..77cfe9ff86d9 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/update @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p poetry poetry2nix.cli +set -eu +poetry lock +poetry2nix lock diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34d74f1edf67..8da78e29b0aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21789,6 +21789,7 @@ with pkgs; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; + prometheus-dmarc-exporter = callPackage ../servers/monitoring/prometheus/dmarc-exporter { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; From cafa5b400c48be75300b3e1ec28ddeead9f6f392 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 28 Feb 2022 19:39:55 +0100 Subject: [PATCH 011/329] prometheus-dmarc-exporter: add meta --- .../prometheus/dmarc-exporter/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix index ebd567557b11..98848ee67022 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix @@ -7,6 +7,14 @@ let poetry2nix.defaultPoetryOverrides (import ./poetry-git-overlay.nix { inherit pkgs; }) (self: super: { + dmarc-metrics-exporter = super.dmarc-metrics-exporter.overridePythonAttrs ({ meta ? {}, ... }: { + meta = with lib; meta // { + license = licenses.mit; + homepage = "https://github.com/jgosmann/dmarc-metrics-exporter/"; + description = " Export Prometheus metrics from DMARC reports"; + maintainers = with maintainers; [ ma27 ]; + }; + }); more-properties = super.more-properties.overridePythonAttrs (old: { src = pkgs.fetchFromGitHub { owner = "madman-bob"; @@ -42,7 +50,9 @@ let env = python.withPackages (p: [ p.dmarc-metrics-exporter ]); in -pkgs.writeShellScriptBin "prometheus-dmarc-exporter" '' +(pkgs.writeShellScriptBin "prometheus-dmarc-exporter" '' export PYTHONPATH="${env}/lib/${env.libPrefix}/site-packages''${PYTHONPATH:+:}''${PYTHONPATH}" exec ${env}/bin/python3 -m dmarc_metrics_exporter "$@" -'' +'') // { + inherit (python.pkgs.dmarc-metrics-exporter) meta; +} From cd70dfb51262b4e49a9392b0523e5a1accdb4535 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 04:17:12 +0000 Subject: [PATCH 012/329] docker-slim: 1.37.3 -> 1.37.4 --- pkgs/applications/virtualization/docker-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index cd8a1f5041aa..3bc0f225de6e 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.37.3"; + version = "1.37.4"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-jzwQ3nrhLDiQXcVkPiXrRAmpLQOD8ILBnoCEUiEbxzw="; + sha256 = "sha256-iz1V+wcrJf0grOe81kwbXPBqnvXpHnh7IMDdugaUOH0="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; From b93f5fd8b38cba4ffda76f9d353cb2915725a387 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 12:46:56 +0000 Subject: [PATCH 013/329] otpclient: 2.4.8 -> 2.4.9.1 --- pkgs/applications/misc/otpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index afc0ac71d5d2..1f5f3d187290 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.4.8"; + version = "2.4.9.1"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2exqMYcxg0UxlH+ZANQv2MFii9dZ6nizB4vxGR9cAwk="; + sha256 = "sha256-QcdPyuwbGK12Kul+gGTfRGmXfghr0qugpBEcrgATOT4="; }; buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; From 76ccd48af3c2dc53a73c13c60ee9d5370066b6ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 15:04:28 +0000 Subject: [PATCH 014/329] rpcs3: 0.0.20-13222-8c2fd5095 -> 0.0.21-13327-6c096b72b --- pkgs/applications/emulators/rpcs3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 0ea56d3a72d3..6f58990e4735 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "13222-8c2fd5095"; - rpcs3Version = "0.0.20-13222-8c2fd5095"; - rpcs3Revision = "8c2fd50957be3af05c04a9bb782dce8505fb6400"; - rpcs3Sha256 = "1cf62vpqdc9i4masgv9zz24h7zdc7gcymx6n1hbh7wp5gg1dw4qi"; + rpcs3GitVersion = "13327-6c096b72b"; + rpcs3Version = "0.0.21-13327-6c096b72b"; + rpcs3Revision = "6c096b72b5294758067a002f981563bbd618d30d"; + rpcs3Sha256 = "0xmdhjskqbv02jvl43bvw0clsgh9gnahl50fr3q8lmpwpy13ldr4"; ittapi = fetchFromGitHub { owner = "intel"; From 94e16d346b2da7f9a19a71e9febea12e859119b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Mar 2022 15:10:39 +0000 Subject: [PATCH 015/329] dune_3: 3.0.2 -> 3.0.3 --- pkgs/development/tools/ocaml/dune/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 59ea9c43512f..f6f45944a816 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/fiber-${version}.tbz"; - sha256 = "sha256-o108qIeWMOX0VU/wWdc5bg/UDCT2CCcw/Xx3nFiDbes="; + sha256 = "sha256-1QRJmhZY8Nmcrvv/1zhvLjHUbOynMWcVf+RobEHlcy8="; }; nativeBuildInputs = [ ocaml findlib ]; From 4c7784f467e13f408f14af533242f0b049e2da2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Mar 2022 06:10:57 +0000 Subject: [PATCH 016/329] flow: 0.172.0 -> 0.173.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 36c852857041..6ef9806bf371 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.172.0"; + version = "0.173.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-N3mP1dhul7Ljn278CJmge4IrVllQJsc73A3/7mTSU70="; + sha256 = "sha256-F0t85/sq9p+eNEf2XAGxw+ZWeRgUbkhrKFdGASijuAs="; }; installPhase = '' From 6d45fa725acb42c10a2c204fb610129714449322 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Sat, 5 Mar 2022 16:12:02 +0000 Subject: [PATCH 017/329] surf: set PREFIX for both build and install Fixes #162727 as the WebKitWebExtension will now load properly. --- pkgs/applications/networking/browsers/surf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 7bf3ee9e75b0..c79aa1d6f1d6 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit patches; - installFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ]; # Add run-time dependencies to PATH. Append them to PATH so the user can # override the dependencies with their own PATH. From a00227fa9ea43e991be025feb66b4942620f4223 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Mar 2022 08:40:09 +0000 Subject: [PATCH 018/329] mkgmap-splitter: 645 -> 647 --- pkgs/applications/misc/mkgmap/splitter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index db89e538d51f..97f74becede7 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "645"; + version = "647"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "Y9feRNDjmwUbSOwxfMIaYIycCvOBMihq5LkuKbALVDY="; + sha256 = "j9TJ+9WuItueztWjYoD9s9x8wfsga2QCIY5X2+s3Z1c="; }; patches = [ From 33f32d0076a89548d8b36115cf9d308a42f8e68b Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 6 Mar 2022 12:00:00 +0000 Subject: [PATCH 019/329] pkgsi686Linux.gccForLibs: use recent gcc the build failure seems to have disappeared on gcc10, and this is required to get recent c++ support in libstdc++. --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bc874b8c879..6ed811e84611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14739,10 +14739,7 @@ with pkgs; # This is for e.g. LLVM libraries on linux. gccForLibs = - # with gcc-7: undefined reference to `__divmoddi4' - if stdenv.targetPlatform.isi686 - then gcc6.cc - else if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU + if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU # Can only do this is in the native case, otherwise we might get infinite # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. then targetPackages.stdenv.cc.cc From 72db02ec9e21bc89b2263421019b26288540bce2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:33:45 +0800 Subject: [PATCH 020/329] kernel: add perl to moduleBuildDependencies --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4f12337c893f..1ac9cbe00ead 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -56,7 +56,7 @@ let hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf; + moduleBuildDependencies = [ perl ] ++ optional (lib.versionAtLeast version "4.14") libelf; installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' From bd8917e7ea45e7250be96232ccfd5609e8e040c8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:34:22 +0800 Subject: [PATCH 021/329] cryptodev: pass moduleBuildDependencies from kernel --- pkgs/os-specific/linux/cryptodev/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index f09679ba2128..cc3a1d81109e 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-vJQ10rG5FGbeEOqCUmH/pZ0P77kAW/MtUarywbtIyHw="; }; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; From 2bd89d95c61ba1cb0162ab773c323ce803197e64 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:34:31 +0800 Subject: [PATCH 022/329] akvcam: pass makeFlags and moduleBuildDependencies from kernel --- pkgs/os-specific/linux/akvcam/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 700389a4a183..0724118431ce 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; sourceRoot = "source/src"; - makeFlags = [ + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; From 07b06a72741c1c3965e75adf3c434b6969e93792 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:35:56 +0800 Subject: [PATCH 023/329] apfs: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/apfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 62437d662b92..98fd83ed5d51 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" From 8d715c1f78a0e4797171418ca27b800b0f268afa Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:40:50 +0800 Subject: [PATCH 024/329] batman_adv: prepend kernel.makeFlags to makeFLags --- pkgs/os-specific/linux/batman-adv/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 354f4b1bff2c..123c42e83971 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ + "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; hardeningDisable = [ "pic" ]; preBuild = '' - makeFlags="KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," \ -e /depmod/d Makefile ''; From fba1f47f001f653086ee73a068882b865603e8f8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:43:54 +0800 Subject: [PATCH 025/329] can-isotop: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/can-isotp/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 9c30aae86fe8..8119f99deb77 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -12,16 +12,17 @@ stdenv.mkDerivation { rev = "21a3a59e2bfad246782896841e7af042382fcae7"; sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; - - KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; + makeFlags = kernel.makeFlags ++ [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; buildPhase = '' - make modules + make modules $makeFlags ''; installPhase = '' - make modules_install + make modules_install $makeFlags ''; nativeBuildInputs = kernel.moduleBuildDependencies; From 98bd4307a60172e92b12cbc03f6f4efaaca423f9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:46:11 +0800 Subject: [PATCH 026/329] digimend: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/digimend/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 6b5f66f825bd..e26509d3a7cb 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "1l54j85540386a8aypqka7p5hy1b63cwmpsscv9rmmf10f78v8mm"; }; - INSTALL_MOD_PATH = "\${out}"; - postPatch = '' sed 's/udevadm /true /' -i Makefile sed 's/depmod /true /' -i Makefile @@ -38,10 +36,11 @@ stdenv.mkDerivation rec { rm -r $out/lib/udev ''; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KVERSION=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "DESTDIR=${placeholder "out"}" + "INSTALL_MOD_PATH=${placeholder "out"}" ]; meta = with lib; { From 694eef94d79a6bd6170f0109c22f8e6d8e6f0938 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:51:58 +0800 Subject: [PATCH 027/329] dpdk-kmods: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/dpdk-kmods/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index a188336cbe50..694e508dcd01 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; + makeFlags = kernel.makeFlags ++ [ + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -18,10 +21,9 @@ stdenv.mkDerivation rec { preBuild = "cd linux/igb_uio"; installPhase = '' - make -C ${KSRC} M=$(pwd) modules_install + make -C ${KSRC} M=$(pwd) modules_install $makeFlags ''; - INSTALL_MOD_PATH = placeholder "out"; enableParallelBuilding = true; meta = with lib; { From 07d1ce68d4259717c0458b6244de4887473a6b8e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:55:51 +0800 Subject: [PATCH 028/329] ena: pass makeFlags from kernel --- pkgs/os-specific/linux/ena/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 1257217a5206..5873a2fe2c1d 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; # linux 3.12 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - strip -S ena.ko + $STRIP -S ena.ko dest=$out/lib/modules/${kernel.modDirVersion}/misc mkdir -p $dest cp ena.ko $dest/ From 490bf9cae5d736c77b81b8288d0ce4ecf35d84ac Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:57:21 +0800 Subject: [PATCH 029/329] evdi: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/evdi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index e40448be4353..721a49ed4a56 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ kernel libdrm ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; From 77e2c0324cdcc23c998585cb8e7cd865e10f93fc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 09:58:55 +0800 Subject: [PATCH 030/329] fwts-efi-runtime: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/fwts/module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index 737d3316e21d..72f25aa800eb 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; From 697e54e3e24b991e54c5a84f0702e16d731509b8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:00:25 +0800 Subject: [PATCH 031/329] gcadapter-oc-kmod: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix index ab2e099d9708..bcea220cc96e 100644 --- a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix +++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build" "INSTALL_MOD_PATH=$(out)" ]; From 0341ed782c3794d9329c87a96120aaf71981e818 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:01:36 +0800 Subject: [PATCH 032/329] hid-nintendo: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/hid-nintendo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hid-nintendo/default.nix b/pkgs/os-specific/linux/hid-nintendo/default.nix index e9ee88252ea8..7d01120b2f3f 100644 --- a/pkgs/os-specific/linux/hid-nintendo/default.nix +++ b/pkgs/os-specific/linux/hid-nintendo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" From fd5ead0eed11a41d44d9d8900e8cce62ee39d02b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:12:55 +0800 Subject: [PATCH 033/329] jool: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/jool/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 2fd10778e2cf..9246ca679a65 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -16,13 +16,12 @@ stdenv.mkDerivation { sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile ''; - buildPhase = '' - make -C src/mod - ''; + makeFlags = kernel.makeFlags ++ [ + "-C src/mod" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; - installPhase = '' - make -C src/mod modules_install INSTALL_MOD_PATH=$out - ''; + installTargets = "modules_install"; meta = with lib; { homepage = "https://www.jool.mx/"; From c35ec1c0317a43c90bd016cc6ca4868af1280f23 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:13:55 +0800 Subject: [PATCH 034/329] lttng-modules: prepend kernel.makeFlags to makeFlags, move moduleBuildDependencies to nativeBuildInputs --- pkgs/os-specific/linux/lttng-modules/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 8753f34087cf..99ffb7756da0 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0hzksx2fw008jdsgfzpws9g7imy6ryw09ai5y0knvrmvr68nvj57"; }; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - preConfigure = '' - export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - export INSTALL_MOD_PATH="$out" - ''; + makeFlags = kernel.makeFlags ++ [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; installTargets = [ "modules_install" ]; From e1f487741f8cfc5275bdc216f765d136e6bbb596 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:15:02 +0800 Subject: [PATCH 035/329] mba6x_bl: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/mba6x_bl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index fe9c11ace1f6..04a89ad038dd 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; From 4315bccd6aade57303cd6345ed101e16e351fa2f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:24:57 +0800 Subject: [PATCH 036/329] mbp2018-bridge-drv: pass makeFlags and moduleBuildDependencies from kernel --- .../linux/mbp-modules/mbp2018-bridge-drv/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 070b4a6207e1..0b4fec4dfb4e 100644 --- a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -11,14 +11,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-o6yGiR+Y5SnX1johdi7fQWP5ts7HdDMqeju75UOhgik="; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; + buildPhase = '' make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ - -j$NIX_BUILD_CORES M=$(pwd) modules + -j$NIX_BUILD_CORES M=$(pwd) modules $makeFlags ''; installPhase = '' make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ - INSTALL_MOD_PATH=$out M=$(pwd) modules_install + INSTALL_MOD_PATH=$out M=$(pwd) modules_install $makeFlags ''; meta = with lib; { From 45e662bd95e6179428d51b5a5f7843213ebe4054 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:28:35 +0800 Subject: [PATCH 037/329] netatop: pass makeFlags and moduleBuildDependencies from kernel --- pkgs/os-specific/linux/netatop/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 28f989929a4c..dec1399d1695 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { sha256 = "0qjw8glfdmngfvbn1w63q128vxdz2jlabw13y140ga9i5ibl6vvk"; }; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kmod zlib ]; hardeningDisable = [ "pic" ]; @@ -36,6 +37,8 @@ stdenv.mkDerivation { kmod=${kmod} substituteAllInPlace netatop.service ''; + makeFlags = kernel.makeFlags; + preInstall = '' mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8} mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra From 03d4ac4e5b88d95b89e0c34dfd42b31fa9cd7abb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:30:53 +0800 Subject: [PATCH 038/329] openrazer: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/openrazer/driver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 6e387de0719f..2de63580ac33 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (common // { nativeBuildInputs = kernel.moduleBuildDependencies; - buildFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; From 86ec7c438c563420375a729f43ad2ac9962efa66 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:38:29 +0800 Subject: [PATCH 039/329] xpadneo: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/xpadneo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index c1874877620c..c5aa09a88608 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" From 271699dcc56daa15a58d511b0c7865c1ca159b28 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:40:05 +0800 Subject: [PATCH 040/329] rtl88x2bu: pass makeFlags from kernel --- pkgs/os-specific/linux/rtl88x2bu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 31d8f50a5288..e092d145abd2 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; - prePatch = '' + prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ From f45eebdb7ecbb9c674aa29003fd6d44dca175d27 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:40:22 +0800 Subject: [PATCH 041/329] xmm7360-pci: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/xmm7360-pci/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xmm7360-pci/default.nix b/pkgs/os-specific/linux/xmm7360-pci/default.nix index 6a589ff889c3..435ff94afb76 100644 --- a/pkgs/os-specific/linux/xmm7360-pci/default.nix +++ b/pkgs/os-specific/linux/xmm7360-pci/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1wdb0phqg9rj9g9ycqdya0m7lx24kzjlh25yw0ifp898ddxrrr0c"; }; - makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.makeFlags ++ [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; nativeBuildInputs = kernel.moduleBuildDependencies; - INSTALL_MOD_PATH = placeholder "out"; installFlags = [ "DEPMOD=true" ]; meta = with lib; { From e2c5168db4cd9e31596f88af110b89802fa6b35b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:42:58 +0800 Subject: [PATCH 042/329] vhba: prepend kernel.makeFlags to makeFlags --- pkgs/applications/emulators/cdemu/vhba.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index aeadcf5c1c1d..40792c81ac1c 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-csWowcRSgF5M74yv787MLSXOGXrkxnODCCgC5a3Nd7Y="; }; - makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; nativeBuildInputs = kernel.moduleBuildDependencies; meta = with lib; { From d3943a84afc5a39eb3f7559d48b3fc31283a3af9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:44:46 +0800 Subject: [PATCH 043/329] veikk-linux-driver: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/veikk-linux-driver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix index a1019d7b7fd6..8cf4896ae027 100644 --- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ kernel ]; - buildPhase = '' - make BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - ''; + makeFlags = kernel.makeFlags ++ [ + "BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; installPhase = '' mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk From 0b302ffa47ed8c80ed8bb652ce3b77991aec7977 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:46:46 +0800 Subject: [PATCH 044/329] v4l2loopback: prepend kernel.makeFlags to makeFlags and some cleanup --- pkgs/os-specific/linux/v4l2loopback/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index c1aa7be2af6b..095d873e66cb 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -16,12 +16,9 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" sed -i '/depmod/d' Makefile - export PATH=${kmod}/sbin:$PATH ''; - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildInputs = [ kmod ]; + nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; postInstall = '' make install-utils PREFIX=$bin @@ -29,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; From 123882b6aaf030cad964b0778fcaceeaca1328e7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:52:31 +0800 Subject: [PATCH 045/329] rtw88: prepend kernel.makeFlags to makeFlags, pass moduleBuildDependencies --- pkgs/os-specific/linux/rtw88/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index c3f849df1181..529ee621892b 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { hash = "sha256-PRzWXC1lre8gt1GfVdnaG836f5YK57P9a8tG20yef0w="; }; - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; From b046f22da2ff60f4943bca8ca8cba1dea8218bee Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:52:40 +0800 Subject: [PATCH 046/329] rtw89: prepend kernel.makeFlags to makeFlags, pass moduleBuildDependencies --- pkgs/os-specific/linux/rtw89/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix index 6b0f06c5bdc4..6ff208fa6dd9 100644 --- a/pkgs/os-specific/linux/rtw89/default.nix +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632"; }; - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; From 3f6359ac266b934dea50bf0269aa6794a3935895 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:55:00 +0800 Subject: [PATCH 047/329] rtl8821cu: pass makeFlags from kernel, move moduleBuildDependencies to nativeBuildInputs --- pkgs/os-specific/linux/rtl8821cu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 9229a3c13069..0ea0682214bf 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; prePatch = '' substituteInPlace ./Makefile \ From e61b83cb60f202068e3a9809f9a363e794a60e19 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:56:52 +0800 Subject: [PATCH 048/329] rtl8821ce: pass makeFlags from kernel, move moduleBuildDependencies to nativeBuildInputs --- pkgs/os-specific/linux/rtl8821ce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 75e12a1b7a46..27303c029802 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; prePatch = '' substituteInPlace ./Makefile \ From a0f82198c7670619894b8ff21590d725b8b48639 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 10:59:27 +0800 Subject: [PATCH 049/329] rtl8814au: pass makeFlags from kernel, move moduleBuildDependencies to nativeBuildInputs --- pkgs/os-specific/linux/rtl8814au/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index f9ca60b1112b..f12adf73d5f3 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0lk3ldff489ggbqmlfi4zvnp1cvxj1b06m0fhpzai82070klzzmj"; }; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; hardeningDisable = [ "pic" ]; From c0ed14933fdd91c7e8999ecb940a503f13630cdf Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 13:27:42 +0800 Subject: [PATCH 050/329] r8168: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/r8168/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 91e15db2eeb6..680cc531af42 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -27,11 +27,13 @@ in stdenv.mkDerivation rec { # avoid using the Makefile directly -- it doesn't understand # any kernel but the current. # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168 + makeFlags = kernel.makeFlags ++ [ + "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(PWD)/src" + "modules" + ]; preBuild = '' - makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build") - makeFlagsArray+=("M=$PWD/src") makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN -DCONFIG_ASPM -DENABLE_S5WOL -DENABLE_EEE") - makeFlagsArray+=("modules") ''; enableParallelBuilding = true; From 977b3b12ace5cdb7bac6e43a18579d6cb031c2a1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 13:33:20 +0800 Subject: [PATCH 051/329] rtl8192eu: prepend kernel.makeFlags to makeFlags --- pkgs/os-specific/linux/rtl8192eu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index b33330611b88..6fa15358582c 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ]; - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; From 364b75a8628050c159a9fb7e207de721489c4452 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 13:34:51 +0800 Subject: [PATCH 052/329] rtl8189es: 2020-10-03 -> 2021-10-01, move moduleBuildDependencies to nativeBuildInputs --- pkgs/os-specific/linux/rtl8189es/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index 500359f7e4fd..d6b5785210b0 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { name = "rtl8189es-${kernel.version}-${version}"; - version = "2020-10-03"; + version = "2021-10-01"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "03ac413135a355b55b693154c44b70f86a39732e"; - sha256 = "0wiikviwyvy6h55rgdvy7csi1zqniqg26p8x44rd6mhbw0g00h56"; + rev = "be378f47055da1bae42ff6ec1d62f1a5052ef097"; + sha256 = "sha256-+19q1Xux2BjquavY+s0UDzTubEt6BEUZ9XVDVmj36us="; }; - nativeBuildInputs = [ bc nukeReferences ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; @@ -23,13 +22,10 @@ stdenv.mkDerivation rec { substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - makeFlags = [ - "ARCH=${stdenv.hostPlatform.linuxArch}" + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; preInstall = '' From b0d43c3409b955a91d1920de120670fa97596ceb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 10 Feb 2022 13:37:36 +0800 Subject: [PATCH 053/329] systemtap: move python and setuptools to nativeBuildInputs --- pkgs/development/tools/profiling/systemtap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 31eafb1086b8..ac00e3418782 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -16,8 +16,8 @@ let pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkg-config cpio ]; - buildInputs = [ elfutils gettext python3 python3.pkgs.setuptools ]; + nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ]; + buildInputs = [ elfutils gettext ]; enableParallelBuilding = true; }; From cdfe6962e971314727c2b89d6bf9abadcf728c37 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 7 Mar 2022 12:34:45 +0800 Subject: [PATCH 054/329] can-isotp: make use of buildFlags and installTargets --- pkgs/os-specific/linux/can-isotp/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 8119f99deb77..73edb3be9ec3 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -12,18 +12,14 @@ stdenv.mkDerivation { rev = "21a3a59e2bfad246782896841e7af042382fcae7"; sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; + makeFlags = kernel.makeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" ]; - buildPhase = '' - make modules $makeFlags - ''; - - installPhase = '' - make modules_install $makeFlags - ''; + buildFlags = [ "modules" ]; + installTargets = [ "modules_install" ]; nativeBuildInputs = kernel.moduleBuildDependencies; From 55e2fe8749f6d4d87dab1925bbd5fde441b46cd1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 7 Mar 2022 11:30:56 -0600 Subject: [PATCH 055/329] sudo-font: 0.62 -> 0.63.1 https://github.com/jenskutilek/sudo-font/releases/tag/v0.63.1 --- pkgs/data/fonts/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 45450a7c20f7..b78880824c74 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.62"; + version = "0.63.1"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "sha256-I0E2zYbfEFBEIBNC7nnJb+hOaBgGZkAIg08YpA8awso="; + sha256 = "sha256-z/1Y2eJMrQ+43UIt4HWcLwjYs+hfCY/g4iRxJ+yBAqw="; postFetch = '' mkdir -p $out/share/fonts/ From fd870f4e7d7c6e71fe7ec45ea36da709bceba9d2 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Mon, 7 Mar 2022 23:50:02 +0100 Subject: [PATCH 056/329] postgresqlPackages.rum: init at 1.3.9 --- pkgs/servers/sql/postgresql/ext/rum.nix | 31 ++++++++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/rum.nix diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix new file mode 100644 index 000000000000..ce7dcbd7a48d --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/rum.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "rum"; + version = "1.3.9"; + + src = fetchFromGitHub { + owner = "postgrespro"; + repo = "rum"; + rev = version; + sha256 = "sha256-xdCj9hzBg7VtAIHpIFpeeaK6U4aRrCsoQrPKdABSl+Y="; + }; + + buildInputs = [ postgresql ]; + + makeFlags = [ "USE_PGXS=1" ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.control + install -D -t $out/share/postgresql/extension *.sql + ''; + + meta = with lib; { + description = "Full text search index method for PostgreSQL"; + homepage = "https://github.com/postgrespro/rum"; + license = licenses.postgresql; + platforms = postgresql.meta.platforms; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index f3df8a99ca22..fec106f32acd 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -61,4 +61,6 @@ self: super: { pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; repmgr = super.callPackage ./ext/repmgr.nix { }; + + rum = super.callPackage ./ext/rum.nix { }; } From 0665513b1f42ee5d9e267ece7ccd67fdb771945f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 02:28:15 +0000 Subject: [PATCH 057/329] cargo-release: 0.20.2 -> 0.20.3 --- pkgs/tools/package-management/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 0c791bbf80fb..49a6d6450606 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-KWLZdFpRwtdP17x71IU2MGFwd1SNnTRcgTUoW1p5Px4="; + sha256 = "sha256-oYnqrNqbn/OsJd0Lh6rQ2pt7FrLOp5p3MoavC56dWQc="; }; - cargoSha256 = "sha256-CTaEWANx3s7YCm8pqGWuvGqR362YtVjmbnc9V3kC8pI="; + cargoSha256 = "sha256-LtDIzqHzzur+GxxvUHciNQCRmxqdmaXSG4ncMV3Rx3c="; nativeBuildInputs = [ pkg-config ]; From b3e1792bf925a69bfb361340e7585cc0dd264e25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 02:53:49 +0000 Subject: [PATCH 058/329] charm: 0.10.2 -> 0.10.3 --- pkgs/applications/misc/charm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 2379b702ee81..907bc7a53e05 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-kyfyRq/5QWMoiMooEpLv7UkehGxFlrfGEq9jA3OHiIs="; + sha256 = "sha256-7WdSIpmpN8Zz2k5PveYZoCueQo5sLxLLZvZdzxRlkaE="; }; - vendorSha256 = "sha256-LB5fwySDOH+kOYYdGdtLAvETmI6fFP2QT6l2eAS3Ijg="; + vendorSha256 = "sha256-5cqZxh2uvmJV7DtAGzQwt//heF3kF9mjyB0KAs8nWZY="; doCheck = false; From 420a68da4ec2ed2d2af626653cae8af93fefa9d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 06:14:57 +0000 Subject: [PATCH 059/329] fceux: 2.6.2 -> 2.6.3 --- pkgs/applications/emulators/fceux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index 9289fb081f01..0247a10f0e54 100644 --- a/pkgs/applications/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fceux"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "TASEmulators"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-yQX58m/sMW/8Jr5cm2SrVXTiF7qyZOgOZg1v0qEyiLw="; + sha256 = "sha256-jNR9AB8s2S9ehYsompkV2GOLsaXIQzldeQ1WRCxdDG0="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From ce0a5ac531f65fff3ea0828fadead98189147061 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 06:47:07 +0000 Subject: [PATCH 060/329] easyeffects: 6.2.3 -> 6.2.4 --- pkgs/applications/audio/easyeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 23ca109c6b48..de4b7a3176f6 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.3"; + version = "6.2.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-A1UanrAbmZFGCmDNIr1h+v5RVMsIl4qgM/veBirudQM="; + sha256 = "sha256-g/qN1Tafh71HdPLHW43Zva9MK6G+qxSnb1aRisuwdBw="; }; nativeBuildInputs = [ From 028508242b83500fb244c385f4a6ff319459e2fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 10:31:59 +0000 Subject: [PATCH 061/329] fasm: 1.73.29 -> 1.73.30 --- pkgs/development/compilers/fasm/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 9f4263b08ed5..d9f809c0a0ae 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.29"; + version = "1.73.30"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-Yyj02DRo9wTkJ01ukOwElHr1ZyZFPOMTibwyAkqYISs="; + sha256 = "sha256-dRlQUaWIHbu+DwQBFh6Tf4o2u0LTRw/Ehp2hT9LC8QE="; }; installPhase = '' From fe6f62834315e73efc0bdd529d3df77f69a0ec67 Mon Sep 17 00:00:00 2001 From: Gaute Ravndal Date: Tue, 8 Mar 2022 12:14:25 +0100 Subject: [PATCH 062/329] nixos/amuled: fix package reference in service definition The amuleDaemon package was renamed to kebab-case in 81ef57d6. --- nixos/modules/services/networking/amuled.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index e55ac7a6b18b..aa72a047526b 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -76,7 +76,7 @@ in script = '' ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \ - -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled' + -c 'HOME="${cfg.dataDir}" ${pkgs.amule-daemon}/bin/amuled' ''; }; }; From 8ef51651b212e3e67dd2f2aff93289e0ccc2dd07 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 8 Mar 2022 19:59:28 +0530 Subject: [PATCH 063/329] cinny: 1.7.0 -> 1.8.0 --- .../networking/instant-messengers/cinny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index c46c19896d5e..1e2dc88a4d5d 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "0133dbzxy0n0i6bn2p3lx33kpabnf9kzs9mv4xws30hbns25q99k"; + sha256 = "0pbapzl3pfx87ns4vp7088kkhl34c0ihbq90r3d0iz6sa16mcs79"; }; installPhase = '' From 73d6046727c4b216e48ccbff5c8cf681db061e1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 14:55:46 +0000 Subject: [PATCH 064/329] nextdns: 1.37.7 -> 1.37.10 --- pkgs/applications/networking/nextdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index a18257dfeb65..c06291c719e8 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.37.7"; + version = "1.37.10"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-L5PeT4Y2oWM1WUJaBK9xgrpfkpvKM1+sA29A3AiDE38="; + sha256 = "sha256-iwxgDBIuTClikvXF+3mCjFKKV0upN+K+aL85ewYkMXo="; }; vendorSha256 = "sha256-6hWD05lXteqL7egj9tiRVHlevKM33i+a+zBUZs7PF7I="; From 788abdba4b1d0444be0c7131004d74edcaff8d71 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 9 Mar 2022 15:29:35 +0100 Subject: [PATCH 065/329] nixos/doc: update rl-2111 w.r.t. iptables-nft migration Follow-up on https://github.com/NixOS/nixpkgs/pull/161426. Explain why having legacy iptables rules installed can lead to confusing firewall behaviour, and provide some guidance on how to fix this. --- .../manual/from_md/release-notes/rl-2111.section.xml | 12 +++++++++++- nixos/doc/manual/release-notes/rl-2111.section.md | 7 +++++++ 2 files changed, 18 insertions(+), 1 deletion(-) 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 a11baa91dea6..b61a0268dee2 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 @@ -35,7 +35,17 @@ This means, ip[6]tables, arptables and ebtables commands will actually show rules from some specific tables in - the nf_tables kernel subsystem. + the nf_tables kernel subsystem. In case + you’re migrating from an older release without rebooting, + there might be cases where you end up with iptable rules + configured both in the legacy iptables + kernel backend, as well as in the nf_tables + backend. This can lead to confusing firewall behaviour. An + iptables-save after switching will complain + about iptables-legacy tables present. It’s + probably best to reboot after the upgrade, or manually + removing all legacy iptables rules (via the + iptables-legacy package). diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index f3644c32832b..310d32cfdd72 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -13,6 +13,13 @@ In addition to numerous new and upgraded packages, this release has the followin [Fedora](https://fedoraproject.org/wiki/Changes/iptables-nft-default). This means, `ip[6]tables`, `arptables` and `ebtables` commands will actually show rules from some specific tables in the `nf_tables` kernel subsystem. + In case you're migrating from an older release without rebooting, there might + be cases where you end up with iptable rules configured both in the legacy + `iptables` kernel backend, as well as in the `nf_tables` backend. + This can lead to confusing firewall behaviour. An `iptables-save` after + switching will complain about "iptables-legacy tables present". + It's probably best to reboot after the upgrade, or manually removing all + legacy iptables rules (via the `iptables-legacy` package). - systemd got an `nftables` backend, and configures (networkd) rules in their own `io.systemd.*` tables. Check `nft list ruleset` to see these rules, not From 8a27980392ae48ace556097c8ec502b0dcf38aea Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 9 Mar 2022 11:54:28 -0300 Subject: [PATCH 066/329] berry: small edit --- pkgs/applications/window-managers/berry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index 82127c2733e2..f6ba52013f6f 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + homepage = "https://berrywm.org/"; description = "A healthy, bite-sized window manager"; longDescription = '' berry is a healthy, bite-sized window manager written in C for unix @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { - Intuitively place new windows in unoccupied spaces. - Virtual desktops. ''; - homepage = "https://berrywm.org/"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; From 071468ac466d8a4e5be0707ebc19b85598d39681 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 7 Mar 2022 22:22:04 -0300 Subject: [PATCH 067/329] cimg: 3.0.0 -> 3.0.2 --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 47e9ffa925ab..4a482c9da454 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg="; + hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk="; }; outputs = [ "out" "doc" ]; From 25c6d1efc4ba06ec250ed9e8aebf042783c8d0cf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 7 Mar 2022 22:22:34 -0300 Subject: [PATCH 068/329] icewm: 2.9.4 -> 2.9.6 --- .../window-managers/icewm/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index deac4bed6079..75cb96f27f4a 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.9.4"; + version = "2.9.6"; src = fetchFromGitHub { - owner = "ice-wm"; + owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-ne2lqo9CAhGgC8dd9R03zhFXy9nPBQR0NcfAY0DeVj4="; + hash = "sha256-qC8gEVJ/cmsEbF8jMzv7zyvVcjlbXhgHU3ixe7RLcnA="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { perl pkg-config ]; + buildInputs = [ expat fontconfig @@ -108,11 +109,11 @@ stdenv.mkDerivation rec { system. Application windows can be managed by keyboard and mouse. Windows can be iconified to the taskbar, to the tray, to the desktop or be made hidden. They are controllable by a quick switch window (Alt+Tab) and in a - window list. A handful of configurable focus models are - menu-selectable. Setups with multiple monitors are supported by RandR and - Xinerama. IceWM is very configurable, themeable and well documented. It - includes an optional external background wallpaper manager with - transparency support, a simple session manager and a system tray. + window list. A handful of configurable focus models are menu-selectable. + Setups with multiple monitors are supported by RandR and Xinerama. IceWM + is very configurable, themeable and well documented. It includes an + optional external background wallpaper manager with transparency support, + a simple session manager and a system tray. ''; license = licenses.lgpl2Only; maintainers = [ maintainers.AndersonTorres ]; From c513d291067805ff95c29af18fa126fd5a19244c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 7 Mar 2022 22:22:57 -0300 Subject: [PATCH 069/329] nsxiv: 28 -> 29 --- pkgs/applications/graphics/nsxiv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/nsxiv/default.nix b/pkgs/applications/graphics/nsxiv/default.nix index 8c414c372479..c1ebbd57c0d6 100644 --- a/pkgs/applications/graphics/nsxiv/default.nix +++ b/pkgs/applications/graphics/nsxiv/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "nsxiv"; - version = "28"; + version = "29"; src = fetchFromGitHub { owner = "nsxiv"; repo = pname; rev = "v${version}"; - hash = "sha256-12RmEAzZdeanrRtnan96loXT7qSjIMjcWf296XmNE+A="; + hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE="; }; buildInputs = [ From 9a4f967173534d3f007e10b493b0a94248d53634 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 7 Mar 2022 22:23:19 -0300 Subject: [PATCH 070/329] labwc: 0.4.0 -> 0.5.0 --- .../window-managers/labwc/default.nix | 11 ++----- ...x-the-version-constraint-for-wlroots.patch | 29 ------------------- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 580fd29faa04..f58b71ef03ad 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -21,20 +21,15 @@ stdenv.mkDerivation rec { pname = "labwc"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "labwc"; repo = pname; rev = version; - hash = "sha256-O9jVDR7UROt5u8inUsZjbzB3dQTosiLYqXkeOyGrbaM="; + hash = "sha256-G0EQuXSHftl4JLXKIro+tmhbApwAhlzcjPEL7DP6LHk="; }; - patches = [ - # Required to fix the build with wlroots 0.15.1: - ./relax-the-version-constraint-for-wlroots.patch - ]; - nativeBuildInputs = [ meson ninja @@ -64,6 +59,6 @@ stdenv.mkDerivation rec { description = "A Wayland stacking compositor, similar to Openbox"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + inherit (wayland.meta) platforms; }; } diff --git a/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch b/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch deleted file mode 100644 index 9a790f285164..000000000000 --- a/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 21d8bfcf7899f5ec50b29f523ace4c19cbfbe919 Mon Sep 17 00:00:00 2001 -From: Michael Weiss -Date: Fri, 4 Feb 2022 21:17:05 +0100 -Subject: [PATCH] build: Relax the version constraint for wlroots to accept - patch releases - -Patch releases only contain backwards compatible changes (mainly bug -fixes) so we want to allow them. This fixes the build with the recently -released wlroots 0.15.1 and uses the same version constraints as other -projects that depend on wlroots (e.g., Sway). ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f950b8e..1905dda 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,7 +37,7 @@ if git.found() - endif - add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c') - --wlroots_version = ['=0.15.0'] -+wlroots_version = ['>=0.15.0', '<0.16.0'] - wlroots_proj = subproject( - 'wlroots', - default_options: ['default_library=static', 'examples=false'], --- -2.34.1 From aea2be707028a175c5c607531f6275c6086a3fc6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 7 Mar 2022 22:30:57 -0300 Subject: [PATCH 071/329] tcsh: 6.23.02 -> 6.24.00 --- pkgs/shells/tcsh/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 1befd2897577..2c8548fb1fd1 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -7,20 +7,21 @@ stdenv.mkDerivation rec { pname = "tcsh"; - version = "6.23.02"; + version = "6.24.00"; src = fetchurl { urls = [ - "https://astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" "https://astron.com/pub/tcsh/${pname}-${version}.tar.gz" - "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" + "https://astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" - "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz" - "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" - "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" + "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" + "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz" ]; - hash = "sha256-wD+AQFE2cxswkdpzWoHN2EgAhRAySrMl8jWv9wnkRus="; + hash = "sha256-YL4sUEvY8fpuQksZVkldfnztUqKslNtf0n9La/yPdPA="; }; buildInputs = [ From 054ad3e47e8fd9c433975b4f1924e5e18fa95d6b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 7 Mar 2022 22:30:39 -0300 Subject: [PATCH 072/329] zchunk: 1.1.16 -> 1.2.0 --- pkgs/development/libraries/zchunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index c2ddda7a6c5f..99fbb84ed28b 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.16"; + version = "1.2.0"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-+8FkivLTZXdu0+1wu+7T98y6rQzIHbG9l15Abrbln1o="; + hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; }; nativeBuildInputs = [ From c8021081cf7fc2b125de751342b1580ff3a342d8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 9 Mar 2022 11:59:37 -0300 Subject: [PATCH 073/329] zchunk: broken on Darwin --- pkgs/development/libraries/zchunk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 99fbb84ed28b..c639eb7b30e9 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # does not find argp-standalone }; } From 77140cea8d696ef94103d10f5f92f5360d04f233 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 9 Mar 2022 15:29:14 +0000 Subject: [PATCH 074/329] mold: 1.1 -> 1.1.1 --- pkgs/development/tools/mold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 00bcd3a5f12f..db1c13da2f98 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+uIP/U7H9P7oy78TL1edX9+JNYUzpwro105PYj3D6Yk="; + sha256 = "sha256-+uPVt3w3A25JFyENxqhAcjZMRzSowi2uHwGjkeQP8Og="; }; buildInputs = [ zlib openssl ]; From acb148bd329b0a558edb43c432869ae5f9cb5272 Mon Sep 17 00:00:00 2001 From: Will Young Date: Wed, 9 Mar 2022 19:38:34 +0100 Subject: [PATCH 075/329] spidermonkey_91: 91.6.0 -> 91.7.0 --- pkgs/development/interpreters/spidermonkey/91.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index 6be61a1210b6..811a0247a57d 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "91.6.0"; + version = "91.7.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; + sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301"; }; outputs = [ "out" "dev" ]; From 57a7e9417584873ca542998becb6488341e4da86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 19:06:58 +0000 Subject: [PATCH 076/329] roxterm: 3.11.1 -> 3.12.1 --- pkgs/applications/terminal-emulators/roxterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index da9bfac952b5..3e4454726b66 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.11.1"; + version = "3.12.1"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "1n7588bl83sp51jwjq97f526c7fkh0kq90idw3nayb4zmi530irx"; + sha256 = "sha256-jVcf/nrEq8dM8rw40ZhXGJjt3DQLroCePtIAdAsVIfs="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; From 36891364410b13cf44e2aca64a03e7f33a234896 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Thu, 10 Mar 2022 09:34:40 -0500 Subject: [PATCH 077/329] swtpm: fix build on darwin --- pkgs/tools/security/swtpm/default.nix | 37 +++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index 648165d8262e..426c43b03cac 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -28,23 +28,28 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config unixtools.netstat expect socat perl # for pod2man + python3 autoreconfHook ]; checkInputs = [ - python3 which + which ]; buildInputs = [ libtpms - openssl libtasn1 libseccomp - fuse glib json-glib + openssl libtasn1 + glib json-glib gnutls + ] ++ lib.optionals stdenv.isLinux [ + fuse + libseccomp ]; configureFlags = [ - "--with-cuse" "--localstatedir=/var" + ] ++ lib.optionals stdenv.isLinux [ + "--with-cuse" ]; postPatch = '' @@ -56,9 +61,31 @@ stdenv.mkDerivation rec { # Use the correct path to the certtool binary # instead of relying on it being in the environment - substituteInPlace src/swtpm_localca/swtpm_localca.c --replace \ + substituteInPlace src/swtpm_localca/swtpm_localca.c \ + --replace \ + '# define CERTTOOL_NAME "gnutls-certtool"' \ + '# define CERTTOOL_NAME "${gnutls}/bin/certtool"' \ + --replace \ '# define CERTTOOL_NAME "certtool"' \ '# define CERTTOOL_NAME "${gnutls}/bin/certtool"' + + substituteInPlace tests/common --replace \ + 'CERTTOOL=gnutls-certtool;;' \ + 'CERTTOOL=certtool;;' + + # Fix error on macOS: + # stat: invalid option -- '%' + # This is caused by the stat program not being the BSD version, + # as is expected by the test + substituteInPlace tests/common --replace \ + 'if [[ "$(uname -s)" =~ (Linux|CYGWIN_NT-) ]]; then' \ + 'if [[ "$(uname -s)" =~ (Linux|Darwin|CYGWIN_NT-) ]]; then' + + # Otherwise certtool seems to pick up the system language on macOS, + # which might cause a test to fail + substituteInPlace tests/test_swtpm_setup_create_cert --replace \ + '$CERTTOOL' \ + 'LC_ALL=C.UTF-8 $CERTTOOL' ''; doCheck = true; From 6a5d127acce5247687b7cc49d15f16ea1d4ec537 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Thu, 10 Mar 2022 17:15:24 -0500 Subject: [PATCH 078/329] swtpm: 0.7.1 -> 0.7.2 --- pkgs/tools/security/swtpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index 426c43b03cac..39128084352e 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-LJQF8PlRkhCJ8rjZzDetg1BFuTb7GBJ8lW6u5hO134k="; + sha256 = "sha256-qeyPCJTNnwuaCosHzqnrQc0JNznGBfDTLsuDmuKREjU="; }; nativeBuildInputs = [ From 02fd7dcb29d7a49944890be322bc797297186dc6 Mon Sep 17 00:00:00 2001 From: Van Tuan Vo Date: Thu, 10 Mar 2022 23:59:05 +0100 Subject: [PATCH 079/329] fluidd: 1.16.2 -> 1.17.1 --- pkgs/applications/misc/fluidd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index eee466650e3d..766b05b2e145 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.16.2"; + version = "1.17.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "1qwj25xvvxvm1fxx216nn2gp7js4d682mm3l4s7ns90fc5ygvc8i"; + sha256 = "sha256-F4hAFLsZmRg/zeTHo9eYoT0BasorynGaSzNSbKr2/JE="; }; nativeBuildInputs = [ unzip ]; From ac74ab0236bb83bbea64538a70ae3f61c0e85235 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 11 Mar 2022 10:36:10 +1200 Subject: [PATCH 080/329] zfs: Remove top-level `with` from expression Using `with` in such a high up scope makes it very easy to accidentally forget to update function arguments and introduce typos because of the lack of any editor support and static analysis. It's better to explicitly inherit the small number of things we need from `lib` into scope so that editors can know of scoped variables. --- pkgs/os-specific/linux/zfs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7341240f95af..16aed8e4a76a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -19,8 +19,9 @@ , linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 }: -with lib; let + inherit (lib) any optionalString optionals optional makeBinPath; + smartmon = smartmontools.override { inherit enableMail; }; buildKernel = any (n: n == configFile) [ "kernel" "all" ]; @@ -113,7 +114,7 @@ let configureFlags = [ "--with-config=${configFile}" "--with-tirpc=1" - (withFeatureAs (buildUser && enablePython) "python" python3.interpreter) + (lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter) ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" @@ -200,9 +201,9 @@ let ''; homepage = "https://github.com/openzfs/zfs"; changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; - license = licenses.cddl; - platforms = platforms.linux; - maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; + license = lib.licenses.cddl; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. From 2a6d6397059ed67714764c4642a14e8a33650495 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 11 Mar 2022 00:12:56 +0000 Subject: [PATCH 081/329] vscode: 1.65.1 -> 1.65.2 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 7fc805a8b112..370647de1fcf 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 = "09hqcym8dj4d8r5ibdzypdmjxdw4ix24zq688vnb4kfas2jbb3hi"; - x86_64-darwin = "1wij82gl1wqrprrfn9cfih19wr4h3bn2xapr1l2l0mkansrzsvg5"; - aarch64-linux = "09x93i190lmxb3ygzjcmb7ag3dz7ixf07yk7zqc7ljrnn5f0b6ag"; - aarch64-darwin = "1k7glnqy0vjx55chjpwbgwipcvzb0vx0wmvqis865pvzmr0d06a0"; - armv7l-linux = "0vkivg1f61k8vkr0j9dm7fw2klh45xxnp07pill1gmrwxafm5bra"; + x86_64-linux = "0x8vc6gj83mn767wi285k0hxhlh5gh1lcvq63na89vglja4ipna4"; + x86_64-darwin = "1x47xfq0fgd10wq6aa8gq55aqrl1ir1f6v1mm6324yny16pf20k2"; + aarch64-linux = "1ibg2qvpnwfwwzgby2xva9xz138b13x9q8vf1xf6plazv0arla1l"; + aarch64-darwin = "100834mqix7b46frlqf0jz4qs673lavxm8sizfjm7c9y0xxy4ld3"; + armv7l-linux = "100yfkzvnjccp1g3p353jr2vicvkjc0skiwmmzgad6i8j1m9js62"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.65.1"; + version = "1.65.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From d844a61cc4066dec0c654c9b220cff13d3c78ec4 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Thu, 10 Mar 2022 19:08:14 -0800 Subject: [PATCH 082/329] probe-run: 0.3.1 -> 0.3.2 --- pkgs/development/tools/rust/probe-run/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 2626de0f84ba..a668fdd11725 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,14 +3,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.1"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "1nfbpdx378p988q75hka9r8zp3xb9zy3dnagcxmha6dca5dhgsdm"; + sha256 = "sha256-SXA77LXM1SuBJ8BH+ahwJl/3gWsCbdLXBiHZdJySWq0="; }; - cargoSha256 = "05p3vmar00215x4mwsvs5knf4wrwmpq52rmbbi6b4qaqs3gqaghy"; + cargoSha256 = "sha256-e9POSuA/I7IUKUOxMTfCWxNn0AicojpGQpxamzmHa7g="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/knurling-rs/probe-run"; changelog = "https://github.com/knurling-rs/probe-run/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ hoverbear ]; + maintainers = with maintainers; [ hoverbear newam ]; }; } From 52ea9d622a03eafe78c007bf3fd549d29ced05ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Mar 2022 07:03:54 +0000 Subject: [PATCH 083/329] unrar: 6.1.5 -> 6.1.6 --- pkgs/tools/archivers/unrar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 3fa4089b866b..b988a135e454 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "6.1.5"; + version = "6.1.6"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "sha256-TlZxfYZ83/egAIt/Haaqeax6j5dM8TTUmowWtXe87Uo="; + sha256 = "sha256-Z/SriRwGIhjCut+qycjKtci/1eltq/ylbI+qPSCagB0="; }; postPatch = '' From 423913035a300abcfb52c2efe321c31262ab1f2e Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Fri, 11 Mar 2022 11:45:17 +0000 Subject: [PATCH 084/329] maintainers: add brianmcgee --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 077381e8d30b..f6ceeaca718d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1688,6 +1688,12 @@ githubId = 355401; name = "Brian Hicks"; }; + brianmcgee = { + name = "Brian McGee"; + email = "brian@41north.dev"; + github = "brianmcgee"; + githubId = 1173648; + }; Br1ght0ne = { email = "brightone@protonmail.com"; github = "Br1ght0ne"; From f03b1a937e3bfd692ae5154a1eb5245810b269cc Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 11 Mar 2022 12:10:34 +0000 Subject: [PATCH 085/329] vscodium: 1.65.1 -> 1.65.2 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 4fd3e89ec591..a91227d9db40 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 = "09zpc8c2il6x88h65kbm6z8vfnx0byzpcqqy9a1za5ilqr3dhk43"; - x86_64-darwin = "09m2ij0phf5ni5m110z2bnmd9z50lz1qsh7w7cfawycjhwsl602z"; - aarch64-linux = "1nsdn9mc4ahrz392w2z071sfxc5jmwhamlaid2qy899cc7sk8nqr"; - armv7l-linux = "1ii6li6l09ccxf0gyjy3f5752kr4a8pga5w0a0ndgfa73mhlamin"; + x86_64-linux = "1sh2f7hwhilwmlgy11kl0s2n3phpcir15wyl2fkyhsr2kdj4jz9r"; + x86_64-darwin = "1s04d91f08982wi8hb4dw0j57d6zqrdgns16ihrgsvahrzksgq4b"; + aarch64-linux = "1a97lk1qz2lz0lk5lpja32zy07iwdbskp6baf429iz7fz232rshm"; + armv7l-linux = "0vjqxqcr7fq3ncx1nl6ny7qcqm4vlsn33c074hhcg5292blg2a0p"; }.${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.65.1"; + version = "1.65.2"; pname = "vscodium"; executableName = "codium"; From acb535fb61930c657be9ae5eca221a47391c91e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 6 Mar 2022 14:52:54 +0100 Subject: [PATCH 086/329] nixos/switchTest: Also test targets --- nixos/tests/switch-test.nix | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 78eb71f0a28e..4160e4818536 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -350,6 +350,31 @@ in { systemd.timers.test-timer.timerConfig.OnCalendar = lib.mkForce "Fri 2012-11-23 16:00:00"; }; + hybridSleepModified.configuration = { + systemd.targets.hybrid-sleep.unitConfig.X-Test = true; + }; + + target.configuration = { + systemd.targets.test-target.wantedBy = [ "multi-user.target" ]; + # We use this service to figure out whether the target was modified. + # This is the only way because targets are filtered and therefore not + # printed when they are started/stopped. + systemd.services.test-service = { + bindsTo = [ "test-target.target" ]; + serviceConfig.ExecStart = "${pkgs.coreutils}/bin/sleep infinity"; + }; + }; + + targetModified.configuration = { + imports = [ target.configuration ]; + systemd.targets.test-target.unitConfig.X-Test = true; + }; + + targetModifiedStopOnReconfig.configuration = { + imports = [ target.configuration ]; + systemd.targets.test-target.unitConfig.X-StopOnReconfiguration = true; + }; + path.configuration = { systemd.paths.test-watch = { wantedBy = [ "paths.target" ]; @@ -821,6 +846,55 @@ in { out = machine.succeed("systemctl show test-timer.timer") assert_contains(out, "OnCalendar=Fri 2012-11-23 16:00:00") + with subtest("targets"): + # Modifying some special targets like hybrid-sleep.target does nothing + out = switch_to_specialisation("${machine}", "hybridSleepModified") + assert_contains(out, "stopping the following units: test-timer.timer\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Adding a new target starts it + out = switch_to_specialisation("${machine}", "target") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: test-target.target\n") + + # Changing a target doesn't print anything because the unit is filtered + machine.systemctl("start test-service.service") + out = switch_to_specialisation("${machine}", "targetModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.succeed("systemctl is-active test-service.service") # target was not restarted + + # With X-StopOnReconfiguration, the target gets stopped and started + out = switch_to_specialisation("${machine}", "targetModifiedStopOnReconfig") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.fail("systemctl is-active test-service.servce") # target was restarted + + # Remove the target by switching to the old specialisation + out = switch_to_specialisation("${machine}", "timerModified") + assert_contains(out, "stopping the following units: test-target.target\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: test-timer.timer\n") + with subtest("paths"): out = switch_to_specialisation("${machine}", "path") assert_contains(out, "stopping the following units: test-timer.timer\n") From c96180c53fcd4f36a7163c3e59a2e6bcd9233f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 6 Mar 2022 19:22:04 +0100 Subject: [PATCH 087/329] nixos/switch-to-configuration: Ignore some unit keys Some unit keys don't need to restart the service to make them effective. Reduce the amount of service restarts by ignoring these keys --- .../development/unit-handling.section.md | 3 +- .../development/unit-handling.section.xml | 5 +- .../activation/switch-to-configuration.pl | 67 ++++++++++++++----- nixos/tests/switch-test.nix | 14 ++++ 4 files changed, 71 insertions(+), 18 deletions(-) diff --git a/nixos/doc/manual/development/unit-handling.section.md b/nixos/doc/manual/development/unit-handling.section.md index bd4fe9e670f5..c51704ad0da4 100644 --- a/nixos/doc/manual/development/unit-handling.section.md +++ b/nixos/doc/manual/development/unit-handling.section.md @@ -17,7 +17,8 @@ checks: them and comparing their contents. If they are different but only `X-Reload-Triggers` in the `[Unit]` section is changed, **reload** the unit. The NixOS module system allows setting these triggers with the option - [systemd.services.\.reloadTriggers](#opt-systemd.services). If the + [systemd.services.\.reloadTriggers](#opt-systemd.services). There are + some additional keys in the `[Unit]` section that are ignored as well. If the unit files differ in any way, the following actions are performed: - `.path` and `.slice` units are ignored. There is no need to restart them diff --git a/nixos/doc/manual/from_md/development/unit-handling.section.xml b/nixos/doc/manual/from_md/development/unit-handling.section.xml index 57c4754c0018..642cc5cccc79 100644 --- a/nixos/doc/manual/from_md/development/unit-handling.section.xml +++ b/nixos/doc/manual/from_md/development/unit-handling.section.xml @@ -38,8 +38,9 @@ reload the unit. The NixOS module system allows setting these triggers with the option systemd.services.<name>.reloadTriggers. - If the unit files differ in any way, the following actions are - performed: + There are some additional keys in the [Unit] + section that are ignored as well. If the unit files differ in + any way, the following actions are performed: diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index a1653d451fea..ca45fc9c286e 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -226,10 +226,20 @@ sub unrecord_unit { sub compare_units { my ($old_unit, $new_unit) = @_; my $ret = 0; + # Keys to ignore in the [Unit] section + my %unit_section_ignores = map { $_ => 1 } qw( + X-Reload-Triggers + Description Documentation + OnFailure OnSuccess OnFailureJobMode + IgnoreOnIsolate StopWhenUnneeded + RefuseManualStart RefuseManualStop + AllowIsolate CollectMode + SourcePath + ); my $comp_array = sub { my ($a, $b) = @_; - return join("\0", @{$a}) eq join("\0", @{$b}); + return join("\0", @{$a}) eq join "\0", @{$b}; }; # Comparison hash for the sections @@ -238,6 +248,18 @@ sub compare_units { foreach my $section_name (keys %{$old_unit}) { # Missing section in the new unit? if (not exists $section_cmp{$section_name}) { + # If the [Unit] section was removed, make sure that only keys + # were in it that are ignored + if ($section_name eq 'Unit') { + foreach my $ini_key (keys %{$old_unit->{'Unit'}}) { + if (not defined $unit_section_ignores{$ini_key}) { + return 1; + } + } + next; # check the next section + } else { + return 1; + } if ($section_name eq 'Unit' and %{$old_unit->{'Unit'}} == 1 and defined(%{$old_unit->{'Unit'}}{'X-Reload-Triggers'})) { # If a new [Unit] section was removed that only contained X-Reload-Triggers, # do nothing. @@ -255,8 +277,8 @@ sub compare_units { my @old_value = @{$old_unit->{$section_name}{$ini_key}}; # If the key is missing in the new unit, they are different... if (not $new_unit->{$section_name}{$ini_key}) { - # ... unless the key that is now missing was the reload trigger - if ($section_name eq 'Unit' and $ini_key eq 'X-Reload-Triggers') { + # ... unless the key that is now missing is one of the ignored keys + if ($section_name eq 'Unit' and defined $unit_section_ignores{$ini_key}) { next; } return 1; @@ -264,19 +286,30 @@ sub compare_units { my @new_value = @{$new_unit->{$section_name}{$ini_key}}; # If the contents are different, the units are different if (not $comp_array->(\@old_value, \@new_value)) { - # Check if only the reload triggers changed - if ($section_name eq 'Unit' and $ini_key eq 'X-Reload-Triggers') { - $ret = 2; - } else { - return 1; + # Check if only the reload triggers changed or one of the ignored keys + if ($section_name eq 'Unit') { + if ($ini_key eq 'X-Reload-Triggers') { + $ret = 2; + next; + } elsif (defined $unit_section_ignores{$ini_key}) { + next; + } } + return 1; } } # A key was introduced that was missing in the old unit if (%ini_cmp) { - if ($section_name eq 'Unit' and %ini_cmp == 1 and defined($ini_cmp{'X-Reload-Triggers'})) { - # If the newly introduced key was the reload triggers, reload the unit - $ret = 2; + if ($section_name eq 'Unit') { + foreach my $ini_key (keys %ini_cmp) { + if ($ini_key eq 'X-Reload-Triggers') { + $ret = 2; + } elsif (defined $unit_section_ignores{$ini_key}) { + next; + } else { + return 1; + } + } } else { return 1; } @@ -284,10 +317,14 @@ sub compare_units { } # A section was introduced that was missing in the old unit if (%section_cmp) { - if (%section_cmp == 1 and defined($section_cmp{'Unit'}) and %{$new_unit->{'Unit'}} == 1 and defined(%{$new_unit->{'Unit'}}{'X-Reload-Triggers'})) { - # If a new [Unit] section was introduced that only contains X-Reload-Triggers, - # reload instead of restarting - $ret = 2; + if (%section_cmp == 1 and defined $section_cmp{'Unit'}) { + foreach my $ini_key (keys %{$new_unit->{'Unit'}}) { + if (not defined $unit_section_ignores{$ini_key}) { + return 1; + } elsif ($ini_key eq 'X-Reload-Triggers') { + $ret = 2; + } + } } else { return 1; } diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 4160e4818536..a994fb781600 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -64,6 +64,11 @@ in { }; }; + simpleServiceDifferentDescription.configuration = { + imports = [ simpleService.configuration ]; + systemd.services.test.description = "Test unit"; + }; + simpleServiceModified.configuration = { imports = [ simpleService.configuration ]; systemd.services.test.serviceConfig.X-Test = true; @@ -497,6 +502,15 @@ in { assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") + # Only changing the description does nothing + out = switch_to_specialisation("${machine}", "simpleServiceDifferentDescription") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + # Restart the simple service out = switch_to_specialisation("${machine}", "simpleServiceModified") assert_contains(out, "stopping the following units: test.service\n") From 3052d3aa50674f2cfeee7c7ddf42c36d84013e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 6 Mar 2022 19:38:51 +0100 Subject: [PATCH 088/329] nixos/switch-to-configuration: Fix restarting by activation script This bug is so obscure and unlikely that I was honestly not able to properly write a test for it. What happens is that we are calling handleModifiedUnit() with $unitsToStart=\%unitsToRestart. We do this to make sure that the unit is stopped before it's started again which is not possible by regular means because the stop phase is already done when calling the activation script. recordUnit() still gets $startListFile, however which is the wrong file. The bug would be triggered if an activation script requests a service restart for a service that has `stopIfChanged = true` and switch-to-configuration is killed before the restart phase was run. If the script is run again, but the activation script is not requesting more restarts, the unit would be started instead of restarted. --- .../system/activation/switch-to-configuration.pl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index ca45fc9c286e..a67a9b057787 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -392,7 +392,11 @@ sub handleModifiedUnit { # exist in new configuration: if (-e "$out/etc/systemd/system/$socket") { $unitsToStart->{$socket} = 1; - recordUnit($startListFile, $socket); + if ($unitsToStart eq $unitsToRestart) { + recordUnit($restartListFile, $socket); + } else { + recordUnit($startListFile, $socket); + } $socket_activated = 1; } # Remove from units to reload so we don't restart and reload @@ -410,7 +414,11 @@ sub handleModifiedUnit { # service gets restarted if we're interrupted. if (!$socket_activated) { $unitsToStart->{$unit} = 1; - recordUnit($startListFile, $unit); + if ($unitsToStart eq $unitsToRestart) { + recordUnit($restartListFile, $unit); + } else { + recordUnit($startListFile, $unit); + } } $unitsToStop->{$unit} = 1; From bc58430068d0bd0ffd3ef561a92a05f5970d149c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 6 Mar 2022 22:43:47 +0100 Subject: [PATCH 089/329] nixos/switch-to-configuration: Fix reloading of stopped services --- .../development/unit-handling.section.md | 3 + .../development/unit-handling.section.xml | 5 ++ .../activation/switch-to-configuration.pl | 31 ++++++++++ nixos/tests/switch-test.nix | 59 +++++++++++++++++++ 4 files changed, 98 insertions(+) diff --git a/nixos/doc/manual/development/unit-handling.section.md b/nixos/doc/manual/development/unit-handling.section.md index c51704ad0da4..a7ccb3dbd042 100644 --- a/nixos/doc/manual/development/unit-handling.section.md +++ b/nixos/doc/manual/development/unit-handling.section.md @@ -34,6 +34,9 @@ checks: - The rest of the units (mostly `.service` units) are then **reload**ed if `X-ReloadIfChanged` in the `[Service]` section is set to `true` (exposed via [systemd.services.\.reloadIfChanged](#opt-systemd.services)). + A little exception is done for units that were deactivated in the meantime, + for example because they require a unit that got stopped before. These + are **start**ed instead of reloaded. - If the reload flag is not set, some more flags decide if the unit is skipped. These flags are `X-RestartIfChanged` in the `[Service]` section diff --git a/nixos/doc/manual/from_md/development/unit-handling.section.xml b/nixos/doc/manual/from_md/development/unit-handling.section.xml index 642cc5cccc79..4c980e1213a8 100644 --- a/nixos/doc/manual/from_md/development/unit-handling.section.xml +++ b/nixos/doc/manual/from_md/development/unit-handling.section.xml @@ -72,6 +72,11 @@ [Service] section is set to true (exposed via systemd.services.<name>.reloadIfChanged). + A little exception is done for units that were deactivated + in the meantime, for example because they require a unit + that got stopped before. These are + started instead of + reloaded. diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index a67a9b057787..d83198bc346e 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -104,6 +104,19 @@ sub getActiveUnits { return $res; } +# Returns whether a systemd unit is active +sub unit_is_active { + my ($unit_name) = @_; + + my $mgr = Net::DBus->system->get_service('org.freedesktop.systemd1')->get_object('/org/freedesktop/systemd1'); + my $units = $mgr->ListUnitsByNames([$unit_name]); + if (@{$units} == 0) { + return 0; + } + my $active_state = $units->[0]->[3]; ## no critic (ValuesAndExpressions::ProhibitMagicNumbers) + return $active_state eq 'active' || $active_state eq 'activating'; +} + sub parseFstab { my ($filename) = @_; my ($fss, $swaps); @@ -744,6 +757,24 @@ close $listActiveUsers; print STDERR "setting up tmpfiles\n"; system("@systemd@/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-prefix=/dev") == 0 or $res = 3; +# Before reloading we need to ensure that the units are still active. They may have been +# deactivated because one of their requirements got stopped. If they are inactive +# but should have been reloaded, the user probably expects them to be started. +if (scalar(keys %unitsToReload) > 0) { + for my $unit (keys %unitsToReload) { + if (!unit_is_active($unit)) { + # Figure out if we need to start the unit + my %unit_info = parse_unit("$out/etc/systemd/system/$unit"); + if (!(parseSystemdBool(\%unit_info, 'Unit', 'RefuseManualStart', 0) || parseSystemdBool(\%unit_info, 'Unit', 'X-OnlyManualStart', 0))) { + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); + } + # Don't reload the unit, reloading would fail + delete %unitsToReload{$unit}; + unrecord_unit($reloadListFile, $unit); + } + } +} # Reload units that need it. This includes remounting changed mount # units. if (scalar(keys %unitsToReload) > 0) { diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index a994fb781600..93eee4babc2d 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -208,6 +208,39 @@ in { systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test"; }; + unitWithRequirement.configuration = { + systemd.services.required-service = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + systemd.services.test-service = { + wantedBy = [ "multi-user.target" ]; + requires = [ "required-service.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + unitWithRequirementModified.configuration = { + imports = [ unitWithRequirement.configuration ]; + systemd.services.required-service.serviceConfig.X-Test = "test"; + systemd.services.test-service.reloadTriggers = [ "test" ]; + }; + + unitWithRequirementModifiedNostart.configuration = { + imports = [ unitWithRequirement.configuration ]; + systemd.services.test-service.unitConfig.RefuseManualStart = true; + }; + restart-and-reload-by-activation-script.configuration = { systemd.services = rec { simple-service = { @@ -574,6 +607,32 @@ in { assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n") assert_lacks(out, "the following new units were started:") + # Ensure units that require changed units are properly reloaded + out = switch_to_specialisation("${machine}", "unitWithRequirement") + assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: required-service.service, test-service.service\n") + + out = switch_to_specialisation("${machine}", "unitWithRequirementModified") + assert_contains(out, "stopping the following units: required-service.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: required-service.service, test-service.service\n") + assert_lacks(out, "the following new units were started:") + + # Unless the unit asks to be not restarted + out = switch_to_specialisation("${machine}", "unitWithRequirementModifiedNostart") + assert_contains(out, "stopping the following units: required-service.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: required-service.service\n") + assert_lacks(out, "the following new units were started:") + with subtest("failing units"): # Let the simple service fail switch_to_specialisation("${machine}", "simpleServiceModified") From 461c1c9e86ccccd2d6c18c3ef9117ddab550e068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 10 Mar 2022 12:54:59 +0100 Subject: [PATCH 090/329] nixos/switch-to-configuration: Use parenthesis on all calls --- .../activation/switch-to-configuration.pl | 177 +++++++++--------- 1 file changed, 89 insertions(+), 88 deletions(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index d83198bc346e..07ee281feec1 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -10,6 +10,8 @@ use Net::DBus; use Sys::Syslog qw(:standard :macros); use Cwd 'abs_path'; +## no critic(CodeLayout::ProhibitParensWithBuiltins) + my $out = "@out@"; my $curSystemd = abs_path("/run/current-system/sw/bin"); @@ -36,13 +38,13 @@ my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list"; make_path("/run/nixos", { mode => oct(755) }); -my $action = shift @ARGV; +my $action = shift(@ARGV); if ("@localeArchive@" ne "") { $ENV{LOCALE_ARCHIVE} = "@localeArchive@"; } -if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) { +if (!defined($action) || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) { print STDERR < 'quiet') // "") =~ /ID="?nixos"?/s; openlog("nixos", "", LOG_USER); # Install or update the bootloader. if ($action eq "switch" || $action eq "boot") { - system("@installBootLoader@ $out") == 0 or exit 1; + system('@installBootLoader@', $out) == 0 or exit 1; } # Just in case the new configuration hangs the system, do a sync now. system("@coreutils@/bin/sync", "-f", "/nix/store") unless ($ENV{"NIXOS_NO_SYNC"} // "") eq "1"; -exit 0 if $action eq "boot"; +exit(0) if $action eq "boot"; # Check if we can activate the new configuration. my $oldVersion = read_file("/run/current-system/init-interface-version", err_mode => 'quiet') // ""; @@ -83,7 +85,7 @@ Warning: the new NixOS configuration has an ‘init’ that is incompatible with the current configuration. The new configuration won\'t take effect until you reboot the system. EOF - exit 100; + exit(100); } # Ignore SIGHUP so that we're not killed if we're running on (say) @@ -110,7 +112,7 @@ sub unit_is_active { my $mgr = Net::DBus->system->get_service('org.freedesktop.systemd1')->get_object('/org/freedesktop/systemd1'); my $units = $mgr->ListUnitsByNames([$unit_name]); - if (@{$units} == 0) { + if (scalar(@{$units}) == 0) { return 0; } my $active_state = $units->[0]->[3]; ## no critic (ValuesAndExpressions::ProhibitMagicNumbers) @@ -121,10 +123,10 @@ sub parseFstab { my ($filename) = @_; my ($fss, $swaps); foreach my $line (read_file($filename, err_mode => 'quiet')) { - chomp $line; + chomp($line); $line =~ s/^\s*#.*//; next if $line =~ /^\s*$/; - my @xs = split / /, $line; + my @xs = split(/ /, $line); if ($xs[2] eq "swap") { $swaps->{$xs[0]} = { options => $xs[3] // "" }; } else { @@ -146,17 +148,16 @@ sub parseFstab { sub parseSystemdIni { my ($unitContents, $path) = @_; # Tie the ini file to a hash for easier access - my %fileContents; - tie %fileContents, "Config::IniFiles", (-file => $path, -allowempty => 1, -allowcontinue => 1); + tie(my %fileContents, 'Config::IniFiles', (-file => $path, -allowempty => 1, -allowcontinue => 1)); ## no critic(Miscellanea::ProhibitTies) # Copy over all sections - foreach my $sectionName (keys %fileContents) { + foreach my $sectionName (keys(%fileContents)) { if ($sectionName eq "Install") { # Skip the [Install] section because it has no relevant keys for us next; } # Copy over all keys - foreach my $iniKey (keys %{$fileContents{$sectionName}}) { + foreach my $iniKey (keys(%{$fileContents{$sectionName}})) { # Ensure the value is an array so it's easier to work with my $iniValue = $fileContents{$sectionName}{$iniKey}; my @iniValues; @@ -194,7 +195,7 @@ sub parse_unit { # Replace \ with \\ so glob() still works with units that have a \ in them # Valid characters in unit names are ASCII letters, digits, ":", "-", "_", ".", and "\" $unit_path =~ s/\\/\\\\/gmsx; - foreach (glob "${unit_path}{,.d/*.conf}") { + foreach (glob("${unit_path}{,.d/*.conf}")) { parseSystemdIni(\%unit_data, "$_") } return %unit_data; @@ -207,7 +208,7 @@ sub parseSystemdBool { my @values = @{$unitConfig->{$sectionName}{$boolName} // []}; # Return default if value is not set - if (scalar @values lt 1 || not defined $values[-1]) { + if (scalar(@values) lt 1 || not defined($values[-1])) { return $default; } # If value is defined multiple times, use the last definition @@ -224,7 +225,7 @@ sub recordUnit { # The opposite of recordUnit, removes a unit name from a file sub unrecord_unit { my ($fn, $unit) = @_; - edit_file { s/^$unit\n//msx } $fn if $action ne "dry-activate"; + edit_file(sub { s/^$unit\n//msx }, $fn) if $action ne "dry-activate"; } # Compare the contents of two unit files and return whether the unit @@ -252,20 +253,20 @@ sub compare_units { my $comp_array = sub { my ($a, $b) = @_; - return join("\0", @{$a}) eq join "\0", @{$b}; + return join("\0", @{$a}) eq join("\0", @{$b}); }; # Comparison hash for the sections - my %section_cmp = map { $_ => 1 } keys %{$new_unit}; + my %section_cmp = map { $_ => 1 } keys(%{$new_unit}); # Iterate over the sections - foreach my $section_name (keys %{$old_unit}) { + foreach my $section_name (keys(%{$old_unit})) { # Missing section in the new unit? - if (not exists $section_cmp{$section_name}) { + if (not exists($section_cmp{$section_name})) { # If the [Unit] section was removed, make sure that only keys # were in it that are ignored if ($section_name eq 'Unit') { - foreach my $ini_key (keys %{$old_unit->{'Unit'}}) { - if (not defined $unit_section_ignores{$ini_key}) { + foreach my $ini_key (keys(%{$old_unit->{'Unit'}})) { + if (not defined($unit_section_ignores{$ini_key})) { return 1; } } @@ -283,15 +284,15 @@ sub compare_units { } delete $section_cmp{$section_name}; # Comparison hash for the section contents - my %ini_cmp = map { $_ => 1 } keys %{$new_unit->{$section_name}}; + my %ini_cmp = map { $_ => 1 } keys(%{$new_unit->{$section_name}}); # Iterate over the keys of the section - foreach my $ini_key (keys %{$old_unit->{$section_name}}) { + foreach my $ini_key (keys(%{$old_unit->{$section_name}})) { delete $ini_cmp{$ini_key}; my @old_value = @{$old_unit->{$section_name}{$ini_key}}; # If the key is missing in the new unit, they are different... if (not $new_unit->{$section_name}{$ini_key}) { # ... unless the key that is now missing is one of the ignored keys - if ($section_name eq 'Unit' and defined $unit_section_ignores{$ini_key}) { + if ($section_name eq 'Unit' and defined($unit_section_ignores{$ini_key})) { next; } return 1; @@ -304,7 +305,7 @@ sub compare_units { if ($ini_key eq 'X-Reload-Triggers') { $ret = 2; next; - } elsif (defined $unit_section_ignores{$ini_key}) { + } elsif (defined($unit_section_ignores{$ini_key})) { next; } } @@ -314,10 +315,10 @@ sub compare_units { # A key was introduced that was missing in the old unit if (%ini_cmp) { if ($section_name eq 'Unit') { - foreach my $ini_key (keys %ini_cmp) { + foreach my $ini_key (keys(%ini_cmp)) { if ($ini_key eq 'X-Reload-Triggers') { $ret = 2; - } elsif (defined $unit_section_ignores{$ini_key}) { + } elsif (defined($unit_section_ignores{$ini_key})) { next; } else { return 1; @@ -330,9 +331,9 @@ sub compare_units { } # A section was introduced that was missing in the old unit if (%section_cmp) { - if (%section_cmp == 1 and defined $section_cmp{'Unit'}) { - foreach my $ini_key (keys %{$new_unit->{'Unit'}}) { - if (not defined $unit_section_ignores{$ini_key}) { + if (%section_cmp == 1 and defined($section_cmp{'Unit'})) { + foreach my $ini_key (keys(%{$new_unit->{'Unit'}})) { + if (not defined($unit_section_ignores{$ini_key})) { return 1; } elsif ($ini_key eq 'X-Reload-Triggers') { $ret = 2; @@ -393,11 +394,11 @@ sub handleModifiedUnit { my $socket_activated = 0; if ($unit =~ /\.service$/) { my @sockets = split(/ /, join(" ", @{$unitInfo{Service}{Sockets} // []})); - if (scalar @sockets == 0) { + if (scalar(@sockets) == 0) { @sockets = ("$baseName.socket"); } foreach my $socket (@sockets) { - if (defined $activePrev->{$socket}) { + if (defined($activePrev->{$socket})) { # We can now be sure this is a socket-activate unit $unitsToStop->{$socket} = 1; @@ -459,8 +460,8 @@ $unitsToRestart{$_} = 1 foreach $unitsToReload{$_} = 1 foreach split('\n', read_file($reloadListFile, err_mode => 'quiet') // ""); -my $activePrev = getActiveUnits; -while (my ($unit, $state) = each %{$activePrev}) { +my $activePrev = getActiveUnits(); +while (my ($unit, $state) = each(%{$activePrev})) { my $baseUnit = $unit; my $prevUnitFile = "/etc/systemd/system/$baseUnit"; @@ -520,9 +521,9 @@ while (my ($unit, $state) = each %{$activePrev}) { my %old_unit_info = parse_unit($prevUnitFile); my %new_unit_info = parse_unit($newUnitFile); my $diff = compare_units(\%old_unit_info, \%new_unit_info); - if ($diff eq 1) { + if ($diff == 1) { handleModifiedUnit($unit, $baseName, $newUnitFile, \%new_unit_info, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); - } elsif ($diff eq 2 and not $unitsToRestart{$unit}) { + } elsif ($diff == 2 and not $unitsToRestart{$unit}) { $unitsToReload{$unit} = 1; recordUnit($reloadListFile, $unit); } @@ -533,11 +534,11 @@ while (my ($unit, $state) = each %{$activePrev}) { sub pathToUnitName { my ($path) = @_; # Use current version of systemctl binary before daemon is reexeced. - open my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path + open(my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path) or die "Unable to escape $path!\n"; - my $escaped = join "", <$cmd>; - chomp $escaped; - close $cmd or die; + my $escaped = join("", <$cmd>); + chomp($escaped); + close($cmd) or die('Unable to close systemd-escape pipe'); return $escaped; } @@ -546,13 +547,13 @@ sub pathToUnitName { # automatically by starting local-fs.target. FIXME: might be nicer if # we generated units for all mounts; then we could unify this with the # unit checking code above. -my ($prevFss, $prevSwaps) = parseFstab "/etc/fstab"; -my ($newFss, $newSwaps) = parseFstab "$out/etc/fstab"; -foreach my $mountPoint (keys %$prevFss) { +my ($prevFss, $prevSwaps) = parseFstab("/etc/fstab"); +my ($newFss, $newSwaps) = parseFstab("$out/etc/fstab"); +foreach my $mountPoint (keys(%$prevFss)) { my $prev = $prevFss->{$mountPoint}; my $new = $newFss->{$mountPoint}; my $unit = pathToUnitName($mountPoint); - if (!defined $new) { + if (!defined($new)) { # Filesystem entry disappeared, so unmount it. $unitsToStop{$unit} = 1; } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) { @@ -568,10 +569,10 @@ foreach my $mountPoint (keys %$prevFss) { } # Also handles swap devices. -foreach my $device (keys %$prevSwaps) { +foreach my $device (keys(%$prevSwaps)) { my $prev = $prevSwaps->{$device}; my $new = $newSwaps->{$device}; - if (!defined $new) { + if (!defined($new)) { # Swap entry disappeared, so turn it off. Can't use # "systemctl stop" here because systemd has lots of alias # units that prevent a stop from actually calling @@ -602,8 +603,8 @@ if ($prevSystemdSystemConfig ne $newSystemdSystemConfig) { sub filterUnits { my ($units) = @_; my @res; - foreach my $unit (sort(keys %{$units})) { - push @res, $unit if !defined $unitsToFilter{$unit}; + foreach my $unit (sort(keys(%{$units}))) { + push(@res, $unit) if !defined($unitsToFilter{$unit}); } return @res; } @@ -614,9 +615,9 @@ my @unitsToStopFiltered = filterUnits(\%unitsToStop); # Show dry-run actions. if ($action eq "dry-activate") { print STDERR "would stop the following units: ", join(", ", @unitsToStopFiltered), "\n" - if scalar @unitsToStopFiltered > 0; - print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" - if scalar(keys %unitsToSkip) > 0; + if scalar(@unitsToStopFiltered) > 0; + print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys(%unitsToSkip))), "\n" + if scalar(keys(%unitsToSkip)) > 0; print STDERR "would activate the configuration...\n"; system("$out/dry-activate", "$out"); @@ -637,7 +638,7 @@ if ($action eq "dry-activate") { $baseName =~ s/\.[a-z]*$//; # Start units if they were not active previously - if (not defined $activePrev->{$unit}) { + if (not defined($activePrev->{$unit})) { $unitsToStart{$unit} = 1; next; } @@ -657,28 +658,28 @@ if ($action eq "dry-activate") { unlink($dryReloadByActivationFile); print STDERR "would restart systemd\n" if $restartSystemd; - print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" - if scalar(keys %unitsToReload) > 0; - print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" - if scalar(keys %unitsToRestart) > 0; + print STDERR "would reload the following units: ", join(", ", sort(keys(%unitsToReload))), "\n" + if scalar(keys(%unitsToReload)) > 0; + print STDERR "would restart the following units: ", join(", ", sort(keys(%unitsToRestart))), "\n" + if scalar(keys(%unitsToRestart)) > 0; my @unitsToStartFiltered = filterUnits(\%unitsToStart); print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" - if scalar @unitsToStartFiltered; + if scalar(@unitsToStartFiltered); exit 0; } syslog(LOG_NOTICE, "switching to system configuration $out"); -if (scalar (keys %unitsToStop) > 0) { +if (scalar(keys(%unitsToStop)) > 0) { print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" - if scalar @unitsToStopFiltered; + if scalar(@unitsToStopFiltered); # Use current version of systemctl binary before daemon is reexeced. - system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); + system("$curSystemd/systemctl", "stop", "--", sort(keys(%unitsToStop))); } -print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" - if scalar(keys %unitsToSkip) > 0; +print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys(%unitsToSkip))), "\n" + if scalar(keys(%unitsToSkip)) > 0; # Activate the new configuration (i.e., update /etc, make accounts, # and so on). @@ -702,7 +703,7 @@ foreach (split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // $baseName =~ s/\.[a-z]*$//; # Start units if they were not active previously - if (not defined $activePrev->{$unit}) { + if (not defined($activePrev->{$unit})) { $unitsToStart{$unit} = 1; recordUnit($startListFile, $unit); next; @@ -739,7 +740,7 @@ system("@systemd@/bin/systemctl", "reset-failed"); system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3; # Reload user units -open my $listActiveUsers, '-|', '@systemd@/bin/loginctl', 'list-users', '--no-legend'; +open(my $listActiveUsers, '-|', '@systemd@/bin/loginctl', 'list-users', '--no-legend'); while (my $f = <$listActiveUsers>) { next unless $f =~ /^\s*(?\d+)\s+(?\S+)/; my ($uid, $name) = ($+{uid}, $+{user}); @@ -751,7 +752,7 @@ while (my $f = <$listActiveUsers>) { "@systemd@/bin/systemctl --user start nixos-activation.service"); } -close $listActiveUsers; +close($listActiveUsers); # Set the new tmpfiles print STDERR "setting up tmpfiles\n"; @@ -760,8 +761,8 @@ system("@systemd@/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-pref # Before reloading we need to ensure that the units are still active. They may have been # deactivated because one of their requirements got stopped. If they are inactive # but should have been reloaded, the user probably expects them to be started. -if (scalar(keys %unitsToReload) > 0) { - for my $unit (keys %unitsToReload) { +if (scalar(keys(%unitsToReload)) > 0) { + for my $unit (keys(%unitsToReload)) { if (!unit_is_active($unit)) { # Figure out if we need to start the unit my %unit_info = parse_unit("$out/etc/systemd/system/$unit"); @@ -777,17 +778,17 @@ if (scalar(keys %unitsToReload) > 0) { } # Reload units that need it. This includes remounting changed mount # units. -if (scalar(keys %unitsToReload) > 0) { - print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; - system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; +if (scalar(keys(%unitsToReload)) > 0) { + print STDERR "reloading the following units: ", join(", ", sort(keys(%unitsToReload))), "\n"; + system("@systemd@/bin/systemctl", "reload", "--", sort(keys(%unitsToReload))) == 0 or $res = 4; unlink($reloadListFile); } # Restart changed services (those that have to be restarted rather # than stopped and started). -if (scalar(keys %unitsToRestart) > 0) { - print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"; - system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4; +if (scalar(keys(%unitsToRestart)) > 0) { + print STDERR "restarting the following units: ", join(", ", sort(keys(%unitsToRestart))), "\n"; + system("@systemd@/bin/systemctl", "restart", "--", sort(keys(%unitsToRestart))) == 0 or $res = 4; unlink($restartListFile); } @@ -799,17 +800,17 @@ if (scalar(keys %unitsToRestart) > 0) { # systemd. my @unitsToStartFiltered = filterUnits(\%unitsToStart); print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n" - if scalar @unitsToStartFiltered; -system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; + if scalar(@unitsToStartFiltered); +system("@systemd@/bin/systemctl", "start", "--", sort(keys(%unitsToStart))) == 0 or $res = 4; unlink($startListFile); # Print failed and new units. my (@failed, @new); -my $activeNew = getActiveUnits; -while (my ($unit, $state) = each %{$activeNew}) { +my $activeNew = getActiveUnits(); +while (my ($unit, $state) = each(%{$activeNew})) { if ($state->{state} eq "failed") { - push @failed, $unit; + push(@failed, $unit); next; } @@ -819,7 +820,7 @@ while (my ($unit, $state) = each %{$activeNew}) { chomp($main_status); if ($main_status ne "0") { - push @failed, $unit; + push(@failed, $unit); next; } } @@ -827,19 +828,19 @@ while (my ($unit, $state) = each %{$activeNew}) { # Ignore scopes since they are not managed by this script but rather # created and managed by third-party services via the systemd dbus API. # This only lists units that are not failed (including ones that are in auto-restart but have not failed previously) - if ($state->{state} ne "failed" && !defined $activePrev->{$unit} && $unit !~ /\.scope$/msx) { - push @new, $unit; + if ($state->{state} ne "failed" && !defined($activePrev->{$unit}) && $unit !~ /\.scope$/msx) { + push(@new, $unit); } } -if (scalar @new > 0) { +if (scalar(@new) > 0) { print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n" } -if (scalar @failed > 0) { - my @failed_sorted = sort @failed; +if (scalar(@failed) > 0) { + my @failed_sorted = sort(@failed); print STDERR "warning: the following units failed: ", join(", ", @failed_sorted), "\n\n"; - system "@systemd@/bin/systemctl status --no-pager --full '" . join("' '", @failed_sorted) . "' >&2"; + system("@systemd@/bin/systemctl status --no-pager --full '" . join("' '", @failed_sorted) . "' >&2"); $res = 4; } @@ -849,4 +850,4 @@ if ($res == 0) { syslog(LOG_ERR, "switching to system configuration $out failed (status $res)"); } -exit $res; +exit($res); From 6084b47a42f651d3fa07c8e8a9c3464edc8247bb Mon Sep 17 00:00:00 2001 From: Anund Date: Sat, 12 Mar 2022 00:39:33 +1100 Subject: [PATCH 091/329] makemkv: 1.16.5 -> 1.16.7 --- pkgs/applications/video/makemkv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 26d80b1596c2..02e4d2ca732d 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.16.5"; + version = "1.16.7"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "1y14yxhjj0sdq0s24qr58m0ddhna2rf0q0w3ny888as4wbqiwvm0"; + sha256 = "sha256-YjsYW2MmzDZqOMdYlqE0dZ399Qq8hJRQ9BCViNexLHs="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "131vdi4gyc996z77rrcqb9nfbd62j8314ai4ib1jnilmrsrk93p5"; + sha256 = "sha256-TL0PRP/pDg16qsbYi9RYyD0egNDaxuApmR86hiR/Rq8="; }; in mkDerivation { From 040cdccee965620a40f8c9dc4bc696c3664e8410 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Fri, 11 Mar 2022 12:53:38 +0000 Subject: [PATCH 092/329] deno: 1.19.1 -> 1.19.3 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index fa2fe98f76cc..b813d6451eec 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.19.1"; + version = "1.19.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BqwiconG5hn5RPV+hlKu6e6+GjZA4Im/dD+no3IduYw="; + sha256 = "sha256-mm4hCRjQitFvSA3ow/p/N+UgG3P7FC440Obfqz3KVbQ="; }; - cargoSha256 = "sha256-q/5AezLQgN7WdGsbHoxX5riJMlxw3cTFhVs5OvCeI5U="; + cargoSha256 = "sha256-tSIYs52pZk/h2hVJLHUbwlsl2gdu2Mszs9OBR52EQKQ="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index a1ea206fabdc..ce8209ab650d 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.40.0"; + version = "0.40.2"; shas = { - x86_64-linux = "sha256-VHkopvK6f5lxdFLBywHe0Z+su2g5hgBsLcTxrwFgq0Y="; - aarch64-linux = "sha256-awWjziqqUDAl9fcLADUjytLFds1y93y5gZoOtvReL9w="; - x86_64-darwin = "sha256-WlRnGiJK3iFgTjNzr25rvmmiPAICPRLaD5hbys7MoJA="; - aarch64-darwin = "sha256-zblcAQVwnLQWh85wajg8CalqxycSR+4WGoSC2dnX7jA="; + x86_64-linux = "sha256-RtEKNDQdL0orI0B4953RaT18KeWPZJIdhPnYbJGj2eM="; + aarch64-linux = "sha256-TL5boy1X/OgOt17H6PYEA5D3MJbChCULrB38ykC5Ghk="; + x86_64-darwin = "sha256-ABnHMABtggrHoTjeFB8YVH6PV2HvVlPZTQWaeRnRZaE="; + aarch64-darwin = "sha256-PGrRmNJxS49K9jviQTxRJlTq1SAn+8epXXNJaexTAWU="; }; } From 860cc90fec86ea49d1f73ac5f5920f11afaba28d Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 11 Mar 2022 13:54:14 +0000 Subject: [PATCH 093/329] pomerium: 0.15.7 -> 0.17.0 --- pkgs/servers/http/pomerium/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index cbf2fe194354..4a8381bccc99 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -11,18 +11,17 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.15.7"; + version = "0.17.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256:0adlk4ylny1z43x1dw3ny0s1932vhb61hpf5wdz4r65y8k9qyfgr"; + hash = "sha256:1hv76i6k9f0kp527nxlxqhklsvkh2cmfnqlszmlk2hxij31qnf8q"; }; - vendorSha256 = "sha256:1fszfbra84pcs8v1h2kf7iy603vf9v2ysg6il76aqmqrxmb1p7nv"; + vendorSha256 = "sha256:1cq4m5a7z64yg3v1c68d15ilw78il6p53vaqzxgn338zjggr3kig"; subPackages = [ "cmd/pomerium" - "cmd/pomerium-cli" ]; ldflags = let @@ -74,7 +73,6 @@ buildGoModule rec { installPhase = '' install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium - install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli ''; passthru.tests = { From 6659ba52480b2881c89c104370c2e7528fb34a0e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 11 Mar 2022 14:01:27 +0000 Subject: [PATCH 094/329] pomerium-cli: init at 0.17.0 --- pkgs/servers/http/pomerium/default.nix | 2 + pkgs/tools/security/pomerium-cli/default.nix | 58 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 61 insertions(+) create mode 100644 pkgs/tools/security/pomerium-cli/default.nix diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 4a8381bccc99..8a5580d5d0db 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -4,6 +4,7 @@ , envoy , zip , nixosTests +, pomerium-cli }: let @@ -77,6 +78,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) pomerium; + inherit pomerium-cli; }; meta = with lib; { diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/tools/security/pomerium-cli/default.nix new file mode 100644 index 000000000000..7dc7e3a7a903 --- /dev/null +++ b/pkgs/tools/security/pomerium-cli/default.nix @@ -0,0 +1,58 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, pomerium +}: + +let + inherit (lib) concatStringsSep concatMap id mapAttrsToList; +in +buildGoModule rec { + pname = "pomerium-cli"; + version = pomerium.version; + src = fetchFromGitHub { + owner = "pomerium"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256:0230b22xjnpykj8bcdahzzlsvlrd63z2cmg6yb246c5ngjs835q1"; + }; + + vendorSha256 = "sha256:0xx22lmh6wip1d1bjrp4lgab3q9yilw54v4lg24lf3xhbsr5si9b"; + subPackages = [ + "cmd/pomerium-cli" + ]; + + ldflags = let + # Set a variety of useful meta variables for stamping the build with. + setVars = { + "github.com/pomerium/cli/version" = { + Version = "v${version}"; + BuildMeta = "nixpkgs"; + ProjectName = "pomerium-cli"; + ProjectURL = "github.com/pomerium/cli"; + }; + }; + concatStringsSpace = list: concatStringsSep " " list; + mapAttrsToFlatList = fn: list: concatMap id (mapAttrsToList fn list); + varFlags = concatStringsSpace ( + mapAttrsToFlatList (package: packageVars: + mapAttrsToList (variable: value: + "-X ${package}.${variable}=${value}" + ) packageVars + ) setVars); + in [ + "${varFlags}" + ]; + + installPhase = '' + install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli + ''; + + meta = with lib; { + homepage = "https://pomerium.io"; + description = "Client-side helper for Pomerium authenticating reverse proxy"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2880d70e645..7b01dfe3fe72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21613,6 +21613,7 @@ with pkgs; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; pomerium = callPackage ../servers/http/pomerium { }; + pomerium-cli = callPackage ../tools/security/pomerium-cli { }; postgrey = callPackage ../servers/mail/postgrey { }; From 3004e58f6a0817080f40db34dc96fdf4d5da6c18 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 11 Mar 2022 14:03:22 +0000 Subject: [PATCH 095/329] nixos/pomerium: avoid blocking when renewing ACME certificates --- nixos/modules/services/web-servers/pomerium.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/pomerium.nix b/nixos/modules/services/web-servers/pomerium.nix index 2bc7d01c7c28..0b460755f50e 100644 --- a/nixos/modules/services/web-servers/pomerium.nix +++ b/nixos/modules/services/web-servers/pomerium.nix @@ -69,11 +69,16 @@ in CERTIFICATE_KEY_FILE = "key.pem"; }; startLimitIntervalSec = 60; + script = '' + if [[ -v CREDENTIALS_DIRECTORY ]]; then + cd "$CREDENTIALS_DIRECTORY" + fi + exec "${pkgs.pomerium}/bin/pomerium" -config "${cfgFile}" + ''; serviceConfig = { DynamicUser = true; StateDirectory = [ "pomerium" ]; - ExecStart = "${pkgs.pomerium}/bin/pomerium -config ${cfgFile}"; PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE MemoryDenyWriteExecute = false; # breaks LuaJIT @@ -99,7 +104,6 @@ in AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; - WorkingDirectory = mkIf (cfg.useACMEHost != null) "$CREDENTIALS_DIRECTORY"; LoadCredential = optionals (cfg.useACMEHost != null) [ "fullchain.pem:/var/lib/acme/${cfg.useACMEHost}/fullchain.pem" "key.pem:/var/lib/acme/${cfg.useACMEHost}/key.pem" @@ -124,7 +128,7 @@ in Type = "oneshot"; TimeoutSec = 60; ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active pomerium.service"; - ExecStart = "/run/current-system/systemd/bin/systemctl restart pomerium.service"; + ExecStart = "/run/current-system/systemd/bin/systemctl --no-block restart pomerium.service"; }; }; }); From c19e76b29f7bd0d225ab89feb0a3726676f915c8 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 11 Mar 2022 14:07:12 +0000 Subject: [PATCH 096/329] pomerium: note changes in packaging in 22.05 release notes --- .../manual/from_md/release-notes/rl-2205.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 9cf27e56827a..333994c0957d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1322,6 +1322,16 @@ warning. + + + The pomerium-cli command has been moved out + of the pomerium package into the + pomerium-cli package, following upstream’s + repository split. If you are using the + pomerium-cli command, you should now + install the pomerium-cli package. + + The option diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 58a1b23d17bf..222c101a2842 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -479,6 +479,11 @@ In addition to numerous new and upgraded packages, this release has the followin Reason is that the old name has been deprecated upstream. Using the old option name will still work, but produce a warning. +- The `pomerium-cli` command has been moved out of the `pomerium` package into + the `pomerium-cli` package, following upstream's repository split. If you are + using the `pomerium-cli` command, you should now install the `pomerium-cli` + package. + - The option [services.networking.networkmanager.enableFccUnlock](#opt-networking.networkmanager.enableFccUnlock) was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager From bab25a7a3a12e5de1c0f9176a5827460733d6447 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 11 Mar 2022 11:40:27 -0300 Subject: [PATCH 097/329] lean: 3.40.0 -> 3.41.0 --- pkgs/applications/science/logic/lean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 315090d1b569..1eea97a0fd23 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.40.0"; + version = "3.41.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "82216a493580a309a04b02c2b6eb5f82f0aef192"; - sha256 = "0cdk124riz8g43n54yx4qyjn7n6qxj5zgn9r4znqs7iyb3djs286"; + rev = "154ac72f4ff674bc4486ac611f926a3d6b999f9f"; + sha256 = "0mpxlfjq460x1vi3v6qzgjv74asg0qlhykd51pj347795x5b1hf1"; }; nativeBuildInputs = [ cmake ]; From 95a28ab29e13c343636e718cc2f20571061abfcd Mon Sep 17 00:00:00 2001 From: Anund Date: Sat, 12 Mar 2022 01:51:53 +1100 Subject: [PATCH 098/329] makemkv: fix icon theme install directory --- pkgs/applications/video/makemkv/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 02e4d2ca732d..712ccacd7a0c 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -55,15 +55,15 @@ in mkDerivation { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon - install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* - install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* - install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop - install -Dm444 -t $out/share/icons/hicolor/16x16 ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* - install -Dm444 -t $out/share/icons/hicolor/32x32 ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* - install -Dm444 -t $out/share/icons/hicolor/64x64 ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* - install -Dm444 -t $out/share/icons/hicolor/128x128 ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* - install -Dm444 -t $out/share/icons/hicolor/256x256 ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* + install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon + install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* + install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* + install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop + install -Dm444 -t $out/share/icons/hicolor/16x16/apps ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* + install -Dm444 -t $out/share/icons/hicolor/32x32/apps ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* + install -Dm444 -t $out/share/icons/hicolor/64x64/apps ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* + install -Dm444 -t $out/share/icons/hicolor/128x128/apps ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* + install -Dm444 -t $out/share/icons/hicolor/256x256/apps ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* runHook postInstall ''; From 61bc4884aea017d3a41e9ad45ea45b4621552019 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Fri, 11 Mar 2022 16:03:35 +0000 Subject: [PATCH 099/329] exploitdb: 2022-03-10 -> 2022-03-11 --- pkgs/tools/security/exploitdb/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 14b7d7efab26..a50588fc1f81 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-03-10"; + version = "2022-03-11"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-zKFkPRmA2Hl/NksJTf76RcPr1nvaLdZu2fyBp5PcZ0Y="; + sha256 = "sha256-dW4cLm//4wROsizRQ59sqEGPRZ26yIU5I7mdPEYC3YU="; + }; nativeBuildInputs = [ makeWrapper ]; From ee7e17b5403b6a3cb1be0cc3f599b9f0ea3988f8 Mon Sep 17 00:00:00 2001 From: Anund Date: Sat, 12 Mar 2022 04:23:31 +1100 Subject: [PATCH 100/329] devilutionx: fix invalid icon filename references The .desktop entries for devilutionx and devilutionx-hellfire point to icons with an *x* at the end of devilutionx. Added in that missing x and included the 32x32 variant of those icons. --- pkgs/games/devilutionx/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 7a6dc2808805..ac76ab5ad189 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -93,8 +93,10 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin devilutionx install -Dm755 -t $out/share/diasurgical/devilutionx devilutionx.mpq install -Dm755 -t $out/share/applications ../Packaging/nix/devilutionx-hellfire.desktop ../Packaging/nix/devilutionx.desktop - install -Dm755 ../Packaging/resources/icon.png $out/share/icons/hicolor/512x512/apps/devilution.png - install -Dm755 ../Packaging/resources/hellfire.png $out/share/icons/hicolor/512x512/apps/devilution-hellfire.png + install -Dm755 ../Packaging/resources/icon.png $out/share/icons/hicolor/512x512/apps/devilutionx.png + install -Dm755 ../Packaging/resources/hellfire.png $out/share/icons/hicolor/512x512/apps/devilutionx-hellfire.png + install -Dm755 ../Packaging/resources/icon_32.png $out/share/icons/hicolor/32x32/apps/devilutionx.png + install -Dm755 ../Packaging/resources/hellfire_32.png $out/share/icons/hicolor/32x32/apps/devilutionx-hellfire.png '') + '' runHook postInstall From 53a45ae8f65f91611e4955e2f642be466217ce55 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 11 Mar 2022 19:26:28 +0100 Subject: [PATCH 101/329] dasel: 1.22.1 -> 1.23.0 --- pkgs/applications/misc/dasel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 1741e9086695..eb17bf5c1943 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "091s3hyz9p892garanm9zmkbsn6hn3bnnrz7h3dqsyi58806d5yr"; + sha256 = "sha256-MUF57begai6yMYLPC5dnyO9S39uHogB+Ie3qDA46Cn8="; }; - vendorSha256 = "1y0k03lg9dh3bpi10xzv03h7gq7h0hgggs304p78p3jkr8pmkqss"; + vendorSha256 = "sha256-NP+Is7Dxz4LGzx5vpv8pJOJhodAYHia1JXYfhJD54as="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" From 1d5521992327330971b3af3435cdcc80292ca6e6 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Fri, 11 Mar 2022 20:02:22 +0100 Subject: [PATCH 102/329] jellycli: init at 0.9.1 --- pkgs/applications/audio/jellycli/default.nix | 33 +++++++++++++++++++ .../audio/jellycli/fix-test-dir.patch | 13 ++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/applications/audio/jellycli/default.nix create mode 100644 pkgs/applications/audio/jellycli/fix-test-dir.patch diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/applications/audio/jellycli/default.nix new file mode 100644 index 000000000000..cfb9deb58726 --- /dev/null +++ b/pkgs/applications/audio/jellycli/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildGoModule, alsa-lib }: + +buildGoModule rec { + pname = "jellycli"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "tryffel"; + repo = "jellycli"; + rev = "v${version}"; + sha256 = "1awzcxnf175a794rhzbmqxxjss77mfa1yrr0wgdxaivrlkibxjys"; + }; + + vendorSha256 = "02fwsnrhj09m0aa199plpqlsjrwpmrk4c80fszzm07s5vmjqvnfy"; + + patches = [ + # Fixes log file path for tests. + ./fix-test-dir.patch + ]; + + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "Jellyfin terminal client"; + longDescription = '' + Terminal music player, works with Jellyfin (>= 10.6) , Emby (>= 4.4), and + Subsonic comptabile servers (API >= 1.16), e.g., Navidrome. + ''; + homepage = "https://github.com/tryffel/jellycli"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/applications/audio/jellycli/fix-test-dir.patch b/pkgs/applications/audio/jellycli/fix-test-dir.patch new file mode 100644 index 000000000000..83cacfe9af0c --- /dev/null +++ b/pkgs/applications/audio/jellycli/fix-test-dir.patch @@ -0,0 +1,13 @@ +diff --git a/config/config_test.go b/config/config_test.go +index 9f63a7e..7e790b8 100644 +--- a/config/config_test.go ++++ b/config/config_test.go +@@ -110,7 +110,7 @@ func TestInitEmptyConfig(t *testing.T) { + Subsonic: Subsonic{}, + Player: Player{ + Server: "jellyfin", +- LogFile: "/tmp/jellycli.log", ++ LogFile: "/build/jellycli.log", + LogLevel: "info", + AudioBufferingMs: 150, + HttpBufferingS: 5, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ee9ac9f9ed6..03731941d051 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3369,6 +3369,8 @@ with pkgs; iotools = callPackage ../tools/misc/iotools { }; + jellycli = callPackage ../applications/audio/jellycli { }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { From 2513f7c5809218e12ec811cf3da927b2a444ce27 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 11 Mar 2022 16:23:07 -0600 Subject: [PATCH 103/329] python39Packages.oci: 2.56.0 -> 2.59.0 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 8da783dbdb27..8fd06ae3b403 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.56.0"; + version = "2.60.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-olrWv4c2DoZ7ddm58Wpb5jZntw8WEKJ6IzAND11tdjk="; + hash = "sha256-fXeea4MftVSJWzanHeAuERRiQLBp8l1l1Cw2lG3uz24="; }; propagatedBuildInputs = [ From dfca474eaf27782af4b4ea7d328ebcb0d09673a8 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 11 Mar 2022 16:33:20 -0600 Subject: [PATCH 104/329] oci-cli: 3.5.0 -> 3.6.0 --- pkgs/tools/admin/oci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index d94abe504d24..21d115407f6e 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -23,14 +23,14 @@ with py.pkgs; buildPythonApplication rec { pname = "oci-cli"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; rev = "v${version}"; - hash = "sha256-udvYfYFUulGfnc1gzjG3UxOc68JuecpPJ1/s57qvX0k="; + hash = "sha256-ADjHPRG3QzSWR7FvcTIJdcBYmzZK+SWipdY1giNtaME="; }; propagatedBuildInputs = [ From a1d44190e97a120f20db10b5dc344902c34a5046 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sat, 12 Mar 2022 04:16:45 +0530 Subject: [PATCH 105/329] tailscale: 1.22.0 -> 1.22.1 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 0d564352c736..8decb2f4d296 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-kBxZFzny61xsLynD0sWz4dd8BzbdZkah0ATnHo3txRM="; + sha256 = "sha256-VUML5GwHrRYPd9lnOZuMA3T1SfdC0rVLP5m1yf+SA0A="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From 6c8c7176bd1aa031757f837a4aefd7023dff5e4b Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 11 Mar 2022 16:49:00 -0600 Subject: [PATCH 106/329] lexicon: 3.9.0 -> 3.9.4 --- pkgs/tools/admin/lexicon/default.nix | 30 +++------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4d48110e9674..c060f600d324 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -3,42 +3,18 @@ , fetchFromGitHub }: -let - py = python3.override { - packageOverrides = self: super: { - # until https://github.com/ags-slc/localzone/issues/1 gets resolved - dnspython = super.dnspython.overridePythonAttrs(oldAttrs: rec { - pname = "dnspython"; - version = "1.16.0"; - # since name is defined from the previous derivation, need to override - # name explicity for correct version to show in drvName - name = "${pname}-${version}"; - - src = super.fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "00cfamn97w2vhq3id87f10mjna8ag5yz5dw0cy5s0sa3ipiyii9n"; - }; - }); - - localzone = super.localzone.overridePythonAttrs(oldAttrs: rec { - meta = oldAttrs.meta // { broken = false; }; - }); - }; - }; -in - with py.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "lexicon"; - version = "3.9.0"; + version = "3.9.4"; format = "pyproject"; src = fetchFromGitHub { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - hash = "sha256-qJFHwFzFjZVdQv4YfrlR2cMQHsEtpQbvg/DMo6C5/z0="; + hash = "sha256-TySgIxBEl2RolndAkEN4vCIDKaI48vrh2ocd+CTn7Ow="; }; nativeBuildInputs = [ From 43203840aaef273f81df9e5ad9b9ec6fbe15c1fb Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 12 Mar 2022 00:12:11 +0100 Subject: [PATCH 107/329] qrcp: add SuperSandro2000 as maintainer --- pkgs/tools/networking/qrcp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index 84854a4bdff3..6e96029294bc 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -39,6 +39,6 @@ buildGoModule rec { complete. ''; license = licenses.mit; - maintainers = with maintainers; [ fgaz ]; + maintainers = with maintainers; [ fgaz SuperSandro2000 ]; }; } From aff47e64c62d004a906149fb67cfc9024887ce22 Mon Sep 17 00:00:00 2001 From: lodi Date: Fri, 11 Mar 2022 18:23:16 -0500 Subject: [PATCH 108/329] maintainers: add lodi --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 077381e8d30b..fa3c2dc619d5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7217,6 +7217,12 @@ githubId = 1267527; name = "Daniel Firth"; }; + lodi = { + email = "anthony.lodi@gmail.com"; + github = "lodi"; + githubId = 918448; + name = "Anthony Lodi"; + }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; From 40a35299fa30421de85a56f084f6c59d05ea883e Mon Sep 17 00:00:00 2001 From: pennae Date: Sun, 9 Jan 2022 08:46:55 +0100 Subject: [PATCH 109/329] nixos: add functions and documentation for escaping systemd Exec* directives it's really easy to accidentally write the wrong systemd Exec* directive, ones that works most of the time but fails when users include systemd metacharacters in arguments that are interpolated into an Exec* directive. add a few functions analogous to escapeShellArg{,s} and some documentation on how and when to use them. --- .../development/writing-modules.chapter.md | 42 ++++++++++++++++ .../development/writing-modules.chapter.xml | 49 +++++++++++++++++++ nixos/lib/utils.nix | 20 ++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/empty-file | 0 nixos/tests/systemd-escaping.nix | 45 +++++++++++++++++ 6 files changed, 157 insertions(+) create mode 100644 nixos/tests/empty-file create mode 100644 nixos/tests/systemd-escaping.nix diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md index 2e3c6b34f1f5..0c41cbd3cb75 100644 --- a/nixos/doc/manual/development/writing-modules.chapter.md +++ b/nixos/doc/manual/development/writing-modules.chapter.md @@ -90,6 +90,17 @@ modules: `systemd.services` (the set of all systemd services) and `systemd.timers` (the list of commands to be executed periodically by `systemd`). +Care must be taken when writing systemd services using `Exec*` directives. By +default systemd performs substitution on `%` specifiers in these +directives, expands environment variables from `$FOO` and `${FOO}`, splits +arguments on whitespace, and splits commands on `;`. All of these must be escaped +to avoid unexpected substitution or splitting when interpolating into an `Exec*` +directive, e.g. when using an `extraArgs` option to pass additional arguments to +the service. The functions `utils.escapeSystemdExecArg` and +`utils.escapeSystemdExecArgs` are provided for this, see [Example: Escaping in +Exec directives](#exec-escaping-example) for an example. When using these +functions system environment substitution should *not* be disabled explicitly. + ::: {#locate-example .example} ::: {.title} **Example: NixOS Module for the "locate" Service** @@ -153,6 +164,37 @@ in { ``` ::: +::: {#exec-escaping-example .example} +::: {.title} +**Example: Escaping in Exec directives** +::: +```nix +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.services.echo; + echoAll = pkgs.writeScript "echo-all" '' + #! ${pkgs.runtimeShell} + for s in "$@"; do + printf '%s\n' "$s" + done + ''; + args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ]; +in { + systemd.services.echo = + { description = "Echo to the journal"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + ${echoAll} ${utils.escapeSystemdExecArgs args} + ''; + }; +} +``` +::: + ```{=docbook} diff --git a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml index e33c24f4f12c..367731eda090 100644 --- a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml +++ b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml @@ -122,6 +122,25 @@ services) and systemd.timers (the list of commands to be executed periodically by systemd). + + Care must be taken when writing systemd services using + Exec* directives. By default systemd performs + substitution on %<char> specifiers in these + directives, expands environment variables from + $FOO and ${FOO}, splits + arguments on whitespace, and splits commands on + ;. All of these must be escaped to avoid + unexpected substitution or splitting when interpolating into an + Exec* directive, e.g. when using an + extraArgs option to pass additional arguments to + the service. The functions + utils.escapeSystemdExecArg and + utils.escapeSystemdExecArgs are provided for + this, see Example: Escaping in + Exec directives for an example. When using these functions + system environment substitution should not be + disabled explicitly. + Example: NixOS Module for the @@ -183,6 +202,36 @@ in { }; }; } + + + + Example: Escaping in Exec + directives + + +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.services.echo; + echoAll = pkgs.writeScript "echo-all" '' + #! ${pkgs.runtimeShell} + for s in "$@"; do + printf '%s\n' "$s" + done + ''; + args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ]; +in { + systemd.services.echo = + { description = "Echo to the journal"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + ${echoAll} ${utils.escapeSystemdExecArgs args} + ''; + }; +} diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index bbebf8ba35a0..291350241954 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -45,6 +45,26 @@ rec { replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"] (removePrefix "/" s); + # Quotes an argument for use in Exec* service lines. + # systemd accepts "-quoted strings with escape sequences, toJSON produces + # a subset of these. + # Additionally we escape % to disallow expansion of % specifiers. Any lone ; + # in the input will be turned it ";" and thus lose its special meaning. + # Every $ is escaped to $$, this makes it unnecessary to disable environment + # substitution for the directive. + escapeSystemdExecArg = arg: + let + s = if builtins.isPath arg then "${arg}" + else if builtins.isString arg then arg + else if builtins.isInt arg || builtins.isFloat arg then toString arg + else throw "escapeSystemdExecArg only allows strings, paths and numbers"; + in + replaceChars [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s); + + # Quotes a list of arguments into a single string for use in a Exec* + # line. + escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg; + # Returns a system path for a given shell package toShellPath = shell: if types.shellPackage.check shell then diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9f3e97ceb13d..01708fe06792 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -459,6 +459,7 @@ in systemd-boot = handleTest ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; + systemd-escaping = handleTest ./systemd-escaping.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {}; diff --git a/nixos/tests/empty-file b/nixos/tests/empty-file new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/nixos/tests/systemd-escaping.nix b/nixos/tests/systemd-escaping.nix new file mode 100644 index 000000000000..7f93eb5e4f70 --- /dev/null +++ b/nixos/tests/systemd-escaping.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + echoAll = pkgs.writeScript "echo-all" '' + #! ${pkgs.runtimeShell} + for s in "$@"; do + printf '%s\n' "$s" + done + ''; + # deliberately using a local empty file instead of pkgs.emptyFile to have + # a non-store path in the test + args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ./empty-file 4.2 23 ]; +in +{ + name = "systemd-escaping"; + + machine = { pkgs, lib, utils, ... }: { + systemd.services.echo = + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ [] ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ {} ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ null ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ false ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ (_:_) ])).success; + { description = "Echo to the journal"; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + ${echoAll} ${utils.escapeSystemdExecArgs args} + ''; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.succeed("systemctl start echo.service") + # skip the first 'Starting ...' line + logs = machine.succeed("journalctl -u echo.service -o cat").splitlines()[1:] + assert "a%Nything" == logs[0] + assert "lang=''${LANG}" == logs[1] + assert ";" == logs[2] + assert "/bin/sh -c date" == logs[3] + assert "/nix/store/ij3gw72f4n5z4dz6nnzl1731p9kmjbwr-empty-file" == logs[4] + assert "4.2" in logs[5] # toString produces extra fractional digits! + assert "23" == logs[6] + ''; +}) From 1b095174cc0f770854ea2a73e36db7e1d5bd4bf4 Mon Sep 17 00:00:00 2001 From: lodi Date: Fri, 11 Mar 2022 18:24:37 -0500 Subject: [PATCH 110/329] wl-gammactl: init at unstable-2021-09-13 --- pkgs/tools/wayland/wl-gammactl/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/wayland/wl-gammactl/default.nix diff --git a/pkgs/tools/wayland/wl-gammactl/default.nix b/pkgs/tools/wayland/wl-gammactl/default.nix new file mode 100644 index 000000000000..98bfc40169a9 --- /dev/null +++ b/pkgs/tools/wayland/wl-gammactl/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub +, meson, pkg-config, ninja +, wayland, wayland-scanner, wlroots, wlr-protocols, gtk3 +}: + +stdenv.mkDerivation rec { + pname = "wl-gammactl"; + version = "unstable-2021-09-13"; + + src = fetchFromGitHub { + owner = "mischw"; + repo = pname; + rev = "e2385950d97a3baf1b6e2f064dd419ccec179586"; + sha256 = "8iMJK4O/sNIGPOBZQEfK47K6OjT6sxYFe19O2r/VSr8="; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ wayland wlroots gtk3 ]; + + postUnpack = '' + rmdir source/wlr-protocols + ln -s ${wlr-protocols}/share/wlr-protocols source + ''; + + postPatch = '' + substituteInPlace meson.build --replace "git = find_program('git')" "git = 'false'" + ''; + + meta = with lib; { + description = "Contrast, brightness, and gamma adjustments for Wayland"; + longDescription = '' + Small GTK GUI application to set contrast, brightness, and gamma for wayland compositors which + support the wlr-gamma-control protocol extension. + ''; + homepage = "https://github.com/mischw/wl-gammactl"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ lodi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c6832ae0547..2d3698945c82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2726,6 +2726,8 @@ with pkgs; wlsunset = callPackage ../tools/wayland/wlsunset { }; + wl-gammactl = callPackage ../tools/wayland/wl-gammactl { }; + wluma = callPackage ../tools/wayland/wluma { }; wob = callPackage ../tools/wayland/wob { }; From cc392252f5b35e3fc83142a9774bc4def1d05307 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 00:45:40 +0000 Subject: [PATCH 111/329] actionlint: 1.6.9 -> 1.6.10 --- pkgs/development/tools/analysis/actionlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 602f6815fb94..68112b01cfb8 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.9"; + version = "1.6.10"; subPackages = [ "cmd/actionlint" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-UDa/qFtRTED6d+lPbjNknX9qFZ3QZ9jiD0ByvLsGARk="; + sha256 = "sha256-RFsNJiCeSAeEWOUnfBpeIZKoS2mlXazYMQd1M6yFLGU="; }; - vendorSha256 = "sha256-0tytdTZxnWYl8AxaquF0ArY3dy51j8H2kzw69qcSHzk="; + vendorSha256 = "sha256-CxNER8aQftMG14M+x6bPwcXgUZRkUDYZtFg1cPxxg+I="; nativeBuildInputs = [ ronn installShellFiles ]; From 5c099529eb074af9a81bf6240a8498155ebccedf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 01:05:17 +0000 Subject: [PATCH 112/329] aliyun-cli: 3.0.110 -> 3.0.112 --- pkgs/tools/admin/aliyun-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 9a65f647d116..94f793f47fd6 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.110"; + version = "3.0.112"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-Omi82feAq0tBuMSuA25JtDatfSJwWcxK3KkWkSI9ax4="; + sha256 = "sha256-gzZFxZMLq0TS8bxnQTTEno6OdAu/5tqr0Tl1cF8Rm3c="; }; - vendorSha256 = "sha256-c7LsCNcxdHwDBEknXJt9AyrmFcem8YtUYy06vNDBdDY="; + vendorSha256 = "sha256-FQvBq8+80h7m271gjraV445ayWcpkemOtVswfmHzUM0="; subPackages = [ "main" ]; From 8c8e02e0d9c28257691578e5a67a69a6ea5f610b Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Sat, 12 Mar 2022 01:41:18 +0300 Subject: [PATCH 113/329] paraview: 5.9.1 -> 5.10.0 --- pkgs/applications/graphics/paraview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1a761de6ec08..cd16fe1de089 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ }: let - version = "5.9.1"; + version = "5.10.0"; docFiles = [ (fetchurl { @@ -35,7 +35,7 @@ in mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - sha256 = "0pzic95br0vr785jnpxqmfxcljw3wk7bhm2xy0jfmwm1dh2b7xac"; + sha256 = "0ipx6zq44hpic7gvv0s2jvjncak6vlmrz5sp9ypc15b15bna0gs2"; fetchSubmodules = true; }; From 5763f7c302dc4920681e582cf7c8f4ffa8463948 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 01:48:41 +0000 Subject: [PATCH 114/329] autorestic: 1.5.5 -> 1.5.6 --- pkgs/tools/backup/autorestic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index aebcc608c76d..3837c55655e9 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JOiFsH9r92Gac7DH7h/4Q6hwXBtqLwHNQpW3gKBybHo="; + sha256 = "sha256-NhKAxybPLBR1Kaw2d4xI8WKS4cG0yAMHbUBDWgr5T0A="; }; vendorSha256 = "sha256-WzmgV0wUsGfMVeho6M8wXJKD9adaAKRYmaJYaAcXwFc="; From e4874b43a67456da2eb7a4fdf9d0cfd2abd40e5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 02:44:27 +0000 Subject: [PATCH 115/329] buildkit: 0.9.3 -> 0.10.0 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index b9ae4e4dd887..df644935cf16 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-xjuHMjJjA4sx2Hrr6tPpvKtSmhGZ3AZka733DLxmYfk="; + sha256 = "sha256-Pdnu0zG1LteAob0YUuG/XDh2pfBj5UO2GrkWFlMZeGY="; }; vendorSha256 = null; From 2b361911cba0dd0dd88bf9b020a0e414ba8468c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 03:00:16 +0000 Subject: [PATCH 116/329] clj-kondo: 2022.03.04 -> 2022.03.09 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 9a48ecb1f58e..0a369bd5f034 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.03.04"; + version = "2022.03.09"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-x/mDyWYxWR5H894n+BCBaxgRLQLPgVCip59nOUbavpk="; + sha256 = "sha256-gPn3wORb30I/zTXUdxUxMesKFJx6ES7jEjUYuC/DAVI="; }; extraNativeImageBuildArgs = [ From 7e14b31f31b5104e3a9b2d306eaef07ddaffd356 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 03:01:59 +0000 Subject: [PATCH 117/329] cargo-make: 0.35.9 -> 0.35.10 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 29dc1202d1c2..2e2ff56fd050 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.9"; + version = "0.35.10"; src = fetchCrate { inherit pname version; - sha256 = "sha256-yjApyM3UM4gLUPpbVMv+7hpF5VGXS8W9RUnlsJd/Sbo="; + sha256 = "sha256-l34sThvzhAW8VfxVuv+UGVil7yOvsOiWSqr/N91V8C8="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-YGpQXz35dPUeY8YlZ4Ul/utpNgEgW90xHiT+I+jOJIo="; + cargoSha256 = "sha256-974Gqtv+g32iHrIqIzqwBsE8frzmjF0Ma/hSMGzMaGs="; # Some tests fail because they need network access. # However, Travis ensures a proper build. From af291f935f039d502fea5c9ecc9b3e8632c8ea37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 03:14:01 +0000 Subject: [PATCH 118/329] cdk-go: 1.0.5 -> 1.0.6 --- pkgs/tools/security/cdk-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cdk-go/default.nix b/pkgs/tools/security/cdk-go/default.nix index 317f60927183..88fd089cb68b 100644 --- a/pkgs/tools/security/cdk-go/default.nix +++ b/pkgs/tools/security/cdk-go/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cdk-go"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "cdk-team"; repo = "CDK"; rev = "v${version}"; - sha256 = "sha256-Ngv+/b9D27ERwjNIC3s3ZBPkV10G+tT8QW8YMOgb8aA="; + sha256 = "sha256-XzUSiE03ZbP75ewwBJFwZE0aKNlOFprezeD26japLD8="; }; - vendorSha256 = "sha256-9Q7f3keMUEI2cWal2dvp4b8kvTZVM1Cf4iTvH9yCyX0="; + vendorSha256 = "sha256-mP49DmOHvS8ewQG7I1J5OEmAOkHEFJfAsEPeiaRBpWc="; # At least one test is outdated doCheck = false; From 313b5b581e69fe72051987757f90ee551aca7da2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 03:53:18 +0000 Subject: [PATCH 119/329] checkSSLCert: 2.21.0 -> 2.22.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index de64666ec770..966040428382 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-tUmRWXdPu3nGj+dUBNvF7cRayMn8vCyA94vyUmQrfRk="; + sha256 = "sha256-ytnaygAVKppyyUnxfMlwf9GvHzt8SN5I+b2FTcyaM/4="; }; nativeBuildInputs = [ From 78efd33e155ecab205f406df540fa0f04044b95b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 03:59:32 +0000 Subject: [PATCH 120/329] checkip: 0.18.1 -> 0.19.0 --- pkgs/tools/networking/checkip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 2f885d7a8591..fb30ad59dff3 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cQY77csZ7UPi09vUOdn3AKrLzGMI2BE16gfL1wDXxZA="; + sha256 = "sha256-h8YZGTjEEQb68TrwMDnAqCJWkNPSuWSAJKcOMLXwXio="; }; vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc="; From c22eebeb4ab6d584393aee050354c0d681e82ed2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 04:15:29 +0000 Subject: [PATCH 121/329] flexget: 3.3.2 -> 3.3.3 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 7f18fe2f51c1..f4a2306017a9 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.2"; + version = "3.3.3"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - hash = "sha256-Z2JYFnE9g2bWaR+Ghxg3zJUD0Ja8/od52jkOVWEqeVE="; + hash = "sha256-a76x4Klad3lct2M9RxSroUYKmEX7lPqDN+dFvfjavo8="; }; postPatch = '' From 217319ca41e0d3c44c8653990b01ba80efff420c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 04:42:14 +0000 Subject: [PATCH 122/329] gitRepo: 2.21 -> 2.22 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index f4eeb4aac12b..7fe27da6080a 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.21"; + version = "2.22"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-nl/NFbyL0MWgvpwaqkCOkKuSquFTQRKZ7Ski5qYRL9w="; + sha256 = "sha256-oVwvoZdjD6V3CHECZOYBSYVtCX1XwW5fynyCn7Oj+Bc="; }; # Fix 'NameError: name 'ssl' is not defined' From e341c4a115fed54acda102afb5d775d2c4013210 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 04:44:33 +0000 Subject: [PATCH 123/329] cloud-nuke: 0.10.0 -> 0.11.0 --- pkgs/development/tools/cloud-nuke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 4fa198f32c0c..f1f44a577755 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y1YpPYTejeZjz4nJmyAPT8rYaEguaJpBfAAfF38dpA4="; + sha256 = "sha256-G1RQEKb3vK8lg0jakCtIMgQXmWqfsq0QWHwU8TAbBbE="; }; vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI="; From 94eacd88226731fc0f441fa2ca26ff2eae97a420 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 04:49:17 +0000 Subject: [PATCH 124/329] cloudfoundry-cli: 8.0.0 -> 8.3.0 --- .../networking/cluster/cloudfoundry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index a4b49adb1e20..4667b130e8db 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.0.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "00cwnfylra0msbb423ad21if98s6smzccsyidqsl4r2mrlkhahwm"; + sha256 = "sha256-tC9U0yvuMEwO4mzWyUC+v+/H0EzgwTu02waTQrx19Bs="; }; - vendorSha256 = "0fcgyyd11xfhn8i11bqnaw3h51bj1y8s37b4d8wzv31dr8zswqsc"; + vendorSha256 = "sha256-aXq92SI4cgJrmo67SEfg8YKPEpO2UW2fcYnKq9TmAQg="; subPackages = [ "." ]; From d311ca198409e15a5da5a5cba7ed43b727330137 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 05:02:06 +0000 Subject: [PATCH 125/329] bitwig-studio: 4.1.6 -> 4.2 --- pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 24cc45a3aaf8..7b527139e919 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.1.6"; + version = "4.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-Q4YYdMUd/T8tGGcakhoLdHvWsHwOq7LgIb77sr2OWuQ="; + sha256 = "sha256-hIIEVj5sM/NdhBiwerFvyIXqj0R8EvcxwM6UZ0CE428="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; From e574f4cf8ffde90990597c7e802b6e31f416f9ee Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 11 Mar 2022 23:58:22 -0500 Subject: [PATCH 126/329] tortoisehg: 6.0 -> 6.1 --- pkgs/applications/version-management/tortoisehg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 66f3b9a0aaf3..6a9903c25b20 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "tortoisehg"; - version = "6.0"; + version = "6.1"; src = fetchurl { url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "sha256-25uQ2llF/+wqdGpun/nzlvAf286OIRmlZUISZ0szH6Y="; + sha256 = "sha256-UG13BlFY9DcsCPWaBiYa6r2oA3ieJtTYfXknDoKNkYI="; }; # Extension point for when thg's mercurial is lagging behind mainline. From 58cd95c93804c7c6ce49f7c1f0e482f060f6173a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 12 Mar 2022 00:01:00 -0500 Subject: [PATCH 127/329] mercurial: 6.0.3 -> 6.1 --- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 0124cf0646e5..0fb1cdddfbaf 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.0.3"; + version = "6.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-Z/E2R6RlF6K1Z83Lc8mHIdddNqBDLeuxUCK3f5wTgzM="; + sha256 = "sha256-hvmGReRWWpJWmR3N4it3uOfSLKb7tgwfTNvYRpo4zB8="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE="; + sha256 = "sha256-+Y91gEC8vmyutNpVFAAL4MSg4KnpFbhH12CIuMRx0Mc="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; From 2cda2c3daec19e4a067cd17cf60de1a02db806fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 06:00:50 +0000 Subject: [PATCH 128/329] fly: 7.6.0 -> 7.7.0 --- .../tools/continuous-integration/fly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index f2136346c1f3..f02a6cf8762f 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.6.0"; + version = "7.7.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-Zi+gyO+2AKDgcfgYrzLskJYZ6hQKOVlOL7Y9nxH/pGg="; + sha256 = "sha256-BKEUKQQxZ+Maq2JSHeWuQ7Lhgfc33pSiVS6VfAlMu/g="; }; - vendorSha256 = "sha256-OF3parnlTPmcr7tVcc6495sUMRApSpBHHjSE/4EFIxE="; + vendorSha256 = "sha256-G9HdhPi4iezUR6SIVYnjL0fznOfiusY4T9ClLPr1w5c="; doCheck = false; From 227e4f4d0ac77a5a033f0dae7c72bbda9e7b9d4c Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 29 Jan 2022 21:21:54 +0900 Subject: [PATCH 129/329] epgstation: 1.7.5 -> 2.6.20 --- .../video/epgstation/client/package.json | 57 +++++++++ .../applications/video/epgstation/default.nix | 77 ++++++++---- .../video/epgstation/epgstation.1 | 6 +- .../video/epgstation/package.json | 113 ++++++++---------- pkgs/applications/video/epgstation/update.nix | 20 ++-- .../use-mysql-over-domain-socket.patch | 55 +++++++-- pkgs/development/node-packages/default.nix | 10 +- 7 files changed, 228 insertions(+), 110 deletions(-) create mode 100644 pkgs/applications/video/epgstation/client/package.json diff --git a/pkgs/applications/video/epgstation/client/package.json b/pkgs/applications/video/epgstation/client/package.json new file mode 100644 index 000000000000..6ba9974afa5a --- /dev/null +++ b/pkgs/applications/video/epgstation/client/package.json @@ -0,0 +1,57 @@ +{ + "name": "epgstation-client", + "version": "2.6.20", + "private": true, + "scripts": { + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "watch": "vue-cli-service build --watch --mode development" + }, + "dependencies": { + "@mdi/font": "6.5.95", + "aribb24.js": "1.8.8", + "axios": "0.24.0", + "eventemitter2": "6.4.5", + "hls.js": "1.1.2", + "inversify": "6.0.1", + "json-stable-stringify": "1.0.1", + "lodash": "4.17.21", + "material-design-icons-iconfont": "6.1.1", + "mpegts.js": "1.6.10", + "reflect-metadata": "0.1.13", + "resize-observer-polyfill": "1.5.1", + "roboto-fontface": "*", + "smoothscroll-polyfill": "0.4.4", + "socket.io-client": "4.3.2", + "typeface-roboto": "1.1.13", + "vue": "2.6.14", + "vue-class-component": "7.2.6", + "vue-property-decorator": "9.1.2", + "vue-router": "3.5.3", + "vuetify": "2.5.10", + "vuetify-datetime-picker": "2.1.1", + "@types/hls.js": "0.13.3", + "@types/json-stable-stringify": "1.0.33", + "@types/lodash": "4.14.178", + "@types/smoothscroll-polyfill": "0.3.1", + "@types/socket.io-client": "1.4.36", + "@typescript-eslint/eslint-plugin": "4.33.0", + "@typescript-eslint/parser": "4.33.0", + "@vue/cli-plugin-eslint": "4.5.12", + "@vue/cli-plugin-typescript": "4.5.13", + "@vue/cli-plugin-vuex": "4.5.13", + "@vue/cli-service": "4.5.13", + "@vue/eslint-config-prettier": "6.0.0", + "@vue/eslint-config-typescript": "7.0.0", + "eslint": "7.32.0", + "eslint-plugin-prettier": "3.4.1", + "eslint-plugin-vue": "7.20.0", + "prettier": "2.4.1", + "sass": "1.32.12", + "sass-loader": "10.2.0", + "typescript": "4.4.4", + "vue-cli-plugin-vuetify": "2.4.3", + "vue-template-compiler": "2.6.14", + "vuetify-loader": "1.7.3" + } +} diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 3d910ad4c0e8..77510ae153de 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -10,17 +10,18 @@ , nodePackages , gzip , jq +, yq }: let # NOTE: use updateScript to bump the package version pname = "EPGStation"; - version = "1.7.5"; + version = "2.6.20"; src = fetchFromGitHub { owner = "l3tnun"; repo = "EPGStation"; rev = "v${version}"; - sha256 = "06yaf5yb5rp3q0kdhw33df7px7vyfby885ckb6bdzw3wnams5d8m"; + sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig="; }; workaround-opencollective-buildfailures = stdenv.mkDerivation { @@ -35,19 +36,44 @@ let ''; }; - pkg = nodePackages.epgstation.override (drv: { + client = nodePackages.epgstation-client.override (drv: { + # FIXME: remove this option if possible + # + # Unsetting this option resulted NPM attempting to re-download packages. + dontNpmInstall = true; + + meta = drv.meta // { + inherit (nodejs.meta) platforms; + }; + }); + + server = nodePackages.epgstation.override (drv: { inherit src; + bypassCache = false; + + # This is set to false to keep devDependencies at build time. Build time + # dependencies are pruned afterwards. + production = false; + buildInputs = [ bash ]; nativeBuildInputs = [ + nodejs workaround-opencollective-buildfailures makeWrapper - nodePackages.node-pre-gyp - ]; + ] ++ (with nodePackages; [ + node-pre-gyp + node-gyp-build + ]); preRebuild = '' # Fix for not being able to connect to mysql using domain sockets. - patch -p1 ${./use-mysql-over-domain-socket.patch} + patch -p1 < ${./use-mysql-over-domain-socket.patch} + + # Workaround for https://github.com/svanderburg/node2nix/issues/275 + sed -i -e "s|#!/usr/bin/env node|#! ${nodejs}/bin/node|" node_modules/node-gyp-build/bin.js + + find . -name package-lock.json -delete ''; postInstall = let @@ -56,12 +82,19 @@ let '' mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} - pushd $out/lib/node_modules/EPGStation + pushd $out/lib/node_modules/epgstation + + cp -r ${client}/lib/node_modules/epgstation-client/node_modules client/node_modules + chmod -R u+w client/node_modules npm run build - npm prune --production - mv config/{enc.sh,enc.js} $out/libexec + npm prune --production + pushd client + npm prune --production + popd + + mv config/enc.js.template $out/libexec/enc.js mv LICENSE Readme.md $out/share/doc/epgstation mv doc/* $out/share/doc/epgstation sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ @@ -82,8 +115,9 @@ let ln -sfT /var/lib/epgstation/thumbnail thumbnail makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ - --run "cd $out/lib/node_modules/EPGStation" \ - --prefix PATH : ${lib.makeBinPath runtimeDeps} + --run "cd $out/lib/node_modules/epgstation" \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} \ + --set APP_ROOT_PATH "$out/lib/node_modules/epgstation" popd ''; @@ -99,22 +133,25 @@ let common-updater-scripts genericUpdater writers - jq; + jq + yq; }; # nodePackages.epgstation is a stub package to fetch npm dependencies and - # is marked as broken to prevent users from installing it directly. This - # technique ensures epgstation can share npm packages with the rest of - # nixpkgs while still allowing us to heavily customize the build. It also - # allows us to provide devDependencies for the epgstation build process - # without doing the same for all the other node packages. - meta = drv.meta // { broken = false; }; + # its meta.platforms is made empty to prevent users from installing it + # directly. This technique ensures epgstation can share npm packages with + # the rest of nixpkgs while still allowing us to heavily customize the + # build. It also allows us to provide devDependencies for the epgstation + # build process without doing the same for all the other node packages. + meta = drv.meta // { + inherit (nodejs.meta) platforms; + }; }); in -pkg // { +server // { name = "${pname}-${version}"; - meta = with lib; pkg.meta // { + meta = with lib; server.meta // { maintainers = with maintainers; [ midchildan ]; # NOTE: updateScript relies on this being correct diff --git a/pkgs/applications/video/epgstation/epgstation.1 b/pkgs/applications/video/epgstation/epgstation.1 index bb5c02381378..2dc67f646088 100644 --- a/pkgs/applications/video/epgstation/epgstation.1 +++ b/pkgs/applications/video/epgstation/epgstation.1 @@ -27,7 +27,7 @@ platforms, run to start EPGStation. .Sh FILES .Bl -tag -width Ds -compact -.It Pa /etc/epgstation/config.json +.It Pa /etc/epgstation/config.yml .Nm configuration file. .El @@ -48,5 +48,9 @@ Restore the EPGstation database. .Pp .Dl $ epgstation run restore /path/to/src .Pp +Restore the EPGstation database from the prior v1 release. +.Pp +.Dl $ epgstation run v1migrate /path/to/src +.Pp .Sh SEE ALSO .Xr npm 1 diff --git a/pkgs/applications/video/epgstation/package.json b/pkgs/applications/video/epgstation/package.json index 53b1ebca2da7..cf302a95161a 100644 --- a/pkgs/applications/video/epgstation/package.json +++ b/pkgs/applications/video/epgstation/package.json @@ -1,85 +1,72 @@ { - "name": "EPGStation", - "version": "1.7.5", + "name": "epgstation", + "version": "2.6.20", "description": "DTV Software in Japan.", "repository": { "type": "git", - "url": "https://github.com/l3tnun/EPGStation.git" + "url": "git+https://github.com/l3tnun/EPGStation-V2.git" }, "author": "l3tnun", "license": "MIT", "bugs": { - "url": "https://github.com/l3tnun/EPGStation/issues" - }, - "homepage": "https://github.com/l3tnun/EPGStation#readme", - "engines": { - "node": "^10.x.x < 11 || ^12.14.0 < 13 || ^14.5.0 < 15" + "url": "https://github.com/l3tnun/EPGStation-V2/issues" }, + "homepage": "https://github.com/l3tnun/EPGStation-V2#readme", "dependencies": { - "aribts": "^2.1.12", - "b24.js": "1.0.3", - "basic-auth": "2.0.1", + "arib-subtitle-timedmetadater": "4.0.9", + "aribts": "2.1.12", + "axios": "0.24.0", "body-parser": "1.19.0", - "chart.js": "2.9.3", - "css-ripple-effect": "1.0.5", - "diskusage": "1.1.3", + "cors": "2.8.5", + "diskusage-ng": "1.0.2", "express": "4.17.1", - "express-openapi": "7.0.1", - "fs-extra": "9.0.1", - "hls-b24.js": "0.12.3", - "js-yaml": "3.14.0", - "lodash": "4.17.20", + "express-openapi": "9.3.0", + "file-type": "16.5.3", + "inversify": "5.1.1", + "js-yaml": "4.1.0", + "lodash": "4.17.21", "log4js": "6.3.0", - "material-design-icons": "3.0.1", - "material-design-lite": "1.3.0", "minimist": "1.2.5", - "mirakurun": "3.3.1", - "mithril": "2.0.4", + "mirakurun": "3.9.0-beta.26", "mkdirp": "1.0.4", - "multer": "1.4.2", + "multer": "1.4.3", "mysql": "2.18.1", - "openapi-types": "7.0.1", - "pg": "8.3.3", - "request": "2.88.2", - "socket.io": "2.3.0", - "socket.io-client": "2.3.0", - "sqlite3": "5.0.0", - "swagger-ui-dist": "3.34.0", + "openapi-types": "9.3.0", + "reflect-metadata": "0.1.13", + "socket.io": "4.3.1", + "source-map-support": "0.5.20", + "sqlite3": "5.0.2", + "swagger-ui-dist": "3.52.5", + "typeorm": "0.2.38", "url-join": "4.0.1", - "@types/basic-auth": "1.1.3", - "@types/body-parser": "1.19.0", - "@types/chart.js": "2.9.24", - "@types/express": "4.17.8", - "@types/hls.js": "0.13.1", - "@types/js-yaml": "3.12.5", - "@types/lodash": "4.14.161", - "@types/material-design-lite": "1.1.16", - "@types/minimist": "1.2.0", - "@types/mithril": "2.0.3", - "@types/mkdirp": "1.0.1", - "@types/multer": "1.4.4", - "@types/mysql": "2.15.15", - "@types/node": "14.11.1", - "@types/pg": "7.14.5", - "@types/request": "2.48.5", - "@types/socket.io": "2.1.11", - "@types/socket.io-client": "1.4.33", - "@types/sqlite3": "3.1.6", - "@types/url-join": "4.0.0", - "del": "5.1.0", + "@types/body-parser": "1.19.1", + "@types/express": "4.17.13", + "@types/file-type": "10.9.1", + "@types/js-yaml": "4.0.4", + "@types/lodash": "4.14.176", + "@types/minimist": "1.2.2", + "@types/mkdirp": "1.0.2", + "@types/mongodb": "4.0.6", + "@types/multer": "1.4.7", + "@types/node": "16.11.6", + "@types/socket.io": "3.0.1", + "@types/source-map-support": "0.5.4", + "@types/sqlite3": "3.1.7", + "@types/url-join": "4.0.1", + "@typescript-eslint/eslint-plugin": "4.33.0", + "@typescript-eslint/parser": "4.33.0", + "del": "6.0.0", + "eslint": "7.32.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-prettier": "3.4.1", "gulp": "4.0.2", - "gulp-clean-css": "4.3.0", - "gulp-concat": "2.6.1", - "gulp-dart-sass": "1.0.2", + "gulp-eslint": "6.0.0", "gulp-plumber": "1.2.1", - "gulp-sourcemaps": "2.6.5", - "gulp-tslint": "8.1.4", + "gulp-sourcemaps": "3.0.0", "gulp-typescript": "5.0.1", - "terser-webpack-plugin": "4.2.2", - "ts-loader": "8.0.4", - "tslint": "6.1.3", - "typescript": "4.0.3", - "webpack": "4.44.2", - "webpack-stream": "6.1.0" + "prettier": "2.4.1", + "ts-loader": "9.2.6", + "ts-node": "10.4.0", + "typescript": "4.4.4" } } diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 5c2fbe66f04e..bbce54ce1dcc 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -6,6 +6,7 @@ , genericUpdater , writers , jq +, yq }: let @@ -40,6 +41,11 @@ in writers.writeBash "update-epgstation" '' } | del(.devDependencies, .main, .scripts)' \ "$SRC/package.json" \ > package.json + ${jq}/bin/jq '. + { + dependencies: (.dependencies + .devDependencies), + } | del(.devDependencies, .main, .scripts)' \ + "$SRC/client/package.json" \ + > client/package.json # Regenerate node packages to update the pre-overriden epgstation derivation. # This must come *after* package.json has been regenerated. @@ -49,18 +55,8 @@ in writers.writeBash "update-epgstation" '' # Generate default streaming settings for the nixos module. pushd ../../../../nixos/modules/services/video/epgstation - ${jq}/bin/jq ' - { liveHLS - , liveMP4 - , liveWebM - , mpegTsStreaming - , mpegTsViewer - , recordedDownloader - , recordedStreaming - , recordedHLS - , recordedViewer - }' \ - "$SRC/config/config.sample.json" \ + ${yq}/bin/yq -j '{ urlscheme , stream }' \ + "$SRC/config/config.yml.template" \ > streaming.json popd '' diff --git a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch index 48640f2ba08d..87bb3e7fbd19 100644 --- a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch +++ b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch @@ -1,17 +1,46 @@ -diff --git a/src/server/ConfigInterface.ts b/src/server/ConfigInterface.ts -index d23badd..1dd2b98 100644 ---- a/src/server/ConfigInterface.ts -+++ b/src/server/ConfigInterface.ts -@@ -11,9 +11,10 @@ interface ConfigInterface { - dbPath: string; - dbInfoPath: string; - mysql: { +diff --git a/ormconfig.js b/ormconfig.js +index 5591853b..838c06cb 100644 +--- a/ormconfig.js ++++ b/ormconfig.js +@@ -38,8 +38,6 @@ switch (config.dbtype) { + + case 'mysql': + ormConfig.type = 'mysql'; +- ormConfig.host = config.mysql.host; +- ormConfig.port = config.mysql.port; + ormConfig.username = config.mysql.user; + ormConfig.password = config.mysql.password; + ormConfig.database = config.mysql.database; +@@ -49,6 +47,12 @@ switch (config.dbtype) { + } else { + ormConfig.charset = config.mysql.charset; + } ++ if (config.mysql.socketPath) { ++ ormConfig.socketPath = config.mysql.socketPath; ++ } else { ++ ormConfig.host = config.mysql.host; ++ ormConfig.port = config.mysql.port; ++ } + break; + + case 'postgres': +diff --git a/src/model/IConfigFile.ts b/src/model/IConfigFile.ts +index 6a502e83..ba84a423 100644 +--- a/src/model/IConfigFile.ts ++++ b/src/model/IConfigFile.ts +@@ -61,12 +61,13 @@ export default interface IConfigFile { + regexp?: boolean; + }; + mysql?: { - host: string; + host?: string; -+ socketPath?: string; user: string; -- password: string; -+ password?: string; +- port: number; ++ port?: number; + password: string; database: string; - connectTimeout: number; - connectionLimit: number; + charset?: string; ++ socketPath?: string; + }; + postgres?: { + host: string; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 5d8064bac2d1..b89d04b18ede 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -127,7 +127,15 @@ let # ../../applications/video/epgstation epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { meta = drv.meta // { - broken = true; # not really broken, see the comment above + platforms = pkgs.lib.platforms.none; + }; + }); + + # NOTE: this is a stub package to fetch npm dependencies for + # ../../applications/video/epgstation/client + epgstation-client = super."epgstation-client-../../applications/video/epgstation/client".override (drv: { + meta = drv.meta // { + platforms = pkgs.lib.platforms.none; }; }); From 3330602a5912748cb3ce139e92ad1cd97b397f56 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 30 Jan 2022 18:26:58 +0900 Subject: [PATCH 130/329] node2nix: backport package alias port --- pkgs/development/node-packages/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index b89d04b18ede..93fbe39d2ead 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -278,6 +278,14 @@ let url = "https://github.com/svanderburg/node2nix/commit/e4c951971df6c9f9584c7252971c13b55c369916.patch"; sha256 = "0w8fcyr12g2340rn06isv40jkmz2khmak81c95zpkjgipzx7hp7w"; }) + # handle package alias in dependencies + # https://github.com/svanderburg/node2nix/pull/240 + # + # TODO: remove after node2nix 1.10.0 + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/644e90c0304038a446ed53efc97e9eb1e2831e71.patch"; + sha256 = "sha256-sQgVf80H1ouUjzHq+2d9RO4a+o++kh+l+FOTNXfPBH0="; + }) ]; }; postInstall = '' From 5f388fdc233d190c0accb10093c669453f5f9ee1 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 29 Jan 2022 21:22:44 +0900 Subject: [PATCH 131/329] nodePackages: update --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 7530 +++++++++++------ 2 files changed, 5042 insertions(+), 2489 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d6ac03eba339..3efdef6cbe6d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -114,6 +114,7 @@ , "emoj" , "emojione" , {"epgstation": "../../applications/video/epgstation"} +, {"epgstation-client": "../../applications/video/epgstation/client"} , "escape-string-regexp" , "eslint" , "eslint_d" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b29d698ecb89..d1f1908ca7a7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -94,22 +94,13 @@ let sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; }; }; - "@angular-devkit/architect-0.1302.5" = { + "@angular-devkit/architect-0.1302.6" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1302.5"; + version = "0.1302.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.5.tgz"; - sha512 = "r07oo8GgUGY28SR3PCM1qNfLE6PNx6SfzBlG4p0OrQQ68ln8HipsEysDGakOWjNFK18SCGWOXAUNrUj8GnV+5g=="; - }; - }; - "@angular-devkit/core-13.2.4" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "13.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.4.tgz"; - sha512 = "hSw1JWA/6dDAF/xleQRXGtzHphfU49TMUhvAoAmsmmz3NAn03xLy1dtqdIXIf+TkFXVvZDaAB2mW8KfRV67GFg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.6.tgz"; + sha512 = "NztzorUMfwJeRaT7SY00Y8WSqc2lQYuF11yNoyEm7Dae3V7VZ28rW2Z9RwibP27rYQL0RjSMaz2wKITHX2vOAw=="; }; }; "@angular-devkit/core-13.2.5" = { @@ -121,13 +112,13 @@ let sha512 = "WuWp/1R0FtCHPBcJLF13lTLHETtDGFUX0ULfGPRaYB5OVCSQcovVp5UbZTTy/Ss3ub3EOEmJlU8kMJfBrWuq+A=="; }; }; - "@angular-devkit/schematics-13.2.4" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "13.2.4"; + "@angular-devkit/core-13.2.6" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.4.tgz"; - sha512 = "VMhYa4cDu5yE31OvHncAd15Rmlchih/Sr6sxFsIwkg4xzRNIIZCtwqxVXgf0TiTN9zrvlvzK7nhPqTGNqqYb2A=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.6.tgz"; + sha512 = "8h2mWdBTN/dYwZuzKMg2IODlOWMdbJcpQG4XVrkk9ejCPP+3aX5Aa3glCe/voN6eBNiRfs8YDM0jxmpN2aWVtg=="; }; }; "@angular-devkit/schematics-13.2.5" = { @@ -139,6 +130,15 @@ let sha512 = "kAye6VYiF9JQAoeO+BYhy8eT2QOmhB+WLziRjXoFCBxh5+yXTygTVfs9fD5jmIpHmeu4hd2ErSh69yT5xWcD9g=="; }; }; + "@angular-devkit/schematics-13.2.6" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "13.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.6.tgz"; + sha512 = "mPgSqdnZRuPSMeUA+T+mwVCrq2yhXpcYm1/Rjbhy09CyHs4wSrFv21WHCrE6shlvXpcmwr0n+I0DIeagAPmjUA=="; + }; + }; "@angular-devkit/schematics-cli-13.2.5" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -355,6 +355,15 @@ let sha512 = "TmB2K5UfpDpSbCNBBntXzKHcAk2EA3/P68jmWvmJvglVUdkO9V6kTAuXVe12+h6C4GK0ndwuCrHHtEVcL5t6pQ=="; }; }; + "@astrojs/svelte-language-integration-0.1.1" = { + name = "_at_astrojs_slash_svelte-language-integration"; + packageName = "@astrojs/svelte-language-integration"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@astrojs/svelte-language-integration/-/svelte-language-integration-0.1.1.tgz"; + sha512 = "npUDO0bitzUC9oTDqVuup0yZObOF45GQ0IkaMf5wxe6XW30SIeyl1j8mdyjOv90vlJeothCKqnQ91qMudpq3Vg=="; + }; + }; "@aws-crypto/crc32-2.0.0" = { name = "_at_aws-crypto_slash_crc32"; packageName = "@aws-crypto/crc32"; @@ -427,13 +436,13 @@ let sha512 = "JJmFFwvbm08lULw4Nm5QOLg8+lAQeC8aCXK5xrtxntYzYXCGfHwUJ4Is3770Q7HmICsXthGQ+ZsDL7C2uH3yBQ=="; }; }; - "@aws-sdk/abort-controller-3.53.0" = { + "@aws-sdk/abort-controller-3.54.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.53.0.tgz"; - sha512 = "Xe7IX2mpf/qOjh1LrPnJ1UtiDw3cBlmy8n+Q2xSP5vaS/9IH0OMdQUveC9MV9HSgzICX+xzbPyUuSKc+4tufBQ=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.54.0.tgz"; + sha512 = "6N7numECrGwal2NEbJwYXOGjwWsFafz8VuUvCBK5G9SgSL5XAbq1S3lL/4gbme5jhgh9CWh7s+bAY7EpOEH2Xg=="; }; }; "@aws-sdk/chunked-blob-reader-3.52.0" = { @@ -454,193 +463,193 @@ let sha512 = "/hVzC0Q12/mWRMBBQD3v82xsLSxZ4RwG6N44XP7MuJoHy4ui4T7D9RSuvBpzzr/4fqF0w9M7XYv6aM4BD2pFIQ=="; }; }; - "@aws-sdk/client-s3-3.53.1" = { + "@aws-sdk/client-s3-3.54.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.53.1"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.53.1.tgz"; - sha512 = "uAhjR/TAuXNct6BL/shVg2f/6Zg1EZoXTG8KIywfmLitiUF0PvYwfwSPtNohkz6czgTs/rtirAZHAQKi8jjieA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.54.0.tgz"; + sha512 = "9JdhkTqRCYA3esnjFR7xaFysXMfX5TatKE9H8Sds78eoMQrfgB2Yl6ZcEl8Oy0vpMVpOzqRYmcSmFfaBOhuI/g=="; }; }; - "@aws-sdk/client-sso-3.53.0" = { + "@aws-sdk/client-sso-3.54.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.53.0.tgz"; - sha512 = "X32YHHc5MO7xO4W3Ly8DeryieeEiDOsnl6ypBkfML7loO3M0ckvvL+HnNUR1J+HYyseEV7V93BsF/A1z5HmINQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.54.0.tgz"; + sha512 = "5ZYYhoMqeaYhOU4kOEM7daKb8D5QhJ+IpwhHHMPhoHqQEwbbhBTFDXRs3ObUP/QYdBUMWS71+pnDoUdyHqPQ0Q=="; }; }; - "@aws-sdk/client-sts-3.53.0" = { + "@aws-sdk/client-sts-3.54.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.53.0.tgz"; - sha512 = "MNG+Pmw/zZQ0kboZtsc8UEGM9pn8abjStDN0Yk67fwFAZMqz8sUHDtFXpa3gSXMrFqBwT+jMFXmIxqiq7XuAeA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.54.0.tgz"; + sha512 = "UY8fyi1zaWBJm+ZtDZRvSOv1rjHlvJjtJF3MfGQWDwUM10Amwzfh4Hc2JEzyeMJPkoSSvm6CVjSDyqXo8yLGZA=="; }; }; - "@aws-sdk/config-resolver-3.53.0" = { + "@aws-sdk/config-resolver-3.54.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.53.0.tgz"; - sha512 = "wAqP/xNx49H1dutHWHjhKduaKtAcDg2KoH25W6peW2qXZ6OfpVcxRIBbJE4Z0yGOmFFaxw0OeH3h2ptP7tdhGQ=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.54.0.tgz"; + sha512 = "VaNuvJLMaz3znmBD9BNkoEqNUs5teILU66SnFqBwVqabmOVeOh7M6/f43CcDarkwGklzZB/bn/rx9NOWUtdunA=="; }; }; - "@aws-sdk/credential-provider-env-3.53.0" = { + "@aws-sdk/credential-provider-env-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.53.0.tgz"; - sha512 = "ocqZ4w7y7eay2M+uUBAD6NkhikUPoajEFX1/7iMvEFMmS5MyzjuolHPNK7Hh8lFmPyoflxaMXJVKO8C1MguA/A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.54.0.tgz"; + sha512 = "XWfzoUyFVsT4J7iTnXO38FKNdGFyE6ZNBtW9+Yx9EiiLtUlzH09PRv+54KIRQ4uqU+fEdtRh0gOdFajTrnRi3g=="; }; }; - "@aws-sdk/credential-provider-imds-3.53.0" = { + "@aws-sdk/credential-provider-imds-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.53.0.tgz"; - sha512 = "aKc8POSqCi58566KhF1p8Sxt7LHehMnshyfQzNAOB7xshSxuWg41rxafnQU4Soq9Tz7q5bwkauR2CEUihv/TRg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.54.0.tgz"; + sha512 = "Chygp8jswdjtCPmNxEMXigX4clgqh5GDaFGopR/gFaaG960hjF88Fx1/CPYD7exvM1FRO67nyfBOS0QKjSqTXg=="; }; }; - "@aws-sdk/credential-provider-ini-3.53.0" = { + "@aws-sdk/credential-provider-ini-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.53.0.tgz"; - sha512 = "g+UoJ1ikDrfpI1wHAhlrcBtX4OHxoLV6vakirpG27hhFwuMih565Q/Sjn3o5hLT8PBlWxwT2YeRuxCjtaL3cDA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.54.0.tgz"; + sha512 = "EobK9bJwsUdMKx7vB+tL5eaNaj/NoOPaFJlv0JRL3+5px7d2vF0i9yklj4uT7F3vDlOup6R3b1Gg9GtqxfYt9w=="; }; }; - "@aws-sdk/credential-provider-node-3.53.0" = { + "@aws-sdk/credential-provider-node-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.53.0.tgz"; - sha512 = "sy0NeuJHOBhe7XwxCX2y+YZAB4CqcHveyXJfT6mv7eY6bYQskkMTCPp2D586hSH3c6cfIsmvLSxNhNJApj1Atw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.54.0.tgz"; + sha512 = "KsXJG0K7yJg2MCzNW52fSDbCIR5mRobbNnXTMpDRkghlQyHP1gdHsyRedVciMkJhdDILop2lScLw70iQBayP/Q=="; }; }; - "@aws-sdk/credential-provider-process-3.53.0" = { + "@aws-sdk/credential-provider-process-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.53.0.tgz"; - sha512 = "nazHndueCa4y5jUM58OHSysb52E953r3VhmpCs0qIv1ZH5Ijs3kT/usbUq7Yms7pcpaUmpu00VZTc6IfOOC0GA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.54.0.tgz"; + sha512 = "hjUQ6FRG3Ihsm77Rgrf1dSfRUVZAFEyAHCuwURePXpYjzMpFYjl12wL6Pwa7MLCqVMyLKQ8HYamznkgBlLQqxw=="; }; }; - "@aws-sdk/credential-provider-sso-3.53.0" = { + "@aws-sdk/credential-provider-sso-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.53.0.tgz"; - sha512 = "EongClNxdVw+O4y+S0mZFjNeLHv1ssdAnBM/9L1PfR6sH06eikVmU6isEN2quwoKBy9HRVPaIVF075Q8QIpipg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.54.0.tgz"; + sha512 = "8HfBTdOw+9gbWsXRTr5y+QYq8gK+YYDx7tKbNv7ZWjMfw49SDef0j0W4ZBZH+FYEPepOEAKjBgtjvlUeFxrOaA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.53.0" = { + "@aws-sdk/credential-provider-web-identity-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.53.0.tgz"; - sha512 = "YbysBkX3mbomHJZULxk/3jyQ7NWn6rZ68IDY28bmp8cNWajWeGzDxKmR4Y+c8gNiN2ziWjUZWfHcnZC056/79Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.54.0.tgz"; + sha512 = "Mi87IzpgIi6P3WntumgMJ6rNY8Ay/HtsLFYm4bZ1ZGJH/3QVT4YLm1n8A4xoC+ouhL0i24jmN3X1aNu6amBfEg=="; }; }; - "@aws-sdk/eventstream-marshaller-3.53.0" = { + "@aws-sdk/eventstream-marshaller-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-marshaller"; packageName = "@aws-sdk/eventstream-marshaller"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.53.0.tgz"; - sha512 = "Vt8OjC0hgF0rNcGPbMEROnM5SHODzRdQsG9Y+M2suWDkUqFoh8+6m4v9c/ej3iudAEydZDLcnpV9yGv/CTqceg=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.54.0.tgz"; + sha512 = "blOxssrHCnugxdcudYB3Vmlp7ziG0to9RfnPq+InI98mIDm3G+rt7vW6GtlkgyWu0EYduj6N+aOI7ssRUCOyDQ=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.53.0" = { + "@aws-sdk/eventstream-serde-browser-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.53.0.tgz"; - sha512 = "B+nAlXet/NSEIzaN4fZYGwoFHBYtURuXUE+Ru4EaWyC8+vBEdeO4Vs9o/8mlZSHGiUn41QYYqiZvd+OKweTtBA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.54.0.tgz"; + sha512 = "XU9+nA7WlO+Rj0hV+C/2ZlB0zfI4eoit/CIlfGaonfx6EFezH3l4ngMZq8lgd8fSuPy1dN25DWQsW/F3AFSRdg=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.53.0" = { + "@aws-sdk/eventstream-serde-config-resolver-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.53.0.tgz"; - sha512 = "4O66c1aSgfdWfbr2pUJTONReVwA4oWQ/fRMhcAMhacqbPko5+3v0Iy/vOiVCm6Isa4K2kVpOUN0L+64niE7jag=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.54.0.tgz"; + sha512 = "fnbwtjaSd05K2+rcEZ3TQfM6YBY6obWqqt/x0qTTt7277wdqvE3+i0dWcvrQLldGD7xY3+oitEmClAeCE0raiA=="; }; }; - "@aws-sdk/eventstream-serde-node-3.53.0" = { + "@aws-sdk/eventstream-serde-node-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.53.0.tgz"; - sha512 = "92rlY8M8+nU4mUm3j4gtJiv9HY2fGTGLSIGLukOXAUf7xuJ220L+9ZInS4ToiRgq+dOSt8cFPCxRVpQtNesBfA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.54.0.tgz"; + sha512 = "b/EXk+Yb6lspfdEvClDkutif1z7Ggbeg/s2z9ug8Zh32i4/8gc4kcoWHy4ez8GUqsrRuOfD1MScqxkSAmIlPlg=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.53.0" = { + "@aws-sdk/eventstream-serde-universal-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.53.0.tgz"; - sha512 = "Y3OjTAKhDyz2UyLE0ATmDD3RFyBfJLWeBQkpJu7qICI0XYN2tmV1mCkQUtkT3e4s+UxnuUOa55YQpdUsQUWIDA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.54.0.tgz"; + sha512 = "HdFYrLvKHWATev0BCp0I8xH40MhP9cNhxK0h+srdCC9o/Djs3QrI0Nn5rzWdg/hQDyRg8jPSvaGG8P/ekyTn2w=="; }; }; - "@aws-sdk/fetch-http-handler-3.53.0" = { + "@aws-sdk/fetch-http-handler-3.54.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.53.0.tgz"; - sha512 = "0CcEYarIAVAoGzu1ClO2xDq30Jii6AevDFJYR7M9yojqAMvwjP31DY4/qfPc2nCpSAd9dASR6vcx6r/RoIynVg=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.54.0.tgz"; + sha512 = "TIn2ocem/gpMQ12KoiOu3uTHO86OOrmFITulV9D8xTzvFqHe34JKjHQPqII6lDbTCnU9N5CMv3N1CXxolIhiOQ=="; }; }; - "@aws-sdk/hash-blob-browser-3.53.0" = { + "@aws-sdk/hash-blob-browser-3.54.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.53.0.tgz"; - sha512 = "A3xa0o1W9/tALw0/yoXyBKfxsMlzi1BvzEgCFUU2y914yBo62FiIf1E+BX42m9MfPJ87SD+l3O5QcptMVWvarw=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.54.0.tgz"; + sha512 = "KIflBj2efxy5/z1ffg1HL3CRxqM7hNqel+dtVCYaCfTJ/MQhcfcR5GsodhJYl99pitryorJeB4chhgNv4bbPUA=="; }; }; - "@aws-sdk/hash-node-3.53.0" = { + "@aws-sdk/hash-node-3.54.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.53.0.tgz"; - sha512 = "0xK5PSUUVOPttvCLWrrUTmrKe7Fz6njPdBYvB3ESk1whXL+TY3syJj4em63Sq6yFyeuXdqyTzqfcs9fU2puWkA=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.54.0.tgz"; + sha512 = "o2XRftfj3Tj2jsZsdvnEY4OtmkT/9OADCWkINQCTcfy+nMuvs1IAS/qruunfaMJ58GntOoI4CVIbRa2lhhJr5w=="; }; }; - "@aws-sdk/hash-stream-node-3.53.1" = { + "@aws-sdk/hash-stream-node-3.54.0" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.53.1"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.53.1.tgz"; - sha512 = "y7pUc6EtkG3TscZR9dpR/BCauP/lRepU+Td43Oe9VUhD6l3lS3TuIHUwB7PEU7NeSU9iqWuflBVK/IBWXrfH3w=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.54.0.tgz"; + sha512 = "j936gz9O1ist0Bu2IXCf2DUrYfB9DkwKUMRAN14mTrKB+3PAMRhBazUVDJjIxPbcC9MQJnwIa2tiZWn8QC48UA=="; }; }; - "@aws-sdk/invalid-dependency-3.53.0" = { + "@aws-sdk/invalid-dependency-3.54.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.53.0.tgz"; - sha512 = "qp2qRFa1a/AjZRCe6MZCpbaXo5t4enGAtch/83fuH4rRkzVOctYox1gyTGTliHk28rjMREtSgZDQZojp5/5M5w=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.54.0.tgz"; + sha512 = "eeefTPtkb0FQFMBKmwhvmdPqCgGvTcWEiNH8pznAH0hqxLvOLNdNRoKnX5a1WlYoq3eTm0YN9Zh+N1Sj4mbkcg=="; }; }; "@aws-sdk/is-array-buffer-3.52.0" = { @@ -652,229 +661,229 @@ let sha512 = "5Pe9QKrOeSZb9Z8gtlx9CDMfxH8EiNdClBfXBbc6CiUM7y6l7UintYHkm133zM5XTqtMRYY1jaD8svVAoRPApA=="; }; }; - "@aws-sdk/md5-js-3.53.0" = { + "@aws-sdk/md5-js-3.54.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.53.0.tgz"; - sha512 = "+XbYdbxgWniyC7E4kqHC0z0Qsud/EMv9RuKghWLr7IwbUjfR7zix5+AVw3XR+FWrKrDAlyRBhyzG+60STliuiA=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.54.0.tgz"; + sha512 = "pMprZD8JBw9WU4Risfd0Clm9SrUpsUS3QriSDeuFnGfRcKHkpw1sDj6HsNsIQ1OCeWuhYqW55Wtzc0pH8U80Mg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.53.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.54.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.53.0.tgz"; - sha512 = "q88eevXUkUWp6e/vHGnpt8/8TjscbfW6CWGpexj3DFWt3WZhEhExcoGwwszoL4FQfMFWBL+11EKNZm2orHqDwg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.54.0.tgz"; + sha512 = "4VC6zxDaveCnQD3eUJezSQ3Ikeq+MxRnvfcNhZytB20tYRy1PnR4jLoqjYkw5U1zstVRABbZdzlsWzZMe308ew=="; }; }; - "@aws-sdk/middleware-content-length-3.53.0" = { + "@aws-sdk/middleware-content-length-3.54.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.53.0.tgz"; - sha512 = "CXANhpL2MAE2tPKmu0cOf4Fd99useIj5kgX6UA+HWg/ZbJ4qBg6Q4W/nYVt+OuukeqwEEbpt3wv0lKQ8k/vINQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.54.0.tgz"; + sha512 = "DTlZo00stFwFHyR+GTXxhYePzNbXm+aX5yYQUsrsY2J2HuSbADVgDDekJXbtOH36QBa0OJf7JKbWP8PZDxk1zg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.53.0" = { + "@aws-sdk/middleware-expect-continue-3.54.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.53.0.tgz"; - sha512 = "aMKtfOX9b1yx0ER0QspN2jOR/Q1ucRYEaR46yOUPjdcMHHnGxuk3kimsyGqgFm2+pPJdi9FRd9S2eC/tNjYn8w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.54.0.tgz"; + sha512 = "6k4hoD7XqGDA8yq10AzF+iafgc+RyrPxr4kqzv50+hI5CZkPcl/vOAgS7iD+Y33dLITYuh+jzlpn7zlLwdOoqw=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.53.0" = { + "@aws-sdk/middleware-flexible-checksums-3.54.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.53.0.tgz"; - sha512 = "g069Es0Sy3So2HRz+UAwaubFKkGuxwhEf6OS9pmovY2+2yfZBOLoQmf7jS50RgbxJcUDoI7uuKZrp0BcdLDgEg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.54.0.tgz"; + sha512 = "4+bUwQyYHtTbaJDaj2F7j2K/JUcYdKg169pKmpefZiXZVdfR2/WWwj7Wx7EI40rpPYHaMpSal9tIxz054LPYnw=="; }; }; - "@aws-sdk/middleware-header-default-3.53.0" = { + "@aws-sdk/middleware-header-default-3.54.0" = { name = "_at_aws-sdk_slash_middleware-header-default"; packageName = "@aws-sdk/middleware-header-default"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.53.0.tgz"; - sha512 = "eQLFdNBzydZoocnj7YDVO+AJZ3YhuImZ1GXzGsF9FN8IdSjuE4gwB8BQhG6vuUg3GVe+sI+7VUJT6h55OaDBXw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.54.0.tgz"; + sha512 = "DvkdMJRAYrVsu6S92Z/fhSnj7ZFCNE3ertmIiGsukfMuGmzkuVKxqlUfo89xS3sOF3VY2nNOdNTCnVY4VZLSQQ=="; }; }; - "@aws-sdk/middleware-host-header-3.53.0" = { + "@aws-sdk/middleware-host-header-3.54.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.53.0.tgz"; - sha512 = "w5qMAUgy52fvJGqzqruNJhv4BtkanE4I368zWiysmwXXL5xmpKs8TpkGqcSQw4g2wKS8MR2Yxh21LukHlsgAJw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.54.0.tgz"; + sha512 = "X+lvYc2ij1+9tfpvdGGb+/APvH7g/M9RYzIEkI/LvNjVCOA3f3rgzFftZZhD/zccRtrygsvXfeZhoDrHxFKl9g=="; }; }; - "@aws-sdk/middleware-location-constraint-3.53.0" = { + "@aws-sdk/middleware-location-constraint-3.54.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.53.0.tgz"; - sha512 = "HtBy8L3XNbovHLVh6wtIIThsbdTsX+jv09M9Cmmu80eM1WXw5Uu6lJX6FdIQXfMXBTZjnmHRL+72CxEtsets8g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.54.0.tgz"; + sha512 = "qwZR+GWlRoIFvvCt5ywmX3kV15KxrFbUxyAADCEJ4Q86ebEI3ux9mAHB6niOArRwtA5/wyvjRrOiYo/fTq7eLQ=="; }; }; - "@aws-sdk/middleware-logger-3.53.0" = { + "@aws-sdk/middleware-logger-3.54.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.53.0.tgz"; - sha512 = "jMME8OOyPHliHhVD3FaBQ+4X+FDCQovw6CYGqPdqP0JUuhR8E1LWKHV1+xRpkpOICKwBnIXrgD8/0NQo/+Z84A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.54.0.tgz"; + sha512 = "bDCQj8IBq1vrXRRrpqD+suJ8hKc4oxUXpRkWdsAD+HnWWRqHjsy0hdq5F8Rj1Abq7CsFtZ+rUXddl+KlmgZ3+A=="; }; }; - "@aws-sdk/middleware-retry-3.53.0" = { + "@aws-sdk/middleware-retry-3.54.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.53.0.tgz"; - sha512 = "TKEdTLP//SjasunU3/yX7avXMxhIEDoSOaiwj77zEpPGF2NWcR99UFfqNLeJsRPCyzYScYo1JSuxIwgXHNIhyQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.54.0.tgz"; + sha512 = "8kVzwxe0HQajeZWXzAp2XCkbiK8E8AZESfXvLyM34Xy2e8L8gdi1j90QLzpFk6WX6rz7hXBQG7utrCJkwXQxLA=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.53.0" = { + "@aws-sdk/middleware-sdk-s3-3.54.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.53.0.tgz"; - sha512 = "cq2NFixf5HBctPaUUMjV97M++q18e/WDrM61lN7eMHfdXW+TlYv4tVF9y9MaE7dpoNp7G0ORLsz05JdVdUI33g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.54.0.tgz"; + sha512 = "xESksyOVCuDkMPC8mEqrInnuBeJHLSVOfwIl/pGwzevc+Q5spO9FDUlNfhaEVOEoLqK21TUdZo4z/ElNN94m4w=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.53.0" = { + "@aws-sdk/middleware-sdk-sts-3.54.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.53.0.tgz"; - sha512 = "b9AUXYqA5jaUTpWu7wPZz43RQnmy1WGPFVHd8CvcUzFdMzwJlQeH4wq+sEdZ1KtIsz6n6TmY7vobzrScgq3ftg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.54.0.tgz"; + sha512 = "4vOlG96fKgqmLMsguoKFdBkk2Fq8JttpgPts9d5Ox73+yQsa0VKrpLiD5OUPqgjGZcX2bilMKCAOBc2v3ESAHw=="; }; }; - "@aws-sdk/middleware-serde-3.53.0" = { + "@aws-sdk/middleware-serde-3.54.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.53.0.tgz"; - sha512 = "jPoou51ULWN2PpvWkDF3wLKnTezyM33NBdF89mvfnI4++Za0/NpuL12636YqWLXt2CK87u8cA2Q+7Opob7KocA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.54.0.tgz"; + sha512 = "O89/5aOiNegBP6Mv+gPr22Zawz2zF2v1o8kwFv2s4PWDzpmvrdF2by6e2Uh9sKzfpcwEW7Wr8kDTwajampVjgA=="; }; }; - "@aws-sdk/middleware-signing-3.53.0" = { + "@aws-sdk/middleware-signing-3.54.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.53.0.tgz"; - sha512 = "r3g2ytin1YbhXCDedMfR7ZSlt1B39GWA0+J04ZZzUdevtnS2VnkFNhsanO5os/WOpVUV7iqk/ncJgSpn9LI2DA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.54.0.tgz"; + sha512 = "KYxmRDh7D6ysAezlsDf3cN2h6OjH66x3NUdgUmW+78nkN9tRvvJEjhmu6IOkPd4E1V9P3JOLbq6zVjDVU12WDQ=="; }; }; - "@aws-sdk/middleware-ssec-3.53.0" = { + "@aws-sdk/middleware-ssec-3.54.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.53.0.tgz"; - sha512 = "2p2QT3PNepUC5MwT+t0l9bf7MlRHw6DN6CLg4Dptgr3SFR2k8LjUp2S7dJqg4qrhXRiiO7lTZK57PaPPR90dFw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.54.0.tgz"; + sha512 = "wNQR5pRoN4wJq2IcFOXhRxvars4uWgdUnBQcJ5UDSJhUPwVDA4m+M83Q/54GWRHT+SVsobuNTmTeFnCbgsIq3A=="; }; }; - "@aws-sdk/middleware-stack-3.53.0" = { + "@aws-sdk/middleware-stack-3.54.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.53.0.tgz"; - sha512 = "YanQOVUXGjm63GCZVRYPlPMl6niaWtVjE2C0+0lpCrJQYaUIrvKh27Ff40JLi3U0F89hmsYOO7yPQOPTbc9NBg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.54.0.tgz"; + sha512 = "38iit8VJ7jhFlMdwdDESEJOwbi8wIjF7Q1FOFIoCvURLGkTDQdabGXKwcFVfRuceLO+LJxWP3l0z0c10uZa6gQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.53.0" = { + "@aws-sdk/middleware-user-agent-3.54.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.53.0.tgz"; - sha512 = "ClKxpFXoHLhdnDxyDRRVNaFYQnfylps7rk1wfbRLWb+FWQwKWBvLq5c5ZPvznBU8BvftDSkFtrY+7OLMlj6qxA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.54.0.tgz"; + sha512 = "831GP5EBJdDxyq93dpgBZUwBWnZAID2aFvE/VN8c5X8U00ZT7GRt9cy5EL2b6AQN3Z4uWL1ZVDVkYmRAHs33Lg=="; }; }; - "@aws-sdk/node-config-provider-3.53.0" = { + "@aws-sdk/node-config-provider-3.54.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.53.0.tgz"; - sha512 = "l00gDzU7n2WSIBHZPVW8/t6L0UD6qwtre5kuGKiv8ZkZKynPg9VV39IB/JZ7swp2uydbXuqxgDxFvqImvY3IyA=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.54.0.tgz"; + sha512 = "Q2a1vyoZa2UX/dItP3cqNdLUoTGdIY4hD5nA+mTg5mKlOWci35v8Rypr40tQz4ZwiDF6QQmK0tvD3bBUULm0wA=="; }; }; - "@aws-sdk/node-http-handler-3.53.0" = { + "@aws-sdk/node-http-handler-3.54.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.53.0.tgz"; - sha512 = "YqovPyn75gNzDSvPWQUTAEbwhr8PBdp1MQz65bB8p+qOlzQi1jGCyj1uHqG7qwVIlis9+bAfqpAqNDuYpdGsNg=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.54.0.tgz"; + sha512 = "g6+IXe4FCMrx4vrY73yvFNAUsBJ1vhjDshUCihBv5tEXsd45/MqmON/VWYoaQZts0m2wx2fKsdoDKSIZZY7AiQ=="; }; }; - "@aws-sdk/property-provider-3.53.0" = { + "@aws-sdk/property-provider-3.54.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.53.0.tgz"; - sha512 = "qrVFYcOV/Da7/ozW2bDLDz0JQP0NLIn6/eNUwT2fqKVw9MWcrLf6xtyAJhCwckdUVOWS2HoBSyvEopa4mdh9Sw=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.54.0.tgz"; + sha512 = "8e+KXskwOhXF0MIdIcZLFsOTfMVGp41Y6kywgewQaHkZoMzZ6euRziyWNgnshUE794tjxxol9resudSUehPjIw=="; }; }; - "@aws-sdk/protocol-http-3.53.0" = { + "@aws-sdk/protocol-http-3.54.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.53.0.tgz"; - sha512 = "lKOXq2FjQH2i/ztJOKHoNgJ9Kpaprhb6/lsKMjHuePr/YDEzp62nEuJKbVx5rA9C8Rxuuj2hE8vXhQ6dyUIsjg=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.54.0.tgz"; + sha512 = "v4CgQ2mBzEwNubM1duWP3Unu98EPNF2BuKWe4wT1HNG2MTkODS56fsgVT6sGGXS9nB/reEzB+3bXO5FS8+3SUg=="; }; }; - "@aws-sdk/querystring-builder-3.53.0" = { + "@aws-sdk/querystring-builder-3.54.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.53.0.tgz"; - sha512 = "oliOrup52985pSKOjHbbm7t3bGL0HTPs9UODhBuDpHE7l0pdWE1hv9YiU3FF5NUIF25VwbL83GYmL9R52GxZhA=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.54.0.tgz"; + sha512 = "7rs2gGPpiIHntbYGPFkxkXQkSK7uVBqlWRl0m6fNngUEz2n8jRxytB6LlALMHbXeXh28+zzq0VxbAwqAAUQ4oQ=="; }; }; - "@aws-sdk/querystring-parser-3.53.0" = { + "@aws-sdk/querystring-parser-3.54.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.53.0.tgz"; - sha512 = "wEkS40w/wW4eBSnf7xt+m8InZFVzjLAzRYK1yPab2qfOIShpWgxg1ndqEP0eu14MvwdEfMPW9xU6J2AiWoxWng=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.54.0.tgz"; + sha512 = "OZ4mRJ9rXgBskPBSoXBw8tV4kfNK0f/pP55qE1eZIcQ1z7EvVz4NjldgqMfscT20Cx5VzUbus3q9EPcV+HbR1w=="; }; }; - "@aws-sdk/s3-request-presigner-3.53.1" = { + "@aws-sdk/s3-request-presigner-3.54.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.53.1"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.53.1.tgz"; - sha512 = "Ym6Ll3SV9dGb8MlAJz6bCLEeFSbFFtSsBtIT9X9edofXD61o/gIbs6SWpoTBnTLezLcqtA1qWaIl3PcMitGP7Q=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.54.0.tgz"; + sha512 = "xPIahWW1brKu3Cnphx/pYAB3nRAyAZH4Zh7n1zm9XUsqqsBc4ZkIKqC5tDvJ/lBOLrqks8oSh2wpckfCwO9EpA=="; }; }; - "@aws-sdk/service-error-classification-3.53.0" = { + "@aws-sdk/service-error-classification-3.54.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.53.0.tgz"; - sha512 = "l5g8QncKk0ZmzQL7mWyQ6n5xWkd1XQJuoOfLZPBas9SJAyz7wanV5P3CG9PX6s1GVHWLC+2MafpIQ6+aH1x5cQ=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.54.0.tgz"; + sha512 = "XWANvjJJZNqsYhGmccSSuhsvINIUX1KckfDmvYtUR6cKM6nM6QWOg/QJeTFageTEpruJ5TqzW9vY414bIE883w=="; }; }; "@aws-sdk/shared-ini-file-loader-3.52.0" = { @@ -886,40 +895,40 @@ let sha512 = "tALb8u8IVcI4pT7yFZpl4O6kgeY5EAXyphZoRPgQSCDhmEyFUIi/sXbCN8HQiHjnHdWfXdaNE1YsZcW3GpcuoQ=="; }; }; - "@aws-sdk/signature-v4-3.53.0" = { + "@aws-sdk/signature-v4-3.54.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.53.0.tgz"; - sha512 = "CUvCIrwiiWpJd/ldSA04RERXPsdvkuKW3+gBDIUREq4uc7co7Cml1/wbIJ0UOHAmJpDw82NDYqAUthYB1kbHrQ=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.54.0.tgz"; + sha512 = "22Bf8uQ0Q/I7WpLFU88G7WVpRw6tWUX9Ggr0Z++81uZF5YCPbWDNtFDHitoERaRc/M4vUMxNuTsX/JWOR3fFPg=="; }; }; - "@aws-sdk/smithy-client-3.53.0" = { + "@aws-sdk/smithy-client-3.54.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.53.0.tgz"; - sha512 = "/mZn1/1/BXFgV5PwbGfXczbSyZFrhUEhWQzPG7x1NXLQh3kcSoHGDSONqFhqTeHWkfEXp1Tn0zUe7R4vAseFmQ=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.54.0.tgz"; + sha512 = "zdYN5pwhJU7x8qZKWTZPsFD5YQkDt6kyCNRsNjSWJ0ON4R3wUlFIwT3YzeQ5nMOTD86cVIm1n2RaSTYHwelFXg=="; }; }; - "@aws-sdk/types-3.53.0" = { + "@aws-sdk/types-3.54.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.53.0.tgz"; - sha512 = "FqHfWRXdnQvfxgngDKfYpYOuQ1HmPgxaGKELx3pFaEnQdMo/dMXjfBGQcEQgP8jqU6bPLaJSfykjWjDzua8JBg=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.54.0.tgz"; + sha512 = "Jp2MHXnrM0pk0RIoSl5AHFm7TBk+7b8HTIcQ2X/6kGwwwnWw9qlg9ZFziegJTNTLJ4iVgZjz/yMlEvgrp7z9CA=="; }; }; - "@aws-sdk/url-parser-3.53.0" = { + "@aws-sdk/url-parser-3.54.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.53.0.tgz"; - sha512 = "lB0U5TkBDSdJK8h3noDkSG/P1cGnpSxOxBroMgPHA8Lrf5lmFRMvDXLXMhRDnTiqtsd/DpHDPyat91pfwLVEwA=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.54.0.tgz"; + sha512 = "DJWdlkXq3rsOydxwR9htPUW4QXhmo75Hybg96D3F2uPUvPCm8gJFngXp/9hW1OYcgfNu13HXqUy+t6V23cC7Iw=="; }; }; "@aws-sdk/util-arn-parser-3.52.0" = { @@ -949,22 +958,22 @@ let sha512 = "V96YIXBuIiVu7Zk72Y9dly7Io9cYOT30Hjf77KAkBeizlFgT5gWklWYGcytPY8FxLuEy4dPLeHRmgwQnlDwgPA=="; }; }; - "@aws-sdk/util-body-length-browser-3.52.0" = { + "@aws-sdk/util-body-length-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-body-length-browser"; packageName = "@aws-sdk/util-body-length-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.52.0.tgz"; - sha512 = "8omOgIGmopUtwg3XaeyvqacxrIrCsDKUVQp5n+8iLmyYt5mQM70vXbUC273GJzKDtibGDfxiN4FqSLBlo9F/oQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.54.0.tgz"; + sha512 = "hnY9cXbKWJ2Fjb4bK35sFdD4vK+sFe59JtxxI336yYzANulc462LU/J1RgONXYBW60d9iwJ7U+S+9oTJrEH6WQ=="; }; }; - "@aws-sdk/util-body-length-node-3.52.0" = { + "@aws-sdk/util-body-length-node-3.54.0" = { name = "_at_aws-sdk_slash_util-body-length-node"; packageName = "@aws-sdk/util-body-length-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.52.0.tgz"; - sha512 = "1WWsGh0hip4y1uvOLFV2v3Nvq3W35dmW5YniCi0gQDBLc5JHES8Zka7yoCDYOfaYFUodVH5mC/jFBjGRQ3TpDw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.54.0.tgz"; + sha512 = "BBQB3kqHqHQp2GAINJGuse9JBM7hfU0tMp9rfw0nym4C/VRooiJVrIb28tKseLtd7nihXvsZXPvEc2jQBe1Thg=="; }; }; "@aws-sdk/util-buffer-from-3.52.0" = { @@ -985,13 +994,13 @@ let sha512 = "1wonBNkOOLJpMZnz2Kn69ToFgSoTTyGzJInir8WC5sME3zpkb5j41kTuEVbImNJhVv9MKjmGYrMeZbBVniLRPw=="; }; }; - "@aws-sdk/util-create-request-3.53.0" = { + "@aws-sdk/util-create-request-3.54.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.53.0.tgz"; - sha512 = "yRc+XGz8oUxBLd1ikluRJ4pltP2fORjTvaLLou5sK/jsougPhGmSKcUgvz4rublwUU5L7zeFLk3ndrcg2b5AKQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.54.0.tgz"; + sha512 = "Sa+t75YQnMXXcCruLBvKZ6B1DzyGAod1PZT+iDHwDDobDsUVG3Cjov9gJepYAH2EEmvZa9f0IT+W6lvGv3uL4w=="; }; }; "@aws-sdk/util-credentials-3.53.0" = { @@ -1003,31 +1012,31 @@ let sha512 = "XP/3mYOmSn5KpWv+PnBTP2UExXb+hx1ugbH4Gkveshdq9KBlVnpV5eVgIwSAnKBsplScfsNMJ5EOtHjz5Cvu5A=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.53.0" = { + "@aws-sdk/util-defaults-mode-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.53.0.tgz"; - sha512 = "ubOcZT3rkVXSTwCHeIJevgBVV5GHnejz3hd+dFY9OcuK53oMZnFPS8SfJLgGG6PHfg30P8EurKv1VhWrbuuJDw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.54.0.tgz"; + sha512 = "9QnRbTsD2MuEr59vaPAbC95ba7druMFRSZjpwc3L7U9zpsJruNDaL5aAmV0gCAIPZg7eSaJmipyWr0AvwwgroQ=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.53.0" = { + "@aws-sdk/util-defaults-mode-node-3.54.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.53.0.tgz"; - sha512 = "84nczaF0eZMRkZ7chJh7OZd4ekV31eWmw8LOTJ4RQeeRy+0eY8th23yKyt5TU+YgmMLrY0BVK7103BQAI/6ccQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.54.0.tgz"; + sha512 = "kHFgEyAWCaR5uSmRwyVbWQnjiNib3EJSAG9y7bwMIHSOK/6TVOXGlb1KIoO6ZtLE1FZFlS55FIRFeOPmIFFZbA=="; }; }; - "@aws-sdk/util-format-url-3.53.0" = { + "@aws-sdk/util-format-url-3.54.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.53.0.tgz"; - sha512 = "+r80EoHjk8sN/GjZ90JdI3a5mNKcnEWU6TL+C+cRkCMbdAXMGOCsnt3C567IcpGU3dUba/UcYA9Y2Y34FzpetA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.54.0.tgz"; + sha512 = "nnrXT0dQc+eRWJPgkqDK91NEluTFU9Tqs/LhIlIq+6Z8BELTN24lCi9feUKtw1s3a5ucUSs2unYyfHnl35PeeQ=="; }; }; "@aws-sdk/util-hex-encoding-3.52.0" = { @@ -1048,22 +1057,22 @@ let sha512 = "l10U2cLko6070A9DYLJG4NMtwYH8JBG2J/E+RH8uY3lad2o6fGEIkJU0jQbWbUeHYLG3IWuCxT47V4gxYrFj7g=="; }; }; - "@aws-sdk/util-stream-browser-3.53.0" = { + "@aws-sdk/util-stream-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-stream-browser"; packageName = "@aws-sdk/util-stream-browser"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.53.0.tgz"; - sha512 = "oh+PVTeo7nvkuXwlrAy6TErTpzTRrtxaL+2ErTFiLFPPFKK2/0X0E12zoNB0DMaY48sRdkJmrlLbOtxGDS1rNg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.54.0.tgz"; + sha512 = "KVBRQcTie9Q231pdbO4gzGxHG8wNomGic3bHDnwfVdE+tq1Pbi8xNgUelmmd/uZvgMf8awuNN8OHzkex06HAHQ=="; }; }; - "@aws-sdk/util-stream-node-3.53.0" = { + "@aws-sdk/util-stream-node-3.54.0" = { name = "_at_aws-sdk_slash_util-stream-node"; packageName = "@aws-sdk/util-stream-node"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.53.0.tgz"; - sha512 = "Hubb2cvn2idlNsHkJ5v46wW+cvodLySGJCqTat5kUAoOxR20ZFG3P3R6InU85PAh54zZTRvURuD0UM0uPtIQYQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.54.0.tgz"; + sha512 = "h3kpLMYzGgPkCIq0sLlE70zAt75C6wcbZm4gPh5iN8KRmmhpktqKpBami9J5fY6cBPC5ZlEmv5iDdZrI90Imrw=="; }; }; "@aws-sdk/util-uri-escape-3.52.0" = { @@ -1075,22 +1084,22 @@ let sha512 = "W9zw5tE8syjg17jiCYtyF99F0FgDIekQdLg+tQGobw9EtCxlUdg48UYhifPfnjvVyADRX2ntclHF9NmhusOQaQ=="; }; }; - "@aws-sdk/util-user-agent-browser-3.53.0" = { + "@aws-sdk/util-user-agent-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.53.0.tgz"; - sha512 = "fJsxzjo4UMv2o6KYSvw8cwfDhAQiao3X+iY1lGNVKrcY2bnI4zW5pWYge94oIJXMyFjjg6k6Ek+JIvGLMFY0XA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.54.0.tgz"; + sha512 = "pU5KL1Nnlc1igeED2R44k9GEIxlLBhwmUGIw8/Emfm8xAlGOX4NsVSfHK9EpJQth0z5ZJ4Lni6S5+nW4V16yLw=="; }; }; - "@aws-sdk/util-user-agent-node-3.53.0" = { + "@aws-sdk/util-user-agent-node-3.54.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.53.0.tgz"; - sha512 = "YbrqMpTi+ArL9qG+NIXPInmnjGwYu0lohiH5uyEMHAHolqg4vqdKBlXyZ7Pjls2Nka7px2UUfX/Ba2RIssBBMQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.54.0.tgz"; + sha512 = "euKoYk1TfyV9XlJyAlGWdYqhQ5B4COwBxsV9OpwiAINUFm91NSv6uavFC/ZZQBXRks6j9pHDAXeXu7bHVolvlA=="; }; }; "@aws-sdk/util-utf8-browser-3.52.0" = { @@ -1111,13 +1120,13 @@ let sha512 = "fujr7zeobZ2y5nnOnQZrCPPc+lCAhtNF/LEVslsQfd+AQ0bYWiosrKNetodQVWlfh10E2+i6/5g+1SBJ5kjsLw=="; }; }; - "@aws-sdk/util-waiter-3.53.0" = { + "@aws-sdk/util-waiter-3.54.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.53.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.53.0.tgz"; - sha512 = "WyiyHOzmiapbbwB8dtu7axRqu9u5+Mnp1/+k2Ia7cm0UMUTKLjdixPsaM89HNre3EMa8WHrDBnwyVmo/Khbq3w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.54.0.tgz"; + sha512 = "+Gz5R14jWKsQtMCWbzWJe2Ac/CdMV/h5/R8uEZmwM3f6MHICPOftMQd0uDLdGezSBV9PuU3PCwiBZBTFzNSYBg=="; }; }; "@aws-sdk/xml-builder-3.52.0" = { @@ -2443,6 +2452,15 @@ let sha512 = "BlwPjCDjeSdwIk7vP3wU6kFI+ZJBji8j5QWy631r+aQM1t74AclUOWNQZT8/GX3y2hqmC9LZnFT/bTQtVxw24g=="; }; }; + "@chinachu/aribts-1.3.5-mirakurun.17" = { + name = "_at_chinachu_slash_aribts"; + packageName = "@chinachu/aribts"; + version = "1.3.5-mirakurun.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@chinachu/aribts/-/aribts-1.3.5-mirakurun.17.tgz"; + sha512 = "1rgl8GNttf8+Ru/lOhWmH36zYQwUBaKIChHXe66KdJXDF+lRUaFhD1cR5NBCOFR983xzrvTJtGp0GWoYbILd1Q=="; + }; + }; "@cnakazawa/watch-1.0.4" = { name = "_at_cnakazawa_slash_watch"; packageName = "@cnakazawa/watch"; @@ -2965,13 +2983,13 @@ let sha512 = "MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g=="; }; }; - "@cspell/dict-software-terms-2.1.2" = { + "@cspell/dict-software-terms-2.1.3" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.2.tgz"; - sha512 = "iTkkduYX4+NVHt1CKbDGDQJsSTqMCafGZKhtasPQTUN6UxIaDFM9Hxl1wAoECDaRRDgkaGP0v1C7F8jY7nFyKQ=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.3.tgz"; + sha512 = "JmMfRa9Xl0MCD/z5gYUnY05BNxSMnx25Ky6kO/Cs0gBYZZdYzHZNqrbfnqBMsB9PpOzn2uqrYUmAEusoI1WyMQ=="; }; }; "@cspell/dict-swift-1.0.2" = { @@ -3118,13 +3136,13 @@ let sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g=="; }; }; - "@discoveryjs/json-ext-0.5.6" = { + "@discoveryjs/json-ext-0.5.7" = { name = "_at_discoveryjs_slash_json-ext"; packageName = "@discoveryjs/json-ext"; - version = "0.5.6"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz"; - sha512 = "ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA=="; + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; + sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; }; "@electron-forge/async-ora-6.0.0-beta.63" = { @@ -3397,6 +3415,15 @@ let sha512 = "igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w=="; }; }; + "@eslint/eslintrc-1.2.1" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz"; + sha512 = "bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ=="; + }; + }; "@exodus/schemasafe-1.0.0-rc.6" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; @@ -3424,22 +3451,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-6.0.18" = { + "@expo/config-6.0.19" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "6.0.18"; + version = "6.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-6.0.18.tgz"; - sha512 = "60z0YICI9eJWlvajl/Wgq8+lKm0jfkZOMdATDQtWz6GvWshUxd+A8EYhtgjJ9eWMGqOYkwrCpRNLHz5TZtCKWA=="; + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.19.tgz"; + sha512 = "UkLnnKnt4zP382K7s0UDnUNY646Gdw8PoDWnxaIGAL515R9IX8oWef7+7hX/dZMi27d/WLJPmWNRYsEL8Q/3rw=="; }; }; - "@expo/config-plugins-4.0.18" = { + "@expo/config-plugins-4.1.0" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "4.0.18"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.0.18.tgz"; - sha512 = "tW4bnrnKhn+PPHF8wf1KAoubICAVUHW8CcagvyFqaRIzeh6yavMIOsQShxOVTbgx7LzSyymZ1nEs45yCGAiMfA=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.0.tgz"; + sha512 = "+Uq7kzi1StUZZZivnnqNV6+v8b+SMF6MDgH+cEZxCoM9uwLXOK0rTAURzBGtl+C6EEbKnoZmnKGuzABBGPRP7A=="; }; }; "@expo/config-types-44.0.0" = { @@ -3451,22 +3478,22 @@ let sha512 = "d+gpdKOAhqaD5RmcMzGgKzNtvE1w+GCqpFQNSXLliYlXjj+Tv0eL8EPeAdPtvke0vowpPFwd5McXLA90dgY6Jg=="; }; }; - "@expo/dev-server-0.1.105" = { + "@expo/dev-server-0.1.106" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.105"; + version = "0.1.106"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.105.tgz"; - sha512 = "Glw+826+4eS3zCXAEg5ruQVK3fCk+aT5BG+AiOYW5Dzb6EmRVYcbkK93ZdXloiqarflum9bQY+rogItB0hjjrw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.106.tgz"; + sha512 = "MEB5YuOkew2O4K3GTDLHS1PT/Ca7B/tGx4J+eH74QK6051PlmrikPA5/buuZd23ww/cmOAAKBw509agcbrpajg=="; }; }; - "@expo/dev-tools-0.13.145" = { + "@expo/dev-tools-0.13.146" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.145"; + version = "0.13.146"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.145.tgz"; - sha512 = "GtqnA9rmmSqCrv893MWbzbAoDZnYaSXe4kKQ57tCWYeSTOKav74ofvZlUZalosPuPjE9yuMA47rH9XJY0YgC1g=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.146.tgz"; + sha512 = "3bZe8He2uLha2SY1vOp2YnwtuXDHXodQwdkYdN/IL6XBveIKaBR9HDhBg/kBvI+/aNcut6ymwSSo9IOEmvUk5g=="; }; }; "@expo/devcert-1.0.0" = { @@ -3496,13 +3523,13 @@ let sha512 = "ZxtBodAZGxdLtgKzmsC+8ViUxt1mhFW642Clu2OuG3f6PAyAFsU/SqEGag9wKFaD3x3Wt8VhL+3y5fMJmUFgPw=="; }; }; - "@expo/metro-config-0.3.11" = { + "@expo/metro-config-0.3.12" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.11.tgz"; - sha512 = "F0Oe3JbRjbPA7LvZW969/6PTn7EXvXaudJq4fL8Fs4xfLgNHFv+t+NvlnoTj+y8IyY3z2jOfJkwpq64rzhx+6g=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.12.tgz"; + sha512 = "8cvsMMe68BfZqNYIXeYDVtf6ijEHmJ27llhFKFwS8XZwKaqcfSLRANK8I8xxTc00tzXaWyE1BKJIY6DMq/gbJA=="; }; }; "@expo/osascript-2.0.31" = { @@ -3532,13 +3559,13 @@ let sha512 = "5Ul3d/YOYE6mfum0jCE25XUnkKHZ5vGlU/X2275ZmCtGrpRn1Fl8Nq+jQKSaks3NqTfxdyXROi/TgH8Zxeg2wg=="; }; }; - "@expo/prebuild-config-3.0.18" = { + "@expo/prebuild-config-3.1.0" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "3.0.18"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.0.18.tgz"; - sha512 = "Eyb+HJCsxYba2sWlDi3rqXWQ3jDjN41rSiYmvApY121Zqdrrj/384ntHZh6cbz0LWPeHXjPZBM3SDbK0ri9FTw=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.1.0.tgz"; + sha512 = "Vwz2L3brsrvLVDBXj2gcB2QfeyAPKxa7rCOSFnPhyHf2qpxtmncv9IVrSdkHyWlPW7KmFVfiRsT3/nHXoataqQ=="; }; }; "@expo/rudder-sdk-node-1.1.1" = { @@ -3577,13 +3604,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.16.18" = { + "@expo/webpack-config-0.16.19" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.16.18"; + version = "0.16.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.18.tgz"; - sha512 = "zANXNW68EzQ5Q8FyEmfZz1z7050yOaqJOpByWOLJ3NE1TRzflyzjt55OXsggPxBz2wpmikq/NjlZuF92e18UGw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.19.tgz"; + sha512 = "VB8QNJ4Kvt46cy/y+AbBrJViOH2QY+AEfELNZRDifokZg0wPauxQCz/3Dk7qQnjLYsVOszoH7AtgfOdy/5NSjg=="; }; }; "@expo/xcpretty-4.1.0" = { @@ -3613,67 +3640,130 @@ let sha512 = "uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA=="; }; }; - "@fluentui/date-time-utilities-7.9.1" = { + "@fluentui/date-time-utilities-8.4.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.9.1"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.9.1.tgz"; - sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.4.0.tgz"; + sha512 = "fEc8JMG0Y21De6kjD5xfP/ix7y3u0zbFTKgNWNASGpIYsZKXbJqeu8/DEqnc4x9Lf5pxiV+WhNcoMLbtjKTpmg=="; }; }; - "@fluentui/dom-utilities-1.1.2" = { + "@fluentui/dom-utilities-2.2.0" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "1.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.2.tgz"; - sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.0.tgz"; + sha512 = "M4SmXu428wwQLu1iw6ST07iACjdKY5HiU+xpcgD3IQMMQazgN616GDzc6KZ1ebuBsF7B4TyQS7KZh9mfxnnldg=="; }; }; - "@fluentui/keyboard-key-0.2.17" = { + "@fluentui/font-icons-mdl2-8.2.4" = { + name = "_at_fluentui_slash_font-icons-mdl2"; + packageName = "@fluentui/font-icons-mdl2"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.2.4.tgz"; + sha512 = "Qep23/wpAwONuX0NSQa0D6RbGbEJQBjGMLdV4Qp6h4NKIGELsKJ1xEIa5ZCD68LzQHJsVtXDtOnSWi57Ug/P1A=="; + }; + }; + "@fluentui/foundation-legacy-8.2.4" = { + name = "_at_fluentui_slash_foundation-legacy"; + packageName = "@fluentui/foundation-legacy"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.4.tgz"; + sha512 = "3pBUhKxkfJiRmTcTkkv/QvvF4it4hng7xx5GqcOD7WDzCVXUBTdWCbK/41kCOrTV8kfpu7hzJReCwZeBLlymuQ=="; + }; + }; + "@fluentui/keyboard-key-0.4.0" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.17"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.17.tgz"; - sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.0.tgz"; + sha512 = "2jcD23FzOPaSXqWtfOSCzopkKtxTXUFuHZyVt4aqVRDEjPbkQ/7p37O1WL95xweWTR/9fEPO/gPtv9kOnXrJcA=="; }; }; - "@fluentui/react-7.183.1" = { + "@fluentui/merge-styles-8.5.0" = { + name = "_at_fluentui_slash_merge-styles"; + packageName = "@fluentui/merge-styles"; + version = "8.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.0.tgz"; + sha512 = "+WoaAaoYx/wfkrz1Ag40JqHvDUFfQcg+dQ3jaEOoau16y7EZGIe7oN8WYIXNMgWuMxH7r1QlanFbQZ+ziKjHmw=="; + }; + }; + "@fluentui/react-8.60.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.183.1"; + version = "8.60.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.183.1.tgz"; - sha512 = "skyvnVfsy/pJWJf1Tksa2lf+gNHFQFVOwM95Z+or+auGPfdpxKUN0nHbCnqyMLYoKdmKEUyciUzrQ2LxMOcU0A=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.60.3.tgz"; + sha512 = "KLxnvgz1+BvP4csqhShrdAxg7I9GXNcrhESgbEUoR5ILeK6O62/q8ElWWQzKqR9WQ6PKeSp9f2S3Ucdfpc6WiA=="; }; }; - "@fluentui/react-focus-7.18.2" = { + "@fluentui/react-focus-8.5.4" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.18.2"; + version = "8.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.18.2.tgz"; - sha512 = "Pwk5TVIfannsSZI540ytvQxJCFi5Qgp54QqKbouv9+jUTtgiNRh5VcEkkhT+NKmtlAKhwPi77bU8WQRGRPV61w=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.5.4.tgz"; + sha512 = "SjCz1IJn1T6a6o6xcaEPd5Hou9B3QbpheHNxKWOJSQHG6wazwnHJRhNyTcgiX5+D1KEbnO757EoyOoxIVsnENQ=="; }; }; - "@fluentui/react-window-provider-1.0.2" = { + "@fluentui/react-hooks-8.5.2" = { + name = "_at_fluentui_slash_react-hooks"; + packageName = "@fluentui/react-hooks"; + version = "8.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.5.2.tgz"; + sha512 = "YqyLDa/1SbQSrfGQ+nBUvQYJo2wOWGDAhQbdWTwQGjG7jEmRfmScqMY+KJGjM/Gisn6v8CG5d1duSZLmbm0syA=="; + }; + }; + "@fluentui/react-window-provider-2.2.0" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "1.0.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.2.tgz"; - sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.0.tgz"; + sha512 = "1iZzfVQHZQn6IJSJD1pxnXi5H8T3vrZYi9aqKyVIPZ12DCTVE2gw8W3mnOjsfVuXMGdv1sA7dgd6v4xi9erBow=="; }; }; - "@fluentui/theme-1.7.4" = { + "@fluentui/set-version-8.2.0" = { + name = "_at_fluentui_slash_set-version"; + packageName = "@fluentui/set-version"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.0.tgz"; + sha512 = "bqjpfhqaIkBy16vdYzdc7tER9Td7BTcmC+kCXuqkHOQVuG9LJfqVGRV0DA857KLhOxiy0GXwKMeDbNV5jJf6qQ=="; + }; + }; + "@fluentui/style-utilities-8.6.4" = { + name = "_at_fluentui_slash_style-utilities"; + packageName = "@fluentui/style-utilities"; + version = "8.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.4.tgz"; + sha512 = "jWG5zq7nc37Q6O1LzaoU2U8Ki4Xo5ySm3d5uzefDsEIQpK9E22c1mpUI3hDWwWKILxF3S3dYkHNqbsGH72JYaw=="; + }; + }; + "@fluentui/theme-2.6.3" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.7.4"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.4.tgz"; - sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.3.tgz"; + sha512 = "fqqRDnbbPjSbY8PdbsSJMYidhFdjdSoYuDab5n8yiePEHyWQ5OcQFkf1j6V7dg+2fZvW3XTWWSQEboQl+kTdNQ=="; + }; + }; + "@fluentui/utilities-8.8.0" = { + name = "_at_fluentui_slash_utilities"; + packageName = "@fluentui/utilities"; + version = "8.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.8.0.tgz"; + sha512 = "IwKN9ZkYMJApzcvJUlJd4ZURJCMwZG8FNsep05GAcDzynZygvH2Y1ECpIFn9VTSsrKxMKYFIQ61Rwg+AW/eBcw=="; }; }; "@gar/promisify-1.1.3" = { @@ -3811,13 +3901,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-8.5.1" = { + "@graphql-tools/delegate-8.5.2" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "8.5.1"; + version = "8.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.5.1.tgz"; - sha512 = "/YPmVxitt57F8sH50pnfXASzOOjEfaUDkX48eF5q6f16+JBncej2zeu+Zm2c68q8MbIxhPlEGfpd0QZeqTvAxw=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.5.2.tgz"; + sha512 = "M7d1jY4orPUC7MBoSKZEP21HTVqVGX+mS0AL6UGxg1L7GCRtaYQeopyKXmnnEmBi5FNZ9KduJgHRtxkS4Hc6uA=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -3928,13 +4018,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.8.0" = { + "@graphql-tools/url-loader-7.9.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.8.0"; + version = "7.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.8.0.tgz"; - sha512 = "4j5X40hpYInM5J7KbURSspEJCi6tPqvEE2kyBOyP0C0YIOYtKgUJTAryjbBXqr+HWGyEwJ2zuQ2cQdVMn8l78A=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.1.tgz"; + sha512 = "UYKc0f8jw+MODDb79XKOG8wyvRCG/7KBYtRUfUKed4LBjftjZfF5VovAbF3axiTuzt2FSyPRu8YMEQ7kypkc8g=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -4045,13 +4135,13 @@ let sha512 = "UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg=="; }; }; - "@gulp-sourcemaps/identity-map-1.0.2" = { + "@gulp-sourcemaps/identity-map-2.0.1" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz"; - sha512 = "ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ=="; + url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz"; + sha512 = "Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q=="; }; }; "@gulp-sourcemaps/map-sources-1.0.0" = { @@ -4072,6 +4162,33 @@ let sha512 = "maIyMJtYjA5e/R9nyA22Qd7Yw73MBSxClJvle0a8XWAS/5l6shc/OFpQqrmwMy4IXUCmywJ9ER0gOGz/YA720w=="; }; }; + "@hapi/address-2.1.4" = { + name = "_at_hapi_slash_address"; + packageName = "@hapi/address"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; + }; + }; + "@hapi/bourne-1.3.2" = { + name = "_at_hapi_slash_bourne"; + packageName = "@hapi/bourne"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; + }; + }; + "@hapi/hoek-8.5.1" = { + name = "_at_hapi_slash_hoek"; + packageName = "@hapi/hoek"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; + }; + }; "@hapi/hoek-9.2.1" = { name = "_at_hapi_slash_hoek"; packageName = "@hapi/hoek"; @@ -4081,6 +4198,24 @@ let sha512 = "gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw=="; }; }; + "@hapi/joi-15.1.1" = { + name = "_at_hapi_slash_joi"; + packageName = "@hapi/joi"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; + }; + }; + "@hapi/topo-3.1.6" = { + name = "_at_hapi_slash_topo"; + packageName = "@hapi/topo"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; + sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; + }; + }; "@hapi/topo-5.1.0" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; @@ -4225,6 +4360,15 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; + "@intervolga/optimize-cssnano-plugin-1.0.6" = { + name = "_at_intervolga_slash_optimize-cssnano-plugin"; + packageName = "@intervolga/optimize-cssnano-plugin"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz"; + sha512 = "zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA=="; + }; + }; "@ionic/cli-framework-3.0.6" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; @@ -4522,22 +4666,22 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/check-node-1.54.0" = { + "@jsii/check-node-1.55.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.54.0.tgz"; - sha512 = "pogNR1vgiXgBK2DQF+RsCnJQ9QPe+y7lyoRlsTtUplIFB6ryWnSsmCyzkInSVoKAKCo5CHkuDy190MbYL4Ns4Q=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.55.0.tgz"; + sha512 = "vfBW/3ptY3emiBVrwk7ySwGyzOvwLxb66FMNTzyslYegH9RvIwE+UY8kC87zscuZSDOCwINwgD0KdqrrfnR5yg=="; }; }; - "@jsii/spec-1.54.0" = { + "@jsii/spec-1.55.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.54.0.tgz"; - sha512 = "IOspxWPC26+Re6DNJvaxCEkG1BYByiGSPlRxQpIpts+Hx2EZgAvuG+8rQoryNt7JqaAKpcJ6W3OdRmSw3x5Yrg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.55.0.tgz"; + sha512 = "MsmAmi9+2s8p5jSypYFDTufkO2iAUWK7Ngq+btGDM6bMyQgqInMKNQcPcZAgWuwUCOU0ne/oYMVIbCR2njjAGA=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -5395,6 +5539,15 @@ let sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; }; }; + "@mdi/font-6.5.95" = { + name = "_at_mdi_slash_font"; + packageName = "@mdi/font"; + version = "6.5.95"; + src = fetchurl { + url = "https://registry.npmjs.org/@mdi/font/-/font-6.5.95.tgz"; + sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="; + }; + }; "@mdn/browser-compat-data-4.1.6" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; @@ -5611,13 +5764,13 @@ let sha512 = "BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg=="; }; }; - "@nestjs/schematics-8.0.7" = { + "@nestjs/schematics-8.0.8" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.7"; + version = "8.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.7.tgz"; - sha512 = "7k+eMMBUwvXFp6vwZ5byiLBEQKzjMyIJwO46ginoFugt2AXrOt0iUhR3BKFuWDBZaYQ1l4az86UGw5ohgH3wow=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.8.tgz"; + sha512 = "xIIb5YnMQN/OJQ68+MCapy2bXvTxSWgINoqQbyZWkLL/yTIuROvZCdtV850NPGyr7f7l93VBP0ZPitbFIexy3Q=="; }; }; "@netflix/nerror-1.1.3" = { @@ -5683,6 +5836,132 @@ let sha512 = "tUGLGj3fTgOjWwhp9uK6M+LUb3rxIrU61DbA0fVpANCEeqk5UNJpje4vOag9dWmJS7hn/ONcDK7dslHLyOQUIQ=="; }; }; + "@node-rs/crc32-1.5.0" = { + name = "_at_node-rs_slash_crc32"; + packageName = "@node-rs/crc32"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.5.0.tgz"; + sha512 = "TLVm7FR1QAjXlXkss3HSx3BG/CvVwl4NVEL/qLAgossq4FQsybkvt0RCISrkI3j5fI30gPaGI/qwHn8xkLctow=="; + }; + }; + "@node-rs/crc32-android-arm-eabi-1.5.0" = { + name = "_at_node-rs_slash_crc32-android-arm-eabi"; + packageName = "@node-rs/crc32-android-arm-eabi"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm-eabi/-/crc32-android-arm-eabi-1.5.0.tgz"; + sha512 = "Si3YKPAkT9IW2ZJfmFQg+9KJWDNgykk1vgybYljR3TJg9WzlrJQvPmJFsZ/Ci+79Htsb8a4auavBbmIkj+JpVQ=="; + }; + }; + "@node-rs/crc32-android-arm64-1.5.0" = { + name = "_at_node-rs_slash_crc32-android-arm64"; + packageName = "@node-rs/crc32-android-arm64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.5.0.tgz"; + sha512 = "2uJD7muLg6wXjPhcuuS+HZBgXGX8HsxJzDjVoe51uAoGx+Az0hyH2I6p/ObOIYzcW4xFML0rzlYM9XkMglJhfw=="; + }; + }; + "@node-rs/crc32-darwin-arm64-1.5.0" = { + name = "_at_node-rs_slash_crc32-darwin-arm64"; + packageName = "@node-rs/crc32-darwin-arm64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.5.0.tgz"; + sha512 = "E3dWA/fKu7FeDGBYB20/YEz28Fw/8sj4iuXgE4n1aoh8994AdbXdsJlmNip6/AkcEynC8Q9RdPS4HdfM7kBPiw=="; + }; + }; + "@node-rs/crc32-darwin-x64-1.5.0" = { + name = "_at_node-rs_slash_crc32-darwin-x64"; + packageName = "@node-rs/crc32-darwin-x64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.5.0.tgz"; + sha512 = "YjQ6y/3L1D2kOrNguB42sPf6HdEkqXcL2jxJ41QOfuIRV18lp7/5sM9OWRdjmLpQUUvmpqSSWxZFQ/2P/35EXw=="; + }; + }; + "@node-rs/crc32-freebsd-x64-1.5.0" = { + name = "_at_node-rs_slash_crc32-freebsd-x64"; + packageName = "@node-rs/crc32-freebsd-x64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.5.0.tgz"; + sha512 = "K+HfvordJrw0xkht9wElxIHGDm5qodOVzNa95I7ZW8BktHWC2QmPkcYRotrDnZLaOs8NfA0xWGiqp/ncAJ3XOw=="; + }; + }; + "@node-rs/crc32-linux-arm-gnueabihf-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm-gnueabihf"; + packageName = "@node-rs/crc32-linux-arm-gnueabihf"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.5.0.tgz"; + sha512 = "MFwJlcIAmgtnWAluthAY2gyTbKIu5/+6PUSlOZ4xlSZIddb3ra3M/AQ0BkDSvEoDeQQ5ZdkcnVWzpqoCdUOe4Q=="; + }; + }; + "@node-rs/crc32-linux-arm64-gnu-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm64-gnu"; + packageName = "@node-rs/crc32-linux-arm64-gnu"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.5.0.tgz"; + sha512 = "7JYsJXRUE6yrK/mt7uLX91ARLS3HOCggTSGD3Kw52lhJRPXTyJVVIhuLj8/neW8ENTgH3zgpQdeId0sKQtKrDg=="; + }; + }; + "@node-rs/crc32-linux-arm64-musl-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm64-musl"; + packageName = "@node-rs/crc32-linux-arm64-musl"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.5.0.tgz"; + sha512 = "irOtNHrizI8toVCX92o/3FIIfz4O+Z5qiSlIwH3PxsOoak0mz6uEInYwPVnDDKfAYzCUA0oxcGV2QIR1uYpCKQ=="; + }; + }; + "@node-rs/crc32-linux-x64-gnu-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-x64-gnu"; + packageName = "@node-rs/crc32-linux-x64-gnu"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.5.0.tgz"; + sha512 = "KOevSXLbgs2htznP8jlsN6tZ4kmpGloBj00lo4X4H4Lm6eKeWyG9txbCGD0yK4ZX/XhrL6Qs4VIMCaVFpxFIsw=="; + }; + }; + "@node-rs/crc32-linux-x64-musl-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-x64-musl"; + packageName = "@node-rs/crc32-linux-x64-musl"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.5.0.tgz"; + sha512 = "e6ivD6MWVMp/FP6VVq3EBjiBXKN/qBsTn8bOsHtIf+Et6dEkITbEk26m5+w9TFHIHKJGvwytH7+RigK7N7o5VQ=="; + }; + }; + "@node-rs/crc32-win32-arm64-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-arm64-msvc"; + packageName = "@node-rs/crc32-win32-arm64-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.5.0.tgz"; + sha512 = "PTvfUb08MAdQ0hab5OxXBauPocP09SG2rShRjwtmyRnze+Nd5JHJcsj5O0WhX/DCu8acK1sS0Q0Np3b1lIbwkg=="; + }; + }; + "@node-rs/crc32-win32-ia32-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-ia32-msvc"; + packageName = "@node-rs/crc32-win32-ia32-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.5.0.tgz"; + sha512 = "+fUiXIUddPgoxPcBA4lpG7fQQgJGEkinnS1ne3+pySu1Z2Ej4vJFS5aJyKc56+1IV9ztrXo2H+b3r0IdnLvy7w=="; + }; + }; + "@node-rs/crc32-win32-x64-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-x64-msvc"; + packageName = "@node-rs/crc32-win32-x64-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.5.0.tgz"; + sha512 = "FvgItAuN6eRHZDAPVlBZbzQjiRO0DFFFLgy2KFUjx+vLx20Auf5Hi0/D+dFLmH9jdESaoZqwZC5FpB7nfit1lQ=="; + }; + }; "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; @@ -5773,13 +6052,13 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/map-workspaces-2.0.1" = { + "@npmcli/map-workspaces-2.0.2" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.1.tgz"; - sha512 = "awwkB/tSWWaCD8F0IbawBdmoPFlbXMaEPN9LyTuJcyJz404/QhB4B/vhQntpk6uxOAkM+bxR7qWMJghYg0tcYQ=="; + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.2.tgz"; + sha512 = "ED54EslGsHFWBPN5x8JAOszuWywuoXYSi9E3HQRsgVkWnqsdTBJDSM4IFMRwmmBUbCHAxmP3wGLu1WMm4fhrOw=="; }; }; "@npmcli/metavuln-calculator-2.0.0" = { @@ -7240,13 +7519,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.85" = { + "@redocly/openapi-core-1.0.0-beta.87" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.85"; + version = "1.0.0-beta.87"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.85.tgz"; - sha512 = "46ilsZ9g+tE5aWdNIKCUc9o6kcYM8nh5oKOlt9scawGR+spv1SfiYrvjtrcjLP5WyX082AUFBdnmzzScxs49Og=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.87.tgz"; + sha512 = "bGvINYT8jpcYEbibhd4AO0M5WPE1IQLNLS4LCNZbD7jkoSQB1EHWBZJDhfPd1kxKPPcQ7UJNUCJwtIIrRs5gTQ=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -7303,13 +7582,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-13.2.5" = { + "@schematics/angular-13.2.6" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "13.2.5"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.5.tgz"; - sha512 = "pUaTwyMZRy7laV9RQozREomiUKi7Tn4wdyyuCUSqVvaiLI+DKvWE4vJXA2+/ketfzRjx6xIaCEexjsHJ+2FNtg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.6.tgz"; + sha512 = "8NzHMX9+FSgaB0lJYxlTJv9OcBuolwZJqo9M/yX3RPSqSHghA33jWwgVbV551hBJOpbVEePerG1DQkIC99DXKA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -7330,13 +7609,13 @@ let sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; }; }; - "@serverless/aws-lambda-otel-extension-dist-0.1.6" = { + "@serverless/aws-lambda-otel-extension-dist-0.1.10" = { name = "_at_serverless_slash_aws-lambda-otel-extension-dist"; packageName = "@serverless/aws-lambda-otel-extension-dist"; - version = "0.1.6"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/aws-lambda-otel-extension-dist/-/aws-lambda-otel-extension-dist-0.1.6.tgz"; - sha512 = "Xt1bVZvDYKp01kXo8z0/8yd5rHeq1SxOmP4ZsdoASNXVlliR/wo4W/Pt4eJk5/zklA6CjWN4PfhcRkt90XKqtw=="; + url = "https://registry.npmjs.org/@serverless/aws-lambda-otel-extension-dist/-/aws-lambda-otel-extension-dist-0.1.10.tgz"; + sha512 = "SPMmou6Bom/TcX69WcKXDiHPVQycfbocUW8vrXLU9oBxFY49Z0l70Yk7lOvtc1H/lc5taIfkcW0Eo12cOp9cvA=="; }; }; "@serverless/dashboard-plugin-6.1.5" = { @@ -7510,6 +7789,42 @@ let sha512 = "dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ=="; }; }; + "@socket.io/component-emitter-3.0.0" = { + name = "_at_socket.io_slash_component-emitter"; + packageName = "@socket.io/component-emitter"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz"; + sha512 = "2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q=="; + }; + }; + "@soda/friendly-errors-webpack-plugin-1.8.1" = { + name = "_at_soda_slash_friendly-errors-webpack-plugin"; + packageName = "@soda/friendly-errors-webpack-plugin"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz"; + sha512 = "h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg=="; + }; + }; + "@soda/get-current-script-1.0.2" = { + name = "_at_soda_slash_get-current-script"; + packageName = "@soda/get-current-script"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz"; + sha512 = "T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="; + }; + }; + "@sqltools/formatter-1.2.3" = { + name = "_at_sqltools_slash_formatter"; + packageName = "@sqltools/formatter"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.3.tgz"; + sha512 = "O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg=="; + }; + }; "@squoosh/lib-0.4.1" = { name = "_at_squoosh_slash_lib"; packageName = "@squoosh/lib"; @@ -8023,15 +8338,6 @@ let sha512 = "G4yqdVlhr6YhzLXFKy5F7HtRBU8Y23+iWy7UKthMq/OSQnL1hbsoeXESQ2LY8zEDlknipDG3nRGhUC9tkwvy/w=="; }; }; - "@types/basic-auth-1.1.3" = { - name = "_at_types_slash_basic-auth"; - packageName = "@types/basic-auth"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/basic-auth/-/basic-auth-1.1.3.tgz"; - sha512 = "W3rv6J0IGlxqgE2eQ2pTb0gBjaGtejQpJ6uaCjz3UQ65+TFTPC5/lAE+POfx1YLdjtxvejJzsIAfd3MxWiVmfg=="; - }; - }; "@types/bn.js-5.1.0" = { name = "_at_types_slash_bn.js"; packageName = "@types/bn.js"; @@ -8050,6 +8356,15 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; + "@types/body-parser-1.19.1" = { + name = "_at_types_slash_body-parser"; + packageName = "@types/body-parser"; + version = "1.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="; + }; + }; "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -8086,15 +8401,6 @@ let sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; }; }; - "@types/chart.js-2.9.24" = { - name = "_at_types_slash_chart.js"; - packageName = "@types/chart.js"; - version = "2.9.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.24.tgz"; - sha512 = "AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ=="; - }; - }; "@types/clone-2.1.1" = { name = "_at_types_slash_clone"; packageName = "@types/clone"; @@ -8275,15 +8581,6 @@ let sha512 = "qdBo/2Y8MXaJ/2spKjDZocuq79GpnOhkwMHnK2GnVFa8WYFgfA+ei6sil3aeWQPCreOKIx9ogPpR5+7MaOqYAA=="; }; }; - "@types/engine.io-3.1.7" = { - name = "_at_types_slash_engine.io"; - packageName = "@types/engine.io"; - version = "3.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.7.tgz"; - sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ=="; - }; - }; "@types/eslint-7.29.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; @@ -8356,15 +8653,6 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-4.17.8" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz"; - sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; - }; - }; "@types/express-serve-static-core-4.17.28" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -8374,13 +8662,13 @@ let sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; }; - "@types/fancy-log-1.3.0" = { - name = "_at_types_slash_fancy-log"; - packageName = "@types/fancy-log"; - version = "1.3.0"; + "@types/file-type-10.9.1" = { + name = "_at_types_slash_file-type"; + packageName = "@types/file-type"; + version = "10.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-1.3.0.tgz"; - sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; + url = "https://registry.npmjs.org/@types/file-type/-/file-type-10.9.1.tgz"; + sha512 = "oq0fy8Jqj19HofanFsZ56o5anMDUQtFO9B3wfLqM9o42RyCe1WT+wRbSvRbL2l8ARZXNaJturHk0b442+0yi+g=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -8446,13 +8734,13 @@ let sha512 = "wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g=="; }; }; - "@types/hls.js-0.13.1" = { + "@types/hls.js-0.13.3" = { name = "_at_types_slash_hls.js"; packageName = "@types/hls.js"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.1.tgz"; - sha512 = "5sr71YcHBVHJY8DhM+L6O9WjAGS3jrie2hpBldVpd8sqvRvNTgIikTE6RxKya1ZvJCvUkZR2ewQarZaC4TRZLg=="; + url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.3.tgz"; + sha512 = "Po8ZPCsAcPPuf5OODPEkb6cdWJ/w4BdX1veP7IIOc2WG0x1SW4GEQ1+FHKN1AMG2AePJfNUceJbh5PKtP92yRQ=="; }; }; "@types/html-minifier-terser-5.1.2" = { @@ -8581,15 +8869,6 @@ let sha512 = "qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g=="; }; }; - "@types/js-yaml-3.12.5" = { - name = "_at_types_slash_js-yaml"; - packageName = "@types/js-yaml"; - version = "3.12.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.5.tgz"; - sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; - }; - }; "@types/js-yaml-3.12.7" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; @@ -8599,6 +8878,15 @@ let sha512 = "S6+8JAYTE1qdsc9HMVsfY7+SgSuUU/Tp6TYTmITW0PZxiyIMvol3Gy//y69Wkhs0ti4py5qgR3uZH6uz/DNzJQ=="; }; }; + "@types/js-yaml-4.0.4" = { + name = "_at_types_slash_js-yaml"; + packageName = "@types/js-yaml"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.4.tgz"; + sha512 = "AuHubXUmg0AzkXH0Mx6sIxeY/1C110mm/EkE/gB1sTRz3h2dao2W/63q42SlVST+lICxz5Oki2hzYA6+KnnieQ=="; + }; + }; "@types/js-yaml-4.0.5" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; @@ -8626,6 +8914,15 @@ let sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; + "@types/json-stable-stringify-1.0.33" = { + name = "_at_types_slash_json-stable-stringify"; + packageName = "@types/json-stable-stringify"; + version = "1.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.33.tgz"; + sha512 = "qEWiQff6q2tA5gcJGWwzplQcXdJtm+0oy6IHGHzlOf3eFAkGE/FIPXZK9ofWgNSHVp8AFFI33PJJshS0ei3Gvw=="; + }; + }; "@types/json5-0.0.29" = { name = "_at_types_slash_json5"; packageName = "@types/json5"; @@ -8680,13 +8977,22 @@ let sha512 = "HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA=="; }; }; - "@types/lodash-4.14.161" = { + "@types/lodash-4.14.176" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.161"; + version = "4.14.176"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz"; - sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz"; + sha512 = "xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ=="; + }; + }; + "@types/lodash-4.14.178" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.178"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz"; + sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; }; }; "@types/lodash-4.14.179" = { @@ -8725,15 +9031,6 @@ let sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; }; }; - "@types/material-design-lite-1.1.16" = { - name = "_at_types_slash_material-design-lite"; - packageName = "@types/material-design-lite"; - version = "1.1.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/material-design-lite/-/material-design-lite-1.1.16.tgz"; - sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; - }; - }; "@types/mdast-3.0.10" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; @@ -8779,15 +9076,6 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/minimist-1.2.0" = { - name = "_at_types_slash_minimist"; - packageName = "@types/minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz"; - sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; - }; - }; "@types/minimist-1.2.2" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; @@ -8797,22 +9085,13 @@ let sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; }; }; - "@types/mithril-2.0.3" = { - name = "_at_types_slash_mithril"; - packageName = "@types/mithril"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mithril/-/mithril-2.0.3.tgz"; - sha512 = "cZHOdO2IiXYeyjeDYdbOisSdfaJRzfmRo3zVzgu33IWTMA0KEQObp9fdvqcuYdPz93iJ1yCl19GcEjo/9yv+yA=="; - }; - }; - "@types/mkdirp-1.0.1" = { + "@types/mkdirp-1.0.2" = { name = "_at_types_slash_mkdirp"; packageName = "@types/mkdirp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz"; - sha512 = "HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q=="; + url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.2.tgz"; + sha512 = "o0K1tSO0Dx5X6xlU5F1D6625FawhC3dU3iqr25lluNv/+/QIVH8RLNEiVokgIZo+mz+87w/3Mkg/VvQS+J51fQ=="; }; }; "@types/mocha-7.0.2" = { @@ -8833,6 +9112,15 @@ let sha512 = "ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw=="; }; }; + "@types/mongodb-4.0.6" = { + name = "_at_types_slash_mongodb"; + packageName = "@types/mongodb"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mongodb/-/mongodb-4.0.6.tgz"; + sha512 = "XTbn1Z1j7fHzC1Vkd9LYO48lO2C581r+oRCi/KNzcTHIri7hEaya8r9vxoHJiKr+oeUWVK69+9xr84Mp+aReaw=="; + }; + }; "@types/ms-0.7.31" = { name = "_at_types_slash_ms"; packageName = "@types/ms"; @@ -8842,22 +9130,13 @@ let sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; }; - "@types/multer-1.4.4" = { + "@types/multer-1.4.7" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; - version = "1.4.4"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.4.tgz"; - sha512 = "wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ=="; - }; - }; - "@types/mysql-2.15.15" = { - name = "_at_types_slash_mysql"; - packageName = "@types/mysql"; - version = "2.15.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.15.tgz"; - sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.7.tgz"; + sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; "@types/nlcst-1.0.0" = { @@ -8896,13 +9175,13 @@ let sha512 = "Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="; }; }; - "@types/node-12.20.46" = { + "@types/node-12.20.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.46"; + version = "12.20.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz"; - sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz"; + sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; }; }; "@types/node-13.13.52" = { @@ -8914,15 +9193,6 @@ let sha512 = "s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="; }; }; - "@types/node-14.11.1" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz"; - sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; - }; - }; "@types/node-14.17.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8959,6 +9229,15 @@ let sha512 = "GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="; }; }; + "@types/node-16.11.6" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz"; + sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; + }; + }; "@types/node-16.11.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -9094,24 +9373,6 @@ let sha512 = "Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ=="; }; }; - "@types/pg-7.14.5" = { - name = "_at_types_slash_pg"; - packageName = "@types/pg"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.5.tgz"; - sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg=="; - }; - }; - "@types/pg-types-2.2.0" = { - name = "_at_types_slash_pg-types"; - packageName = "@types/pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA=="; - }; - }; "@types/prop-types-15.7.4" = { name = "_at_types_slash_prop-types"; packageName = "@types/prop-types"; @@ -9175,13 +9436,13 @@ let sha512 = "+TRLFmHLnpoV0uw4O/PzqMbPT6bhQM0q2KO0l+R7M3sHYRndPpNL6kv8p7Ee9ZxgQ6noYB18/t+heQi7eijOHA=="; }; }; - "@types/react-16.14.23" = { + "@types/react-16.14.24" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.23"; + version = "16.14.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.23.tgz"; - sha512 = "WngBZLuSkP4IAgPi0HOsGCHo6dn3CcuLQnCfC17VbA7YBgipZiZoTOhObwl/93DsFW0Y2a/ZXeonpW4DxirEJg=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.24.tgz"; + sha512 = "e7U2WC8XQP/xfR7bwhOhNFZKPTfW1ph+MiqtudKb8tSV8RyCsovQx2sNVtKoOryjxFKpHPPC/yNiGfdeVM5Gyw=="; }; }; "@types/react-dom-16.9.14" = { @@ -9211,15 +9472,6 @@ let sha512 = "V8g8sBDLVeJJAfEENJS7VXZK+DRJ+jzPNtk8jpj2G+obhf+iqGNUDGwNWCbBhLiD+KpHhf3kWQlKBRi0tAeU4Q=="; }; }; - "@types/request-2.48.5" = { - name = "_at_types_slash_request"; - packageName = "@types/request"; - version = "2.48.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz"; - sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; - }; - }; "@types/request-2.48.7" = { name = "_at_types_slash_request"; packageName = "@types/request"; @@ -9319,22 +9571,31 @@ let sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; }; }; - "@types/socket.io-2.1.11" = { - name = "_at_types_slash_socket.io"; - packageName = "@types/socket.io"; - version = "2.1.11"; + "@types/smoothscroll-polyfill-0.3.1" = { + name = "_at_types_slash_smoothscroll-polyfill"; + packageName = "@types/smoothscroll-polyfill"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.11.tgz"; - sha512 = "bVprmqPhJMLb9ZCm8g0Xy8kwBFRbnanOWSxzWkDkkIwxTvud5tKMfAJymXX6LQbizUKCS1yima7JM4BeLqjNqA=="; + url = "https://registry.npmjs.org/@types/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.1.tgz"; + sha512 = "+KkHw4y+EyeCtVXET7woHUhIbfWFCflc0E0mZnSV+ZdjPQeHt/9KPEuT7gSW/kFQ8O3EG30PLO++YhChDt8+Ag=="; }; }; - "@types/socket.io-client-1.4.33" = { + "@types/socket.io-3.0.1" = { + name = "_at_types_slash_socket.io"; + packageName = "@types/socket.io"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-3.0.1.tgz"; + sha512 = "XSma2FhVD78ymvoxYV4xGXrIH/0EKQ93rR+YR0Y+Kw1xbPzLDCip/UWSejZ08FpxYeYNci/PZPQS9anrvJRqMA=="; + }; + }; + "@types/socket.io-client-1.4.36" = { name = "_at_types_slash_socket.io-client"; packageName = "@types/socket.io-client"; - version = "1.4.33"; + version = "1.4.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.33.tgz"; - sha512 = "m4LnxkljsI9fMsjwpW5QhRpMixo2BeeLpFmg0AE+sS4H1pzAd/cs/ftTiL60FLZgfFa8PFRPx5KsHu8O0bADKQ=="; + url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.36.tgz"; + sha512 = "ZJWjtFBeBy1kRSYpVbeGYTElf6BqPQUkXDlHHD4k/42byCN5Rh027f4yARHCink9sKAkbtGZXEAmR0ZCnc2/Ag=="; }; }; "@types/sockjs-0.3.33" = { @@ -9355,13 +9616,22 @@ let sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; - "@types/sqlite3-3.1.6" = { + "@types/source-map-support-0.5.4" = { + name = "_at_types_slash_source-map-support"; + packageName = "@types/source-map-support"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.4.tgz"; + sha512 = "9zGujX1sOPg32XLyfgEB/0G9ZnrjthL/Iv1ZfuAjj8LEilHZEpQSQs1scpRXPhHzGYgWiLz9ldF1cI8JhL+yMw=="; + }; + }; + "@types/sqlite3-3.1.7" = { name = "_at_types_slash_sqlite3"; packageName = "@types/sqlite3"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.6.tgz"; - sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA=="; + url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.7.tgz"; + sha512 = "8FHV/8Uzd7IwdHm5mvmF2Aif4aC/gjrt4axWD9SmfaxITnOjtOhCbOSTuqv/VbH1uq0QrwlaTj9aTz3gmR6u4w=="; }; }; "@types/stack-utils-2.0.1" = { @@ -9454,13 +9724,13 @@ let sha512 = "PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="; }; }; - "@types/url-join-4.0.0" = { + "@types/url-join-4.0.1" = { name = "_at_types_slash_url-join"; packageName = "@types/url-join"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz"; - sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; + url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.1.tgz"; + sha512 = "wDXw9LEEUHyV+7UWy7U315nrJGJ7p1BzaCxDpEoLr789Dk1WDVMMlf3iBfbG2F8NdWnYyFbtTxUn2ZNbm1Q4LQ=="; }; }; "@types/url-parse-1.4.8" = { @@ -9472,6 +9742,15 @@ let sha512 = "zqqcGKyNWgTLFBxmaexGUKQyWqeG7HjXj20EuQJSJWwXe54BjX0ihIo5cJB9yAQzH8dNugJ9GvkBYMjPXs/PJw=="; }; }; + "@types/uuid-3.4.10" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "3.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.10.tgz"; + sha512 = "BgeaZuElf7DEYZhWYDTc/XcLZXdVgFkVSTa13BqKvbnmUrxr3TJFKofUxCtDO9UQOdhnV+HPOESdHiHKZOJV1A=="; + }; + }; "@types/vfile-3.0.2" = { name = "_at_types_slash_vfile"; packageName = "@types/vfile"; @@ -9508,6 +9787,15 @@ let sha512 = "wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w=="; }; }; + "@types/webidl-conversions-6.1.1" = { + name = "_at_types_slash_webidl-conversions"; + packageName = "@types/webidl-conversions"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz"; + sha512 = "XAahCdThVuCFDQLT7R7Pk/vqeObFNL3YqRyFZg+AqAP/W1/w3xHaIxuW7WszQqTbIBOPRcItYJIou3i/mppu3Q=="; + }; + }; "@types/webpack-4.41.32" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; @@ -9517,6 +9805,24 @@ let sha512 = "cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg=="; }; }; + "@types/webpack-dev-server-3.11.6" = { + name = "_at_types_slash_webpack-dev-server"; + packageName = "@types/webpack-dev-server"; + version = "3.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz"; + sha512 = "XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ=="; + }; + }; + "@types/webpack-env-1.16.3" = { + name = "_at_types_slash_webpack-env"; + packageName = "@types/webpack-env"; + version = "1.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.3.tgz"; + sha512 = "9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw=="; + }; + }; "@types/webpack-sources-3.2.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; @@ -9544,6 +9850,24 @@ let sha512 = "NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ=="; }; }; + "@types/whatwg-url-8.2.1" = { + name = "_at_types_slash_whatwg-url"; + packageName = "@types/whatwg-url"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.1.tgz"; + sha512 = "2YubE1sjj5ifxievI5Ge1sckb9k/Er66HyR2c+3+I6VDUUg1TLPdYYTEbQ+DjRkS4nTxMJhgWfSfMRD2sl2EYQ=="; + }; + }; + "@types/ws-6.0.4" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; + sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; + }; + }; "@types/ws-7.4.7" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -9688,69 +10012,6 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@uifabric/foundation-7.10.1" = { - name = "_at_uifabric_slash_foundation"; - packageName = "@uifabric/foundation"; - version = "7.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.10.1.tgz"; - sha512 = "Op05qHLBFEieT4+fG8OgpzqDHTQyei1dgVXDd6M4VS6CFJ5ZIPtC7Lwi+ZlkPkwUwccQ9mijuQumzpNKdv035A=="; - }; - }; - "@uifabric/icons-7.6.2" = { - name = "_at_uifabric_slash_icons"; - packageName = "@uifabric/icons"; - version = "7.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.6.2.tgz"; - sha512 = "q7jEIwB5Tt2Egw9fqdgNPlBqBQ6hNNMQ3qs5y4S4YETRluB+AQTdKbrbYMsXo3Pm0FsJnRfiDojMzxusGX+MWA=="; - }; - }; - "@uifabric/merge-styles-7.19.2" = { - name = "_at_uifabric_slash_merge-styles"; - packageName = "@uifabric/merge-styles"; - version = "7.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.2.tgz"; - sha512 = "kTlhwglDqwVgIaJq+0yXgzi65plGhmFcPrfme/rXUGMJZoU+qlGT5jXj5d3kuI59p6VB8jWEg9DAxHozhYeu0g=="; - }; - }; - "@uifabric/react-hooks-7.14.0" = { - name = "_at_uifabric_slash_react-hooks"; - packageName = "@uifabric/react-hooks"; - version = "7.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.14.0.tgz"; - sha512 = "Ndu/DEKHF4gFXEZa2AGgSkdWaj+njVrsSyXbkWRh2UZReFWnH1LMko9p/ZCwk1i9kAd5CUmyIfURUzIEya9YCg=="; - }; - }; - "@uifabric/set-version-7.0.24" = { - name = "_at_uifabric_slash_set-version"; - packageName = "@uifabric/set-version"; - version = "7.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.24.tgz"; - sha512 = "t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg=="; - }; - }; - "@uifabric/styling-7.20.0" = { - name = "_at_uifabric_slash_styling"; - packageName = "@uifabric/styling"; - version = "7.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.20.0.tgz"; - sha512 = "SoaK5J4cwn8D9DWejRlWo+TmKZaHIiVlkIH+B2zLXE8Uc4ZYcotwYGxaSc1gCA16viLvGQkQU+ieWFq91RxdRw=="; - }; - }; - "@uifabric/utilities-7.33.5" = { - name = "_at_uifabric_slash_utilities"; - packageName = "@uifabric/utilities"; - version = "7.33.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.5.tgz"; - sha512 = "I+Oi0deD/xltSluFY8l2EVd/J4mvOaMljxKO2knSD9/KoGDlo/o5GN4gbnVo8nIt76HWHLAk3KtlJKJm6BhbIQ=="; - }; - }; "@ungap/promise-all-settled-1.1.2" = { name = "_at_ungap_slash_promise-all-settled"; packageName = "@ungap/promise-all-settled"; @@ -9832,6 +10093,69 @@ let sha512 = "lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg=="; }; }; + "@vue/cli-overlay-4.5.15" = { + name = "_at_vue_slash_cli-overlay"; + packageName = "@vue/cli-overlay"; + version = "4.5.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.5.15.tgz"; + sha512 = "0zI0kANAVmjFO2LWGUIzdGPMeE3+9k+KeRDXsUqB30YfRF7abjfiiRPq5BU9pOzlJbVdpRkisschBrvdJqDuDg=="; + }; + }; + "@vue/cli-plugin-eslint-4.5.12" = { + name = "_at_vue_slash_cli-plugin-eslint"; + packageName = "@vue/cli-plugin-eslint"; + version = "4.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.12.tgz"; + sha512 = "nbjGJkWxo/xdD32DwvnEAUwkWYsObpqNk9NuU7T62ehdzHPzz58o3j03YZ7a7T7Le8bYyOWMYsdNfz63F+XiZQ=="; + }; + }; + "@vue/cli-plugin-router-4.5.15" = { + name = "_at_vue_slash_cli-plugin-router"; + packageName = "@vue/cli-plugin-router"; + version = "4.5.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.15.tgz"; + sha512 = "q7Y6kP9b3k55Ca2j59xJ7XPA6x+iSRB+N4ac0ZbcL1TbInVQ4j5wCzyE+uqid40hLy4fUdlpl4X9fHJEwuVxPA=="; + }; + }; + "@vue/cli-plugin-typescript-4.5.13" = { + name = "_at_vue_slash_cli-plugin-typescript"; + packageName = "@vue/cli-plugin-typescript"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-typescript/-/cli-plugin-typescript-4.5.13.tgz"; + sha512 = "CpLlIdFNV1gn9uC4Yh6QgWI42uk2x5Z3cb2ScxNSwWsR1vgSdr0/1DdNzoBm68aP8RUtnHHO/HZfPnvXiq42xA=="; + }; + }; + "@vue/cli-plugin-vuex-4.5.13" = { + name = "_at_vue_slash_cli-plugin-vuex"; + packageName = "@vue/cli-plugin-vuex"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.13.tgz"; + sha512 = "I1S9wZC7iI0Wn8kw8Zh+A2Qkf6s1M6vTGBkx8boXjuzfwEEyEHRxadsVCecZc8Mkpydo0nykj+MyYF96TKFuVA=="; + }; + }; + "@vue/cli-service-4.5.13" = { + name = "_at_vue_slash_cli-service"; + packageName = "@vue/cli-service"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.5.13.tgz"; + sha512 = "CKAZN4iokMMsaUyJRU22oUAz3oS/X9sVBSKAF2/shFBV5xh3jqAlKl8OXZYz4cXGFLA6djNuYrniuLAo7Ku97A=="; + }; + }; + "@vue/cli-shared-utils-4.5.15" = { + name = "_at_vue_slash_cli-shared-utils"; + packageName = "@vue/cli-shared-utils"; + version = "4.5.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.15.tgz"; + sha512 = "SKaej9hHzzjKSOw1NlFmc6BSE0vcqUQMQiv1cxQ2DhVyy4QxZXBmzmiLBUBe+hYZZs1neXW7n//udeN9bCAY+Q=="; + }; + }; "@vue/cli-shared-utils-5.0.1" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -9886,6 +10210,42 @@ let sha512 = "60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg=="; }; }; + "@vue/component-compiler-utils-3.3.0" = { + name = "_at_vue_slash_component-compiler-utils"; + packageName = "@vue/component-compiler-utils"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"; + sha512 = "97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="; + }; + }; + "@vue/eslint-config-prettier-6.0.0" = { + name = "_at_vue_slash_eslint-config-prettier"; + packageName = "@vue/eslint-config-prettier"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz"; + sha512 = "wFQmv45c3ige5EA+ngijq40YpVcIkAy0Lihupnsnd1Dao5CBbPyfCzqtejFLZX1EwH/kCJdpz3t6s+5wd3+KxQ=="; + }; + }; + "@vue/eslint-config-typescript-7.0.0" = { + name = "_at_vue_slash_eslint-config-typescript"; + packageName = "@vue/eslint-config-typescript"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-7.0.0.tgz"; + sha512 = "UxUlvpSrFOoF8aQ+zX1leYiEBEm7CZmXYn/ZEM1zwSadUzpamx56RB4+Htdjisv1mX2tOjBegNUqH3kz2OL+Aw=="; + }; + }; + "@vue/preload-webpack-plugin-1.1.2" = { + name = "_at_vue_slash_preload-webpack-plugin"; + packageName = "@vue/preload-webpack-plugin"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"; + sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; + }; + }; "@vue/shared-3.2.31" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; @@ -9895,6 +10255,15 @@ let sha512 = "ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="; }; }; + "@vue/web-component-wrapper-1.3.0" = { + name = "_at_vue_slash_web-component-wrapper"; + packageName = "@vue/web-component-wrapper"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"; + sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; + }; + }; "@webassemblyjs/ast-1.11.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -12109,6 +12478,15 @@ let sha1 = "2af5c2b544a40e15fc1ac55548314397460845d0"; }; }; + "app-root-path-3.0.0" = { + name = "app-root-path"; + packageName = "app-root-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz"; + sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw=="; + }; + }; "appdata-path-1.0.0" = { name = "appdata-path"; packageName = "appdata-path"; @@ -12388,13 +12766,31 @@ let sha1 = "6e7207b4ecdb39b0af88303fa5ae22bda8df61cb"; }; }; - "aribts-1.3.5" = { - name = "aribts"; - packageName = "aribts"; - version = "1.3.5"; + "arib-mpeg2ts-parser-3.0.13" = { + name = "arib-mpeg2ts-parser"; + packageName = "arib-mpeg2ts-parser"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/aribts/-/aribts-1.3.5.tgz"; - sha512 = "fvDR4iYpZkbMqMbTfKynPGfpXDhFTxzZWSS7C3c70xQ8ElmFkjwVrg/NLcEA+R3s4Jz6mVrz/1vOLEAI+ycrSQ=="; + url = "https://registry.npmjs.org/arib-mpeg2ts-parser/-/arib-mpeg2ts-parser-3.0.13.tgz"; + sha512 = "QgNZghj9R4dafXeBJbKZ0Ff5f7YENqQP/CDLAhWEWXdPoOOPUcQCu5zs3KHqeTKxg3/ip6i8a+aIu+J6QYICOg=="; + }; + }; + "arib-subtitle-timedmetadater-4.0.9" = { + name = "arib-subtitle-timedmetadater"; + packageName = "arib-subtitle-timedmetadater"; + version = "4.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/arib-subtitle-timedmetadater/-/arib-subtitle-timedmetadater-4.0.9.tgz"; + sha512 = "bfLMCjJlon8+GdOMP7gMIzTHaoxWBFTypREYsaTMlqgFw4O5WnYtU8xrDbeafp792zylvw2xHMIayXtgbRoj7Q=="; + }; + }; + "aribb24.js-1.8.8" = { + name = "aribb24.js"; + packageName = "aribb24.js"; + version = "1.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/aribb24.js/-/aribb24.js-1.8.8.tgz"; + sha512 = "7tCEIOzDoDxvr5UuGTVDpszRYNcJFLRqAXf/lIbJi6DmeeDnfbYQdfr0DiRokG/MUSPx5rqyxRSyVSoWDanGNw=="; }; }; "aribts-2.1.12" = { @@ -13567,13 +13963,22 @@ let sha512 = "zL20v5QXoSsb2S6RKAhDmfnZYUIRldR93ihJ6mCYrw6Zl+Dir2SVmALy++U/zduDbKB4NaU72mscumx2RWc7Hg=="; }; }; - "aws-sdk-2.1087.0" = { + "aws-sdk-2.1091.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1087.0"; + version = "2.1091.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1087.0.tgz"; - sha512 = "m5EERT29Fwh2cv3SaSdygeAjJBXnjSaXRRERy70bf6PQ7KgmASJouBxY11g5G7LTEPK/yfB0TGshujKh3hEtPA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1091.0.tgz"; + sha512 = "DSidFjHdZZopF2kBt6I5wlkxeV5xhXWWXtLtZVQw9g9RQxFnmm+B3iBf1mQtw9fPspfyKyQwnBUNnvMtPku3Yw=="; + }; + }; + "aws-sdk-2.1092.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.1092.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1092.0.tgz"; + sha512 = "8PH2rOgZazGT3VfGPkKcvzz2K9ylVfDniJH4WfJXHEBGxu0+XEMDbjuYpe8k/L1C7w0UTP6CuChjqCxgJznrxg=="; }; }; "aws-sign2-0.6.0" = { @@ -13675,15 +14080,6 @@ let sha512 = "XDG91XzLZ15reP12s3jFkKS8oiagSICjnLwxEYieme4+4h3ZveFOFRA4iYIG40RyHXsiI0mefFYYMFIJbMpWcg=="; }; }; - "b24.js-1.0.3" = { - name = "b24.js"; - packageName = "b24.js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/b24.js/-/b24.js-1.0.3.tgz"; - sha512 = "j2hHu0asf6HxacVmGJKFSsrfoG8nC0JEjujIpsmRVkr74nC6o5gs6YF6AQD3e7YyJ8PaKuA7k2uSL9A2mAG9Og=="; - }; - }; "b4a-1.3.1" = { name = "b4a"; packageName = "b4a"; @@ -14134,15 +14530,6 @@ let sha512 = "VTtHsmvwRBkX3yLK4e+pFwk88BC6iNFqS2J8CCx2ddQc7RjXoRhuXXIgYCng21DYNty9IicCwDdTDjdr+TM7eg=="; }; }; - "babel-polyfill-6.23.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz"; - sha1 = "8364ca62df8eafb830499f699177466c3b03499d"; - }; - }; "babel-preset-current-node-syntax-0.1.4" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; @@ -16213,6 +16600,15 @@ let sha512 = "66UkjoB9f7lhT+WKgYq8MQa6nkr96mlX64JYMlIsXe/X4VeqNwvsx7UOE3ZqD6lkwg8GvBhapRTWj0qWO3Pw8w=="; }; }; + "bson-4.6.1" = { + name = "bson"; + packageName = "bson"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-4.6.1.tgz"; + sha512 = "I1LQ7Hz5zgwR4QquilLNZwbhPw0Apx7i7X9kGMBTsqPdml/03Q9NBtD9nt/19ahjlphktQImrnderxqpzeVDjw=="; + }; + }; "btc-rpc-client-git://github.com/btc21/btc-rpc-client" = { name = "bitcoin-core"; packageName = "bitcoin-core"; @@ -16502,15 +16898,6 @@ let sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002"; }; }; - "buffer-writer-2.0.0" = { - name = "buffer-writer"; - packageName = "buffer-writer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; - }; - }; "buffer-xor-1.0.3" = { name = "buffer-xor"; packageName = "buffer-xor"; @@ -16898,6 +17285,15 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; + "cache-loader-4.1.0" = { + name = "cache-loader"; + packageName = "cache-loader"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz"; + sha512 = "ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw=="; + }; + }; "cacheable-lookup-2.0.1" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; @@ -17249,13 +17645,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001313" = { + "caniuse-lite-1.0.30001314" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001313"; + version = "1.0.30001314"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001313.tgz"; - sha512 = "rI1UN0koZUiKINjysQDuRi2VeSCce3bYJNmDcj3PIKREiAmjakugBul1QSkg/fPrlULYl6oWfGg3PbgOSY9X4Q=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz"; + sha512 = "0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw=="; }; }; "canvas-2.9.0" = { @@ -17411,22 +17807,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.5.35" = { + "cdk8s-1.5.39" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.5.35"; + version = "1.5.39"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.35.tgz"; - sha512 = "khKlC9OrNsNHHbBkuKulns4FzbNvuQVILHPJFx0gUg/Rq3SGpn4xwKqYmh4AhE//Y9RY6EhzQO9pHL9fpkPt0Q=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.39.tgz"; + sha512 = "xwb0PxV5u3/Bubc1vda1Rz2hQcDiC2kiNBie/vgCyYt+Z70KGi5i5Cz9X3ZEHGb7yuAU4jk0LyVBQdPfUu3qIw=="; }; }; - "cdk8s-plus-22-1.0.0-beta.137" = { + "cdk8s-plus-22-1.0.0-beta.142" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.137"; + version = "1.0.0-beta.142"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.137.tgz"; - sha512 = "RR3j4FMeGsolMScsneW0wNaXrpiwQ4v3ObDi7FeljfPwqTY1RL+Aip9rbzVqNp9qzEwOZMUja8dFF+DxjhXaOg=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.142.tgz"; + sha512 = "Ted9JMqKBdKdXZp2kLaeWfYOU1/a7Fy8FnqGraxkzXYS7Gd6Cx/3PHT3SVl0sAnV9a0uhy/DLRVKWA+J6Dc+5w=="; }; }; "cdktf-0.9.4" = { @@ -17573,13 +17969,13 @@ let sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; - "chalk-5.0.0" = { + "chalk-5.0.1" = { name = "chalk"; packageName = "chalk"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-5.0.0.tgz"; - sha512 = "/duVOqst+luxCQRKEo4bNxinsOQtMP80ZYm7mMqzuh5PociNL0PvmHFvREJ9ueYL2TxlHjBcmLCdmocx9Vg+IQ=="; + url = "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz"; + sha512 = "Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="; }; }; "chance-1.0.18" = { @@ -17726,15 +18122,6 @@ let sha512 = "6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg=="; }; }; - "chart.js-2.9.3" = { - name = "chart.js"; - packageName = "chart.js"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chart.js/-/chart.js-2.9.3.tgz"; - sha512 = "+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw=="; - }; - }; "chart.js-3.7.1" = { name = "chart.js"; packageName = "chart.js"; @@ -17744,24 +18131,6 @@ let sha512 = "8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA=="; }; }; - "chartjs-color-2.4.1" = { - name = "chartjs-color"; - packageName = "chartjs-color"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz"; - sha512 = "haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w=="; - }; - }; - "chartjs-color-string-0.6.0" = { - name = "chartjs-color-string"; - packageName = "chartjs-color-string"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; - sha512 = "TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A=="; - }; - }; "charwise-3.0.1" = { name = "charwise"; packageName = "charwise"; @@ -18230,15 +18599,6 @@ let sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; - "clean-css-4.2.3" = { - name = "clean-css"; - packageName = "clean-css"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; - sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; - }; - }; "clean-css-4.2.4" = { name = "clean-css"; packageName = "clean-css"; @@ -18392,6 +18752,15 @@ let sha512 = "VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="; }; }; + "cli-highlight-2.1.11" = { + name = "cli-highlight"; + packageName = "cli-highlight"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"; + sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; + }; + }; "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; @@ -19031,13 +19400,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.54.0" = { + "codemaker-1.55.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.54.0.tgz"; - sha512 = "83iPWGyIa089xWAomeTOmBVqgTa0p3k5KGav4kIVZzTLXqh5JiPCjpJr89kuts4O9vLSuvkCBCl8n0MVYP6nlQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.55.0.tgz"; + sha512 = "oVCJ3PUqkMf65pS8TtstLSn5AAGmuDTfrjlZjG8qOcOMHvG/w12iJ4ZlJt/wULaAqlYh9bTemXaGIzT5YbX43A=="; }; }; "codepage-1.4.0" = { @@ -19814,15 +20183,6 @@ let sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; - "concat-with-sourcemaps-1.1.0" = { - name = "concat-with-sourcemaps"; - packageName = "concat-with-sourcemaps"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"; - sha512 = "4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg=="; - }; - }; "conf-1.4.0" = { name = "conf"; packageName = "conf"; @@ -20048,6 +20408,15 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; + "consolidate-0.15.1" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; + sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; + }; + }; "constantinople-3.1.2" = { name = "constantinople"; packageName = "constantinople"; @@ -20075,22 +20444,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.81" = { + "constructs-10.0.84" = { name = "constructs"; packageName = "constructs"; - version = "10.0.81"; + version = "10.0.84"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.81.tgz"; - sha512 = "5+3bCzKPfcxo8ZQ3GOaiOpDmIux8PZXgkXqNwEopjTRCypcMWMt1AT8ORHPVht3Iqsj36/qG3wV72WaiCKe3mQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.84.tgz"; + sha512 = "7Id7kN3oIlsr0IQ2ghC1I4xLWOUMorC9P0he007/TvrnA+2nmUjODRNYq536m/1tRV668H78dvZ4VQ6+ExOHIw=="; }; }; - "constructs-3.3.236" = { + "constructs-3.3.239" = { name = "constructs"; packageName = "constructs"; - version = "3.3.236"; + version = "3.3.239"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.236.tgz"; - sha512 = "tYYAn8XtPOMa24KEBtIYeHwi5OxVQGKu19Ie9NhojOLlQsCgP+6knjEVfuZ0Hgn1T8nMRqMriwAgM19GiwCjDg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.239.tgz"; + sha512 = "Is6qgAkws98ZtOBro4E9Mjp6p4mkElvdURXNWx0ho40RbSBAOe/hYklP7nn1+k6hA1H/fcFkVZedgQrs2igj/A=="; }; }; "consume-http-header-1.0.0" = { @@ -20589,6 +20958,15 @@ let sha512 = "XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw=="; }; }; + "copy-webpack-plugin-5.1.2" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"; + sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; + }; + }; "copy-webpack-plugin-6.0.4" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; @@ -20994,13 +21372,13 @@ let sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "create-torrent-5.0.1" = { + "create-torrent-5.0.2" = { name = "create-torrent"; packageName = "create-torrent"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.1.tgz"; - sha512 = "fVvg1YYSogo3TlU1WFeTt937nhGQlf5KtB6M2HyDa/U02dbeMBE2AY9PcPlMufXNQoM/UCO28y26EmuApM7ZmA=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.2.tgz"; + sha512 = "tNelixVeEkjiyeAuCW7uWFl1ARA+YapyZvdSWw6U3AXe/VXpxR4ihFNfjOzmvc5TBqK5EkGdsoKXAEKfQ8xlmQ=="; }; }; "cron-parser-2.18.0" = { @@ -21372,15 +21750,6 @@ let sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4"; }; }; - "css-ripple-effect-1.0.5" = { - name = "css-ripple-effect"; - packageName = "css-ripple-effect"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/css-ripple-effect/-/css-ripple-effect-1.0.5.tgz"; - sha1 = "6963b752aaf59babbd3fea3ec0da5d44e9122efb"; - }; - }; "css-select-1.0.0" = { name = "css-select"; packageName = "css-select"; @@ -21543,13 +21912,13 @@ let sha512 = "6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="; }; }; - "cssnano-5.1.0" = { + "cssnano-5.1.3" = { name = "cssnano"; packageName = "cssnano"; - version = "5.1.0"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.0.tgz"; - sha512 = "wWxave1wMlThGg4ueK98jFKaNqXnQd1nVZpSkQ9XvR+YymlzP1ofWqES1JkHtI250LksP9z5JH+oDcrKDJezAg=="; + url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.3.tgz"; + sha512 = "bdf+sY2w4XV+F5LOCEd7fWnSeMeKBO4lKgoAKVWZOSTR7CmWEk1UW/s9ibTMMnsTsinBmIdgZs755sAGa1eoXQ=="; }; }; "cssnano-preset-default-4.0.8" = { @@ -21561,13 +21930,13 @@ let sha512 = "LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="; }; }; - "cssnano-preset-default-5.2.0" = { + "cssnano-preset-default-5.2.3" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; - version = "5.2.0"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.0.tgz"; - sha512 = "3N5Vcptj2pqVKpHVqH6ezOJvqikR2PdLTbTrsrhF61FbLRQuujAqZ2sKN5rvcMsb7hFjrNnjZT8CGEkxoN/Pwg=="; + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.3.tgz"; + sha512 = "e4pzD/FnsvRywKO3i2Ti4jgAcJO5MhQPudrex92HXAJoMyQfS8lZHIzzC1yZ1t+d2zdkLXFY1sHdsZaT7lKoCQ=="; }; }; "cssnano-util-get-arguments-4.0.0" = { @@ -23001,6 +23370,15 @@ let sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; + "de-indent-1.0.2" = { + name = "de-indent"; + packageName = "de-indent"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; + sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; + }; + }; "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; @@ -23217,6 +23595,15 @@ let sha1 = "6f6df6b85d7e7c4410a932ffc26489b78e9acd13"; }; }; + "decache-4.6.1" = { + name = "decache"; + packageName = "decache"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decache/-/decache-4.6.1.tgz"; + sha512 = "ohApBM8u9ygepJCjgBrEZSSxPjc0T/PJkD+uNyxXPkqudyUpdXpwJYp0VISm2WrPVzASU6DZyIi6BWdyw7uJ2Q=="; + }; + }; "decamelize-1.2.0" = { name = "decamelize"; packageName = "decamelize"; @@ -23532,6 +23919,15 @@ let sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; + "deepmerge-1.5.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; + sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; + }; + }; "deepmerge-2.1.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -23595,6 +23991,15 @@ let sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; + "default-gateway-5.0.5" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz"; + sha512 = "z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA=="; + }; + }; "default-gateway-6.0.3" = { name = "default-gateway"; packageName = "default-gateway"; @@ -23766,15 +24171,6 @@ let sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; - "del-5.1.0" = { - name = "del"; - packageName = "del"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz"; - sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; - }; - }; "del-6.0.0" = { name = "del"; packageName = "del"; @@ -24135,15 +24531,6 @@ let sha512 = "4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ=="; }; }; - "devtools-protocol-0.0.960912" = { - name = "devtools-protocol"; - packageName = "devtools-protocol"; - version = "0.0.960912"; - src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.960912.tgz"; - sha512 = "I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg=="; - }; - }; "devtools-protocol-0.0.969999" = { name = "devtools-protocol"; packageName = "devtools-protocol"; @@ -24405,13 +24792,13 @@ let sha512 = "cK6rH1PuGjSjpmEQbnpuTxq1Yv8B89SotyKUFcr4RhnsiZnfBfDOev7DD7v5vhtEyyj51NuMWFoRJzgy/m08Uw=="; }; }; - "diskusage-1.1.3" = { - name = "diskusage"; - packageName = "diskusage"; - version = "1.1.3"; + "diskusage-ng-1.0.2" = { + name = "diskusage-ng"; + packageName = "diskusage-ng"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/diskusage/-/diskusage-1.1.3.tgz"; - sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; + url = "https://registry.npmjs.org/diskusage-ng/-/diskusage-ng-1.0.2.tgz"; + sha512 = "IO+Dbvxf5kXGuOEAHFCSf/aW9z/E96OwUH1Szstf2Rjzy+AP6sr/Y5yQh70fdX8SEFKdkTMpVG+b5jR7Uw3Q1Q=="; }; }; "diveSync-0.3.0" = { @@ -25386,13 +25773,22 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.76" = { + "electron-to-chromium-1.4.81" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.76"; + version = "1.4.81"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.76.tgz"; - sha512 = "3Vftv7cenJtQb+k00McEBZ2vVmZ/x+HEF7pcZONZIkOsESqAqVuACmBxMv0JhzX7u0YltU0vSqRqgBSTAhFUjA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.81.tgz"; + sha512 = "Gs7xVpIZ7tYYSDA+WgpzwpPvfGwUk3KSIjJ0akuj5XQHFdyQnsUoM76EA4CIHXNLPiVwTwOFay9RMb0ChG3OBw=="; + }; + }; + "electron-to-chromium-1.4.82" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.82"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.82.tgz"; + sha512 = "Ks+ANzLoIrFDUOJdjxYMH6CMKB8UQo5modAwvSZTxgF+vEs/U7G5IbWFUp6dS4klPkTDVdxbORuk8xAXXhMsWw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25739,6 +26135,15 @@ let sha512 = "t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ=="; }; }; + "engine.io-6.0.1" = { + name = "engine.io"; + packageName = "engine.io"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.0.1.tgz"; + sha512 = "Y53UaciUh2Rmx5MiogtMxOQcfh7pnemday+Bb4QDg0Wjmnvo/VTvuEyNGQgYmh8L7VOe8Je1QuiqjLNDelMqLA=="; + }; + }; "engine.io-6.1.3" = { name = "engine.io"; packageName = "engine.io"; @@ -25784,6 +26189,15 @@ let sha512 = "QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA=="; }; }; + "engine.io-client-6.0.3" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.0.3.tgz"; + sha512 = "IH8ZhDIwiLv0d/wXVzmjfV9Y82hbJIDhCGSVUV8o1kcpDe2I6Y3bZA3ZbJy4Ls7k7IVmcy/qn4k9RKWFhUGf5w=="; + }; + }; "engine.io-parser-1.0.6" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -26063,6 +26477,15 @@ let sha512 = "d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ=="; }; }; + "error-stack-parser-2.0.7" = { + name = "error-stack-parser"; + packageName = "error-stack-parser"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz"; + sha512 = "chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA=="; + }; + }; "errorhandler-1.5.1" = { name = "errorhandler"; packageName = "errorhandler"; @@ -26117,13 +26540,13 @@ let sha1 = "5dae3e650e5be3684b88066513d528d092629862"; }; }; - "es5-ext-0.10.53" = { + "es5-ext-0.10.58" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.53"; + version = "0.10.58"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; - sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.58.tgz"; + sha512 = "LHO+KBBaHGwjy32ibSaMY+ZzjpC4K4I5bPoijICMBL7gXEXfrEUrzssmNP+KigbQEp1dRUnGkry/vUnxOqptLQ=="; }; }; "es6-error-4.1.1" = { @@ -26432,6 +26855,15 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; + "eslint-6.8.0" = { + name = "eslint"; + packageName = "eslint"; + version = "6.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"; + sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; + }; + }; "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; @@ -26450,6 +26882,24 @@ let sha512 = "H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ=="; }; }; + "eslint-config-prettier-6.15.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "6.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz"; + sha512 = "a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw=="; + }; + }; + "eslint-config-prettier-8.3.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; + sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; + }; + }; "eslint-formatter-pretty-4.1.0" = { name = "eslint-formatter-pretty"; packageName = "eslint-formatter-pretty"; @@ -26459,6 +26909,15 @@ let sha512 = "IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ=="; }; }; + "eslint-loader-2.2.1" = { + name = "eslint-loader"; + packageName = "eslint-loader"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz"; + sha512 = "RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg=="; + }; + }; "eslint-plugin-no-unsanitized-4.0.1" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; @@ -26468,6 +26927,15 @@ let sha512 = "y/lAMWnPPC7RYuUdxlEL/XiCL8FehN9h9s3Kjqbp/Kv0i9NZs+IXSC2kS546Fa4Bumwy31HlVS/OdWX0Kxb5Xg=="; }; }; + "eslint-plugin-prettier-3.4.1" = { + name = "eslint-plugin-prettier"; + packageName = "eslint-plugin-prettier"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"; + sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; + }; + }; "eslint-plugin-vue-6.2.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -27089,15 +27557,6 @@ let sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; }; }; - "eventemitter3-3.1.0" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; - sha512 = "ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="; - }; - }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -27431,13 +27890,13 @@ let sha512 = "bILEG0Fg+ZhIhdEaShHzsEN1WC0hUmXJ5Kcd4cd+8rVk1Ead9vRZxA/yLx1cNBDCOwMe0GAMrhF7TKT+A1P+YA=="; }; }; - "expo-pwa-0.0.113" = { + "expo-pwa-0.0.114" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.113"; + version = "0.0.114"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.113.tgz"; - sha512 = "uKmNgSMrZs/dUy1yIqXBFELmjuVtvSJzNoscTMN1ehdBa8QJqz/d3QGdu/IVlYNWxqCvAaqHXY/x6WseA3X3dg=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.114.tgz"; + sha512 = "vJCpKROPULPrTnLTCytZuxBkm23yS9CBXBald2BDeizgKsJV19vOc2+lmTk4fL5hh+TgHQybwtt6UwEy3ORjgg=="; }; }; "express-2.5.11" = { @@ -27548,22 +28007,22 @@ let sha1 = "dbe1e8139aecb234fb6adb5c0059c75db9733d2a"; }; }; - "express-openapi-6.0.0" = { + "express-openapi-8.0.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "6.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-6.0.0.tgz"; - sha512 = "WQGmghzn+loQsIQUEnLZ0HVKCLhIBVcURvrAhyt6mOqsFsG2tBYhaNKX728EOz2aMXRhEQhkQ+RXQsIFpbS6IA=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-8.0.0.tgz"; + sha512 = "MUntG3qQKdU5eRG51WLglaUfIXrVagQHNmStwl44lzu6XKiMj4TBDm/cIbubO49HAMCqNkX5BaiKCOK6pvP5Wg=="; }; }; - "express-openapi-7.0.1" = { + "express-openapi-9.3.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.0.1"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.1.tgz"; - sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-9.3.0.tgz"; + sha512 = "92H8nuvO1vVMutapDqQXESOxFnaC4/tZAXSi7kJMD+xWXZwNwmuinCxbfQc7JyUY6Y3+vjFXqJ7xeTCpsUhSiA=="; }; }; "express-prom-bundle-6.3.0" = { @@ -28376,6 +28835,15 @@ let sha512 = "ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww=="; }; }; + "figlet-1.5.2" = { + name = "figlet"; + packageName = "figlet"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz"; + sha512 = "WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ=="; + }; + }; "figures-1.7.0" = { name = "figures"; packageName = "figures"; @@ -28457,6 +28925,15 @@ let sha512 = "4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw=="; }; }; + "file-loader-4.3.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz"; + sha512 = "aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="; + }; + }; "file-loader-6.0.0" = { name = "file-loader"; packageName = "file-loader"; @@ -28466,6 +28943,15 @@ let sha512 = "/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ=="; }; }; + "file-loader-6.2.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz"; + sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; + }; + }; "file-or-stdin-1.0.2" = { name = "file-or-stdin"; packageName = "file-or-stdin"; @@ -28781,6 +29267,15 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; + "find-cache-dir-0.1.1" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz"; + sha1 = "c8defae57c8a52a8a784f9e31c57c742e993a0b9"; + }; + }; "find-cache-dir-2.1.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -29375,6 +29870,15 @@ let sha512 = "7YGDo0UlbMy++6G3lzncWISDaT5CVp+yPVAkZ7FDFF0ec+0HKgBOWOhPGKpMF0hjcm3Ps/HbtrETrQLYREZ7YQ=="; }; }; + "fork-ts-checker-webpack-plugin-3.1.1" = { + name = "fork-ts-checker-webpack-plugin"; + packageName = "fork-ts-checker-webpack-plugin"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; + sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; + }; + }; "fork-ts-checker-webpack-plugin-4.1.6" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; @@ -29393,6 +29897,15 @@ let sha512 = "uOfQdg/iQ8iokQ64qcbu8iZb114rOmaKLQFu7hU14/eJaKgsP91cQ7ts7v2iiDld6TzDe84Meksha8/MkWiCyw=="; }; }; + "fork-ts-checker-webpack-plugin-v5-5.2.1" = { + name = "fork-ts-checker-webpack-plugin-v5"; + packageName = "fork-ts-checker-webpack-plugin-v5"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz"; + sha512 = "SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw=="; + }; + }; "form-data-1.0.0-rc3" = { name = "form-data"; packageName = "form-data"; @@ -29861,22 +30374,22 @@ let sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="; }; }; - "fs-routes-2.0.0" = { + "fs-routes-8.0.0" = { name = "fs-routes"; packageName = "fs-routes"; - version = "2.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-routes/-/fs-routes-2.0.0.tgz"; - sha512 = "oITW9GoYFZwYWR2aMDdUvr6W9O5mtzSizIVEUdeCQaFD6+BylwPSEP2+ZFWv1UYpE9kiPS3Hb0knh2PmFJcj6A=="; + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-8.0.0.tgz"; + sha512 = "EezW71GPu+VK2ZOnX0Aljaref63+mvhkkz55DqUp5xryV/mJraA2t/XFmBxNMwgRq6tFUOYuQOlr+RQh4nq5kQ=="; }; }; - "fs-routes-7.0.1" = { + "fs-routes-9.0.3" = { name = "fs-routes"; packageName = "fs-routes"; - version = "7.0.1"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fs-routes/-/fs-routes-7.0.1.tgz"; - sha512 = "kSAfx/P8oLSi5+tblecTETcJJ/Q+qL+xzGx4hns/+gHXMkTOZEzG73/2dBDW1FFy5+ZW080XoMaBAN2kCN55aQ=="; + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-9.0.3.tgz"; + sha512 = "Y5tkylY9fQ1jm11FdJoptzqIG3OyzqrOF16W5odNlIdqFqb2355IbNB3jQkE+C268mSShLmIur8ynYCgL/Yg/g=="; }; }; "fs-write-stream-atomic-1.0.10" = { @@ -30077,22 +30590,22 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.9.0" = { + "gatsby-core-utils-3.9.1" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.9.0.tgz"; - sha512 = "SvPnr86oXTY3ldbQ4QAkEew3BQE9vlzUXcXVJqTOhMUeGEz2kibBFUmVp8ia9Y1eOD+K/0xXQ54jUqaResj69w=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.9.1.tgz"; + sha512 = "DNf7NhhH0WrFuoBvyURjsw4w+eKbp1GlRA0cchYHJwVTaDPvLvX1o7zxN76xIBx+m0kttpnO3KuJ9LDOSli3ag=="; }; }; - "gatsby-telemetry-3.9.0" = { + "gatsby-telemetry-3.9.1" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.9.0.tgz"; - sha512 = "ifqJ4KS16mbpfZ5oVaU4WEbk6gccivVqjCbzfVGgqtl+C8B0u1CeShvr4NcJE1FdVFYIOB4uJeV9Wym03B075A=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.9.1.tgz"; + sha512 = "ChXTshfvo5njd/u6kSZErDUvc/uSmtOEuo7wrt/68Xjz2JVG6nsLlRxaZpx0DxnDAInouItMVX0VF40RAU7qKg=="; }; }; "gauge-1.2.7" = { @@ -30122,13 +30635,13 @@ let sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; - "gauge-4.0.2" = { + "gauge-4.0.3" = { name = "gauge"; packageName = "gauge"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-4.0.2.tgz"; - sha512 = "aSPRm2CvA9R8QyU5eXMFPd+cYkyxLsXHd2l5/FOH2V/eml//M04G6KZOmTap07O1PvEwNcl2NndyLfK8g3QrKA=="; + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.3.tgz"; + sha512 = "ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw=="; }; }; "gaxios-2.3.4" = { @@ -31095,6 +31608,15 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; + "globals-12.4.0" = { + name = "globals"; + packageName = "globals"; + version = "12.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + }; "globals-13.12.1" = { name = "globals"; packageName = "globals"; @@ -31698,13 +32220,13 @@ let sha512 = "Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA=="; }; }; - "graphql-sse-1.0.6" = { + "graphql-sse-1.1.0" = { name = "graphql-sse"; packageName = "graphql-sse"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.0.6.tgz"; - sha512 = "y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w=="; + url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.1.0.tgz"; + sha512 = "xE8AGPJa5X+g7iFmRQw/8H+7lXIDJvSkW6lou/XSSq17opPQl+dbKOMiqraHMx52VrDgS061ZVx90OSuqS6ykA=="; }; }; "graphql-subscriptions-1.2.1" = { @@ -31878,15 +32400,6 @@ let sha512 = "dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA=="; }; }; - "gulp-clean-css-4.3.0" = { - name = "gulp-clean-css"; - packageName = "gulp-clean-css"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz"; - sha512 = "mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg=="; - }; - }; "gulp-cli-2.3.0" = { name = "gulp-cli"; packageName = "gulp-cli"; @@ -31896,24 +32409,6 @@ let sha512 = "zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A=="; }; }; - "gulp-concat-2.6.1" = { - name = "gulp-concat"; - packageName = "gulp-concat"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz"; - sha1 = "633d16c95d88504628ad02665663cee5a4793353"; - }; - }; - "gulp-dart-sass-1.0.2" = { - name = "gulp-dart-sass"; - packageName = "gulp-dart-sass"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-dart-sass/-/gulp-dart-sass-1.0.2.tgz"; - sha512 = "8fLttA824mbuc0jRVlGs00zWYZXBckat6INawx5kp66Eqsz5srNWTA51t0mbfB4C8a/a/GZ9muYLwXGklgAHlw=="; - }; - }; "gulp-eslint-3.0.1" = { name = "gulp-eslint"; packageName = "gulp-eslint"; @@ -31923,6 +32418,15 @@ let sha1 = "04e57e3e18c6974267c12cf6855dc717d4a313bd"; }; }; + "gulp-eslint-6.0.0" = { + name = "gulp-eslint"; + packageName = "gulp-eslint"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz"; + sha512 = "dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig=="; + }; + }; "gulp-plumber-1.2.1" = { name = "gulp-plumber"; packageName = "gulp-plumber"; @@ -31932,22 +32436,13 @@ let sha512 = "mctAi9msEAG7XzW5ytDVZ9PxWMzzi1pS2rBH7lA095DhMa6KEXjm+St0GOCc567pJKJ/oCvosVAZEpAey0q2eQ=="; }; }; - "gulp-sourcemaps-2.6.5" = { + "gulp-sourcemaps-3.0.0" = { name = "gulp-sourcemaps"; packageName = "gulp-sourcemaps"; - version = "2.6.5"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz"; - sha512 = "SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg=="; - }; - }; - "gulp-tslint-8.1.4" = { - name = "gulp-tslint"; - packageName = "gulp-tslint"; - version = "8.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.4.tgz"; - sha512 = "wBoZIEMJRz9urHwolsvQpngA9l931p6g/Liwz1b/KrsVP6jEBFZv/o0NS1TFCQZi/l8mXxz8+v3twhf4HOXxPQ=="; + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz"; + sha512 = "RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ=="; }; }; "gulp-typescript-5.0.1" = { @@ -32337,6 +32832,15 @@ let sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; + "hash-sum-1.0.2" = { + name = "hash-sum"; + packageName = "hash-sum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; + sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + }; + }; "hash-sum-2.0.0" = { name = "hash-sum"; packageName = "hash-sum"; @@ -32742,6 +33246,15 @@ let sha512 = "oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="; }; }; + "highlight.js-10.7.3" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "10.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; + sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; + }; + }; "highlight.js-11.4.0" = { name = "highlight.js"; packageName = "highlight.js"; @@ -32796,13 +33309,13 @@ let sha1 = "6f36e770769275113a57ae1a6007001af771cff6"; }; }; - "hls-b24.js-0.12.3" = { - name = "hls-b24.js"; - packageName = "hls-b24.js"; - version = "0.12.3"; + "hls.js-1.1.2" = { + name = "hls.js"; + packageName = "hls.js"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hls-b24.js/-/hls-b24.js-0.12.3.tgz"; - sha512 = "C8nwzS33zKvR7grYIoHvp8wPxBvk9sEJ6dsh3Bx+T/4jNNhDksqLS73NIWqHvInjRiOsrXgEY4+h/NjNbzzh0g=="; + url = "https://registry.npmjs.org/hls.js/-/hls.js-1.1.2.tgz"; + sha512 = "ujditC4vvBmZd00RRNfNPLgFVlqEeUX4sAFv5lGhBHuql8iAZodOdlZTD3em/1zo7vyjQp12up/lCVqQk8dvxA=="; }; }; "hmac-blake2b-2.0.0" = { @@ -33408,6 +33921,15 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; + "http-proxy-middleware-1.3.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"; + sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; + }; + }; "http-proxy-middleware-2.0.3" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; @@ -34560,15 +35082,6 @@ let sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; - "inquirer-3.0.6" = { - name = "inquirer"; - packageName = "inquirer"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz"; - sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347"; - }; - }; "inquirer-3.3.0" = { name = "inquirer"; packageName = "inquirer"; @@ -34623,6 +35136,15 @@ let sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ=="; }; }; + "inquirer-8.2.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.1.tgz"; + sha512 = "pxhBaw9cyTFMjwKtkjePWDhvwzvrNGAw7En4hottzlPvz80GZaMZthdDU35aA6/f5FRZf3uhE057q8w1DE3V2g=="; + }; + }; "inquirer-autocomplete-prompt-1.4.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -34911,6 +35433,15 @@ let sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="; }; }; + "inversify-6.0.1" = { + name = "inversify"; + packageName = "inversify"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inversify/-/inversify-6.0.1.tgz"; + sha512 = "B3ex30927698TJENHR++8FfEaJGqoWOgI6ZY5Ht/nLUsFCwHn6akbwtnUAPCgUepAnTpe2qHxhDNjoKLyz6rgQ=="; + }; + }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -35001,6 +35532,15 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; + "ip-num-1.3.4" = { + name = "ip-num"; + packageName = "ip-num"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-num/-/ip-num-1.3.4.tgz"; + sha512 = "ZlO1YqjR87dsMFTxUJGj1iZR+UV+0QHWeOAMZfTBpGocBsKGc7fJdlFoa7F5xpK/guKW7dkfT6UAVDwvWjLK1Q=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -37306,13 +37846,13 @@ let sha512 = "2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA=="; }; }; - "jquery.terminal-2.32.0" = { + "jquery.terminal-2.32.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.32.0"; + version = "2.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.32.0.tgz"; - sha512 = "Q+eYaAQikguSx5UHVs/r7Y/C1/jzEEZS40DGAhHmga8MQZdk9Z+dstfN/U4IcNnm1nXPer8A6CKMBdTPLrROkg=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.32.1.tgz"; + sha512 = "AbaZfSuNPQSBpUEP2jqNix5H7wS3fqUQGe+k6D8umBAOA3XxIVJpXTcGitfs1df7AZ52DruOQnV+p5+s+E3QqQ=="; }; }; "js-base64-2.6.3" = { @@ -37639,49 +38179,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.54.0" = { + "jsii-1.55.0" = { name = "jsii"; packageName = "jsii"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.54.0.tgz"; - sha512 = "XuqGpmGIxFcX2GvX3zjcHBzBeZ7+tJ7hr5tu/7qV6wQ/thXuZFdAoj2znSgBkpGOt6mjtRuqv01HIRl25Nys5g=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.55.0.tgz"; + sha512 = "OpY67STJMTqF/pQRYMXx8xaA1lCnKoQCnraB043tkx6F3reyUNzlIzSIkQIgTEFoBa/OEYANHdtHJCfw6Y3nzA=="; }; }; - "jsii-pacmak-1.54.0" = { + "jsii-pacmak-1.55.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.54.0.tgz"; - sha512 = "1uvHzdrUiTL7Z6QLaoY5F4iK+JbVh8BL4dJrZRikd+ntVWW8sh0CIxAAtlwYgAMER8HihZ1AZUzngdZ/zO2AFw=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.55.0.tgz"; + sha512 = "2i1VQVGQIC0JUSryw9gV2VqcMNbR/KLQOwsfNb7gTs6qKccR5Pmf4eXuIC+HxpyIiecu1UeEbToz5q8fMdVcig=="; }; }; - "jsii-reflect-1.54.0" = { + "jsii-reflect-1.55.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.54.0.tgz"; - sha512 = "wB4hxHTAN4LEBVg/Y5sr3Sbh3Xe2+jrYIftnhT+2mmhMexHj3U0RhjPW/MFXxRTbiSgDad1fbw5VkJYDWnpGXw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.55.0.tgz"; + sha512 = "PLrRTqkE0FJ9locNabIOnmXh/fX+JaKhWD9ktPmYmZzPyPL7pfHGUUnFJhtk+0yXZ9vwg/Bp5qr/l3HH2Bq+uA=="; }; }; - "jsii-rosetta-1.54.0" = { + "jsii-rosetta-1.55.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.54.0.tgz"; - sha512 = "fxgx9L5eWzyMC1IEkDitxgcraHUuZbQQVQztJtZHw/QlZ9n0DUjfbKrefJQ2HpobtI9ZV2fDEYjuwZDBAVBdsA=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.55.0.tgz"; + sha512 = "LOw8i5ypoJ8A2D24Za3fIWeiNbPa6q0wuLuu0LAr+VWvu4f2A5A9SJfzsB39CXwDVKjrAVVvCy83Fgdv3/2VFw=="; }; }; - "jsii-srcmak-0.1.495" = { + "jsii-srcmak-0.1.499" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.495"; + version = "0.1.499"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.495.tgz"; - sha512 = "zAfFT/y52spvqFZJ5UDB29eAiyXvLce1ouTY/7GtJbRzlNxfwDOpmwZfNtnR6KQTfeW9DWtl6zJQQscIzdn38g=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.499.tgz"; + sha512 = "FJ8ovnFkrWL2BgseeGDkpCsx5+AfWYp0vyihtiKWvb3x/uQhB0N5q90oOhJn1uRLpwv4+UOTG3d41t4ZtCQzKg=="; }; }; "json-bigint-1.0.0" = { @@ -37981,13 +38521,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.155" = { + "json2jsii-0.2.159" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.155"; + version = "0.2.159"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.155.tgz"; - sha512 = "uAcZRDPOQSD7LrITobxxaxwld34carsGTKY6u6fAH2arw13X0Pq5QlrgQBaVvFt/Uwh+L0g3TGAkumPMaYMm8A=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.159.tgz"; + sha512 = "zbMiuYG79Azg3zXzVA/hP20XtDJO1obIiAbYvYzB+eXIP3YPNn/BIITiLRi6g55oCW8TaLlSRgBJDBNaTt5/tg=="; }; }; "json3-3.2.6" = { @@ -38206,6 +38746,15 @@ let sha512 = "PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="; }; }; + "jsonrpc2-ws-1.0.0-beta9" = { + name = "jsonrpc2-ws"; + packageName = "jsonrpc2-ws"; + version = "1.0.0-beta9"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonrpc2-ws/-/jsonrpc2-ws-1.0.0-beta9.tgz"; + sha512 = "0KA+ufhSy7gN2/jGXagXLz4V5m+vymmNTI5IpNBIUiunday45P6dspdaOO0wwt2JJyrACC/BKMH154OqsuB80w=="; + }; + }; "jsonschema-1.4.0" = { name = "jsonschema"; packageName = "jsonschema"; @@ -39007,6 +39556,15 @@ let sha512 = "3QrsCXejlWYHjBPFXTyGNhPj4rrQdB+5+r5r3wArpLH201aR+nWUgw/zKKkTmilCfY/sv6u8qo98pNvtg8LUTA=="; }; }; + "launch-editor-middleware-2.3.0" = { + name = "launch-editor-middleware"; + packageName = "launch-editor-middleware"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.3.0.tgz"; + sha512 = "GJR64trLdFFwCoL9DMn/d1SZX0OzTDPixu4mcfWTShQ4tIqCHCGvlg9fOEYQXyBlrSMQwylsJfUWncheShfV2w=="; + }; + }; "layered-graph-1.1.3" = { name = "layered-graph"; packageName = "layered-graph"; @@ -39898,6 +40456,15 @@ let sha512 = "OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw=="; }; }; + "loader-fs-cache-1.0.3" = { + name = "loader-fs-cache"; + packageName = "loader-fs-cache"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha512 = "ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -40591,6 +41158,15 @@ let sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; }; }; + "lodash.defaultsdeep-4.6.1" = { + name = "lodash.defaultsdeep"; + packageName = "lodash.defaultsdeep"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"; + sha512 = "3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="; + }; + }; "lodash.difference-4.5.0" = { name = "lodash.difference"; packageName = "lodash.difference"; @@ -40924,6 +41500,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.mapvalues-4.6.0" = { + name = "lodash.mapvalues"; + packageName = "lodash.mapvalues"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; + sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -41140,6 +41725,15 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; + "lodash.transform-4.6.0" = { + name = "lodash.transform"; + packageName = "lodash.transform"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz"; + sha1 = "12306422f63324aed8483d3f38332b5f670547a0"; + }; + }; "lodash.truncate-4.4.2" = { name = "lodash.truncate"; packageName = "lodash.truncate"; @@ -41689,13 +42283,13 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.4.1" = { + "lru-cache-7.4.4" = { name = "lru-cache"; packageName = "lru-cache"; - version = "7.4.1"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.1.tgz"; - sha512 = "NCD7/WRlFmADccuHjsRUYqdluYBr//n/O0fesCb/n52FoGcgKh8o4Dpm7YIbZwVcDs8rPBQbCZLmWWsp6m+xGQ=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.4.tgz"; + sha512 = "2XbUJmlpIbmc9JvNNmtLzHlF31srxoDxuiQiwBHic7RZyHyltbTdzoO6maRqpdEhOOG5GD80EXvzAU0wR15ccg=="; }; }; "lru-queue-0.1.0" = { @@ -41960,13 +42554,13 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "make-fetch-happen-10.0.4" = { + "make-fetch-happen-10.0.5" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "10.0.4"; + version = "10.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.4.tgz"; - sha512 = "CiReW6usy3UXby5N46XjWfLPFPq1glugCszh18I0NYJCwr129ZAx9j3Dlv+cRsK0q3VjlVysEzhdtdw2+NhdYA=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.5.tgz"; + sha512 = "0JQ0daMRDFEv14DelmcFlprdhSDNG7WEgInTjBeWYWZ78W0jfDqygZdPLhcrQ4s/G8skNhBrS4fiF6xA+YlFjQ=="; }; }; "make-fetch-happen-8.0.14" = { @@ -42491,22 +43085,13 @@ let sha512 = "YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g=="; }; }; - "material-design-icons-3.0.1" = { - name = "material-design-icons"; - packageName = "material-design-icons"; - version = "3.0.1"; + "material-design-icons-iconfont-6.1.1" = { + name = "material-design-icons-iconfont"; + packageName = "material-design-icons-iconfont"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz"; - sha1 = "9a71c48747218ebca51e51a66da682038cdcb7bf"; - }; - }; - "material-design-lite-1.3.0" = { - name = "material-design-lite"; - packageName = "material-design-lite"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/material-design-lite/-/material-design-lite-1.3.0.tgz"; - sha1 = "d004ce3fee99a1eeb74a78b8a325134a5f1171d3"; + url = "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.1.1.tgz"; + sha512 = "nkoXybeXoofanNagj4tbM6+/LALWpWxYX5ee861to5VQrKgb0/TskTw28Svwn0OGDKajuqK7ShFOsIBxIygGKA=="; }; }; "math-random-1.0.4" = { @@ -43238,6 +43823,15 @@ let sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; }; }; + "merge-source-map-1.1.0" = { + name = "merge-source-map"; + packageName = "merge-source-map"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; + sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; + }; + }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -44138,13 +44732,22 @@ let sha512 = "IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw=="; }; }; - "mini-svg-data-uri-1.4.3" = { + "mini-css-extract-plugin-0.9.0" = { + name = "mini-css-extract-plugin"; + packageName = "mini-css-extract-plugin"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; + }; + }; + "mini-svg-data-uri-1.4.4" = { name = "mini-svg-data-uri"; packageName = "mini-svg-data-uri"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.3.tgz"; - sha512 = "gSfqpMRC8IxghvMcxzzmMnWpXAChSA+vy4cia33RgerMS8Fex95akUyQZPbxJJmeBGiGmK7n/1OpUX8ksRjIdA=="; + url = "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz"; + sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; }; }; "minicap-prebuilt-2.3.0" = { @@ -44219,6 +44822,15 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; + "minimatch-4.2.1" = { + name = "minimatch"; + packageName = "minimatch"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz"; + sha512 = "9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g=="; + }; + }; "minimatch-5.0.1" = { name = "minimatch"; packageName = "minimatch"; @@ -44246,15 +44858,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; "minimist-1.2.3" = { name = "minimist"; packageName = "minimist"; @@ -44345,13 +44948,13 @@ let sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; - "minipass-fetch-2.0.2" = { + "minipass-fetch-2.0.3" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.0.2.tgz"; - sha512 = "M63u5yWX0yxY1C3DcLVY1xWai0pNM3qa1xCMXFgdejY5F/NTmyzNVHGcBxKerX51lssqxwWWTjpg/ZPuD39gOQ=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.0.3.tgz"; + sha512 = "VA+eiiUtaIvpQJXISwE3OiMvQwAWrgKb97F0aXlCS1Ahikr8fEQq8m3Hf7Kv9KT3nokuHigJKsDMB6atU04olQ=="; }; }; "minipass-flush-1.0.5" = { @@ -44417,13 +45020,13 @@ let sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; - "mirakurun-3.3.1" = { + "mirakurun-3.9.0-beta.26" = { name = "mirakurun"; packageName = "mirakurun"; - version = "3.3.1"; + version = "3.9.0-beta.26"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.1.tgz"; - sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.9.0-beta.26.tgz"; + sha512 = "w1yetqCebn8G4RRBnPEWLiVeLCOL1r/6t6E/81REOjF27yasxOo8duydpzd2aYWHsMDNr/+yc0xqlRdA64X6Tw=="; }; }; "mired-0.0.0" = { @@ -44462,15 +45065,6 @@ let sha1 = "53d500266cbd09cda9d94c4cf392e60589b5b324"; }; }; - "mithril-2.0.4" = { - name = "mithril"; - packageName = "mithril"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mithril/-/mithril-2.0.4.tgz"; - sha512 = "mgw+DMZlhMS4PpprF6dl7ZoeZq5GGcAuWnrg5e12MvaGauc4jzWsDZtVGRCktsiQczOEUr2K5teKbE5k44RlOg=="; - }; - }; "mitt-1.2.0" = { name = "mitt"; packageName = "mitt"; @@ -44606,13 +45200,13 @@ let sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; - "mocha-9.2.1" = { + "mocha-9.2.2" = { name = "mocha"; packageName = "mocha"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz"; - sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz"; + sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="; }; }; "mock-require-3.0.3" = { @@ -44714,6 +45308,24 @@ let sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; }; }; + "mongodb-4.4.1" = { + name = "mongodb"; + packageName = "mongodb"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.4.1.tgz"; + sha512 = "IAD3nFtCR4s22vi5qjqkCBnuyDDrOW8WVSSmgHquOvGaP1iTD+XpC5tr8wAUbZ2EeZkaswwBKQFHDvl4qYcKqQ=="; + }; + }; + "mongodb-connection-string-url-2.5.2" = { + name = "mongodb-connection-string-url"; + packageName = "mongodb-connection-string-url"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.2.tgz"; + sha512 = "tWDyIG8cQlI5k3skB6ywaEA5F9f5OntrKKsT/Lteub2zgwSUlhqEN2inGgBTm8bpYJf8QYBdA/5naz65XDpczA=="; + }; + }; "moniker-0.1.2" = { name = "moniker"; packageName = "moniker"; @@ -44831,6 +45443,15 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; + "mpegts.js-1.6.10" = { + name = "mpegts.js"; + packageName = "mpegts.js"; + version = "1.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/mpegts.js/-/mpegts.js-1.6.10.tgz"; + sha512 = "ZgX4b93cWk+EazOFRV4lekLqmc4rV7P+WMisG8N0F2M4/EiluPMNNWjuaurQfitak++AIc/ZVQ3IgM3cBcH7WA=="; + }; + }; "mqtt-4.3.5" = { name = "mqtt"; packageName = "mqtt"; @@ -44966,13 +45587,13 @@ let sha512 = "fxdRfQUxPrL/TizyfYfMn09dK58e+d65bRD/fcaVH4052vj30QOzzqxcQIS7B0NsqlypEQ/6Du3QmP2DhWFfCA=="; }; }; - "multer-1.4.2" = { + "multer-1.4.3" = { name = "multer"; packageName = "multer"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.4.2.tgz"; - sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; + url = "https://registry.npmjs.org/multer/-/multer-1.4.3.tgz"; + sha512 = "np0YLKncuZoTzufbkM6wEKp68EhWJXcU6fq6QqrSwkckd2LlMgd1UqhUJLj6NS/5sZ8dE8LYDWslsltJznnXlg=="; }; }; "multer-1.4.4" = { @@ -45146,15 +45767,6 @@ let sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; }; - "munin-plugin-0.0.9" = { - name = "munin-plugin"; - packageName = "munin-plugin"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/munin-plugin/-/munin-plugin-0.0.9.tgz"; - sha1 = "ca17e1eafb3b9155b5e4c21062210e348a9dbe91"; - }; - }; "murmurhash-js-1.0.0" = { name = "murmurhash-js"; packageName = "murmurhash-js"; @@ -45461,15 +46073,6 @@ let sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; - "nanoid-3.2.0" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"; - sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; - }; - }; "nanoid-3.3.1" = { name = "nanoid"; packageName = "nanoid"; @@ -45713,13 +46316,13 @@ let sha512 = "SIrthcL5Wc0sps+2e1xGj3zceEa68TgNZDLuCx0daxmfTP7sFTB3/mtE2pYhlFsCxWoMn+JfID5E1NlzvvbRJg=="; }; }; - "near-ledger-js-0.2.0" = { + "near-ledger-js-0.2.1" = { name = "near-ledger-js"; packageName = "near-ledger-js"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/near-ledger-js/-/near-ledger-js-0.2.0.tgz"; - sha512 = "6YcK7o+GcsUoGevjVqDotVZE3hvCcr9cRxFx/+PyR7JrDbzbVhavXQInqJxdZnqYC7K/dh/YZKhwhtXHXEF1iQ=="; + url = "https://registry.npmjs.org/near-ledger-js/-/near-ledger-js-0.2.1.tgz"; + sha512 = "8anZb6e96gJNBOKUR/HReLN/x8BmBhCpyPq+XxFbx8jxmsRz+M1Hxq085+ROYaMI2EDJqatrjjLAdArk13BOhA=="; }; }; "near-seed-phrase-0.2.0" = { @@ -45993,15 +46596,6 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "next-tick-1.0.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; - }; - }; "next-tick-1.1.0" = { name = "next-tick"; packageName = "next-tick"; @@ -46326,15 +46920,6 @@ let sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; - "node-fetch-1.6.3" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz"; - sha1 = "dc234edd6489982d58e8f0db4f695029abcd8c04"; - }; - }; "node-fetch-1.7.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -46371,13 +46956,13 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-fetch-3.2.2" = { + "node-fetch-3.2.3" = { name = "node-fetch"; packageName = "node-fetch"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.2.tgz"; - sha512 = "Cwhq1JFIoon15wcIkFzubVNFE5GvXGV82pKf4knXXjvGmn7RJKcypeuqcVNZMGDZsAFWyIRya/anwAJr7TWJ7w=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.3.tgz"; + sha512 = "AXP18u4pidSZ1xYXRDPY/8jdv3RAozIt/WLNR/MBGZAz+xjtlr90RvCnsvHQRiXyWliZF/CpytExp32UU67/SA=="; }; }; "node-fetch-h2-2.3.0" = { @@ -46974,6 +47559,15 @@ let sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; }; }; + "normalize-path-1.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz"; + sha1 = "32d0e472f91ff345701c15a8311018d3b0a90379"; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -47460,6 +48054,15 @@ let sha512 = "A8A8+PtlH937KWXJnfct6ubGPfgHOe3lwFkkmrT5xW8+aRBnDWqSiW5NRuiVuh/k/auLGsZdu+WrIU2epL/FHg=="; }; }; + "null-loader-4.0.1" = { + name = "null-loader"; + packageName = "null-loader"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/null-loader/-/null-loader-4.0.1.tgz"; + sha512 = "pxqVbi4U6N26lq+LmgIbB5XATP0VdZKOG25DhHi8btMmJJefGArFyDg1yc4U3hWCJbMqSrw0qyrz1UQX+qYXqg=="; + }; + }; "nullthrows-1.1.1" = { name = "nullthrows"; packageName = "nullthrows"; @@ -47983,15 +48586,6 @@ let sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; }; }; - "office-ui-fabric-react-7.183.1" = { - name = "office-ui-fabric-react"; - packageName = "office-ui-fabric-react"; - version = "7.183.1"; - src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.183.1.tgz"; - sha512 = "2C0fmVPYi7kuMa0e+0Cw37C5SxOb4I//e5zwoBgOPagODYO/yhxZAxOt6VTOkn1Nr3zTZeYAfN7mjUNrjfyvFA=="; - }; - }; "omggif-1.0.10" = { name = "omggif"; packageName = "omggif"; @@ -48172,13 +48766,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.54.0" = { + "oo-ascii-tree-1.55.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.54.0.tgz"; - sha512 = "EAk5I5GHidk2lvqwcfR1bl/EeK1Pns8BMzzFKle6clapov3LX54l3k70VGHQDLsHo42dy9UJe23mJPVpg9iTcg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.55.0.tgz"; + sha512 = "oC+v1W4giMwOU19ZZmT89culEvqRlpGxoKAPirk4URHdOEWROSJy+xbuemiKRxrQwbmLMqgZw0Uq2PkiaBmtDw=="; }; }; "open-0.0.2" = { @@ -48244,112 +48838,112 @@ let sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; }; }; - "openapi-default-setter-2.1.0" = { + "openapi-default-setter-8.0.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "2.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-2.1.0.tgz"; - sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz"; + sha512 = "Ro0hg8w+lTPe18r5noVUjHgYMXZ3mPe5evW6fA0hdahqLns444wR/Cuvcykb/FHteqaq0WooQrsoKObO4lIHWA=="; }; }; - "openapi-default-setter-7.2.3" = { + "openapi-default-setter-9.3.1" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.2.3.tgz"; - sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-9.3.1.tgz"; + sha512 = "Tc/qpL7H2urJAilmb1wLqHJ8BjjJYudodRFl3RbTkWPSzwalZwPEo4VRP6WnEGvaRgkzLFaT62XgTHRGT8G9lw=="; }; }; - "openapi-framework-0.26.0" = { + "openapi-framework-8.0.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "0.26.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-0.26.0.tgz"; - sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-8.0.0.tgz"; + sha512 = "T9rP8onTa5xU+7+FCiiBO/p0DLjbHlcfhu+8yUEWFlmlCyihqjbsH0YiH7cCQYNOLgKZUCQZOaxJDiYBlVIaQQ=="; }; }; - "openapi-framework-7.5.0" = { + "openapi-framework-9.3.1" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.5.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.5.0.tgz"; - sha512 = "t+sGVNMs2apX6d/rf5oq/3S6tCyBTgCjgFY0EDEIKKWepO4v3wM+kjy/Ve9iU92Ui5GeWbGR6ceFKY6VP/OKfQ=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-9.3.1.tgz"; + sha512 = "cnDQQSHNhwS4jn5IE1gTO4mMTolbPbMf3EzVCMNmEcN09IKGQYmtiVSxxL+uGFiHHlpPfOTSsWrvTCiwbhRtyA=="; }; }; - "openapi-jsonschema-parameters-1.2.0" = { + "openapi-jsonschema-parameters-8.0.0" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "1.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-1.2.0.tgz"; - sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz"; + sha512 = "yBBShgxPyo1M33q6RHNAvhTH6AydMDyDl7e89YUA/VkAf1wrU2HO/7Nok65R0vGbZFF43yml4i8sIak3GGnqVA=="; }; }; - "openapi-jsonschema-parameters-7.2.3" = { + "openapi-jsonschema-parameters-9.3.1" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.2.3.tgz"; - sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-9.3.1.tgz"; + sha512 = "WeP/7nh4VAZFhtf5+FbA2HQQPD/a13+xf8uCd3QqpynSzBmcdkstb/kg8Uk4Hmqh5WlNkTGpxnjMxqSw6sHcWw=="; }; }; - "openapi-request-coercer-2.4.0" = { + "openapi-request-coercer-8.0.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "2.4.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-2.4.0.tgz"; - sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz"; + sha512 = "CTWZJT6rAPiLO7kvBpN9CJ7TXbCTlZzE7Z/Id/gegK/5FlxYIoB+ybx4tYC4IwJEjfm/lxY7Xv2CRp6RLJfKPw=="; }; }; - "openapi-request-coercer-7.5.0" = { + "openapi-request-coercer-9.3.1" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "7.5.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.5.0.tgz"; - sha512 = "wvrh3xSEpmgKaHiAnVhPxL6Yp9IXW+NEI192z6X5RiU6xe+jszn6A3v8vJcceyNsvDBA4tkm4I3mFndDlhc6Zw=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-9.3.1.tgz"; + sha512 = "4rIT/3H5k/zVSXSbxnLQvmHw4BXyCv4ocPjweybDxlVN6ryk+eIaMWiJzFoOf7RI86w++742HOECyzaLoBHftQ=="; }; }; - "openapi-request-validator-4.2.0" = { + "openapi-request-validator-8.0.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "4.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-4.2.0.tgz"; - sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz"; + sha512 = "7gqNp4MvYu+pbdbq8Pw0qMsKqlhWQeYdKCHiu1OeOgBG8YkjlNGGeTuX028TsBEB/jGw7PgMCggaHuMl/W3bmQ=="; }; }; - "openapi-request-validator-7.4.0" = { + "openapi-request-validator-9.3.1" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "7.4.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.4.0.tgz"; - sha512 = "0rnslY82Btw5nM6rUEuXkvupav4ujvP+e9WziZvcMrE+VZ6IxRGDP8F7w0XmtPBwMS2nJGgt/J7BnRXAFTx5tw=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-9.3.1.tgz"; + sha512 = "YhX942jTNWH3V/C+ysYcgchyjulT5ZJ1l0c9++isSnF0SKyEiIA+uUiSyAE+pKTc+Oel3ad8mXiy6rFFHoIKaQ=="; }; }; - "openapi-response-validator-4.0.0" = { + "openapi-response-validator-8.0.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "4.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-4.0.0.tgz"; - sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz"; + sha512 = "h41hcEIgT7ldowLafcWlaE2m3+ss9IgRRrBfEzTtdBab2SyefYeXBV5keicL/muC1msmhT2p2rftjQnvfQN2jA=="; }; }; - "openapi-response-validator-7.4.0" = { + "openapi-response-validator-9.3.1" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "7.4.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.4.0.tgz"; - sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-9.3.1.tgz"; + sha512 = "2AOzHAbrwdj5DNL3u+BadhfmL3mlc3mmCv6cSAsEjoMncpOOVd95JyMf0j0XUyJigJ8/ILxnhETfg35vt1pGSQ=="; }; }; "openapi-sampler-1.2.1" = { @@ -48361,40 +48955,40 @@ let sha512 = "mHrYmyvcLD0qrfqPkPRBAL2z16hGT2rW0d0B7nklfoTcc3pmkJLkSZlKSeFgerUM41E5c7jlxf0Y19xrM7mWQQ=="; }; }; - "openapi-schema-validator-3.0.3" = { + "openapi-schema-validator-8.0.0" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "3.0.3"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-3.0.3.tgz"; - sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz"; + sha512 = "cxacCVE/pIhlfzDPjhMREEVgWsFFUxU/+bKU258LKDmgXcdbbajtWtRT63VarXPnQ0sS4Bhl3V4ZKWxdJMiOXA=="; }; }; - "openapi-schema-validator-7.2.3" = { + "openapi-schema-validator-9.3.1" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.2.3.tgz"; - sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-9.3.1.tgz"; + sha512 = "5wpFKMoEbUcjiqo16jIen3Cb2+oApSnYZpWn8WQdRO2q/dNQZZl8Pz6ESwCriiyU5AK4i5ZI6+7O3bHQr6+6+g=="; }; }; - "openapi-security-handler-2.0.4" = { + "openapi-security-handler-8.0.0" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "2.0.4"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-2.0.4.tgz"; - sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz"; + sha512 = "XWD15AQSZA3OQFS1gqupC9KoxOuUacyG8PUEna91sihPvZdO5lVcAfqHkJ1tqOKcn5k8Y8EsSoCwlr0d5njCaw=="; }; }; - "openapi-security-handler-7.2.3" = { + "openapi-security-handler-9.3.1" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.2.3.tgz"; - sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-9.3.1.tgz"; + sha512 = "q9rzMCwo3hia/56eBVkCUURQXZBlP/2DzplVd9Gvi3fgCXrgjnp+eY0W9EcmTJU5unb8rOuMExKsEI2cdEziVg=="; }; }; "openapi-to-graphql-2.2.5" = { @@ -48406,33 +49000,6 @@ let sha512 = "HlCCs/D7wMtraNZVYR8fgqv2Fr4afWgWKVf38uwwMEdhTuVHadn+1ILYfmZV6AdejFw7ViQpjNGVRcdrN2wzFg=="; }; }; - "openapi-types-1.3.4" = { - name = "openapi-types"; - packageName = "openapi-types"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.4.tgz"; - sha512 = "h8rADpW3k/wepLdERKF0VKMAPdoFYNQCLGPmc/f8sgQ2dxUy+7sY4WAX2XDUDjhKTjbJVbxxofLkzy7f1/tE4g=="; - }; - }; - "openapi-types-1.3.5" = { - name = "openapi-types"; - packageName = "openapi-types"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz"; - sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="; - }; - }; - "openapi-types-7.0.1" = { - name = "openapi-types"; - packageName = "openapi-types"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.1.tgz"; - sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A=="; - }; - }; "openapi-types-7.2.3" = { name = "openapi-types"; packageName = "openapi-types"; @@ -48442,6 +49009,33 @@ let sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; }; }; + "openapi-types-8.0.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-8.0.0.tgz"; + sha512 = "dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g=="; + }; + }; + "openapi-types-9.3.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "9.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.0.tgz"; + sha512 = "sR23YjmuwDSMsQVZDHbV9mPgi0RyniQlqR0AQxTC2/F3cpSjRFMH3CFPjoWvNqhC4OxPkDYNb2l8Mc1Me6D/KQ=="; + }; + }; + "openapi-types-9.3.1" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "9.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.1.tgz"; + sha512 = "/Yvsd2D7miYB4HLJ3hOOS0+vnowQpaT75FsHzr/y5M9P4q9bwa7RcbW2YdH6KZBn8ceLbKGnHxMZ1CHliGHUFw=="; + }; + }; "openapi3-ts-2.0.2" = { name = "openapi3-ts"; packageName = "openapi3-ts"; @@ -48451,15 +49045,6 @@ let sha512 = "TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw=="; }; }; - "opencollective-1.0.3" = { - name = "opencollective"; - packageName = "opencollective"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz"; - sha1 = "aee6372bc28144583690c3ca8daecfc120dd0ef1"; - }; - }; "opencollective-postinstall-2.0.3" = { name = "opencollective-postinstall"; packageName = "opencollective-postinstall"; @@ -48523,15 +49108,6 @@ let sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a"; }; }; - "opn-4.0.2" = { - name = "opn"; - packageName = "opn"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"; - sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; - }; - }; "opn-5.3.0" = { name = "opn"; packageName = "opn"; @@ -49468,15 +50044,6 @@ let sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; - "packet-reader-1.0.0" = { - name = "packet-reader"; - packageName = "packet-reader"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; - sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; - }; - }; "packet-stream-2.0.6" = { name = "packet-stream"; packageName = "packet-stream"; @@ -49549,6 +50116,15 @@ let sha512 = "byws4+Ap+z8n/lLoZ8miW0WqaYkH/3DMmggdPmfrbYLLmSGkJEBYDnUMICX6941h1/j5KN6EC7l/MTSKaWg7/g=="; }; }; + "paid-services-3.12.2" = { + name = "paid-services"; + packageName = "paid-services"; + version = "3.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.12.2.tgz"; + sha512 = "1Eg1uF7Jil8w2S8Fx1vFnqhDrN4DznNunZMah3LKynsaQGDmYmBX4ryyQZshoXv8gAQ8YaqFSTdw+wipsym3lQ=="; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -49630,6 +50206,15 @@ let sha512 = "uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg=="; }; }; + "parent-require-1.0.0" = { + name = "parent-require"; + packageName = "parent-require"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz"; + sha1 = "746a167638083a860b0eef6732cb27ed46c32977"; + }; + }; "parents-1.0.1" = { name = "parents"; packageName = "parents"; @@ -50656,69 +51241,6 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.3.3" = { - name = "pg"; - packageName = "pg"; - version = "8.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.3.3.tgz"; - sha512 = "wmUyoQM/Xzmo62wgOdQAn5tl7u+IA1ZYK7qbuppi+3E+Gj4hlUxVHjInulieWrd0SfHi/ADriTb5ILJ/lsJrSg=="; - }; - }; - "pg-connection-string-2.5.0" = { - name = "pg-connection-string"; - packageName = "pg-connection-string"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; - sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; - }; - }; - "pg-int8-1.0.1" = { - name = "pg-int8"; - packageName = "pg-int8"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; - sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; - }; - }; - "pg-pool-3.5.1" = { - name = "pg-pool"; - packageName = "pg-pool"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz"; - sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; - }; - }; - "pg-protocol-1.5.0" = { - name = "pg-protocol"; - packageName = "pg-protocol"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; - }; - }; - "pg-types-2.2.0" = { - name = "pg-types"; - packageName = "pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; - }; - }; - "pgpass-1.0.5" = { - name = "pgpass"; - packageName = "pgpass"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz"; - sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; - }; - }; "phin-2.9.3" = { name = "phin"; packageName = "phin"; @@ -50980,6 +51502,15 @@ let sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; }; }; + "pkg-dir-1.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz"; + sha1 = "7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"; + }; + }; "pkg-dir-3.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -51494,13 +52025,13 @@ let sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; }; }; - "postcss-discard-comments-5.1.0" = { + "postcss-discard-comments-5.1.1" = { name = "postcss-discard-comments"; packageName = "postcss-discard-comments"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.0.tgz"; - sha512 = "L0IKF4jAshRyn03SkEO6ar/Ipz2oLywVbg2THf2EqqdNkBwmVMxuTR/RoAltOw4piiaLt3gCAdrbAqmTBInmhg=="; + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz"; + sha512 = "5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ=="; }; }; "postcss-discard-duplicates-4.0.2" = { @@ -51530,13 +52061,13 @@ let sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; }; }; - "postcss-discard-empty-5.1.0" = { + "postcss-discard-empty-5.1.1" = { name = "postcss-discard-empty"; packageName = "postcss-discard-empty"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.0.tgz"; - sha512 = "782T/buGgb3HOuHOJAHpdyKzAAKsv/BxWqsutnZ+QsiHEcDkY7v+6WWdturuBiSal6XMOO1p1aJvwXdqLD5vhA=="; + url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"; + sha512 = "zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="; }; }; "postcss-discard-overridden-4.0.1" = { @@ -51638,13 +52169,13 @@ let sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; }; }; - "postcss-merge-longhand-5.1.0" = { + "postcss-merge-longhand-5.1.1" = { name = "postcss-merge-longhand"; packageName = "postcss-merge-longhand"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.0.tgz"; - sha512 = "Gr46srN2tsLD8fudKYoHO56RG0BLQ2nsBRnSZGY04eNBPwTeWa9KeHrbL3tOLAHyB2aliikycPH2TMJG1U+W6g=="; + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.1.tgz"; + sha512 = "JLtqAY1LvxiD2aej6hcAk/TkXvEPM+Gs1aOkOIZub2MDEiB5NMtpMe/Ir2seIMMM245bsuHggzIhQBv6qFBm4A=="; }; }; "postcss-merge-rules-4.0.3" = { @@ -51710,13 +52241,13 @@ let sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; }; }; - "postcss-minify-params-5.1.0" = { + "postcss-minify-params-5.1.1" = { name = "postcss-minify-params"; packageName = "postcss-minify-params"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.0.tgz"; - sha512 = "q67dcts4Hct6x8+JmhBgctHkbvUsqGIg2IItenjE63iZXMbhjr7AlVZkNnKtIGt/1Wsv7p/7YzeSII6Q+KPXRg=="; + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.1.tgz"; + sha512 = "WCpr+J9Uz8XzMpAfg3UL8z5rde6MifBbh5L8bn8S2F5hq/YDJJzASYCnCHvAB4Fqb94ys8v95ULQkW2EhCFvNg=="; }; }; "postcss-minify-selectors-4.0.2" = { @@ -51989,13 +52520,13 @@ let sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; }; }; - "postcss-normalize-whitespace-5.1.0" = { + "postcss-normalize-whitespace-5.1.1" = { name = "postcss-normalize-whitespace"; packageName = "postcss-normalize-whitespace"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.0.tgz"; - sha512 = "7O1FanKaJkpWFyCghFzIkLhehujV/frGkdofGLwhg5upbLyGsSfiTcZAdSzoPsSUgyPCkBkNMeWR8yVgPdQybg=="; + url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"; + sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; }; }; "postcss-ordered-values-4.1.2" = { @@ -52169,13 +52700,13 @@ let sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; }; }; - "postcss-unique-selectors-5.1.0" = { + "postcss-unique-selectors-5.1.1" = { name = "postcss-unique-selectors"; packageName = "postcss-unique-selectors"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.0.tgz"; - sha512 = "LmUhgGobtpeVJJHuogzjLRwJlN7VH+BL5c9GKMVJSS/ejoyePZkXvNsYUtk//F6vKOGK86gfRS0xH7fXQSDtvA=="; + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"; + sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; }; }; "postcss-value-parser-3.3.1" = { @@ -52196,42 +52727,6 @@ let sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; }; }; - "postgres-array-2.0.0" = { - name = "postgres-array"; - packageName = "postgres-array"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; - sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; - }; - }; - "postgres-bytea-1.0.0" = { - name = "postgres-bytea"; - packageName = "postgres-bytea"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; - }; - }; - "postgres-date-1.0.7" = { - name = "postgres-date"; - packageName = "postgres-date"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; - sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; - }; - }; - "postgres-interval-1.2.0" = { - name = "postgres-interval"; - packageName = "postgres-interval"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; - }; - }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -52700,6 +53195,15 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; + "prettier-2.4.1" = { + name = "prettier"; + packageName = "prettier"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz"; + sha512 = "9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="; + }; + }; "prettier-2.5.1" = { name = "prettier"; packageName = "prettier"; @@ -52727,6 +53231,15 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; + "prettier-linter-helpers-1.0.0" = { + name = "prettier-linter-helpers"; + packageName = "prettier-linter-helpers"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; + }; + }; "prettier-plugin-svelte-2.6.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; @@ -54446,22 +54959,13 @@ let sha512 = "2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w=="; }; }; - "puppeteer-13.4.1" = { + "puppeteer-13.5.1" = { name = "puppeteer"; packageName = "puppeteer"; - version = "13.4.1"; + version = "13.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.4.1.tgz"; - sha512 = "2arcYPEGvLV9HvOw01Zv1b1IAXrMWHqsFJn0Hn00qe9HtCmaF0b8FlrbdLjCIbkaFc6icH5+GqcG8R5KxlJSRg=="; - }; - }; - "puppeteer-13.5.0" = { - name = "puppeteer"; - packageName = "puppeteer"; - version = "13.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.5.0.tgz"; - sha512 = "raPr2YZ3RZLboGwt7jJgusJTBRDaVEUiPOSOWWFLV1oj07xqT5UqqbjmNXFXlMlkhF/NwmcEInW64VhvyllVdw=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.5.1.tgz"; + sha512 = "wWxO//vMiqxlvuzHMAJ0pRJeDHvDtM7DQpW1GKdStz2nZo2G42kOXBDgkmQ+zqjwMCFofKGesBeeKxIkX9BO+w=="; }; }; "purest-3.1.0" = { @@ -54518,13 +55022,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.227" = { + "pyright-1.1.228" = { name = "pyright"; packageName = "pyright"; - version = "1.1.227"; + version = "1.1.228"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.227.tgz"; - sha512 = "/nRQqbTpHraNiUZ0tpQfWYyqOV4nByx/rRHZp+wFjRv6v3Vfg1rIa973y9LsfH/vGkETbZMvRanb8VSlWp9Tlg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.228.tgz"; + sha512 = "Q/LnDoZK6bxc7u60kFjFwi9X3s79kLaGd/g23T0c6T1CUdrRxDyRTvNRLjLPSLaX8EuPIdcXuPXAzXgSjBz/Mw=="; }; }; "q-0.9.7" = { @@ -55391,22 +55895,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.23.0" = { + "react-devtools-core-4.24.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.23.0"; + version = "4.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.23.0.tgz"; - sha512 = "KkzneT1LczFtebbTJlvRphIRvzuHLhI9ghfrseVv9ktBs+l2cXy8Svw5U16lzQnwU9okVEcURmGPgH79WWrlaw=="; - }; - }; - "react-dom-16.14.0" = { - name = "react-dom"; - packageName = "react-dom"; - version = "16.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz"; - sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.0.tgz"; + sha512 = "Rw7FzYOOzcfyUPaAm9P3g0tFdGqGq2LLiAI+wjYcp6CsF3DeeMrRS3HZAho4s273C29G/DJhx0e8BpRE/QZNGg=="; }; }; "react-dom-17.0.2" = { @@ -55706,13 +56201,13 @@ let sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; }; }; - "read-package-json-4.1.1" = { + "read-package-json-4.1.2" = { name = "read-package-json"; packageName = "read-package-json"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.1.tgz"; - sha512 = "P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.2.tgz"; + sha512 = "Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ=="; }; }; "read-package-json-fast-2.0.3" = { @@ -56318,15 +56813,6 @@ let sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -58289,6 +58775,15 @@ let sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; }; + "roboto-fontface-0.10.0" = { + name = "roboto-fontface"; + packageName = "roboto-fontface"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz"; + sha512 = "OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="; + }; + }; "robust-predicates-3.0.1" = { name = "robust-predicates"; packageName = "robust-predicates"; @@ -58631,13 +59126,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.5.4" = { + "rxjs-7.5.5" = { name = "rxjs"; packageName = "rxjs"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz"; - sha512 = "h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz"; + sha512 = "sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw=="; }; }; "s3-stream-upload-2.0.2" = { @@ -58829,6 +59324,24 @@ let sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; }; }; + "saslprep-1.0.3" = { + name = "saslprep"; + packageName = "saslprep"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz"; + sha512 = "/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag=="; + }; + }; + "sass-1.32.12" = { + name = "sass"; + packageName = "sass"; + version = "1.32.12"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.32.12.tgz"; + sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; + }; + }; "sass-1.49.9" = { name = "sass"; packageName = "sass"; @@ -58838,6 +59351,15 @@ let sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A=="; }; }; + "sass-loader-10.2.0" = { + name = "sass-loader"; + packageName = "sass-loader"; + version = "10.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz"; + sha512 = "kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw=="; + }; + }; "sax-0.5.8" = { name = "sax"; packageName = "sax"; @@ -58901,15 +59423,6 @@ let sha512 = "agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ=="; }; }; - "scheduler-0.19.1" = { - name = "scheduler"; - packageName = "scheduler"; - version = "0.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz"; - sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; - }; - }; "scheduler-0.20.2" = { name = "scheduler"; packageName = "scheduler"; @@ -58928,6 +59441,15 @@ let sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; + "schema-utils-2.7.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz"; + sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; + }; + }; "schema-utils-2.7.1" = { name = "schema-utils"; packageName = "schema-utils"; @@ -59135,15 +59657,6 @@ let sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; }; }; - "semver-4.3.2" = { - name = "semver"; - packageName = "semver"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz"; - sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; - }; - }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -60467,6 +60980,15 @@ let sha512 = "hLdVp5vqzrEEJSAQKSmURvBVImQj9oVbp7zBP6JLEmSenUGhc6kl9nrSXUj14JHiQcnKF80eRAWPsdUcV6YXFw=="; }; }; + "smoothscroll-polyfill-0.4.4" = { + name = "smoothscroll-polyfill"; + packageName = "smoothscroll-polyfill"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz"; + sha512 = "TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg=="; + }; + }; "snabbdom-0.7.0" = { name = "snabbdom"; packageName = "snabbdom"; @@ -60602,6 +61124,15 @@ let sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; + "socket.io-4.3.1" = { + name = "socket.io"; + packageName = "socket.io"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.3.1.tgz"; + sha512 = "HC5w5Olv2XZ0XJ4gOLGzzHEuOCfj3G0SmoW3jLHYYh34EVsIr3EkW9h6kgfW+K3TFEcmYy8JcPWe//KUkBp5jA=="; + }; + }; "socket.io-4.4.1" = { name = "socket.io"; packageName = "socket.io"; @@ -60683,6 +61214,15 @@ let sha512 = "M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ=="; }; }; + "socket.io-client-4.3.2" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.3.2.tgz"; + sha512 = "2B9LqSunN60yV8F7S84CCEEcgbYNfrn7ejIInZtLZ7ppWtiX8rGZAjvdCvbnC8bqo/9RlCNOUsORLyskxSFP1g=="; + }; + }; "socket.io-parser-2.1.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -60737,6 +61277,15 @@ let sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; }; }; + "socket.io-parser-4.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.1.2.tgz"; + sha512 = "j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog=="; + }; + }; "sockjs-0.3.20" = { name = "sockjs"; packageName = "sockjs"; @@ -61232,6 +61781,15 @@ let sha512 = "0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig=="; }; }; + "spark-md5-3.0.2" = { + name = "spark-md5"; + packageName = "spark-md5"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.2.tgz"; + sha512 = "wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="; + }; + }; "sparkles-1.0.1" = { name = "sparkles"; packageName = "sparkles"; @@ -62060,13 +62618,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.221" = { + "sscaff-1.2.225" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.221"; + version = "1.2.225"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.221.tgz"; - sha512 = "C3t2CkhHcfJEjWmntW6m/hMHqU9MEaTOiPew4qn+ax+JW0sMvK0Oix/6BTUNFQHsh0Xcvg1WU+EGd/nlUshojw=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.225.tgz"; + sha512 = "hpbhRLb5pC9zsEpQgfaAKI+a6/JUIKvEIQ1B2THIMDZZbfUyXZIW5Sn/u1/nhqPbvo2j+aslar8ewqRwI2eWbw=="; }; }; "ssh-config-1.1.6" = { @@ -62744,13 +63302,13 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; - "streamx-2.12.3" = { + "streamx-2.12.4" = { name = "streamx"; packageName = "streamx"; - version = "2.12.3"; + version = "2.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.12.3.tgz"; - sha512 = "im2U3yhz6NoJQzzn6AwBlb+MRuGLxlnXJXqZudQ9RZzsVcq9+MHTPGR5b4Rh23RSLQenqtBaMwemM61w10VcWQ=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.12.4.tgz"; + sha512 = "K3xdIp8YSkvbdI0PrCcP0JkniN8cPCyeKlcZgRFSl1o1xKINCYM93FryvTSOY57x73pz5/AjO5B8b9BYf21wWw=="; }; }; "strftime-0.10.1" = { @@ -64022,13 +64580,22 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.34.0" = { + "swagger-ui-dist-3.52.5" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.34.0"; + version = "3.52.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.34.0.tgz"; - sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.52.5.tgz"; + sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; + }; + }; + "swagger-ui-dist-4.6.2" = { + name = "swagger-ui-dist"; + packageName = "swagger-ui-dist"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.6.2.tgz"; + sha512 = "BSt+ukOGkGZ2uHV4jyyCAzt60ysyQpGZAAhtIh7AMHT4MH1xXGkoXm2tfr1oRqO1N4IEY6qqNAlmcfMo/dAYuw=="; }; }; "swagger2openapi-7.0.8" = { @@ -64166,13 +64733,22 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.11.6" = { + "systeminformation-5.11.7" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.11.6"; + version = "5.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.6.tgz"; - sha512 = "7KBXgdnIDxABQ93w+GrPSrK/pup73+fM09VGka4A/+FhgzdlRY0JNGGDFmV8BHnFuzP9zwlI3n64yDbp7emasQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.7.tgz"; + sha512 = "MI6HtSoBF2e1pTpRGQC8b5X5QDln8mazQTD3KyFFlLGkk7291kQv+mjeriz30TDVTcWEnEfKPxZwHnZBFYnr6w=="; + }; + }; + "systeminformation-5.11.8" = { + name = "systeminformation"; + packageName = "systeminformation"; + version = "5.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.8.tgz"; + sha512 = "u30rM0KwGKiJof44Ak25WeSh9661NU2GshXpHPpv/zGXvvSGI5eALjpVJ3EYnIroceToWzy9+xkuMfjHIx6OiQ=="; }; }; "sywac-1.3.0" = { @@ -64725,15 +65301,6 @@ let sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; }; }; - "terser-webpack-plugin-4.2.2" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.2.tgz"; - sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; - }; - }; "terser-webpack-plugin-5.3.1" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; @@ -64932,6 +65499,15 @@ let sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; }; }; + "thread-loader-2.1.3" = { + name = "thread-loader"; + packageName = "thread-loader"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz"; + sha512 = "wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg=="; + }; + }; "thread-stream-0.13.2" = { name = "thread-stream"; packageName = "thread-stream"; @@ -65049,15 +65625,6 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "through2-3.0.1" = { - name = "through2"; - packageName = "through2"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; - sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; - }; - }; "through2-3.0.2" = { name = "through2"; packageName = "through2"; @@ -66138,13 +66705,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-loader-8.0.4" = { + "ts-loader-6.2.2" = { name = "ts-loader"; packageName = "ts-loader"; - version = "8.0.4"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.4.tgz"; - sha512 = "5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ=="; + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"; + sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; }; }; "ts-loader-8.3.0" = { @@ -66156,6 +66723,15 @@ let sha512 = "MgGly4I6cStsJy27ViE32UoqxPTN9Xly4anxxVyaIWR+9BGxboV4EyJBGfR3RePV7Ksjj3rHmPZJeIt+7o4Vag=="; }; }; + "ts-loader-9.2.6" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "9.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.6.tgz"; + sha512 = "QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw=="; + }; + }; "ts-log-2.2.4" = { name = "ts-log"; packageName = "ts-log"; @@ -66174,6 +66750,15 @@ let sha512 = "WHXLtFDcIRwoqaiu0elAoZ/AmI+SwwDafnPKjgJmdwJ2gRVO0jMKBt88rV2liT/c6MTsXyuWbGFiHe9MRddWJw=="; }; }; + "ts-node-10.4.0" = { + name = "ts-node"; + packageName = "ts-node"; + version = "10.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz"; + sha512 = "g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A=="; + }; + }; "ts-node-10.7.0" = { name = "ts-node"; packageName = "ts-node"; @@ -66795,6 +67380,15 @@ let sha512 = "B2B+wo5gC7VRAqcFEiUCjS6CJ1vmeYZ7uzY3Jsu6UNStHiF+W0vkhZAmQaj5m9sC2KVrpyHGRzGuhz3M6+n/8A=="; }; }; + "typeface-roboto-1.1.13" = { + name = "typeface-roboto"; + packageName = "typeface-roboto"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-1.1.13.tgz"; + sha512 = "YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw=="; + }; + }; "typeforce-1.18.0" = { name = "typeforce"; packageName = "typeforce"; @@ -66813,6 +67407,15 @@ let sha512 = "MdlbWu0HfmgFJf4+xj6eqGYuanV2LJxBYTzLrD0kTV+woQ5dxDD2k8UVVjYnbBGkAagAyxzQevPiFZRWLFHSBw=="; }; }; + "typeorm-0.2.38" = { + name = "typeorm"; + packageName = "typeorm"; + version = "0.2.38"; + src = fetchurl { + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.38.tgz"; + sha512 = "M6Y3KQcAREQcphOVJciywf4mv6+A0I/SeR+lWNjKsjnQ+a3XcMwGYMGL0Jonsx3H0Cqlf/3yYqVki1jIXSK/xg=="; + }; + }; "typescript-2.9.2" = { name = "typescript"; packageName = "typescript"; @@ -66849,15 +67452,6 @@ let sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; }; }; - "typescript-4.0.3" = { - name = "typescript"; - packageName = "typescript"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; - sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; - }; - }; "typescript-4.3.4" = { name = "typescript"; packageName = "typescript"; @@ -66867,6 +67461,15 @@ let sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; }; }; + "typescript-4.4.4" = { + name = "typescript"; + packageName = "typescript"; + version = "4.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"; + sha512 = "DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="; + }; + }; "typescript-4.5.5" = { name = "typescript"; packageName = "typescript"; @@ -67029,13 +67632,13 @@ let sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; }; }; - "uglify-js-3.15.2" = { + "uglify-js-3.15.3" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz"; - sha512 = "peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; }; }; "uglify-js-3.4.10" = { @@ -67371,13 +67974,13 @@ let sha1 = "5e4bda308e4a8a2ae584f9b9a4359a499825cc50"; }; }; - "undici-4.15.0" = { + "undici-4.15.1" = { name = "undici"; packageName = "undici"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-4.15.0.tgz"; - sha512 = "kHppwh/y49FLEXl/zYCCbGB0D3nrcWNBczNYCsDdNYzWPs80aQgfKic1PVkJEIc2YlR7m0Lf5i559zbr0AA7FQ=="; + url = "https://registry.npmjs.org/undici/-/undici-4.15.1.tgz"; + sha512 = "h8LJybhMKD09IyQZoQadNtIR/GmugVhTOVREunJrpV6RStriKBFdSVoFzEzTihwXi/27DIBO+Z0OGF+Mzfi0lA=="; }; }; "unherit-1.1.3" = { @@ -67470,13 +68073,13 @@ let sha1 = "afb10e4ef1eeddc711417bbb652bc885da9d4171"; }; }; - "unified-10.1.1" = { + "unified-10.1.2" = { name = "unified"; packageName = "unified"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-10.1.1.tgz"; - sha512 = "v4ky1+6BN9X3pQrOdkFIPWAaeDsHPE1svRDxq7YpTc2plkIqFMwukfqM+l0ewpP9EfwARlt9pPFAeWYhHm8X9w=="; + url = "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz"; + sha512 = "pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q=="; }; }; "unified-2.1.4" = { @@ -68532,15 +69135,6 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "url-toolkit-2.2.5" = { - name = "url-toolkit"; - packageName = "url-toolkit"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz"; - sha512 = "mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg=="; - }; - }; "url-value-parser-2.1.0" = { name = "url-value-parser"; packageName = "url-value-parser"; @@ -68650,13 +69244,13 @@ let sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb"; }; }; - "utf-8-validate-5.0.8" = { + "utf-8-validate-5.0.9" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "5.0.8"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.8.tgz"; - sha512 = "k4dW/Qja1BYDl2qD4tOMB9PFVha/UJtxTc1cXYOe3WwA/2m0Yn4qB7wLMpJyLJ/7DR0XnTut3HsCSzDT4ZvKgA=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz"; + sha512 = "Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q=="; }; }; "utf7-1.0.2" = { @@ -68956,6 +69550,15 @@ let sha512 = "brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw=="; }; }; + "uws-9.148.0" = { + name = "uws"; + packageName = "uws"; + version = "9.148.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uws/-/uws-9.148.0.tgz"; + sha512 = "vWt+e8dOdwLM4neb1xIeZuQ7ZUN3l7n0qTKrOUtU1EZrV4BpmrSnsEL30d062/ocqRMGtLpwzVFsLKFgXomA9g=="; + }; + }; "v8-compile-cache-2.3.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -69856,15 +70459,6 @@ let sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; }; }; - "vinyl-sourcemaps-apply-0.2.1" = { - name = "vinyl-sourcemaps-apply"; - packageName = "vinyl-sourcemaps-apply"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; - sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; - }; - }; "vizion-2.2.1" = { name = "vizion"; packageName = "vizion"; @@ -70576,6 +71170,24 @@ let sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; + "vue-class-component-7.2.6" = { + name = "vue-class-component"; + packageName = "vue-class-component"; + version = "7.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz"; + sha512 = "+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w=="; + }; + }; + "vue-cli-plugin-vuetify-2.4.3" = { + name = "vue-cli-plugin-vuetify"; + packageName = "vue-cli-plugin-vuetify"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.3.tgz"; + sha512 = "dT9KpH1rXT6UWzBDFLMB69sgrNCoWFcxWiIyDDZ4vikv85JDweMHh2dT5n6QaAt7qsGlvL4IMOopjcyUTiPW9g=="; + }; + }; "vue-codemod-0.0.5" = { name = "vue-codemod"; packageName = "vue-codemod"; @@ -70612,6 +71224,33 @@ let sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; }; }; + "vue-hot-reload-api-2.3.4" = { + name = "vue-hot-reload-api"; + packageName = "vue-hot-reload-api"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"; + sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; + }; + }; + "vue-loader-15.9.8" = { + name = "vue-loader"; + packageName = "vue-loader"; + version = "15.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz"; + sha512 = "GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog=="; + }; + }; + "vue-loader-v16-16.8.3" = { + name = "vue-loader-v16"; + packageName = "vue-loader-v16"; + version = "16.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz"; + sha512 = "7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="; + }; + }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -70621,6 +71260,78 @@ let sha512 = "ikg8ruE17tIXF9mrVvKoOR3oyM9nk0TcmUHyeBWod5ILEH9DRN0+seX4gwsSbjdxMYlIIvmnCFPQeMdlcJqPJQ=="; }; }; + "vue-property-decorator-9.1.2" = { + name = "vue-property-decorator"; + packageName = "vue-property-decorator"; + version = "9.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz"; + sha512 = "xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ=="; + }; + }; + "vue-router-3.5.3" = { + name = "vue-router"; + packageName = "vue-router"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz"; + sha512 = "FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="; + }; + }; + "vue-style-loader-4.1.3" = { + name = "vue-style-loader"; + packageName = "vue-style-loader"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz"; + sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; + }; + }; + "vue-template-compiler-2.6.14" = { + name = "vue-template-compiler"; + packageName = "vue-template-compiler"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"; + sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; + }; + }; + "vue-template-es2015-compiler-1.9.1" = { + name = "vue-template-es2015-compiler"; + packageName = "vue-template-es2015-compiler"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"; + sha512 = "4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="; + }; + }; + "vuetify-2.5.10" = { + name = "vuetify"; + packageName = "vuetify"; + version = "2.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify/-/vuetify-2.5.10.tgz"; + sha512 = "UODZQrib36l7i1WGg0MUvurczLspYTe0nKAmfbwyMs6dC2lG1Q1VV9caqPbCAB9zgG6QIJaOmRQKSKduw9eZTw=="; + }; + }; + "vuetify-datetime-picker-2.1.1" = { + name = "vuetify-datetime-picker"; + packageName = "vuetify-datetime-picker"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify-datetime-picker/-/vuetify-datetime-picker-2.1.1.tgz"; + sha512 = "xY3YCVNxoe/5Chbm7G2BXrkg12CWLWwnDJZdhNPVKe1p8S72H8NomYOB6SSBzMMEHisRGIRzAQTDwDfDU06x/Q=="; + }; + }; + "vuetify-loader-1.7.3" = { + name = "vuetify-loader"; + packageName = "vuetify-loader"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.7.3.tgz"; + sha512 = "1Kt6Rfvuw3i9BBlxC9WTMnU3WEU7IBWQmDX+fYGAVGpzWCX7oHythUIwPCZGShHSYcPMKSDbXTPP8UvT5RNw8Q=="; + }; + }; "vuvuzela-1.0.3" = { name = "vuvuzela"; packageName = "vuvuzela"; @@ -70999,15 +71710,6 @@ let sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; - "webpack-4.44.2" = { - name = "webpack"; - packageName = "webpack"; - version = "4.44.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; - sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; - }; - }; "webpack-4.46.0" = { name = "webpack"; packageName = "webpack"; @@ -71044,6 +71746,15 @@ let sha512 = "Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA=="; }; }; + "webpack-chain-6.5.1" = { + name = "webpack-chain"; + packageName = "webpack-chain"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz"; + sha512 = "7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -71134,6 +71845,15 @@ let sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; + "webpack-merge-4.2.2" = { + name = "webpack-merge"; + packageName = "webpack-merge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; + sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + }; + }; "webpack-merge-5.8.0" = { name = "webpack-merge"; packageName = "webpack-merge"; @@ -71179,15 +71899,6 @@ let sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; }; }; - "webpack-stream-6.1.0" = { - name = "webpack-stream"; - packageName = "webpack-stream"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-6.1.0.tgz"; - sha512 = "kFMnDzFTzyvVmn4ajaj0xEJavvYizd3I/KmQ6C5aUstcAkNwZUidxkk/uEaEPSydaAn66v8ZcP1+bhKSshNJUQ=="; - }; - }; "webrtc-adapter-7.7.1" = { name = "webrtc-adapter"; packageName = "webrtc-adapter"; @@ -71233,13 +71944,22 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.8.5" = { + "webtorrent-1.8.6" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.5.tgz"; - sha512 = "LPiXC/AqHehu0CWTGrmE4IxPSaXY25qe7FQyvBXRfI1w00mf2PkV6g+UeChdGXVJE2uwcFl02UkjNwL+Yjvdlg=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.6.tgz"; + sha512 = "yx/y2O+IeTtkvkkjqTh5tyBjk+C/u8IqE6evOKllLs1kerVzMcbbHQMU7vgU05tThb1vRjbq3FAuU20g+HoEUg=="; + }; + }; + "webworkify-webpack-2.1.5" = { + name = "webworkify-webpack"; + packageName = "webworkify-webpack"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz"; + sha512 = "2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="; }; }; "whatwg-encoding-1.0.5" = { @@ -71296,6 +72016,15 @@ let sha512 = "CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w=="; }; }; + "whatwg-url-11.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz"; + sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; + }; + }; "whatwg-url-5.0.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -72250,13 +72979,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.2.29" = { + "xdl-59.2.30" = { name = "xdl"; packageName = "xdl"; - version = "59.2.29"; + version = "59.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.2.29.tgz"; - sha512 = "qwLdMdv7AR3Tz9rud/Dro2TQFlhZHLN9GIN4+TKKcz9M9mkeoqZAFbDEt+7MyDUKQ644iBpSvShjMdyRA7M+aQ=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.2.30.tgz"; + sha512 = "Id4b3prDMPlW9OuycaeQwXeD/3tAgTmJY0N1blRL5Xr3KXhybXkyCsnvOaFyvQ+luqnmsOUdJQkfzL0JuyIauw=="; }; }; "xenvar-0.5.1" = { @@ -72548,6 +73277,15 @@ let sha512 = "3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="; }; }; + "xmlhttprequest-ssl-2.0.0" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz"; + sha512 = "QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="; + }; + }; "xor-distance-2.0.0" = { name = "xor-distance"; packageName = "xor-distance"; @@ -72800,6 +73538,15 @@ let sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; }; }; + "yargonaut-1.1.4" = { + name = "yargonaut"; + packageName = "yargonaut"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz"; + sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA=="; + }; + }; "yargs-1.3.3" = { name = "yargs"; packageName = "yargs"; @@ -73250,6 +73997,15 @@ let sha512 = "YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g=="; }; }; + "yorkie-2.0.0" = { + name = "yorkie"; + packageName = "yorkie"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz"; + sha512 = "jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw=="; + }; + }; "yosay-2.0.2" = { name = "yosay"; packageName = "yosay"; @@ -73295,6 +74051,15 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; + "zen-observable-ts-1.2.3" = { + name = "zen-observable-ts"; + packageName = "zen-observable-ts"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.3.tgz"; + sha512 = "hc/TGiPkAWpByykMwDcem3SdUgA4We+0Qb36bItSuJC9xD0XVBZoFHYoadAomDSNf64CG8Ydj0Qb8Od8BUWz5g=="; + }; + }; "zeromq-5.2.8" = { name = "zeromq"; packageName = "zeromq"; @@ -73391,15 +74156,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "13.2.5"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-13.2.5.tgz"; - sha512 = "S1uuScNCue6K7HpSG707/N+ULy+utrByeYLjx8zIwIOW1/ZjLB+1/Dxem3bu/OSLY2j2R7bX1WHw8Mnljnk4QQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.2.6.tgz"; + sha512 = "xIjEaQI5sWemXXc7GXLm4u9UL5sjtrQL/y1PJvvk/Jsa8+kIT+MutOfZfC7zcdAh9fqHd8mokH3guFV8BJdFxA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1302.5" - sources."@angular-devkit/core-13.2.5" - sources."@angular-devkit/schematics-13.2.5" + sources."@angular-devkit/architect-0.1302.6" + sources."@angular-devkit/core-13.2.6" + sources."@angular-devkit/schematics-13.2.6" sources."@gar/promisify-1.1.3" sources."@npmcli/fs-1.1.1" sources."@npmcli/git-2.1.0" @@ -73408,7 +74173,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.2.5" + sources."@schematics/angular-13.2.6" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -73464,7 +74229,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.2" + sources."gauge-4.0.3" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" @@ -73486,7 +74251,7 @@ in sources."ini-2.0.0" (sources."inquirer-8.2.0" // { dependencies = [ - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."tslib-2.3.1" ]; }) @@ -73534,10 +74299,10 @@ in dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.4.1" - (sources."make-fetch-happen-10.0.4" // { + sources."lru-cache-7.4.4" + (sources."make-fetch-happen-10.0.5" // { dependencies = [ - sources."minipass-fetch-2.0.2" + sources."minipass-fetch-2.0.3" ]; }) ]; @@ -73923,7 +74688,7 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."type-fest-1.4.0" - sources."uglify-js-3.15.2" + sources."uglify-js-3.15.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unxhr-1.0.1" @@ -73963,12 +74728,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.9.1"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.9.1.tgz"; - sha512 = "Nf35GAmPafcmqiI51PYNa/0Sh82GdCXGrL0jPtBopRQi+TsJJE/kbBB1rqpa082w4YLv2otpaE5apiYUOI8VYg=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.11.0.tgz"; + sha512 = "rDpbvfhjM1BF2r1U64A2TLxUTrvdT9yKunjzhDDDoR4b5OBgyclhCvbdbWuq7wR3RCOl+P6bI+TGdYDwYnNd1g=="; }; dependencies = [ + sources."@astrojs/svelte-language-integration-0.1.1" sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" @@ -73986,6 +74752,7 @@ in sources."braces-3.0.2" sources."code-block-writer-10.1.1" sources."concat-map-0.0.1" + sources."dedent-js-1.0.1" sources."emmet-2.3.6" sources."fast-glob-3.2.11" sources."fastq-1.13.0" @@ -73996,18 +74763,24 @@ in sources."is-number-7.0.0" sources."jsonc-parser-2.3.1" sources."lodash-4.17.21" + sources."lower-case-2.0.2" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."minimatch-3.1.2" sources."mkdirp-1.0.4" + sources."no-case-3.0.4" + sources."pascal-case-3.1.2" sources."path-browserify-1.0.1" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-0.7.3" + sources."svelte-3.46.4" + sources."svelte2tsx-0.5.5" sources."to-regex-range-5.0.1" sources."ts-morph-12.2.0" + sources."tslib-2.3.1" sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" (sources."vscode-html-languageservice-3.2.0" // { @@ -74646,7 +75419,7 @@ in sources."ieee754-1.2.1" sources."indent-string-4.0.0" sources."inherits-2.0.4" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" (sources."inquirer-autocomplete-prompt-ipt-2.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -74686,7 +75459,7 @@ in sources."lodash-4.17.21" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."loud-rejection-2.2.0" @@ -74767,7 +75540,7 @@ in sources."restore-cursor-3.1.0" sources."router-ips-1.0.0" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -75110,7 +75883,7 @@ in sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.12.3" + sources."streamx-2.12.4" (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -76034,7 +76807,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uc.micro-1.0.6" - sources."uglify-js-3.15.2" + sources."uglify-js-3.15.3" sources."underscore-1.13.2" sources."union-value-1.0.1" (sources."universal-url-2.0.0" // { @@ -76233,7 +77006,7 @@ in dependencies = [ sources."chalk-4.1.2" sources."inquirer-8.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."tslib-2.3.1" ]; }) @@ -76249,12 +77022,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-8.0.7" // { - dependencies = [ - sources."@angular-devkit/core-13.2.4" - sources."@angular-devkit/schematics-13.2.4" - ]; - }) + sources."@nestjs/schematics-8.0.8" sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.50" @@ -76299,7 +77067,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -76318,7 +77086,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.81" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.9.2" @@ -76614,7 +77382,7 @@ in sha512 = "KzWugryEBFkmoaYcBE18rs6gthWCFHHO7cAZm2/hv3hwD67AzwP7udSCa22E7R1+CEJL/FfhYsJWrc0b1aeSzw=="; }; dependencies = [ - sources."mini-svg-data-uri-1.4.3" + sources."mini-svg-data-uri-1.4.4" ]; buildInputs = globalBuildInputs; meta = { @@ -76710,7 +77478,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1087.0" // { + (sources."aws-sdk-2.1091.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -77318,7 +78086,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -77439,7 +78207,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.81" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -77624,7 +78392,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."internal-slot-1.0.3" sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" @@ -77899,7 +78667,7 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -78745,7 +79513,7 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-3.0.0" - (sources."unified-10.1.1" // { + (sources."unified-10.1.2" // { dependencies = [ sources."is-plain-obj-4.0.0" ]; @@ -78881,7 +79649,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.20.0" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -78891,7 +79659,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.3" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -79262,8 +80030,8 @@ in }; dependencies = [ sources."browserslist-4.20.0" - sources."caniuse-lite-1.0.30001313" - sources."electron-to-chromium-1.4.76" + sources."caniuse-lite-1.0.30001314" + sources."electron-to-chromium-1.4.82" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."node-releases-2.0.2" @@ -79298,7 +80066,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1087.0" // { + (sources."aws-sdk-2.1091.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -79383,7 +80151,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."ip-1.1.5" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -79438,7 +80206,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -79916,10 +80684,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.57.0"; + version = "11.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.57.0.tgz"; - sha512 = "uL32sXEpka9XF0l8u5xTeGLUhAUE1UySX3myN//c9YibcVhLHJG/ZYAY3wYZQZ+15bI61giduMCwB1Kv/XmAGw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.57.1.tgz"; + sha512 = "4VZ0wtEhVxobxcQuXnnWMKWp+lFCaYNwy24gLx38Jm634/ry3vQ1V5T2Y2OIrA0ea6h6CanL7mryjZRmaLwiqw=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.0" // { @@ -80179,7 +80947,7 @@ in sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" @@ -80374,10 +81142,13 @@ in sources."raw-body-2.4.2" ]; }) + sources."paid-services-3.12.1" sources."qs-6.9.7" sources."raw-body-2.4.3" sources."safe-buffer-5.2.1" + sources."tiny-secp256k1-2.2.1" sources."type-fest-2.11.2" + sources."uint8array-tools-0.0.7" sources."ws-8.5.0" ]; }) @@ -80462,52 +81233,10 @@ in sources."semver-6.3.0" ]; }) - (sources."paid-services-3.12.1" // { + (sources."paid-services-3.12.2" // { dependencies = [ - sources."@grpc/grpc-js-1.5.5" - sources."@types/node-17.0.18" - sources."body-parser-1.19.2" - sources."bolt09-0.2.2" - sources."bytes-3.1.2" - sources."cookie-0.4.2" - sources."express-4.17.3" - (sources."lightning-5.8.1" // { - dependencies = [ - sources."bytes-3.1.1" - sources."cookie-0.4.1" - (sources."express-4.17.2" // { - dependencies = [ - sources."body-parser-1.19.1" - ]; - }) - sources."qs-6.9.6" - sources."raw-body-2.4.2" - sources."tiny-secp256k1-2.2.0" - ]; - }) - sources."ln-service-53.9.2" - (sources."ln-sync-3.10.1" // { - dependencies = [ - sources."@types/node-17.0.17" - sources."body-parser-1.19.1" - sources."bolt09-0.2.1" - sources."bytes-3.1.1" - sources."cookie-0.4.1" - sources."express-4.17.2" - sources."lightning-5.7.1" - sources."ln-service-53.8.1" - sources."qs-6.9.6" - sources."raw-body-2.4.2" - sources."tiny-secp256k1-2.2.0" - ]; - }) - sources."qs-6.9.7" - sources."raw-body-2.4.3" - sources."safe-buffer-5.2.1" sources."tiny-secp256k1-2.2.1" - sources."type-fest-2.11.2" sources."uint8array-tools-0.0.7" - sources."ws-8.5.0" ]; }) sources."parseurl-1.3.3" @@ -80551,7 +81280,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" @@ -83097,18 +83826,18 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.116"; + version = "1.0.120"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.116.tgz"; - sha512 = "LNbUuGtIWglPVj+FzyTSH7fH9jiQGKIFkJqmJuSO3wau21DU5ULP+GEmNd27a7lfMBqFJBKTNwyNzJTKUSz3Zw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.120.tgz"; + sha512 = "2Ik+JGf5Pt+6V4tBDSFicqxRb0mRv5u+x7lOiegoeRku467VH4I6Vk4Di+MDLr9lt2OEmJftAxXpvAMv0DBCfQ=="; }; dependencies = [ - sources."@jsii/check-node-1.54.0" - sources."@jsii/spec-1.54.0" + sources."@jsii/check-node-1.55.0" + sources."@jsii/spec-1.55.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-12.20.46" + sources."@types/node-12.20.47" sources."@xmldom/xmldom-0.8.1" sources."ajv-8.10.0" sources."ansi-regex-5.0.1" @@ -83119,12 +83848,12 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.5.35" - sources."cdk8s-plus-22-1.0.0-beta.137" + sources."cdk8s-1.5.39" + sources."cdk8s-plus-22-1.0.0-beta.142" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.54.0" // { + (sources."codemaker-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -83133,7 +83862,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.236" + sources."constructs-3.3.239" sources."date-format-4.0.4" sources."debug-4.3.3" sources."decamelize-5.0.1" @@ -83196,38 +83925,38 @@ in sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" sources."isarray-2.0.5" - (sources."jsii-1.54.0" // { + (sources."jsii-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.54.0" // { + (sources."jsii-pacmak-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.54.0" // { + (sources."jsii-reflect-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.54.0" // { + (sources."jsii-rosetta-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.495" // { + (sources."jsii-srcmak-0.1.499" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.155" + sources."json2jsii-0.2.159" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -83245,7 +83974,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.54.0" + sources."oo-ascii-tree-1.55.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -83271,7 +84000,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.1" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.221" + sources."sscaff-1.2.225" (sources."streamroller-3.0.4" // { dependencies = [ sources."fs-extra-10.0.1" @@ -83339,7 +84068,7 @@ in sources."@cdktf/hcl2cdk-0.9.4" sources."@cdktf/hcl2json-0.9.4" sources."@cdktf/provider-generator-0.9.4" - (sources."@jsii/check-node-1.54.0" // { + (sources."@jsii/check-node-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -83349,7 +84078,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.54.0" + sources."@jsii/spec-1.55.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -83381,7 +84110,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.81" + sources."constructs-10.0.84" sources."date-format-4.0.4" sources."debug-4.3.3" sources."decamelize-1.2.0" @@ -83449,7 +84178,7 @@ in sources."isarray-2.0.5" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.54.0" // { + (sources."jsii-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -83467,11 +84196,11 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.54.0" // { + (sources."jsii-pacmak-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" - sources."codemaker-1.54.0" + sources."codemaker-1.55.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."decamelize-5.0.1" @@ -83485,7 +84214,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.54.0" // { + (sources."jsii-reflect-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -83503,7 +84232,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.54.0" // { + (sources."jsii-rosetta-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -83518,7 +84247,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.495" // { + (sources."jsii-srcmak-0.1.499" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -83547,7 +84276,7 @@ in sources."object.assign-4.1.2" sources."obliterator-2.0.2" sources."once-1.4.0" - sources."oo-ascii-tree-1.54.0" + sources."oo-ascii-tree-1.55.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -84247,10 +84976,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.12.tgz"; - sha512 = "mRjStj+wjmqp9Lb3cDYegz+cavykWNYQf1ecdwrF2HEtbKVIcc+k62NS5wM6QVB5Y6FD2OxjPNWcoQmIFM1cfQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.14.tgz"; + sha512 = "zFExh1wGAZl4LXSp76NAjWORO9Tyhfw8WtALnhDv741p4tjWjVSEl6GmXTQN0U0tXz8UZ8ln2rL2OaxOdgMCTA=="; }; dependencies = [ sources."@chemzqm/neovim-5.7.5" @@ -84487,13 +85216,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.223"; + version = "1.1.228"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.223.tgz"; - sha512 = "ILWzT0OqD24ppvGnVmjQZYygUtDWAVxvLeXkcsJuIk4ED8O9ezFbPbD3GeBrLWG87X3mC37vb/k6EsF1BR6pUQ=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.228.tgz"; + sha512 = "msCM17jXDDyaTW+wmSRq9DSgkIwj6foeOdQwn37Ny7B2+7iKCsWv0/GmLYj7fZe+is9hXjeGety9dF6tQq+4Wg=="; }; dependencies = [ - sources."pyright-1.1.227" + sources."pyright-1.1.228" ]; buildInputs = globalBuildInputs; meta = { @@ -84603,10 +85332,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.5.9"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.5.9.tgz"; - sha512 = "EOl0uBpNm34r1I5IotKsrJPV7I01cAd2MDKyHV2FQfWF3KJoCnPuhPfh17Gy7Ji94I7bSt03qNrawk+9476x6Q=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.0.2.tgz"; + sha512 = "AQslAPlptSdPE0kTlM146EFnpeS491MqJmYa/O/vmlhd30aQidJmC79wBgrmpGj8T5ergsetb59uFnE3iuW+GQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -84705,7 +85434,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -84742,7 +85471,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -85113,10 +85842,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.9.13"; + version = "1.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.13.tgz"; - sha512 = "oczIpLpZ5VjUf8eFExa5kUJqgIMMtOLDgKRxpjkTVWM67dLczfQQY9BjiR2GjwZvdfMBp7PkpN3tBTOjPUaW5g=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.14.tgz"; + sha512 = "MiyV1Tq5Jpj6P0t3PVb3IFyrfOm93E29Oz90nCfSdMBW+yY0U4H4uE5V9AKO3zhVFhzHRwalYfaFxf/6VCmkgA=="; }; dependencies = [ sources."typescript-4.6.2" @@ -85376,10 +86105,10 @@ in coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.2.tgz"; - sha512 = "Lbs1R5QyTgdnbIQYr74RpOquC1t61mWBpZtAdB4pNHvZEF+IntcjHUm7Ns4ekdIvLgbiMncFatmKHXDRc3RpBg=="; + url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.4.tgz"; + sha512 = "w3bJrPoNkx5uiydRRPQ5Xqx01voizi0CxTh7/V7MJsuTP+2KNHRselm3cZcit79OyzO9rF1R0PGlDwLgPf54gg=="; }; buildInputs = globalBuildInputs; meta = { @@ -85984,7 +86713,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."uglify-js-3.15.2" + sources."uglify-js-3.15.3" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -86468,7 +87197,7 @@ in }) sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" @@ -86535,7 +87264,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.6" + sources."systeminformation-5.11.7" sources."tar-6.1.11" sources."through-2.3.8" sources."tmp-0.2.1" @@ -86618,10 +87347,10 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-4.0.0.tgz"; - sha512 = "jYrVFg9/ZAl3GRg8ambMoCgCZIGhNO2HNte5jdJXXMSEtM1ZFxw+qo8290LVtWWDrzu++eUyTXoqcqZZNuv8AQ=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-4.1.0.tgz"; + sha512 = "JA6bth6/mxPCa19SrWkIuPEBrea8vO9g1v0qhmCLnAKOfTcsNk5/X3W1o9aZuOHgugRcxdyR67rO4Gw/DA+4Qg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -86796,7 +87525,7 @@ in sources."debug-3.2.7" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -86852,7 +87581,7 @@ in sources."minimist-1.2.5" sources."ms-2.1.3" sources."mute-stream-0.0.7" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.0" sources."object-keys-1.1.1" @@ -87085,7 +87814,7 @@ in sources."@cspell/dict-ruby-2.0.1" sources."@cspell/dict-rust-2.0.0" sources."@cspell/dict-scala-2.0.0" - sources."@cspell/dict-software-terms-2.1.2" + sources."@cspell/dict-software-terms-2.1.3" sources."@cspell/dict-swift-1.0.2" sources."@cspell/dict-typescript-2.0.0" sources."@cspell/dict-vue-2.0.2" @@ -88016,7 +88745,7 @@ in sources."@types/node-fetch-2.6.1" sources."@types/prop-types-15.7.4" sources."@types/rc-1.2.1" - sources."@types/react-16.14.23" + sources."@types/react-16.14.24" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" sources."@types/react-window-infinite-loader-1.0.6" @@ -88069,7 +88798,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -88136,7 +88865,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.6.9" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -89109,7 +89838,7 @@ in sources."universalify-0.1.2" ]; }) - sources."gauge-4.0.2" + sources."gauge-4.0.3" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" (sources."get-package-info-1.0.0" // { @@ -89153,7 +89882,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-core-module-2.8.1" @@ -89323,7 +90052,7 @@ in sources."roarr-2.15.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -89530,7 +90259,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -89559,7 +90288,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -89685,7 +90414,7 @@ in sources."punycode-2.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.23.0" + sources."react-devtools-core-4.24.0" sources."react-is-16.13.1" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { @@ -89787,31 +90516,60 @@ in reconstructLock = true; }; "epgstation-../../applications/video/epgstation" = nodeEnv.buildNodePackage { - name = "EPGStation"; - packageName = "EPGStation"; - version = "1.7.5"; + name = "epgstation"; + packageName = "epgstation"; + version = "2.6.20"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.16.7" + sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.16.7" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) - sources."@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.183.1" - sources."@fluentui/react-focus-7.18.2" - sources."@fluentui/react-window-provider-1.0.2" - sources."@fluentui/theme-1.7.4" - sources."@gar/promisify-1.1.3" - (sources."@gulp-sourcemaps/identity-map-1.0.2" // { + (sources."@chinachu/aribts-1.3.5-mirakurun.17" // { dependencies = [ - sources."normalize-path-2.1.1" + sources."iconv-lite-0.6.3" + ]; + }) + sources."@cspotcode/source-map-consumer-0.8.0" + sources."@cspotcode/source-map-support-0.7.0" + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + sources."ajv-6.12.6" + sources."debug-4.3.3" + sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."ms-2.1.2" + sources."strip-json-comments-3.1.1" + ]; + }) + sources."@fluentui/date-time-utilities-8.4.0" + sources."@fluentui/dom-utilities-2.2.0" + sources."@fluentui/font-icons-mdl2-8.2.4" + sources."@fluentui/foundation-legacy-8.2.4" + sources."@fluentui/keyboard-key-0.4.0" + sources."@fluentui/merge-styles-8.5.0" + sources."@fluentui/react-8.60.3" + sources."@fluentui/react-focus-8.5.4" + sources."@fluentui/react-hooks-8.5.2" + sources."@fluentui/react-window-provider-2.2.0" + sources."@fluentui/set-version-8.2.0" + sources."@fluentui/style-utilities-8.6.4" + sources."@fluentui/theme-2.6.3" + sources."@fluentui/utilities-8.8.0" + (sources."@gulp-sourcemaps/identity-map-2.0.1" // { + dependencies = [ + sources."acorn-6.4.2" + sources."inherits-2.0.4" + sources."through2-3.0.2" ]; }) (sources."@gulp-sourcemaps/map-sources-1.0.0" // { @@ -89819,99 +90577,111 @@ in sources."normalize-path-2.1.1" ]; }) + (sources."@humanwhocodes/config-array-0.5.0" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.1" sources."@microsoft/load-themed-styles-1.10.247" + sources."@node-rs/crc32-1.5.0" + sources."@node-rs/crc32-android-arm-eabi-1.5.0" + sources."@node-rs/crc32-android-arm64-1.5.0" + sources."@node-rs/crc32-darwin-arm64-1.5.0" + sources."@node-rs/crc32-darwin-x64-1.5.0" + sources."@node-rs/crc32-freebsd-x64-1.5.0" + sources."@node-rs/crc32-linux-arm-gnueabihf-1.5.0" + sources."@node-rs/crc32-linux-arm64-gnu-1.5.0" + sources."@node-rs/crc32-linux-arm64-musl-1.5.0" + sources."@node-rs/crc32-linux-x64-gnu-1.5.0" + sources."@node-rs/crc32-linux-x64-musl-1.5.0" + sources."@node-rs/crc32-win32-arm64-msvc-1.5.0" + sources."@node-rs/crc32-win32-ia32-msvc-1.5.0" + sources."@node-rs/crc32-win32-x64-msvc-1.5.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-1.1.1" - (sources."@npmcli/move-file-1.1.2" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) sources."@sindresorhus/is-0.14.0" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@sqltools/formatter-1.2.3" sources."@szmarczak/http-timer-1.1.2" - sources."@types/basic-auth-1.1.3" - sources."@types/body-parser-1.19.0" - sources."@types/caseless-0.12.2" - sources."@types/chart.js-2.9.24" + sources."@tokenizer/token-0.3.0" + sources."@tsconfig/node10-1.0.8" + sources."@tsconfig/node12-1.0.9" + sources."@tsconfig/node14-1.0.1" + sources."@tsconfig/node16-1.0.2" + sources."@types/body-parser-1.19.1" + sources."@types/component-emitter-1.2.11" sources."@types/connect-3.4.35" - sources."@types/engine.io-3.1.7" - sources."@types/express-4.17.8" + sources."@types/cookie-0.4.1" + sources."@types/cors-2.8.12" + sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.28" - sources."@types/fancy-log-1.3.0" - sources."@types/glob-7.2.0" - sources."@types/hls.js-0.13.1" - sources."@types/js-yaml-3.12.5" + sources."@types/file-type-10.9.1" + sources."@types/js-yaml-4.0.4" sources."@types/json-schema-7.0.9" - sources."@types/lodash-4.14.161" - sources."@types/material-design-lite-1.1.16" + sources."@types/lodash-4.14.176" sources."@types/mime-1.3.2" - sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.0" - sources."@types/mithril-2.0.3" - sources."@types/mkdirp-1.0.1" - sources."@types/multer-1.4.4" - sources."@types/mysql-2.15.15" - sources."@types/node-14.11.1" - sources."@types/pg-7.14.5" - sources."@types/pg-types-2.2.0" + sources."@types/minimist-1.2.2" + sources."@types/mkdirp-1.0.2" + sources."@types/mongodb-4.0.6" + sources."@types/multer-1.4.7" + sources."@types/node-16.11.6" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - (sources."@types/request-2.48.5" // { + sources."@types/serve-static-1.13.10" + sources."@types/socket.io-3.0.1" + sources."@types/source-map-support-0.5.4" + sources."@types/sqlite3-3.1.7" + sources."@types/url-join-4.0.1" + sources."@types/uuid-3.4.10" + sources."@types/webidl-conversions-6.1.1" + sources."@types/whatwg-url-8.2.1" + sources."@types/ws-6.0.4" + (sources."@typescript-eslint/eslint-plugin-4.33.0" // { dependencies = [ - sources."form-data-2.5.1" + sources."debug-4.3.3" + sources."ms-2.1.2" ]; }) - sources."@types/serve-static-1.13.10" - sources."@types/socket.io-2.1.11" - sources."@types/socket.io-client-1.4.33" - sources."@types/sqlite3-3.1.6" - sources."@types/tough-cookie-4.0.1" - sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.10.1" - sources."@uifabric/icons-7.6.2" - sources."@uifabric/merge-styles-7.19.2" - sources."@uifabric/react-hooks-7.14.0" - sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.20.0" - sources."@uifabric/utilities-7.33.5" - sources."@webassemblyjs/ast-1.9.0" - sources."@webassemblyjs/floating-point-hex-parser-1.9.0" - sources."@webassemblyjs/helper-api-error-1.9.0" - sources."@webassemblyjs/helper-buffer-1.9.0" - sources."@webassemblyjs/helper-code-frame-1.9.0" - sources."@webassemblyjs/helper-fsm-1.9.0" - sources."@webassemblyjs/helper-module-context-1.9.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" - sources."@webassemblyjs/helper-wasm-section-1.9.0" - sources."@webassemblyjs/ieee754-1.9.0" - sources."@webassemblyjs/leb128-1.9.0" - sources."@webassemblyjs/utf8-1.9.0" - sources."@webassemblyjs/wasm-edit-1.9.0" - sources."@webassemblyjs/wasm-gen-1.9.0" - sources."@webassemblyjs/wasm-opt-1.9.0" - sources."@webassemblyjs/wasm-parser-1.9.0" - sources."@webassemblyjs/wast-parser-1.9.0" - sources."@webassemblyjs/wast-printer-1.9.0" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" + sources."@typescript-eslint/experimental-utils-4.33.0" + (sources."@typescript-eslint/parser-4.33.0" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + (sources."@typescript-eslint/typescript-estree-4.33.0" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/visitor-keys-4.33.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-5.7.4" - sources."after-0.8.2" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.2" + sources."acorn-walk-8.2.0" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" - sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.2" - sources."ansi-colors-1.1.0" + sources."ajv-8.10.0" + sources."ajv-formats-2.1.1" + sources."ansi-colors-4.1.1" sources."ansi-cyan-0.1.1" - sources."ansi-escapes-1.4.0" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) sources."ansi-gray-0.1.1" sources."ansi-red-0.1.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-4.3.0" sources."ansi-wrap-0.1.0" + sources."any-promise-1.3.0" (sources."anymatch-2.0.0" // { dependencies = [ (sources."braces-2.3.2" // { @@ -89934,6 +90704,7 @@ in sources."to-regex-range-2.1.1" ]; }) + sources."app-root-path-3.0.0" sources."append-buffer-1.0.2" sources."append-field-1.0.0" sources."aproba-1.2.0" @@ -89945,7 +90716,10 @@ in sources."string_decoder-1.1.1" ]; }) + sources."arg-4.1.3" sources."argparse-1.0.10" + sources."arib-mpeg2ts-parser-3.0.13" + sources."arib-subtitle-timedmetadater-4.0.9" sources."aribts-2.1.12" sources."arr-diff-4.0.0" sources."arr-filter-1.1.2" @@ -89972,37 +90746,19 @@ in }) sources."array-union-2.1.0" sources."array-unique-0.3.2" - sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.6" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" + sources."astral-regex-2.0.0" sources."async-done-1.3.2" sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."async-settle-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."b24.js-1.0.3" - sources."babel-polyfill-6.23.0" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) + sources."axios-0.24.0" sources."bach-1.2.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -90011,42 +90767,23 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" sources."base64id-2.0.0" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."better-assert-1.0.2" - sources."big.js-5.2.2" + sources."big-integer-1.6.51" sources."bignumber.js-9.0.0" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."blob-0.0.5" sources."block-stream-0.0.9" - sources."bluebird-3.7.2" - sources."bn.js-5.2.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."inherits-2.0.4" - sources."safe-buffer-5.2.1" - ]; - }) - sources."browserify-zlib-0.2.0" + sources."bson-4.6.1" sources."buffer-5.7.1" sources."buffer-equal-1.0.0" sources."buffer-from-1.1.2" - sources."buffer-writer-2.0.0" - sources."buffer-xor-1.0.3" - sources."builtin-modules-1.1.1" - sources."builtin-status-codes-3.0.0" + sources."bufferutil-4.0.6" (sources."busboy-0.2.14" // { dependencies = [ sources."readable-stream-1.1.14" @@ -90054,17 +90791,6 @@ in ]; }) sources."bytes-3.1.0" - (sources."cacache-15.3.0" // { - dependencies = [ - sources."chownr-2.0.0" - sources."fs-minipass-2.1.0" - sources."minipass-3.1.6" - sources."minizlib-2.1.2" - sources."p-map-4.0.0" - sources."rimraf-3.0.2" - sources."tar-6.1.11" - ]; - }) sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -90073,14 +90799,11 @@ in ]; }) sources."call-bind-1.0.2" - sources."callsite-1.0.0" + sources."callsites-3.1.0" sources."camelcase-3.0.0" sources."caseless-0.12.0" - sources."chalk-1.1.3" - sources."chardet-0.4.2" - sources."chart.js-2.9.3" - sources."chartjs-color-2.4.1" - sources."chartjs-color-string-0.6.0" + sources."chalk-4.1.2" + sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { dependencies = [ sources."braces-2.3.2" @@ -90097,8 +90820,6 @@ in ]; }) sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.3" - sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -90116,14 +90837,24 @@ in sources."kind-of-5.1.0" ]; }) - sources."clean-css-4.2.3" sources."clean-stack-2.2.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - (sources."cliui-3.2.0" // { + sources."cli-cursor-3.1.0" + (sources."cli-highlight-2.1.11" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-16.2.0" + ]; + }) + sources."cli-width-3.0.0" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."clone-2.1.2" @@ -90140,16 +90871,12 @@ in sources."code-point-at-1.1.0" sources."collection-map-1.0.0" sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."color-support-1.1.3" - sources."colors-1.4.0" sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."commondir-1.0.1" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" + sources."commander-7.2.0" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ @@ -90158,40 +90885,33 @@ in sources."string_decoder-1.1.1" ]; }) - sources."concat-with-sourcemaps-1.1.0" - sources."console-browserify-1.2.0" sources."console-control-strings-1.1.0" - sources."constants-browserify-1.0.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."convert-source-map-1.8.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) sources."copy-descriptor-0.1.1" (sources."copy-props-2.0.5" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."core-js-2.6.12" sources."core-util-is-1.0.3" + sources."cors-2.8.5" sources."crc-3.8.0" - (sources."create-ecdh-4.0.4" // { + sources."create-require-1.1.1" + (sources."cross-spawn-7.0.3" // { dependencies = [ - sources."bn.js-4.12.0" + sources."which-2.0.2" + ]; + }) + (sources."css-3.0.0" // { + dependencies = [ + sources."inherits-2.0.4" + sources."source-map-resolve-0.6.0" ]; }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."crypto-browserify-3.12.0" - sources."css-2.2.4" - sources."css-ripple-effect-1.0.5" - sources."cyclist-1.0.1" sources."d-1.0.1" sources."dashdash-1.14.1" sources."date-format-3.0.0" @@ -90206,6 +90926,7 @@ in sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."deep-is-0.1.4" (sources."default-compare-1.0.0" // { dependencies = [ sources."kind-of-5.1.0" @@ -90215,15 +90936,15 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" - (sources."del-5.1.0" // { + (sources."del-6.0.0" // { dependencies = [ sources."rimraf-3.0.2" ]; }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."denque-2.0.1" sources."depd-1.1.2" - sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detect-file-1.0.0" sources."detect-libc-1.0.3" @@ -90235,15 +90956,10 @@ in ]; }) sources."diff-4.0.2" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."difunc-0.0.4" sources."dir-glob-3.0.1" - sources."diskusage-1.1.3" - sources."domain-browser-1.2.0" + sources."diskusage-ng-1.0.2" + sources."doctrine-3.0.0" sources."dotenv-8.6.0" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { @@ -90256,60 +90972,73 @@ in sources."each-props-1.3.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - sources."inherits-2.0.4" - ]; - }) - sources."emojis-list-3.0.0" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.2" // { + (sources."engine.io-6.0.1" // { dependencies = [ - sources."cookie-0.3.1" - sources."debug-4.1.1" - sources."ms-2.1.3" + sources."cookie-0.4.2" + sources."debug-4.3.3" + sources."ms-2.1.2" + sources."ws-8.2.3" ]; }) - (sources."engine.io-client-3.4.4" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" - ]; - }) - sources."engine.io-parser-2.2.1" - sources."enhanced-resolve-4.5.0" - sources."errno-0.1.8" + sources."engine.io-parser-5.0.3" + sources."enhanced-resolve-5.9.2" + sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" - sources."es6-promise-4.2.8" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" + (sources."eslint-7.32.0" // { + dependencies = [ + sources."ajv-6.12.6" + sources."ansi-regex-5.0.1" + sources."debug-4.3.3" + sources."escape-string-regexp-4.0.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."ms-2.1.2" + sources."strip-ansi-6.0.1" + sources."strip-json-comments-3.1.1" + ]; + }) + sources."eslint-config-prettier-8.3.0" + sources."eslint-plugin-prettier-3.4.1" + sources."eslint-scope-5.1.1" + sources."eslint-utils-3.0.0" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) (sources."esrecurse-4.3.0" // { dependencies = [ sources."estraverse-5.3.0" ]; }) sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-emitter-0.3.5" sources."eventemitter3-2.0.3" - sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -90331,7 +91060,7 @@ in sources."expand-tilde-2.0.2" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.0.1" + sources."express-openapi-9.3.0" (sources."ext-1.6.0" // { dependencies = [ sources."type-2.6.0" @@ -90343,7 +91072,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-2.2.0" + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -90353,16 +91082,18 @@ in sources."extsprintf-1.3.0" sources."fancy-log-1.3.3" sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" - sources."figgy-pudding-3.5.2" - sources."figures-2.0.0" + sources."figlet-1.5.2" + sources."figures-3.2.0" + sources."file-entry-cache-6.0.1" + sources."file-type-16.5.3" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."find-cache-dir-3.3.2" sources."find-up-1.1.2" (sources."findup-sync-3.0.0" // { dependencies = [ @@ -90377,6 +91108,12 @@ in }) sources."fined-1.2.0" sources."flagged-respawn-1.0.1" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."flatted-3.2.5" + sources."rimraf-3.0.2" + ]; + }) sources."flatted-2.0.2" (sources."flush-write-stream-1.1.1" // { dependencies = [ @@ -90385,6 +91122,7 @@ in sources."string_decoder-1.1.1" ]; }) + sources."follow-redirects-1.14.9" sources."for-in-1.0.2" sources."for-own-1.0.0" sources."forever-agent-0.6.1" @@ -90392,24 +91130,10 @@ in sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - (sources."from2-2.3.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."fs-extra-9.0.1" + sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs-mkdirp-stream-1.0.0" - sources."fs-routes-7.0.1" - (sources."fs-write-stream-atomic-1.0.10" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."fs-routes-9.0.3" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" (sources."fstream-1.0.12" // { @@ -90418,13 +91142,9 @@ in ]; }) sources."function-bind-1.1.1" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - sources."get-caller-file-1.0.3" + sources."functional-red-black-tree-1.0.1" + sources."gauge-2.7.4" + sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -90443,39 +91163,90 @@ in sources."glob-watcher-5.0.5" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" - sources."globby-10.0.2" + sources."globals-13.12.1" + sources."globby-11.1.0" sources."glogg-1.0.2" sources."got-9.6.0" sources."graceful-fs-4.2.9" sources."gulp-4.0.2" - (sources."gulp-clean-css-4.3.0" // { + (sources."gulp-cli-2.3.0" // { dependencies = [ - sources."through2-3.0.1" + sources."ansi-colors-1.1.0" + sources."cliui-3.2.0" + sources."get-caller-file-1.0.3" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.2" + sources."yargs-7.1.2" + sources."yargs-parser-5.0.1" ]; }) - sources."gulp-cli-2.3.0" - sources."gulp-concat-2.6.1" - (sources."gulp-dart-sass-1.0.2" // { + (sources."gulp-eslint-6.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ajv-6.12.6" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" + sources."astral-regex-1.0.0" sources."chalk-2.4.2" - sources."strip-ansi-4.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."debug-4.3.3" + sources."emoji-regex-7.0.3" + sources."eslint-6.8.0" + sources."eslint-utils-1.4.3" + sources."eslint-visitor-keys-1.3.0" + sources."espree-6.2.1" + sources."file-entry-cache-5.0.1" + sources."flat-cache-2.0.1" + sources."globals-12.4.0" + sources."has-flag-3.0.0" + sources."ignore-4.0.6" + sources."is-fullwidth-code-point-2.0.0" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."levn-0.3.0" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."optionator-0.8.3" + sources."path-key-2.0.1" + sources."prelude-ls-1.1.2" + sources."regexpp-2.0.1" + sources."rimraf-2.6.3" + sources."semver-6.3.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."slice-ansi-2.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" + sources."table-5.4.6" + sources."type-check-0.3.2" + sources."type-fest-0.8.1" ]; }) (sources."gulp-plumber-1.2.1" // { dependencies = [ + sources."ansi-styles-2.2.1" sources."arr-diff-1.1.0" sources."arr-union-2.1.0" sources."array-slice-0.2.3" + sources."chalk-1.1.3" sources."extend-shallow-1.1.4" sources."kind-of-1.1.0" sources."plugin-error-0.1.2" + sources."supports-color-2.0.0" + ]; + }) + (sources."gulp-sourcemaps-3.0.0" // { + dependencies = [ + sources."acorn-6.4.2" ]; }) - sources."gulp-sourcemaps-2.6.5" - sources."gulp-tslint-8.1.4" (sources."gulp-typescript-5.0.1" // { dependencies = [ sources."ansi-colors-3.2.4" @@ -90486,16 +91257,15 @@ in }) sources."gulplog-1.0.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" - sources."has-ansi-2.0.0" - (sources."has-binary2-1.0.3" // { + (sources."har-validator-5.1.5" // { dependencies = [ - sources."isarray-2.0.1" + sources."ajv-6.12.6" + sources."json-schema-traverse-0.4.1" ]; }) - sources."has-cors-1.1.0" - sources."has-flag-3.0.0" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."has-value-1.0.0" @@ -90509,42 +91279,35 @@ in sources."kind-of-4.0.0" ]; }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."inherits-2.0.4" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash.js-1.1.7" - (sources."hls-b24.js-0.12.3" // { - dependencies = [ - sources."eventemitter3-3.1.0" - ]; - }) - sources."hmac-drbg-1.0.1" + sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."iferr-0.1.5" sources."ignore-5.2.0" sources."ignore-walk-3.0.4" - sources."immutable-4.0.0" + sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexof-0.0.1" - sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.8" - sources."inquirer-3.0.6" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."interpret-1.4.0" + sources."inversify-5.1.1" sources."invert-kv-1.0.0" sources."ip-1.1.5" + sources."ip-num-1.3.4" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" @@ -90557,7 +91320,7 @@ in sources."is-dir-1.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.3" sources."is-negated-glob-1.0.0" sources."is-number-7.0.0" @@ -90566,36 +91329,32 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-relative-1.0.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" + sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" - (sources."jest-worker-26.6.2" // { + sources."js-tokens-4.0.0" + (sources."js-yaml-4.1.0" // { dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."argparse-2.0.1" ]; }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-1.0.1" - (sources."jsonfile-6.1.0" // { + sources."jsonfile-4.0.0" + (sources."jsonrpc2-ws-1.0.0-beta9" // { dependencies = [ - sources."universalify-2.0.0" + sources."eventemitter3-3.1.2" ]; }) sources."jsprim-1.4.2" @@ -90613,16 +91372,12 @@ in }) sources."lcid-1.0.0" sources."lead-1.0.0" + sources."levn-0.4.1" sources."liftoff-3.1.0" sources."load-json-file-1.1.0" - sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" - sources."locate-path-5.0.0" - sources."lodash-4.17.20" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" + sources."lodash-4.17.21" sources."lodash.merge-4.6.2" - sources."lodash.some-4.6.0" + sources."lodash.truncate-4.4.2" (sources."log4js-6.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -90633,14 +91388,9 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."make-error-1.3.6" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" - sources."map-stream-0.0.7" sources."map-visit-1.0.0" (sources."matchdep-2.0.0" // { dependencies = [ @@ -90655,39 +91405,18 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."material-design-icons-3.0.1" - sources."material-design-lite-1.3.0" - sources."md5.js-1.3.5" sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) - (sources."memory-fs-0.5.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."memoizee-0.4.15" + sources."memory-pager-1.5.0" sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.4" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."mime-1.6.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { @@ -90695,75 +91424,84 @@ in sources."yallist-3.1.1" ]; }) - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) sources."minizlib-1.3.3" - (sources."mirakurun-3.3.1" // { + (sources."mirakurun-3.9.0-beta.26" // { dependencies = [ - sources."aribts-1.3.5" + sources."ajv-6.12.6" sources."eventemitter3-4.0.7" - sources."express-openapi-6.0.0" - sources."fs-routes-2.0.0" - sources."openapi-default-setter-2.1.0" - sources."openapi-framework-0.26.0" - sources."openapi-jsonschema-parameters-1.2.0" - sources."openapi-request-coercer-2.4.0" - sources."openapi-request-validator-4.2.0" - sources."openapi-response-validator-4.0.0" - (sources."openapi-schema-validator-3.0.3" // { + (sources."express-openapi-8.0.0" // { dependencies = [ - sources."openapi-types-1.3.4" + sources."openapi-types-8.0.0" ]; }) - (sources."openapi-security-handler-2.0.4" // { + sources."fs-routes-8.0.0" + sources."json-schema-traverse-0.4.1" + (sources."openapi-default-setter-8.0.0" // { dependencies = [ - sources."openapi-types-1.3.4" + sources."openapi-types-8.0.0" ]; }) - sources."openapi-types-1.3.5" + (sources."openapi-framework-8.0.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-jsonschema-parameters-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-coercer-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-response-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-schema-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-security-handler-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + sources."openapi-types-7.2.3" + sources."swagger-ui-dist-4.6.2" ]; }) - sources."mississippi-3.0.0" - sources."mithril-2.0.4" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) sources."mkdirp-1.0.4" - sources."moment-2.29.1" + sources."mongodb-4.4.1" + sources."mongodb-connection-string-url-2.5.2" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" ]; }) - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) sources."ms-2.0.0" - (sources."multer-1.4.2" // { + (sources."multer-1.4.3" // { dependencies = [ sources."mkdirp-0.5.5" ]; }) - sources."munin-plugin-0.0.9" sources."mute-stdout-1.0.1" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" (sources."mysql-2.18.1" // { dependencies = [ sources."isarray-1.0.0" @@ -90771,8 +91509,10 @@ in sources."string_decoder-1.1.1" ]; }) + sources."mz-2.7.0" sources."nan-2.15.0" sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" @@ -90780,10 +91520,9 @@ in ]; }) sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."next-tick-1.0.0" - sources."node-addon-api-2.0.0" - sources."node-fetch-1.6.3" + sources."next-tick-1.1.0" + sources."nice-try-1.0.5" + sources."node-addon-api-3.2.1" (sources."node-gyp-3.8.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -90792,19 +91531,7 @@ in sources."tar-2.2.2" ]; }) - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."buffer-4.9.2" - sources."isarray-1.0.0" - sources."punycode-1.4.1" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-http-2.8.3" - ]; - }) + sources."node-gyp-build-4.3.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -90827,7 +91554,6 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-component-0.0.3" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -90848,59 +91574,53 @@ 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.183.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-2.0.1" - (sources."openapi-default-setter-7.2.3" // { + sources."onetime-5.1.2" + (sources."openapi-default-setter-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-framework-7.5.0" // { + (sources."openapi-framework-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."js-yaml-3.14.1" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-jsonschema-parameters-7.2.3" // { + (sources."openapi-jsonschema-parameters-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-request-coercer-7.5.0" // { + (sources."openapi-request-coercer-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-request-validator-7.4.0" // { + (sources."openapi-request-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-response-validator-7.4.0" // { + (sources."openapi-response-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-schema-validator-7.2.3" // { + (sources."openapi-schema-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-security-handler-7.2.3" // { + (sources."openapi-security-handler-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - sources."openapi-types-7.0.1" - (sources."opencollective-1.0.3" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."opencollective-postinstall-2.0.3" - sources."opn-4.0.2" + sources."openapi-types-9.3.0" + sources."optionator-0.9.1" (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."isarray-1.0.0" @@ -90908,96 +91628,64 @@ in sources."string_decoder-1.1.1" ]; }) - sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" - sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."p-map-3.0.0" - sources."p-try-2.2.0" + sources."p-map-4.0.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."packet-reader-1.0.0" - sources."pako-1.0.11" - (sources."parallel-transform-1.2.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."parse-asn1-5.1.6" + sources."parent-module-1.0.1" + sources."parent-require-1.0.0" sources."parse-filepath-1.0.2" sources."parse-json-2.2.0" sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pbkdf2-3.1.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - (sources."pg-8.3.3" // { - dependencies = [ - sources."semver-4.3.2" - ]; - }) - sources."pg-connection-string-2.5.0" - sources."pg-int8-1.0.1" - sources."pg-pool-3.5.1" - sources."pg-protocol-1.5.0" - sources."pg-types-2.2.0" - sources."pgpass-1.0.5" + sources."picocolors-0.2.1" sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-4.2.0" // { + (sources."plugin-error-1.0.1" // { dependencies = [ - sources."find-up-4.1.0" - sources."path-exists-4.0.0" + sources."ansi-colors-1.1.0" ]; }) - sources."plugin-error-1.0.1" sources."posix-character-classes-0.1.1" - sources."postgres-array-2.0.0" - sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.7" - sources."postgres-interval-1.2.0" + sources."postcss-7.0.39" + sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" + sources."prettier-2.4.1" + sources."prettier-linter-helpers-1.0.0" sources."pretty-hrtime-1.0.3" - sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."promise-inflight-1.0.1" + sources."progress-2.0.3" sources."promise-queue-2.2.5" - sources."prop-types-15.8.1" sources."proxy-addr-2.0.7" - sources."prr-1.0.1" sources."psl-1.8.0" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -91006,17 +91694,12 @@ in }) sources."punycode-2.1.1" sources."qs-6.7.0" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."queue-microtask-1.2.3" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."react-16.14.0" - sources."react-dom-16.14.0" - sources."react-is-16.13.1" + sources."react-17.0.2" + sources."react-dom-17.0.2" (sources."read-pkg-1.1.0" // { dependencies = [ sources."path-type-1.1.0" @@ -91024,6 +91707,7 @@ in }) sources."read-pkg-up-1.0.1" sources."readable-stream-3.6.0" + sources."readable-web-to-node-stream-3.0.2" (sources."readdirp-2.2.1" // { dependencies = [ sources."braces-2.3.2" @@ -91039,8 +91723,9 @@ in ]; }) sources."rechoir-0.6.2" - sources."regenerator-runtime-0.10.5" + sources."reflect-metadata-0.1.13" sources."regex-not-1.0.2" + sources."regexpp-3.2.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remove-bom-buffer-3.0.0" @@ -91056,38 +91741,32 @@ in ]; }) sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."resolve-1.22.0" sources."resolve-dir-1.0.1" + sources."resolve-from-4.0.0" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."run-queue-1.0.3" - sources."rx-4.1.0" + (sources."rxjs-6.6.7" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.49.9" // { - dependencies = [ - sources."anymatch-3.1.2" - sources."binary-extensions-2.2.0" - sources."chokidar-3.5.3" - sources."fsevents-2.3.2" - sources."is-binary-path-2.1.0" - sources."readdirp-3.6.0" - ]; - }) + sources."saslprep-1.0.3" sources."sax-1.2.4" - sources."scheduler-0.19.1" - sources."schema-utils-2.7.1" + sources."scheduler-0.20.2" sources."semver-7.3.5" sources."semver-greatest-satisfied-range-1.1.0" (sources."send-0.17.1" // { @@ -91095,7 +91774,6 @@ in sources."ms-2.1.1" ]; }) - sources."serialize-javascript-5.0.1" sources."serve-static-1.14.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -91103,12 +91781,19 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."sift-7.0.1" sources."signal-exit-3.0.7" sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."is-fullwidth-code-point-3.0.0" + ]; + }) + sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -91138,57 +91823,35 @@ in sources."kind-of-3.2.2" ]; }) - (sources."socket.io-2.3.0" // { + (sources."socket.io-4.3.1" // { dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" + sources."debug-4.3.3" + sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { + sources."socket.io-adapter-2.3.3" + (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" - (sources."socket.io-parser-3.3.2" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."debug-4.3.3" + sources."ms-2.1.2" ]; }) - (sources."socket.io-parser-3.4.1" // { - dependencies = [ - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" - ]; - }) - sources."source-list-map-2.0.1" + sources."socks-2.6.2" sources."source-map-0.6.1" - sources."source-map-js-1.0.2" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.21" + sources."source-map-support-0.5.20" sources."source-map-url-0.4.1" sources."sparkles-1.0.1" + sources."sparse-bitfield-3.0.3" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" - sources."split2-4.1.0" sources."sprintf-js-1.0.3" - sources."sqlite3-5.0.0" + sources."sqlite3-5.0.2" sources."sqlstring-2.3.1" sources."sshpk-1.17.0" - (sources."ssri-8.0.1" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ @@ -91208,38 +91871,17 @@ in ]; }) sources."statuses-1.5.0" - (sources."stream-browserify-2.0.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-each-1.2.3" sources."stream-exhaust-1.0.2" - (sources."stream-http-3.2.0" // { - dependencies = [ - sources."inherits-2.0.4" - ]; - }) sources."stream-shift-1.0.1" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" sources."debug-4.3.3" - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" sources."ms-2.1.2" - sources."universalify-0.1.2" ]; }) sources."streamsearch-0.1.2" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-1.0.2" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -91249,13 +91891,22 @@ in sources."strip-bom-2.0.0" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" + sources."strtok3-6.3.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."sver-compat-1.5.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.34.0" + sources."swagger-ui-dist-3.52.5" + (sources."table-6.8.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."tail-2.2.4" - sources."tapable-1.1.3" + sources."tapable-2.2.1" (sources."tar-4.4.19" // { dependencies = [ sources."mkdirp-0.5.5" @@ -91263,13 +91914,9 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.12.0" // { - dependencies = [ - sources."acorn-8.7.0" - sources."source-map-0.7.3" - ]; - }) - sources."terser-webpack-plugin-4.2.2" + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -91280,12 +91927,9 @@ in }) sources."through2-filter-3.0.0" sources."time-stamp-1.1.0" - sources."timers-browserify-2.0.12" sources."timers-ext-0.1.7" sources."tmp-0.0.33" sources."to-absolute-glob-2.0.2" - sources."to-array-0.1.4" - sources."to-arraybuffer-1.0.1" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -91296,42 +91940,47 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."toidentifier-1.0.0" + sources."token-types-4.2.0" sources."tough-cookie-2.5.0" - (sources."ts-loader-8.0.4" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."semver-6.3.0" - sources."supports-color-5.5.0" - ]; - }) + sources."tr46-3.0.0" + sources."ts-loader-9.2.6" sources."ts-log-2.2.4" - sources."tslib-1.14.1" - (sources."tslint-6.1.3" // { + (sources."ts-node-10.4.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."mkdirp-0.5.5" - sources."semver-5.7.1" - sources."supports-color-5.5.0" + sources."acorn-8.7.0" + ]; + }) + sources."tslib-2.3.1" + (sources."tsutils-3.21.0" // { + dependencies = [ + sources."tslib-1.14.1" ]; }) - sources."tsutils-2.29.0" - sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" + sources."type-check-0.4.0" + sources."type-fest-0.20.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typescript-4.0.3" + (sources."typeorm-0.2.38" // { + dependencies = [ + sources."buffer-6.0.3" + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."typescript-4.4.4" sources."unc-path-regex-0.1.2" - sources."undertaker-1.3.0" + (sources."undertaker-1.3.0" // { + dependencies = [ + sources."fast-levenshtein-1.1.4" + ]; + }) sources."undertaker-registry-1.0.1" sources."union-value-1.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" sources."unique-stream-2.3.1" - sources."universalify-1.0.0" + sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -91347,19 +91996,15 @@ in sources."upath-1.2.0" sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-join-4.0.1" sources."url-parse-lax-3.0.0" - sources."url-toolkit-2.2.5" sources."use-3.1.1" - sources."util-0.11.1" + sources."utf-8-validate-5.0.9" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."uws-9.148.0" + sources."v8-compile-cache-2.3.0" sources."v8flags-3.2.0" sources."validate-npm-package-license-3.0.4" sources."value-or-function-3.0.0" @@ -91382,102 +92027,2020 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."vinyl-sourcemaps-apply-0.2.1" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."vm-browserify-1.1.2" - (sources."watchpack-1.7.5" // { - dependencies = [ - sources."anymatch-3.1.2" - sources."binary-extensions-2.2.0" - sources."chokidar-3.5.3" - sources."fsevents-2.3.2" - sources."is-binary-path-2.1.0" - sources."readdirp-3.6.0" - ]; - }) - sources."watchpack-chokidar2-2.0.1" - (sources."webpack-4.44.2" // { - dependencies = [ - sources."acorn-6.4.2" - sources."braces-2.3.2" - sources."cacache-12.0.4" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."is-number-3.0.0" - sources."isarray-1.0.0" - sources."kind-of-3.2.2" - sources."locate-path-3.0.0" - sources."lru-cache-5.1.1" - sources."make-dir-2.1.0" - sources."memory-fs-0.4.1" - sources."micromatch-3.1.10" - sources."mkdirp-0.5.5" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" - sources."readable-stream-2.3.7" - sources."schema-utils-1.0.0" - sources."semver-5.7.1" - sources."serialize-javascript-4.0.0" - sources."ssri-6.0.2" - sources."string_decoder-1.1.1" - sources."terser-4.8.0" - sources."terser-webpack-plugin-1.4.5" - sources."to-regex-range-2.1.1" - sources."y18n-4.0.3" - sources."yallist-3.1.1" - ]; - }) - sources."webpack-sources-1.4.3" - (sources."webpack-stream-6.1.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."webidl-conversions-7.0.0" + sources."whatwg-url-11.0.0" sources."which-1.3.1" sources."which-module-1.0.0" sources."wide-align-1.1.5" - sources."worker-farm-1.7.0" - (sources."wrap-ansi-2.1.0" // { + sources."word-wrap-1.2.3" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.7" - sources."xmlhttprequest-ssl-1.5.5" - sources."xtend-4.0.2" - sources."y18n-3.2.2" - sources."yallist-4.0.0" - (sources."yargs-7.1.2" // { + (sources."write-1.0.3" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."mkdirp-0.5.5" ]; }) - sources."yargs-parser-5.0.1" - sources."yeast-0.1.2" - sources."yocto-queue-0.1.0" + sources."ws-6.2.2" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" + sources."xtend-4.0.2" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + (sources."yargonaut-1.1.4" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."supports-color-2.0.0" + ]; + }) + (sources."yargs-17.3.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-parser-21.0.1" + ]; + }) + sources."yargs-parser-20.2.9" + sources."yn-3.1.1" + sources."zen-observable-0.8.15" + sources."zen-observable-ts-1.2.3" ]; buildInputs = globalBuildInputs; meta = { description = "DTV Software in Japan."; - homepage = "https://github.com/l3tnun/EPGStation#readme"; + homepage = "https://github.com/l3tnun/EPGStation-V2#readme"; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; + "epgstation-client-../../applications/video/epgstation/client" = nodeEnv.buildNodePackage { + name = "epgstation-client"; + packageName = "epgstation-client"; + version = "2.6.20"; + src = ../../applications/video/epgstation/client; + dependencies = [ + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/highlight-7.16.10" + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + sources."acorn-7.4.1" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.3.1" + sources."ignore-4.0.6" + ]; + }) + sources."@hapi/address-2.1.4" + sources."@hapi/bourne-1.3.2" + sources."@hapi/hoek-8.5.1" + sources."@hapi/joi-15.1.1" + sources."@hapi/topo-3.1.6" + sources."@humanwhocodes/config-array-0.5.0" + sources."@humanwhocodes/object-schema-1.2.1" + sources."@intervolga/optimize-cssnano-plugin-1.0.6" + sources."@mdi/font-6.5.95" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@socket.io/component-emitter-3.0.0" + (sources."@soda/friendly-errors-webpack-plugin-1.8.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."@soda/get-current-script-1.0.2" + sources."@types/body-parser-1.19.2" + sources."@types/connect-3.4.35" + sources."@types/connect-history-api-fallback-1.3.5" + sources."@types/express-4.17.13" + sources."@types/express-serve-static-core-4.17.28" + sources."@types/glob-7.2.0" + sources."@types/hls.js-0.13.3" + sources."@types/http-proxy-1.17.8" + sources."@types/json-schema-7.0.9" + sources."@types/json-stable-stringify-1.0.33" + sources."@types/lodash-4.14.178" + sources."@types/mime-1.3.2" + sources."@types/minimatch-3.0.5" + sources."@types/minimist-1.2.2" + sources."@types/node-17.0.21" + sources."@types/normalize-package-data-2.4.1" + sources."@types/parse-json-4.0.0" + sources."@types/q-1.5.5" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" + sources."@types/serve-static-1.13.10" + sources."@types/smoothscroll-polyfill-0.3.1" + sources."@types/socket.io-client-1.4.36" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.8" + (sources."@types/uglify-js-3.13.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-4.41.32" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@types/webpack-dev-server-3.11.6" + sources."@types/webpack-env-1.16.3" + (sources."@types/webpack-sources-3.2.0" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + sources."@typescript-eslint/eslint-plugin-4.33.0" + sources."@typescript-eslint/experimental-utils-4.33.0" + sources."@typescript-eslint/parser-4.33.0" + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + sources."@typescript-eslint/typescript-estree-4.33.0" + sources."@typescript-eslint/visitor-keys-4.33.0" + sources."@vue/cli-overlay-4.5.15" + (sources."@vue/cli-plugin-eslint-4.5.12" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."dir-glob-2.2.2" + sources."fast-glob-2.2.7" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."@vue/cli-plugin-router-4.5.15" + (sources."@vue/cli-plugin-typescript-4.5.13" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + sources."braces-2.3.2" + sources."dir-glob-2.2.2" + sources."extend-shallow-2.0.1" + sources."fast-glob-2.2.7" + sources."fill-range-4.0.0" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."@vue/cli-plugin-vuex-4.5.13" + (sources."@vue/cli-service-4.5.13" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."acorn-7.4.1" + sources."array-union-1.0.2" + sources."braces-2.3.2" + sources."dir-glob-2.2.2" + sources."extend-shallow-2.0.1" + sources."fast-glob-2.2.7" + sources."fill-range-4.0.0" + sources."fs-extra-7.0.1" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."jsonfile-4.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."slash-2.0.0" + sources."ssri-8.0.1" + sources."to-regex-range-2.1.1" + sources."universalify-0.1.2" + ]; + }) + (sources."@vue/cli-shared-utils-4.5.15" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."semver-6.3.0" + sources."yallist-3.1.1" + ]; + }) + (sources."@vue/component-compiler-utils-3.3.0" // { + dependencies = [ + sources."hash-sum-1.0.2" + sources."lru-cache-4.1.5" + sources."source-map-0.6.1" + sources."yallist-2.1.2" + ]; + }) + sources."@vue/eslint-config-prettier-6.0.0" + sources."@vue/eslint-config-typescript-7.0.0" + sources."@vue/preload-webpack-plugin-1.1.2" + sources."@vue/web-component-wrapper-1.3.0" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."accepts-1.3.8" + sources."acorn-6.4.2" + sources."acorn-jsx-5.3.2" + sources."acorn-walk-7.2.0" + sources."address-1.1.2" + sources."ajv-6.12.6" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."alphanum-sort-1.0.2" + sources."ansi-colors-3.2.4" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-html-community-0.0.8" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" + sources."anymatch-3.1.2" + sources."aproba-1.2.0" + sources."arch-2.2.0" + sources."argparse-1.0.10" + sources."aribb24.js-1.8.8" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flatten-1.1.1" + sources."array-union-2.1.0" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."asn1-0.2.6" + (sources."asn1.js-5.4.1" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."astral-regex-2.0.0" + sources."async-2.6.3" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + (sources."autoprefixer-9.8.8" // { + dependencies = [ + sources."picocolors-0.2.1" + ]; + }) + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."axios-0.24.0" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."js-tokens-3.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."backo2-1.0.2" + 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."batch-0.6.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bfj-6.1.2" + sources."big.js-5.2.2" + sources."binary-extensions-2.2.0" + sources."bindings-1.5.0" + sources."bluebird-3.7.2" + sources."bn.js-5.2.0" + (sources."body-parser-1.19.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.9.7" + ]; + }) + (sources."bonjour-3.5.0" // { + dependencies = [ + sources."array-flatten-2.1.2" + ]; + }) + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + sources."browserify-rsa-4.1.0" + (sources."browserify-sign-4.2.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."browserify-zlib-0.2.0" + sources."browserslist-4.20.0" + sources."buffer-4.9.2" + sources."buffer-from-1.1.2" + sources."buffer-indexof-1.1.1" + sources."buffer-json-2.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + sources."bytes-3.1.2" + (sources."cacache-12.0.4" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) + sources."cache-base-1.0.1" + (sources."cache-loader-4.1.0" // { + dependencies = [ + sources."find-cache-dir-3.3.2" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."make-dir-3.1.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + sources."schema-utils-2.7.1" + sources."semver-6.3.0" + ]; + }) + sources."call-bind-1.0.2" + sources."call-me-maybe-1.0.1" + (sources."caller-callsite-2.0.0" // { + dependencies = [ + sources."callsites-2.0.0" + ]; + }) + sources."caller-path-2.0.0" + sources."callsite-1.0.0" + sources."callsites-3.1.0" + sources."camel-case-3.0.0" + sources."camelcase-5.3.1" + sources."caniuse-api-3.0.0" + sources."caniuse-lite-1.0.30001314" + sources."case-sensitive-paths-webpack-plugin-2.4.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."check-types-8.0.3" + sources."chokidar-3.5.3" + sources."chownr-1.1.4" + sources."chrome-trace-event-1.0.3" + sources."ci-info-1.6.0" + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."clean-css-4.2.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."cli-cursor-2.1.0" + (sources."cli-highlight-2.1.11" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."cli-spinners-2.6.1" + sources."cli-width-3.0.0" + (sources."clipboardy-2.3.0" // { + dependencies = [ + sources."is-wsl-2.2.0" + ]; + }) + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" + ]; + }) + sources."clone-1.0.4" + sources."coa-2.0.2" + sources."collection-visit-1.0.0" + sources."color-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.9.0" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."connect-history-api-fallback-1.6.0" + sources."console-browserify-1.2.0" + sources."consolidate-0.15.1" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.4" + sources."content-type-1.0.4" + sources."cookie-0.4.2" + sources."cookie-signature-1.0.6" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + (sources."copy-webpack-plugin-5.1.2" // { + dependencies = [ + sources."array-union-1.0.2" + sources."dir-glob-2.2.2" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."globby-7.1.1" + sources."ignore-3.3.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."pkg-dir-3.0.0" + sources."slash-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."cosmiconfig-6.0.0" + (sources."create-ecdh-4.0.4" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."crypto-browserify-3.12.0" + sources."css-color-names-0.0.4" + sources."css-declaration-sorter-4.0.1" + (sources."css-loader-3.6.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + sources."semver-6.3.0" + ]; + }) + sources."css-select-2.1.0" + sources."css-select-base-adapter-0.1.1" + (sources."css-tree-1.0.0-alpha.37" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-what-3.4.2" + sources."cssesc-3.0.0" + (sources."cssnano-4.1.11" // { + dependencies = [ + sources."cosmiconfig-5.2.1" + sources."import-fresh-2.0.0" + sources."parse-json-4.0.0" + sources."resolve-from-3.0.0" + ]; + }) + sources."cssnano-preset-default-4.0.8" + sources."cssnano-util-get-arguments-4.0.0" + sources."cssnano-util-get-match-4.0.0" + sources."cssnano-util-raw-cache-4.0.1" + sources."cssnano-util-same-parent-4.0.1" + (sources."csso-4.2.0" // { + dependencies = [ + sources."css-tree-1.1.3" + sources."mdn-data-2.0.14" + sources."source-map-0.6.1" + ]; + }) + sources."cyclist-1.0.1" + sources."dashdash-1.14.1" + sources."date-fns-2.28.0" + sources."de-indent-1.0.2" + sources."debug-4.3.3" + sources."decache-4.6.1" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.1.1" + sources."deep-is-0.1.4" + sources."deepmerge-4.2.2" + (sources."default-gateway-5.0.5" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."execa-3.4.0" + sources."get-stream-5.2.0" + sources."is-stream-2.0.1" + sources."mimic-fn-2.1.0" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + (sources."del-4.1.1" // { + dependencies = [ + sources."array-union-1.0.2" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + ]; + }) + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."des.js-1.0.1" + sources."destroy-1.0.4" + sources."detect-node-2.1.0" + sources."diff-4.0.2" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."dir-glob-3.0.1" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.4" + sources."dns-txt-2.0.2" + sources."doctrine-3.0.0" + sources."dom-converter-0.2.0" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domain-browser-1.2.0" + sources."domelementtype-1.3.1" + (sources."domhandler-4.3.0" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domutils-1.7.0" + sources."dot-prop-5.3.0" + sources."dotenv-8.6.0" + sources."dotenv-expand-5.1.0" + sources."duplexer-0.1.2" + sources."duplexify-3.7.1" + sources."easy-stack-1.0.1" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."ejs-2.7.4" + sources."electron-to-chromium-1.4.82" + (sources."elliptic-6.5.4" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."emoji-regex-8.0.0" + sources."emojis-list-3.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."engine.io-client-6.0.3" + sources."engine.io-parser-5.0.3" + (sources."enhanced-resolve-4.5.0" // { + dependencies = [ + sources."memory-fs-0.5.0" + ]; + }) + (sources."enquirer-2.3.6" // { + dependencies = [ + sources."ansi-colors-4.1.1" + ]; + }) + sources."entities-2.2.0" + sources."errno-0.1.8" + sources."error-ex-1.3.2" + sources."error-stack-parser-2.0.7" + sources."es-abstract-1.19.1" + sources."es-to-primitive-1.2.1" + sources."es6-promise-4.2.8" + sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + (sources."eslint-7.32.0" // { + dependencies = [ + sources."@babel/code-frame-7.12.11" + sources."acorn-7.4.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.3" + sources."escape-string-regexp-4.0.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."has-flag-4.0.0" + sources."ignore-4.0.6" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."supports-color-7.2.0" + sources."which-2.0.2" + ]; + }) + sources."eslint-config-prettier-6.15.0" + sources."eslint-loader-2.2.1" + sources."eslint-plugin-prettier-3.4.1" + (sources."eslint-plugin-vue-7.20.0" // { + dependencies = [ + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."semver-6.3.0" + ]; + }) + sources."eslint-scope-5.1.1" + sources."eslint-utils-3.0.0" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-6.2.1" // { + dependencies = [ + sources."acorn-7.4.1" + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."event-pubsub-4.3.0" + sources."eventemitter2-6.4.5" + sources."eventemitter3-4.0.7" + sources."events-3.3.0" + sources."eventsource-1.1.0" + sources."evp_bytestokey-1.0.3" + sources."execa-1.0.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."express-4.17.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.9.7" + ]; + }) + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" + sources."fast-glob-3.2.11" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.13.0" + sources."faye-websocket-0.11.4" + sources."figgy-pudding-3.5.2" + sources."figures-3.2.0" + sources."file-entry-cache-6.0.1" + (sources."file-loader-4.3.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) + sources."file-uri-to-path-1.0.0" + sources."filesize-3.6.1" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-cache-dir-0.1.1" + sources."find-up-1.1.2" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."flatted-3.2.5" + sources."flush-write-stream-1.1.1" + sources."follow-redirects-1.14.9" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + (sources."fork-ts-checker-webpack-plugin-3.1.1" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."semver-5.7.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."fork-ts-checker-webpack-plugin-v5-5.2.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."schema-utils-2.7.0" + sources."supports-color-7.2.0" + ]; + }) + sources."form-data-2.3.3" + sources."forwarded-0.2.0" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."fs-extra-9.1.0" + sources."fs-monkey-1.0.3" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" + sources."get-stdin-6.0.0" + sources."get-stream-4.1.0" + sources."get-symbol-description-1.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."globals-13.12.1" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) + sources."globby-11.1.0" + sources."graceful-fs-4.2.9" + sources."gzip-size-5.1.1" + sources."handle-thing-2.0.1" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-bigints-1.0.1" + sources."has-cors-1.1.0" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."hash-sum-2.0.0" + sources."hash.js-1.1.7" + sources."he-1.2.0" + sources."hex-color-regex-1.1.0" + sources."highlight.js-10.7.3" + sources."hls.js-1.1.2" + sources."hmac-drbg-1.0.1" + sources."hoopy-0.1.4" + sources."hosted-git-info-2.8.9" + sources."hpack.js-2.1.6" + sources."hsl-regex-1.0.0" + sources."hsla-regex-1.0.0" + sources."html-entities-1.4.0" + (sources."html-minifier-3.5.21" // { + dependencies = [ + sources."commander-2.17.1" + ]; + }) + (sources."html-webpack-plugin-3.2.0" // { + dependencies = [ + sources."big.js-3.2.0" + sources."emojis-list-2.1.0" + sources."json5-0.5.1" + sources."loader-utils-0.2.17" + sources."util.promisify-1.0.0" + ]; + }) + (sources."htmlparser2-6.1.0" // { + dependencies = [ + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.8.0" + ]; + }) + sources."http-deceiver-1.2.7" + sources."http-errors-1.8.1" + sources."http-parser-js-0.5.6" + sources."http-proxy-1.18.1" + sources."http-proxy-middleware-1.3.1" + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."human-signals-1.1.1" + sources."iconv-lite-0.4.24" + sources."icss-utils-4.1.1" + sources."ieee754-1.2.1" + sources."iferr-0.1.5" + sources."ignore-5.2.0" + sources."import-cwd-2.1.0" + sources."import-fresh-3.3.0" + (sources."import-from-2.1.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) + (sources."import-local-2.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."pkg-dir-3.0.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indexes-of-1.0.1" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + sources."restore-cursor-3.1.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."internal-ip-4.3.0" // { + dependencies = [ + sources."default-gateway-4.2.0" + ]; + }) + sources."internal-slot-1.0.3" + sources."interpret-1.4.0" + sources."inversify-6.0.1" + sources."ip-1.1.5" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.1" + sources."is-absolute-url-2.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-arguments-1.1.1" + sources."is-arrayish-0.2.1" + sources."is-bigint-1.0.4" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.2" + sources."is-buffer-1.1.6" + sources."is-callable-1.2.4" + sources."is-ci-1.2.1" + sources."is-color-stop-1.1.0" + sources."is-core-module-2.8.1" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.5" + sources."is-descriptor-1.0.2" + sources."is-directory-0.3.1" + 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" + sources."is-negative-zero-2.0.2" + sources."is-number-7.0.0" + sources."is-number-object-1.0.6" + sources."is-obj-2.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-plain-obj-3.0.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.4" + sources."is-resolvable-1.1.0" + sources."is-shared-array-buffer-1.0.1" + sources."is-stream-1.1.0" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typedarray-1.0.0" + sources."is-weakref-1.0.2" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."javascript-stringify-2.1.0" + sources."js-message-1.0.7" + sources."js-queue-2.0.2" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" + sources."jsbn-0.1.1" + sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-0.4.0" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-1.0.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-1.0.1" + sources."jsonfile-6.1.0" + sources."jsonify-0.0.0" + sources."jsprim-1.4.2" + sources."killable-1.0.1" + sources."kind-of-6.0.3" + sources."klona-2.0.5" + sources."launch-editor-2.3.0" + sources."launch-editor-middleware-2.3.0" + sources."levn-0.4.1" + sources."lines-and-columns-1.2.4" + sources."loader-fs-cache-1.0.3" + sources."loader-runner-2.4.0" + sources."loader-utils-1.4.0" + (sources."locate-path-3.0.0" // { + dependencies = [ + sources."path-exists-3.0.0" + ]; + }) + sources."lodash-4.17.21" + sources."lodash.defaultsdeep-4.6.1" + sources."lodash.mapvalues-4.6.0" + sources."lodash.memoize-4.1.2" + sources."lodash.merge-4.6.2" + sources."lodash.transform-4.6.0" + sources."lodash.truncate-4.4.2" + sources."lodash.uniq-4.5.0" + sources."log-symbols-2.2.0" + sources."loglevel-1.8.0" + sources."lower-case-1.1.4" + sources."lru-cache-6.0.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."material-design-icons-iconfont-6.1.1" + sources."md5.js-1.3.5" + sources."mdn-data-2.0.4" + sources."media-typer-0.3.0" + sources."memfs-3.4.1" + sources."memory-fs-0.4.1" + sources."merge-descriptors-1.0.1" + (sources."merge-source-map-1.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."microevent.ts-0.1.1" + sources."micromatch-4.0.4" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."mime-2.6.0" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" + sources."mimic-fn-1.2.0" + (sources."mini-css-extract-plugin-0.9.0" // { + dependencies = [ + sources."normalize-url-1.9.1" + ]; + }) + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.1.2" + sources."minimist-1.2.5" + sources."minipass-3.1.6" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."move-concurrently-1.0.1" + sources."mpegts.js-1.6.10" + sources."ms-2.1.2" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."mute-stream-0.0.8" + sources."mz-2.7.0" + sources."nan-2.15.0" + sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" + sources."negotiator-0.6.3" + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."no-case-2.3.2" + sources."node-forge-0.10.0" + sources."node-ipc-9.2.1" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."node-releases-2.0.2" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."normalize-path-3.0.0" + sources."normalize-range-0.1.2" + sources."normalize-url-3.3.0" + sources."npm-run-path-2.0.2" + sources."nth-check-1.0.2" + (sources."null-loader-4.0.1" // { + dependencies = [ + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."num2fraction-1.2.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-hash-1.3.1" + sources."object-inspect-1.12.0" + sources."object-is-1.1.5" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.3" + sources."object.pick-1.3.0" + sources."object.values-1.1.5" + sources."obuf-1.1.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."open-6.4.0" + sources."opener-1.5.2" + sources."opn-5.5.0" + sources."optionator-0.9.1" + (sources."ora-3.4.0" // { + dependencies = [ + sources."strip-ansi-5.2.0" + ]; + }) + sources."original-1.0.2" + sources."os-browserify-0.3.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-map-2.1.0" + sources."p-retry-3.0.1" + sources."p-try-2.2.0" + sources."pako-1.0.11" + sources."parallel-transform-1.2.0" + sources."param-case-2.1.1" + sources."parent-module-1.0.1" + sources."parse-asn1-5.1.6" + sources."parse-json-5.2.0" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."pbkdf2-3.1.2" + sources."performance-now-2.1.0" + sources."picocolors-1.0.0" + sources."picomatch-2.3.1" + sources."pify-4.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-dir-1.0.0" + sources."pnp-webpack-plugin-1.7.0" + (sources."portfinder-1.0.28" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.39" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."source-map-0.6.1" + ]; + }) + sources."postcss-calc-7.0.5" + (sources."postcss-colormin-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-convert-values-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-discard-comments-4.0.2" + sources."postcss-discard-duplicates-4.0.2" + sources."postcss-discard-empty-4.0.1" + sources."postcss-discard-overridden-4.0.1" + (sources."postcss-load-config-2.1.2" // { + dependencies = [ + sources."cosmiconfig-5.2.1" + sources."import-fresh-2.0.0" + sources."parse-json-4.0.0" + sources."resolve-from-3.0.0" + ]; + }) + sources."postcss-loader-3.0.0" + (sources."postcss-merge-longhand-4.0.11" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-merge-rules-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + (sources."postcss-minify-font-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-gradients-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-params-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-selectors-4.0.2" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."postcss-modules-extract-imports-2.0.0" + sources."postcss-modules-local-by-default-3.0.3" + sources."postcss-modules-scope-2.2.0" + sources."postcss-modules-values-3.0.0" + sources."postcss-normalize-charset-4.0.1" + (sources."postcss-normalize-display-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-positions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-repeat-style-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-string-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-timing-functions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-unicode-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-url-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-whitespace-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-ordered-values-4.1.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-reduce-initial-4.0.3" + (sources."postcss-reduce-transforms-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-selector-parser-6.0.9" + (sources."postcss-svgo-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-unique-selectors-4.0.1" + sources."postcss-value-parser-4.2.0" + sources."prelude-ls-1.2.1" + sources."prepend-http-1.0.4" + sources."prettier-2.4.1" + sources."prettier-linter-helpers-1.0.0" + sources."pretty-error-2.1.2" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."promise-inflight-1.0.1" + sources."proxy-addr-2.0.7" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."psl-1.8.0" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.3" + sources."query-string-4.3.4" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + sources."raw-body-2.4.3" + sources."read-pkg-5.2.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."readdirp-3.6.0" + sources."rechoir-0.6.2" + sources."reflect-metadata-0.1.13" + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.4.1" + sources."regexpp-3.2.0" + sources."relateurl-0.2.7" + sources."remove-trailing-separator-1.1.0" + (sources."renderkid-2.0.7" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."css-select-4.2.1" + sources."css-what-5.1.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.8.0" + sources."nth-check-2.0.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."request-2.88.2" + sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" + sources."require-main-filename-2.0.0" + sources."requires-port-1.0.0" + sources."resize-observer-polyfill-1.5.1" + sources."resolve-1.22.0" + (sources."resolve-cwd-2.0.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."reusify-1.0.4" + sources."rgb-regex-1.0.1" + sources."rgba-regex-1.0.0" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."roboto-fontface-0.10.0" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" + sources."run-queue-1.0.3" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sass-1.32.12" + (sources."sass-loader-10.2.0" // { + dependencies = [ + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."sax-1.2.4" + sources."schema-utils-1.0.0" + sources."select-hose-2.0.0" + sources."selfsigned-1.10.14" + sources."semver-7.3.5" + (sources."send-0.17.2" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."mime-1.6.0" + sources."ms-2.1.3" + ]; + }) + sources."serialize-javascript-4.0.0" + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."ms-2.0.0" + sources."setprototypeof-1.1.0" + ]; + }) + sources."serve-static-1.14.2" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."setprototypeof-1.2.0" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.3" + sources."shelljs-0.8.5" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."smoothscroll-polyfill-0.4.4" + (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."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."socket.io-client-4.3.2" + sources."socket.io-parser-4.1.2" + (sources."sockjs-0.3.24" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) + (sources."sockjs-client-1.6.0" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + (sources."sort-keys-1.1.2" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.21" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.1" + sources."spark-md5-3.0.2" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.11" + sources."spdy-4.0.2" + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.17.0" + sources."ssri-6.0.2" + sources."stable-0.1.8" + sources."stackframe-1.2.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."statuses-1.5.0" + sources."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.1" + sources."strict-uri-encode-1.1.0" + sources."string-width-4.2.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."strip-ansi-6.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + ]; + }) + sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-2.0.0" + sources."strip-json-comments-3.1.1" + (sources."stylehacks-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."supports-color-5.5.0" + sources."supports-preserve-symlinks-flag-1.0.0" + sources."svgo-1.3.2" + (sources."table-6.8.0" // { + dependencies = [ + sources."ajv-8.10.0" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."tapable-1.1.3" + (sources."terser-4.8.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-1.4.5" // { + dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."pkg-dir-3.0.0" + sources."source-map-0.6.1" + ]; + }) + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."thread-loader-2.1.3" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."thunky-1.1.0" + sources."timers-browserify-2.0.12" + sources."timsort-0.3.0" + sources."tmp-0.0.33" + sources."to-arraybuffer-1.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.1" + sources."toposort-1.0.7" + sources."tough-cookie-2.5.0" + sources."tryer-1.0.1" + (sources."ts-loader-6.2.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."ts-pnp-1.2.0" + sources."tslib-1.14.1" + (sources."tslint-5.20.1" // { + dependencies = [ + sources."semver-5.7.1" + sources."tsutils-2.29.0" + ]; + }) + sources."tsutils-3.21.0" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.4.0" + sources."type-fest-0.6.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typeface-roboto-1.1.13" + sources."typescript-4.4.4" + (sources."uglify-js-3.4.10" // { + dependencies = [ + sources."commander-2.19.0" + sources."source-map-0.6.1" + ]; + }) + sources."unbox-primitive-1.0.1" + sources."union-value-1.0.1" + sources."uniq-1.0.1" + sources."uniqs-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."universalify-2.0.0" + sources."unpipe-1.0.0" + sources."unquote-1.1.1" + (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."upath-1.2.0" + sources."upper-case-1.1.3" + sources."uri-js-4.4.1" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."url-loader-2.3.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) + sources."url-parse-1.5.10" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.1" + sources."utila-0.4.0" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."v8-compile-cache-2.3.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."vendors-1.0.4" + sources."verror-1.10.0" + sources."vm-browserify-1.1.2" + sources."vue-2.6.14" + sources."vue-class-component-7.2.6" + sources."vue-cli-plugin-vuetify-2.4.3" + (sources."vue-eslint-parser-7.11.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + sources."semver-6.3.0" + ]; + }) + sources."vue-hot-reload-api-2.3.4" + (sources."vue-loader-15.9.8" // { + dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + (sources."vue-loader-v16-16.8.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."supports-color-7.2.0" + ]; + }) + sources."vue-property-decorator-9.1.2" + sources."vue-router-3.5.3" + (sources."vue-style-loader-4.1.3" // { + dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + sources."vue-template-compiler-2.6.14" + sources."vue-template-es2015-compiler-1.9.1" + sources."vuetify-2.5.10" + sources."vuetify-datetime-picker-2.1.1" + (sources."vuetify-loader-1.7.3" // { + dependencies = [ + sources."file-loader-6.2.0" + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."watchpack-1.7.5" + (sources."watchpack-chokidar2-2.0.1" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + sources."is-binary-path-1.0.1" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readdirp-2.2.1" + sources."to-regex-range-2.1.1" + ]; + }) + sources."wbuf-1.7.3" + sources."wcwidth-1.0.1" + (sources."webpack-4.46.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."eslint-scope-4.0.3" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-bundle-analyzer-3.9.0" // { + dependencies = [ + sources."acorn-7.4.1" + sources."ws-6.2.2" + ]; + }) + (sources."webpack-chain-6.5.1" // { + dependencies = [ + sources."deepmerge-1.5.2" + ]; + }) + sources."webpack-dev-middleware-3.7.3" + (sources."webpack-dev-server-3.11.3" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."emoji-regex-7.0.3" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."find-up-3.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + (sources."http-proxy-middleware-0.19.1" // { + dependencies = [ + sources."is-glob-4.0.3" + ]; + }) + sources."is-absolute-url-3.0.3" + sources."is-binary-path-1.0.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readdirp-2.2.1" + sources."semver-6.3.0" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."supports-color-6.1.0" + sources."to-regex-range-2.1.1" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."ws-6.2.2" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + }) + sources."webpack-log-2.0.0" + sources."webpack-merge-4.2.2" + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."websocket-driver-0.7.4" + sources."websocket-extensions-0.1.4" + sources."webworkify-webpack-2.1.5" + sources."which-1.3.1" + sources."which-boxed-primitive-1.0.2" + sources."which-module-2.0.0" + sources."word-wrap-1.2.3" + sources."worker-farm-1.7.0" + sources."worker-rpc-0.1.1" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-8.2.3" + sources."xmlhttprequest-ssl-2.0.0" + sources."xtend-4.0.2" + sources."y18n-4.0.3" + sources."yallist-4.0.0" + sources."yaml-1.10.2" + (sources."yargs-16.2.0" // { + dependencies = [ + sources."cliui-7.0.4" + sources."y18n-5.0.8" + ]; + }) + sources."yargs-parser-20.2.9" + sources."yeast-0.1.2" + (sources."yorkie-2.0.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.8.0" + sources."get-stream-3.0.0" + sources."lru-cache-4.1.5" + sources."normalize-path-1.0.0" + sources."yallist-2.1.2" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; escape-string-regexp = nodeEnv.buildNodePackage { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -91788,10 +94351,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.2.0.tgz"; - sha512 = "0zyZwv7mBmeeEMZ7ur5xHt/klu1CNiuMuTbsrbDOvQPqDxyLOKlQtvsJOn9VHCUt8sAlyN21Jmu7KI6lH7fSgQ=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.3.0.tgz"; + sha512 = "Oi5E+C3AtAHOwqBbL3GL1eQErfDnZGmIqbMjlDGp8WtELN0f+fdfWA4ZldCOSjnqsYg7hYQFgrZXjIXbjYsC9Q=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -91832,15 +94395,15 @@ in sources."@babel/types-7.17.0" sources."@expo/apple-utils-0.0.0-alpha.26" sources."@expo/bunyan-4.0.0" - sources."@expo/config-6.0.18" - (sources."@expo/config-plugins-4.0.18" // { + sources."@expo/config-6.0.19" + (sources."@expo/config-plugins-4.1.0" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-44.0.0" - sources."@expo/dev-server-0.1.105" - sources."@expo/dev-tools-0.13.145" + sources."@expo/dev-server-0.1.106" + sources."@expo/dev-tools-0.13.146" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -91856,7 +94419,7 @@ in ]; }) sources."@expo/json-file-8.2.34" - sources."@expo/metro-config-0.3.11" + sources."@expo/metro-config-0.3.12" sources."@expo/osascript-2.0.31" (sources."@expo/package-manager-0.0.50" // { dependencies = [ @@ -91870,12 +94433,12 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-3.0.18" + sources."@expo/prebuild-config-3.1.0" sources."@expo/rudder-sdk-node-1.1.1" sources."@expo/schemer-1.3.33" sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.16.18" // { + (sources."@expo/webpack-config-0.16.19" // { dependencies = [ sources."is-wsl-2.2.0" ]; @@ -92135,7 +94698,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -92393,7 +94956,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92410,7 +94973,6 @@ in }) sources."entities-2.2.0" sources."env-editor-0.4.2" - sources."envinfo-7.8.1" sources."eol-0.9.1" sources."errno-0.1.8" sources."error-ex-1.3.2" @@ -92466,7 +95028,7 @@ in sources."fs-extra-9.1.0" ]; }) - (sources."expo-pwa-0.0.113" // { + (sources."expo-pwa-0.0.114" // { dependencies = [ sources."commander-2.20.0" ]; @@ -93859,7 +96421,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.2.29" // { + (sources."xdl-59.2.30" // { dependencies = [ sources."bplist-parser-0.3.1" sources."chownr-1.1.4" @@ -93984,7 +96546,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -94008,8 +96570,8 @@ in ]; }) sources."delay-5.0.0" - sources."devtools-protocol-0.0.960912" - sources."electron-to-chromium-1.4.76" + sources."devtools-protocol-0.0.969999" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -94100,14 +96662,14 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - (sources."puppeteer-13.4.1" // { + (sources."puppeteer-13.5.1" // { dependencies = [ sources."ws-8.5.0" ]; }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.23.0" + sources."react-devtools-core-4.24.0" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -94411,7 +96973,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."type-fest-0.21.3" @@ -94511,7 +97073,7 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -94847,7 +97409,7 @@ in sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -94940,7 +97502,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."gauge-4.0.2" + sources."gauge-4.0.3" sources."gaxios-4.3.2" sources."gcp-metadata-4.3.1" sources."get-caller-file-2.0.5" @@ -94988,7 +97550,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.7" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."install-artifact-from-github-1.3.0" sources."ip-1.1.5" sources."ip-regex-4.3.0" @@ -95106,11 +97668,7 @@ in ]; }) sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) + sources."memoizee-0.4.15" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.6.0" @@ -95145,7 +97703,7 @@ in }) sources."negotiator-0.6.3" sources."netmask-2.0.2" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-emoji-1.11.0" sources."node-fetch-2.6.7" @@ -95254,7 +97812,7 @@ in }) sources."rsvp-4.8.5" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" @@ -95575,7 +98133,7 @@ in sources."ieee754-1.2.1" sources."indent-string-5.0.0" sources."inherits-2.0.4" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" @@ -95659,7 +98217,7 @@ in sources."redent-4.0.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -96453,10 +99011,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.9.0.tgz"; - sha512 = "e4pQ+7Z+9Cppql59fy0OOo2El+ERkzOCVW2+ev5CojiljDb4x/nUHIx9ahKhgA5136F0DaCZ6w/lrOWJmi3ZSQ=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.9.1.tgz"; + sha512 = "iU5pmwAq5d1XXo98BkYe2KccH3Dy/jsj7QsvP0CpfzOO0EFtidg5KUzPPaekLaGyoqxiMwWf0uAX7S1ERzMFYw=="; }; dependencies = [ sources."@ampproject/remapping-2.1.2" @@ -96545,7 +99103,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -96609,7 +99167,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -96644,8 +99202,8 @@ in sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.9.0" - (sources."gatsby-telemetry-3.9.0" // { + sources."gatsby-core-utils-3.9.1" + (sources."gatsby-telemetry-3.9.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -97438,7 +99996,7 @@ in sources."li-1.3.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."lowercase-keys-2.0.0" @@ -97453,7 +100011,7 @@ in sources."onetime-5.1.2" (sources."ora-6.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."p-cancelable-2.1.1" @@ -97635,7 +100193,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" (sources."inquirer-autocomplete-prompt-1.4.0" // { dependencies = [ sources."rxjs-6.6.7" @@ -97772,7 +100330,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -98639,14 +101197,14 @@ in sources."@cronvel/get-pixels-3.4.0" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" sources."@graphql-tools/batch-execute-8.3.2" - sources."@graphql-tools/delegate-8.5.1" + sources."@graphql-tools/delegate-8.5.2" sources."@graphql-tools/graphql-file-loader-7.3.4" sources."@graphql-tools/import-6.6.6" sources."@graphql-tools/json-file-loader-7.3.4" sources."@graphql-tools/load-7.5.2" sources."@graphql-tools/merge-8.2.3" sources."@graphql-tools/schema-8.3.2" - (sources."@graphql-tools/url-loader-7.8.0" // { + (sources."@graphql-tools/url-loader-7.9.1" // { dependencies = [ (sources."subscriptions-transport-ws-0.11.0" // { dependencies = [ @@ -98819,7 +101377,7 @@ in sources."graphql-language-service-parser-1.10.4" sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" - sources."graphql-sse-1.0.6" + sources."graphql-sse-1.1.0" sources."graphql-ws-5.6.2" sources."has-flag-4.0.0" sources."http-errors-1.6.3" @@ -98959,13 +101517,12 @@ in sources."ts-node-9.1.1" sources."tslib-2.3.1" sources."type-is-1.6.18" - sources."undici-4.15.0" + sources."undici-4.15.1" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" - sources."valid-url-1.0.9" sources."value-or-promise-1.0.11" sources."vary-1.1.2" sources."vscode-languageserver-types-3.16.0" @@ -99257,7 +101814,7 @@ in sources."marked-4.0.12" (sources."marked-terminal-5.1.1" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."memory-streams-0.1.3" @@ -99285,7 +101842,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.11.6" + sources."systeminformation-5.11.7" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -99426,7 +101983,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -99574,7 +102131,7 @@ in sources."mute-stdout-1.0.1" sources."nan-2.15.0" sources."nanomatch-1.2.13" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."now-and-later-2.0.1" @@ -99846,7 +102403,7 @@ in ]; }) sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" (sources."expand-brackets-2.1.4" // { @@ -99993,7 +102550,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" (sources."object-copy-0.1.0" // { @@ -100183,7 +102740,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.15.2" + sources."uglify-js-3.15.3" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -100488,7 +103045,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1087.0" + sources."aws-sdk-2.1092.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -101059,7 +103616,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.32.0" + sources."jquery.terminal-2.32.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -101956,87 +104513,87 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.53.0" + sources."@aws-sdk/abort-controller-3.54.0" sources."@aws-sdk/chunked-blob-reader-3.52.0" sources."@aws-sdk/chunked-blob-reader-native-3.52.0" - sources."@aws-sdk/client-s3-3.53.1" - sources."@aws-sdk/client-sso-3.53.0" - sources."@aws-sdk/client-sts-3.53.0" - sources."@aws-sdk/config-resolver-3.53.0" - sources."@aws-sdk/credential-provider-env-3.53.0" - sources."@aws-sdk/credential-provider-imds-3.53.0" - sources."@aws-sdk/credential-provider-ini-3.53.0" - sources."@aws-sdk/credential-provider-node-3.53.0" - sources."@aws-sdk/credential-provider-process-3.53.0" - sources."@aws-sdk/credential-provider-sso-3.53.0" - sources."@aws-sdk/credential-provider-web-identity-3.53.0" - sources."@aws-sdk/eventstream-marshaller-3.53.0" - sources."@aws-sdk/eventstream-serde-browser-3.53.0" - sources."@aws-sdk/eventstream-serde-config-resolver-3.53.0" - sources."@aws-sdk/eventstream-serde-node-3.53.0" - sources."@aws-sdk/eventstream-serde-universal-3.53.0" - sources."@aws-sdk/fetch-http-handler-3.53.0" - sources."@aws-sdk/hash-blob-browser-3.53.0" - sources."@aws-sdk/hash-node-3.53.0" - sources."@aws-sdk/hash-stream-node-3.53.1" - sources."@aws-sdk/invalid-dependency-3.53.0" + sources."@aws-sdk/client-s3-3.54.0" + sources."@aws-sdk/client-sso-3.54.0" + sources."@aws-sdk/client-sts-3.54.0" + sources."@aws-sdk/config-resolver-3.54.0" + sources."@aws-sdk/credential-provider-env-3.54.0" + sources."@aws-sdk/credential-provider-imds-3.54.0" + sources."@aws-sdk/credential-provider-ini-3.54.0" + sources."@aws-sdk/credential-provider-node-3.54.0" + sources."@aws-sdk/credential-provider-process-3.54.0" + sources."@aws-sdk/credential-provider-sso-3.54.0" + sources."@aws-sdk/credential-provider-web-identity-3.54.0" + sources."@aws-sdk/eventstream-marshaller-3.54.0" + sources."@aws-sdk/eventstream-serde-browser-3.54.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.54.0" + sources."@aws-sdk/eventstream-serde-node-3.54.0" + sources."@aws-sdk/eventstream-serde-universal-3.54.0" + sources."@aws-sdk/fetch-http-handler-3.54.0" + sources."@aws-sdk/hash-blob-browser-3.54.0" + sources."@aws-sdk/hash-node-3.54.0" + sources."@aws-sdk/hash-stream-node-3.54.0" + sources."@aws-sdk/invalid-dependency-3.54.0" sources."@aws-sdk/is-array-buffer-3.52.0" - sources."@aws-sdk/md5-js-3.53.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.53.0" - sources."@aws-sdk/middleware-content-length-3.53.0" - sources."@aws-sdk/middleware-expect-continue-3.53.0" - sources."@aws-sdk/middleware-flexible-checksums-3.53.0" - sources."@aws-sdk/middleware-header-default-3.53.0" - sources."@aws-sdk/middleware-host-header-3.53.0" - sources."@aws-sdk/middleware-location-constraint-3.53.0" - sources."@aws-sdk/middleware-logger-3.53.0" - (sources."@aws-sdk/middleware-retry-3.53.0" // { + sources."@aws-sdk/md5-js-3.54.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.54.0" + sources."@aws-sdk/middleware-content-length-3.54.0" + sources."@aws-sdk/middleware-expect-continue-3.54.0" + sources."@aws-sdk/middleware-flexible-checksums-3.54.0" + sources."@aws-sdk/middleware-header-default-3.54.0" + sources."@aws-sdk/middleware-host-header-3.54.0" + sources."@aws-sdk/middleware-location-constraint-3.54.0" + sources."@aws-sdk/middleware-logger-3.54.0" + (sources."@aws-sdk/middleware-retry-3.54.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.53.0" - sources."@aws-sdk/middleware-sdk-sts-3.53.0" - sources."@aws-sdk/middleware-serde-3.53.0" - sources."@aws-sdk/middleware-signing-3.53.0" - sources."@aws-sdk/middleware-ssec-3.53.0" - sources."@aws-sdk/middleware-stack-3.53.0" - sources."@aws-sdk/middleware-user-agent-3.53.0" - sources."@aws-sdk/node-config-provider-3.53.0" - sources."@aws-sdk/node-http-handler-3.53.0" - sources."@aws-sdk/property-provider-3.53.0" - sources."@aws-sdk/protocol-http-3.53.0" - sources."@aws-sdk/querystring-builder-3.53.0" - sources."@aws-sdk/querystring-parser-3.53.0" - sources."@aws-sdk/s3-request-presigner-3.53.1" - sources."@aws-sdk/service-error-classification-3.53.0" + sources."@aws-sdk/middleware-sdk-s3-3.54.0" + sources."@aws-sdk/middleware-sdk-sts-3.54.0" + sources."@aws-sdk/middleware-serde-3.54.0" + sources."@aws-sdk/middleware-signing-3.54.0" + sources."@aws-sdk/middleware-ssec-3.54.0" + sources."@aws-sdk/middleware-stack-3.54.0" + sources."@aws-sdk/middleware-user-agent-3.54.0" + sources."@aws-sdk/node-config-provider-3.54.0" + sources."@aws-sdk/node-http-handler-3.54.0" + sources."@aws-sdk/property-provider-3.54.0" + sources."@aws-sdk/protocol-http-3.54.0" + sources."@aws-sdk/querystring-builder-3.54.0" + sources."@aws-sdk/querystring-parser-3.54.0" + sources."@aws-sdk/s3-request-presigner-3.54.0" + sources."@aws-sdk/service-error-classification-3.54.0" sources."@aws-sdk/shared-ini-file-loader-3.52.0" - sources."@aws-sdk/signature-v4-3.53.0" - sources."@aws-sdk/smithy-client-3.53.0" - sources."@aws-sdk/types-3.53.0" - sources."@aws-sdk/url-parser-3.53.0" + sources."@aws-sdk/signature-v4-3.54.0" + sources."@aws-sdk/smithy-client-3.54.0" + sources."@aws-sdk/types-3.54.0" + sources."@aws-sdk/url-parser-3.54.0" sources."@aws-sdk/util-arn-parser-3.52.0" sources."@aws-sdk/util-base64-browser-3.52.0" sources."@aws-sdk/util-base64-node-3.52.0" - sources."@aws-sdk/util-body-length-browser-3.52.0" - sources."@aws-sdk/util-body-length-node-3.52.0" + sources."@aws-sdk/util-body-length-browser-3.54.0" + sources."@aws-sdk/util-body-length-node-3.54.0" sources."@aws-sdk/util-buffer-from-3.52.0" sources."@aws-sdk/util-config-provider-3.52.0" - sources."@aws-sdk/util-create-request-3.53.0" + sources."@aws-sdk/util-create-request-3.54.0" sources."@aws-sdk/util-credentials-3.53.0" - sources."@aws-sdk/util-defaults-mode-browser-3.53.0" - sources."@aws-sdk/util-defaults-mode-node-3.53.0" - sources."@aws-sdk/util-format-url-3.53.0" + sources."@aws-sdk/util-defaults-mode-browser-3.54.0" + sources."@aws-sdk/util-defaults-mode-node-3.54.0" + sources."@aws-sdk/util-format-url-3.54.0" sources."@aws-sdk/util-hex-encoding-3.52.0" sources."@aws-sdk/util-locate-window-3.52.0" - sources."@aws-sdk/util-stream-browser-3.53.0" - sources."@aws-sdk/util-stream-node-3.53.0" + sources."@aws-sdk/util-stream-browser-3.54.0" + sources."@aws-sdk/util-stream-node-3.54.0" sources."@aws-sdk/util-uri-escape-3.52.0" - sources."@aws-sdk/util-user-agent-browser-3.53.0" - sources."@aws-sdk/util-user-agent-node-3.53.0" + sources."@aws-sdk/util-user-agent-browser-3.54.0" + sources."@aws-sdk/util-user-agent-node-3.54.0" sources."@aws-sdk/util-utf8-browser-3.52.0" sources."@aws-sdk/util-utf8-node-3.52.0" - sources."@aws-sdk/util-waiter-3.53.0" + sources."@aws-sdk/util-waiter-3.54.0" sources."@aws-sdk/xml-builder-3.52.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" @@ -102097,7 +104654,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1087.0" // { + (sources."aws-sdk-2.1092.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -102972,17 +105529,17 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.2.tgz"; - sha512 = "m+rr5cvC8gML9iB8FatQpQ/NEBJ7LHUFMM4KoNfmCfhTElm42SnqslCGKpYB+Dt1NgkibRVrGP0ZAO3TOU1hpA=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.3.tgz"; + sha512 = "VBvNBt3cIrCBHa3gYbVsCFUEReqWZPf+Biq1ZtFdIiQ6rytRLDp3qvtrGv7z/iZDd1D4vXWpW7Nx1nP8muLzkg=="; }; dependencies = [ sources."cli-color-2.0.1" sources."d-1.0.1" sources."difflib-0.2.4" sources."dreamopt-0.8.0" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -102995,12 +105552,8 @@ in sources."heap-0.2.7" sources."is-promise-2.2.2" sources."lru-queue-0.1.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) - sources."next-tick-1.0.0" + sources."memoizee-0.4.15" + sources."next-tick-1.1.0" sources."timers-ext-0.1.7" sources."type-1.2.0" sources."wordwrap-1.0.0" @@ -103999,7 +106552,7 @@ in sources."dotenv-8.6.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."escape-string-regexp-4.0.0" @@ -104067,7 +106620,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-orderby-2.0.3" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-downloader-helper-1.0.19" sources."object-inspect-1.12.0" @@ -104438,7 +106991,7 @@ in sources."bytes-3.1.2" sources."bytesish-0.4.4" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-1.4.0" @@ -104493,7 +107046,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -105730,7 +108283,7 @@ in (sources."init-package-json-2.0.5" // { dependencies = [ sources."normalize-package-data-3.0.3" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" ]; }) sources."inquirer-7.3.3" @@ -106046,7 +108599,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.15.2" + sources."uglify-js-3.15.3" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -107335,7 +109888,7 @@ in sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -107458,7 +110011,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -108769,7 +111322,7 @@ in }) sources."ecc-jsbn-0.1.2" sources."entities-1.1.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -108895,7 +111448,7 @@ in sources."multipipe-0.1.2" sources."mute-stream-0.0.5" sources."natural-compare-1.4.0" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."node-addon-api-1.7.2" sources."node-fetch-2.6.1" sources."number-is-nan-1.0.1" @@ -109194,7 +111747,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-13.5.0" + sources."puppeteer-13.5.1" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" @@ -109229,10 +111782,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz"; - sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz"; + sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -109273,7 +111826,11 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.2.0" + (sources."glob-7.2.0" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) sources."glob-parent-5.1.2" sources."growl-1.10.5" sources."has-flag-4.0.0" @@ -109291,9 +111848,9 @@ in sources."js-yaml-4.1.0" sources."locate-path-6.0.0" sources."log-symbols-4.1.0" - sources."minimatch-3.0.4" + sources."minimatch-4.2.1" sources."ms-2.1.3" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" @@ -109704,7 +112261,7 @@ in sources."ncp-2.0.0" sources."near-api-js-0.44.2" sources."near-hd-key-1.2.1" - sources."near-ledger-js-0.2.0" + sources."near-ledger-js-0.2.1" sources."near-seed-phrase-0.2.0" (sources."node-abi-2.30.1" // { dependencies = [ @@ -109959,7 +112516,7 @@ in sources."err-code-2.0.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."gauge-4.0.2" + sources."gauge-4.0.3" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-unicode-2.0.1" @@ -109977,12 +112534,12 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."lru-cache-7.4.1" - sources."make-fetch-happen-10.0.4" + sources."lru-cache-7.4.4" + sources."make-fetch-happen-10.0.5" sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.0.2" + sources."minipass-fetch-2.0.3" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -111731,10 +114288,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "8.5.3"; + version = "8.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-8.5.3.tgz"; - sha512 = "O+1j66Alx7ZQgWnUSSTaz8rTqQrJnqNb8Num5uQw2vYvc2RrxLaX7cWtRkDhvkPIL8Nf2WU9gx1oSu268QConA=="; + url = "https://registry.npmjs.org/npm/-/npm-8.5.4.tgz"; + sha512 = "VnGLT4t88cUE78lLw5kxBwtLn2/Sx6O7Uw9dYwmq6AnF/taWHyMYQgDzUEsLhaXAVH7prG+sjG+MvxlHdIasgg=="; }; buildInputs = globalBuildInputs; meta = { @@ -111749,10 +114306,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "12.5.2"; + version = "12.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.2.tgz"; - sha512 = "XJGFO3kgcm+WJljOPRYZf/W40FSzEcLDacQ1WPEgW4qXlQy4Ihr1eVnlS2+43y0YEF+qjLkycr7WbHyfkm6C4A=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.3.tgz"; + sha512 = "siFg/+Un+j4tLA6GJCnk6hz2YU4Yc5bftDnOoiSRLKL6NeAS3FScB32mtKNBtITMJf2nsoZSr8vH+wdUGeP19g=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -111762,7 +114319,7 @@ in sources."@npmcli/fs-1.1.1" (sources."@npmcli/git-3.0.0" // { dependencies = [ - sources."lru-cache-7.4.1" + sources."lru-cache-7.4.4" ]; }) sources."@npmcli/installed-package-contents-1.0.7" @@ -111840,7 +114397,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.2" + sources."gauge-4.0.3" sources."get-stdin-8.0.0" sources."get-stream-4.1.0" (sources."glob-7.2.0" // { @@ -111926,9 +114483,9 @@ in sources."semver-6.3.0" ]; }) - (sources."make-fetch-happen-10.0.4" // { + (sources."make-fetch-happen-10.0.5" // { dependencies = [ - sources."lru-cache-7.4.1" + sources."lru-cache-7.4.4" ]; }) sources."merge2-1.4.1" @@ -111938,7 +114495,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.0.2" + sources."minipass-fetch-2.0.3" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -111987,7 +114544,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."rc-config-loader-4.0.0" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" sources."registry-auth-token-4.2.1" @@ -112145,7 +114702,7 @@ in sources."mkdirp-0.5.5" ]; }) - sources."gauge-4.0.2" + sources."gauge-4.0.3" sources."getpass-0.1.7" sources."glob-7.2.0" sources."graceful-fs-2.0.3" @@ -112620,7 +115177,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -112757,7 +115314,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -113486,7 +116043,7 @@ in sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -113508,8 +116065,8 @@ in sources."css-tree-1.1.3" sources."css-what-5.1.0" sources."cssesc-3.0.0" - sources."cssnano-5.1.0" - sources."cssnano-preset-default-5.2.0" + sources."cssnano-5.1.3" + sources."cssnano-preset-default-5.2.3" sources."cssnano-utils-3.1.0" sources."csso-4.2.0" sources."detect-libc-1.0.3" @@ -113519,7 +116076,7 @@ in sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" sources."entities-2.2.0" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -113566,15 +116123,15 @@ in sources."postcss-calc-8.2.4" sources."postcss-colormin-5.3.0" sources."postcss-convert-values-5.1.0" - sources."postcss-discard-comments-5.1.0" + sources."postcss-discard-comments-5.1.1" sources."postcss-discard-duplicates-5.1.0" - sources."postcss-discard-empty-5.1.0" + sources."postcss-discard-empty-5.1.1" sources."postcss-discard-overridden-5.1.0" - sources."postcss-merge-longhand-5.1.0" + sources."postcss-merge-longhand-5.1.1" sources."postcss-merge-rules-5.1.0" sources."postcss-minify-font-values-5.1.0" sources."postcss-minify-gradients-5.1.0" - sources."postcss-minify-params-5.1.0" + sources."postcss-minify-params-5.1.1" sources."postcss-minify-selectors-5.2.0" sources."postcss-normalize-charset-5.1.0" sources."postcss-normalize-display-values-5.1.0" @@ -113584,13 +116141,13 @@ in sources."postcss-normalize-timing-functions-5.1.0" sources."postcss-normalize-unicode-5.1.0" sources."postcss-normalize-url-5.1.0" - sources."postcss-normalize-whitespace-5.1.0" + sources."postcss-normalize-whitespace-5.1.1" sources."postcss-ordered-values-5.1.0" sources."postcss-reduce-initial-5.1.0" sources."postcss-reduce-transforms-5.1.0" sources."postcss-selector-parser-6.0.9" sources."postcss-svgo-5.1.0" - sources."postcss-unique-selectors-5.1.0" + sources."postcss-unique-selectors-5.1.1" sources."postcss-value-parser-4.2.0" sources."posthtml-0.16.6" sources."posthtml-parser-0.11.0" @@ -113882,7 +116439,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.15.2" + sources."uglify-js-3.15.3" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -115073,7 +117630,7 @@ in sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.6" + sources."systeminformation-5.11.8" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.3.1" @@ -115525,10 +118082,10 @@ in pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; - version = "15.0.0"; + version = "16.0.0-0"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-15.0.0.tgz"; - sha512 = "JPzDiSjxwySAFOFnpevZO7YzzDgGdJP/SQap1UJbK0rsrfUVQC+zOHDkm7A8T3gR/0el4ft6KwB6fcDl2bTzVw=="; + url = "https://registry.npmjs.org/pulp/-/pulp-16.0.0-0.tgz"; + sha512 = "6nG6qg/p5IGa0k4w9EkBVBX3+7Ra1mjbOCYwbn85kjUC6x1jkyP+hAP7xAwBxTPgxSD8x5IZtoX9sbrNeKecnQ=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -115966,10 +118523,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.227"; + version = "1.1.228"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.227.tgz"; - sha512 = "/nRQqbTpHraNiUZ0tpQfWYyqOV4nByx/rRHZp+wFjRv6v3Vfg1rIa973y9LsfH/vGkETbZMvRanb8VSlWp9Tlg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.228.tgz"; + sha512 = "Q/LnDoZK6bxc7u60kFjFwi9X3s79kLaGd/g23T0c6T1CUdrRxDyRTvNRLjLPSLaX8EuPIdcXuPXAzXgSjBz/Mw=="; }; buildInputs = globalBuildInputs; meta = { @@ -116659,7 +119216,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -116887,7 +119444,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -118282,7 +120839,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.85" + sources."@redocly/openapi-core-1.0.0-beta.87" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" sources."@types/node-14.18.12" @@ -118525,7 +121082,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.15.2" + sources."uglify-js-3.15.3" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -119387,12 +121944,12 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - (sources."mocha-9.2.1" // { + (sources."mocha-9.2.2" // { dependencies = [ sources."argparse-2.0.1" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" - sources."minimatch-3.0.4" + sources."minimatch-4.2.1" sources."ms-2.1.3" sources."supports-color-8.1.1" sources."yargs-16.2.0" @@ -119401,7 +121958,7 @@ in }) sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."node-abi-3.8.0" @@ -119880,10 +122437,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.7.1"; + version = "3.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.7.1.tgz"; - sha512 = "DIPgJ/jbWQpF1kyAhQR6b3Lqjq2Dwv/41D5UdNyMsnvV5eUOEm5pcCAQE7aT+N/rS8F1ez47iaZyi70esNe3PQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.7.4.tgz"; + sha512 = "TsrSGfzKO9N0/rp2dROVUrKgku3b3JHP1wBEPrCgLLmfBTBLRi6YoTK9HAWgehNa+uSHdE4x02s+nttXU6qhtQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -119892,7 +122449,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@serverless/aws-lambda-otel-extension-dist-0.1.6" + sources."@serverless/aws-lambda-otel-extension-dist-0.1.10" sources."@serverless/dashboard-plugin-6.1.5" sources."@serverless/event-mocks-1.1.1" (sources."@serverless/platform-client-4.3.2" // { @@ -119938,7 +122495,7 @@ in sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1087.0" // { + (sources."aws-sdk-2.1092.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -120078,11 +122635,7 @@ in sources."duration-0.2.2" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."es5-ext-0.10.53" // { - dependencies = [ - sources."next-tick-1.0.0" - ]; - }) + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" (sources."es6-set-0.1.5" // { dependencies = [ @@ -120148,7 +122701,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -120280,7 +122833,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -121009,10 +123562,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.864.0"; + version = "1.868.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.864.0.tgz"; - sha512 = "/RDg1P+uR0czvTZduVUoDvR7hhxi5bjqfp50ZBdRSL6pth2QG3jR6TQJ/GyJeIYpZkXQclU8jRRzg8L+MQG7zA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.868.0.tgz"; + sha512 = "iIzTIgQELgCmqvi3XBdKf+6ButRQ/SKCvR91DJM2SKdnIrRAQykNU2NAzBY5IfM/RHcPqCxlCgeJxTumiswv9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -121144,7 +123697,7 @@ in sources."locate-path-6.0.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."log-update-5.0.0" @@ -121159,7 +123712,7 @@ in sources."onetime-5.1.2" (sources."ora-6.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."p-limit-3.1.0" @@ -122272,7 +124825,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1087.0" // { + (sources."aws-sdk-2.1092.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -124218,7 +126771,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.15.2" + sources."uglify-js-3.15.3" sources."undefsafe-2.0.5" (sources."union-value-1.0.1" // { dependencies = [ @@ -129172,10 +131725,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz"; - sha512 = "peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; }; buildInputs = globalBuildInputs; meta = { @@ -130344,7 +132897,7 @@ in version = "1.6.8"; src = ../../applications/editors/vscode/extensions/vscode-lldb/build-deps; dependencies = [ - sources."@discoveryjs/json-ext-0.5.6" + sources."@discoveryjs/json-ext-0.5.7" sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.51" @@ -130396,7 +132949,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -130436,7 +132989,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.3.0" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.9.2" @@ -130949,7 +133502,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.15.2" + sources."uglify-js-3.15.3" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -132154,12 +134707,11 @@ in sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-1.2.0" // { + (sources."@eslint/eslintrc-1.2.1" // { dependencies = [ sources."debug-4.3.3" sources."eslint-visitor-keys-3.3.0" sources."espree-9.3.1" - sources."ignore-4.0.6" sources."ms-2.1.2" ]; }) @@ -132723,10 +135275,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.20.0" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001313" + sources."caniuse-lite-1.0.30001314" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.76" + sources."electron-to-chromium-1.4.82" sources."enhanced-resolve-5.9.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -132791,7 +135343,7 @@ in sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ=="; }; dependencies = [ - sources."@discoveryjs/json-ext-0.5.6" + sources."@discoveryjs/json-ext-0.5.7" sources."@webpack-cli/configtest-1.1.1" sources."@webpack-cli/info-1.4.1" sources."@webpack-cli/serve-1.6.1" @@ -133211,10 +135763,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.3.tgz"; - sha512 = "UuAv33TkzZGpGYgWH8rLWkvebd91UWid6tueQhUj6eGxfLUpAEl6uFyRMLAEmg2/kskKQzI2YPl8+tgex3TWxg=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.4.tgz"; + sha512 = "uamNZvqmpk1NpK+Vk/L8hppxq/7n8qtD+pQKia9pkXIAGqOGDA65ql9hx6g8rA2tM7cKDNkJhtxxF9ibJsyveQ=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -133317,7 +135869,7 @@ in }) sources."core-util-is-1.0.3" sources."cpus-1.0.3" - sources."create-torrent-5.0.1" + sources."create-torrent-5.0.2" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."define-lazy-prop-2.0.0" @@ -133491,7 +136043,7 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.12.3" + sources."streamx-2.12.4" sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.3.0" @@ -133524,12 +136076,12 @@ in ]; }) sources."ut_pex-3.0.2" - sources."utf-8-validate-5.0.8" + sources."utf-8-validate-5.0.9" sources."util-deprecate-1.0.2" sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.8.5" // { + (sources."webtorrent-1.8.6" // { dependencies = [ sources."debug-4.3.3" sources."decompress-response-6.0.0" @@ -133607,10 +136159,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.5.0.tgz"; - sha512 = "tQA0M1HisyjoW6Y5beUlZ8x9Yil+pIMT4I1ox94erp9Jbm4ZHEPGxOD53TuA/e8CXxy8tX35vf/QqofnDr1/Gg=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.5.1.tgz"; + sha512 = "rTrsKFF2G6vY9oInUoMWHuRjdQi/AAeWkt2H4N9TYKMiQPzEWnz91MufNkNwlXCA26JCDFStwqNjaYPUdI6SDw=="; }; dependencies = [ sources."jsonc-parser-3.0.0" @@ -133747,7 +136299,7 @@ in ]; }) sources."@npmcli/installed-package-contents-1.0.7" - (sources."@npmcli/map-workspaces-2.0.1" // { + (sources."@npmcli/map-workspaces-2.0.2" // { dependencies = [ sources."brace-expansion-2.0.1" sources."minimatch-5.0.1" @@ -134172,7 +136724,7 @@ in sources."ansi-regex-5.0.1" sources."are-we-there-yet-3.0.0" sources."env-paths-2.2.1" - sources."gauge-4.0.2" + sources."gauge-4.0.3" sources."is-fullwidth-code-point-3.0.0" sources."npmlog-6.0.1" sources."readable-stream-3.6.0" @@ -134222,10 +136774,10 @@ in sources."debug-4.3.3" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.4.1" - (sources."make-fetch-happen-10.0.4" // { + sources."lru-cache-7.4.4" + (sources."make-fetch-happen-10.0.5" // { dependencies = [ - sources."minipass-fetch-2.0.2" + sources."minipass-fetch-2.0.3" ]; }) sources."ms-2.1.2" @@ -134620,7 +137172,7 @@ in sources."gauge-3.0.2" sources."get-stream-6.0.1" sources."has-flag-4.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.1" sources."locate-path-6.0.0" @@ -134636,7 +137188,7 @@ in sources."path-key-3.1.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -134688,7 +137240,7 @@ in sources."@types/minimist-1.2.2" sources."@types/node-17.0.21" sources."braces-3.0.2" - sources."chalk-5.0.0" + sources."chalk-5.0.1" sources."data-uri-to-buffer-4.0.0" sources."dir-glob-3.0.1" sources."duplexer-0.1.2" @@ -134714,7 +137266,7 @@ in sources."micromatch-4.0.4" sources."minimist-1.2.5" sources."node-domexception-1.0.0" - sources."node-fetch-3.2.2" + sources."node-fetch-3.2.3" sources."path-type-4.0.0" sources."pause-stream-0.0.11" sources."picomatch-2.3.1" From 5e7be6b480929b8e63a76eccbae441254c5e878b Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 12 Feb 2022 19:58:22 +0900 Subject: [PATCH 132/329] nixos/epgstation: changes for EPGStation v2 --- .../services/video/epgstation/default.nix | 348 +++++++++--------- .../services/video/epgstation/streaming.json | 241 ++++++------ 2 files changed, 311 insertions(+), 278 deletions(-) diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 41613dcbb3ba..71428a00e4df 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -1,30 +1,40 @@ { config, lib, options, pkgs, ... }: -with lib; - let cfg = config.services.epgstation; opt = options.services.epgstation; + description = "EPGStation: DVR system for Mirakurun-managed TV tuners"; + username = config.users.users.epgstation.name; groupname = config.users.users.epgstation.group; + mirakurun = { + sock = config.services.mirakurun.unixSocket; + option = options.services.mirakurun.unixSocket; + }; - settingsFmt = pkgs.formats.json {}; - settingsTemplate = settingsFmt.generate "config.json" cfg.settings; + yaml = pkgs.formats.yaml { }; + settingsTemplate = yaml.generate "config.yml" cfg.settings; preStartScript = pkgs.writeScript "epgstation-prestart" '' #!${pkgs.runtimeShell} - PASSWORD="$(head -n1 "${cfg.basicAuth.passwordFile}")" - DB_PASSWORD="$(head -n1 "${cfg.database.passwordFile}")" + DB_PASSWORD_FILE=${lib.escapeShellArg cfg.database.passwordFile} + + if [[ ! -f "$DB_PASSWORD_FILE" ]]; then + printf "[FATAL] File containing the DB password was not found in '%s'. Double check the NixOS option '%s'." \ + "$DB_PASSWORD_FILE" ${lib.escapeShellArg opt.database.passwordFile} >&2 + exit 1 + fi + + DB_PASSWORD="$(head -n1 ${lib.escapeShellArg cfg.database.passwordFile})" # setup configuration - touch /etc/epgstation/config.json - chmod 640 /etc/epgstation/config.json + touch /etc/epgstation/config.yml + chmod 640 /etc/epgstation/config.yml sed \ - -e "s,@password@,$PASSWORD,g" \ -e "s,@dbPassword@,$DB_PASSWORD,g" \ - ${settingsTemplate} > /etc/epgstation/config.json - chown "${username}:${groupname}" /etc/epgstation/config.json + ${settingsTemplate} > /etc/epgstation/config.yml + chown "${username}:${groupname}" /etc/epgstation/config.yml # NOTE: Use password authentication, since mysqljs does not yet support auth_socket if [ ! -e /var/lib/epgstation/db-created ]; then @@ -35,7 +45,7 @@ let ''; streamingConfig = lib.importJSON ./streaming.json; - logConfig = { + logConfig = yaml.generate "logConfig.yml" { appenders.stdout.type = "stdout"; categories = { default = { appenders = [ "stdout" ]; level = "info"; }; @@ -45,53 +55,51 @@ let }; }; - defaultPassword = "INSECURE_GO_CHECK_CONFIGURATION_NIX\n"; + # Deprecate top level options that are redundant. + deprecateTopLevelOption = config: + lib.mkRenamedOptionModule + ([ "services" "epgstation" ] ++ config) + ([ "services" "epgstation" "settings" ] ++ config); + + removeOption = config: instruction: + lib.mkRemovedOptionModule + ([ "services" "epgstation" ] ++ config) + instruction; in { - options.services.epgstation = { - enable = mkEnableOption "EPGStation: DTV Software in Japan"; + meta.maintainers = with lib.maintainers; [ midchildan ]; - usePreconfiguredStreaming = mkOption { - type = types.bool; + imports = [ + (deprecateTopLevelOption [ "port" ]) + (deprecateTopLevelOption [ "socketioPort" ]) + (deprecateTopLevelOption [ "clientSocketioPort" ]) + (removeOption [ "basicAuth" ] + "Use a TLS-terminated reverse proxy with authentication instead.") + ]; + + options.services.epgstation = { + enable = lib.mkEnableOption description; + + package = lib.mkOption { + default = pkgs.epgstation; + type = lib.types.package; + defaultText = lib.literalExpression "pkgs.epgstation"; + description = "epgstation package to use"; + }; + + usePreconfiguredStreaming = lib.mkOption { + type = lib.types.bool; default = true; description = '' Use preconfigured default streaming options. Upstream defaults: - + ''; }; - port = mkOption { - type = types.port; - default = 20772; - description = '' - HTTP port for EPGStation to listen on. - ''; - }; - - socketioPort = mkOption { - type = types.port; - default = cfg.port + 1; - defaultText = literalExpression "config.${opt.port} + 1"; - description = '' - Socket.io port for EPGStation to listen on. - ''; - }; - - clientSocketioPort = mkOption { - type = types.port; - default = cfg.socketioPort; - defaultText = literalExpression "config.${opt.socketioPort}"; - description = '' - Socket.io port that the web client is going to connect to. This may be - different from if EPGStation is hidden - behind a reverse proxy. - ''; - }; - - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Open ports in the firewall for the EPGStation web interface. @@ -106,50 +114,17 @@ in ''; }; - basicAuth = { - user = mkOption { - type = with types; nullOr str; - default = null; - example = "epgstation"; - description = '' - Basic auth username for EPGStation. If null, basic - auth will be disabled. - - - - Basic authentication has known weaknesses, the most critical being - that it sends passwords over the network in clear text. Use this - feature to control access to EPGStation within your family and - friends, but don't rely on it for security. - - - ''; - }; - - passwordFile = mkOption { - type = types.path; - default = pkgs.writeText "epgstation-password" defaultPassword; - defaultText = literalDocBook ''a file containing ${defaultPassword}''; - example = "/run/keys/epgstation-password"; - description = '' - A file containing the password for . - ''; - }; - }; - - database = { - name = mkOption { - type = types.str; + database = { + name = lib.mkOption { + type = lib.types.str; default = "epgstation"; description = '' Name of the MySQL database that holds EPGStation's data. ''; }; - passwordFile = mkOption { - type = types.path; - default = pkgs.writeText "epgstation-db-password" defaultPassword; - defaultText = literalDocBook ''a file containing ${defaultPassword}''; + passwordFile = lib.mkOption { + type = lib.types.path; example = "/run/keys/epgstation-db-password"; description = '' A file containing the password for the database named @@ -158,69 +133,106 @@ in }; }; - settings = mkOption { + # The defaults for some options come from the upstream template + # configuration, which is the one that users would get if they follow the + # upstream instructions. This is, in some cases, different from the + # application defaults. Some options like encodeProcessNum and + # concurrentEncodeNum doesn't have an optimal default value that works for + # all hardware setups and/or performance requirements. For those kind of + # options, the application default wouldn't always result in the expected + # out-of-the-box behavior because it's the responsibility of the user to + # configure them according to their needs. In these cases, the value in the + # upstream template configuration should serve as a "good enough" default. + settings = lib.mkOption { description = '' - Options to add to config.json. + Options to add to config.yml. Documentation: ''; - default = {}; + default = { }; example = { recPriority = 20; conflictPriority = 10; }; - type = types.submodule { - freeformType = settingsFmt.type; + type = lib.types.submodule { + freeformType = yaml.type; - options.readOnlyOnce = mkOption { - type = types.bool; - default = false; - description = "Don't reload configuration files at runtime."; + options.port = lib.mkOption { + type = lib.types.port; + default = 20772; + description = '' + HTTP port for EPGStation to listen on. + ''; }; - options.mirakurunPath = mkOption (let - sockPath = config.services.mirakurun.unixSocket; - in { - type = types.str; - default = "http+unix://${replaceStrings ["/"] ["%2F"] sockPath}"; - defaultText = literalExpression '' - "http+unix://''${replaceStrings ["/"] ["%2F"] config.${options.services.mirakurun.unixSocket}}" + options.socketioPort = lib.mkOption { + type = lib.types.port; + default = cfg.settings.port + 1; + defaultText = lib.literalExpression "config.${opt.settings.port} + 1"; + description = '' + Socket.io port for EPGStation to listen on. It is valid to share + ports with . + ''; + }; + + options.clientSocketioPort = lib.mkOption { + type = lib.types.port; + default = cfg.settings.socketioPort; + defaultText = lib.literalExpression "config.${opt.settings.socketioPort}"; + description = '' + Socket.io port that the web client is going to connect to. This may + be different from if + EPGStation is hidden behind a reverse proxy. + ''; + }; + + options.mirakurunPath = with mirakurun; lib.mkOption { + type = lib.types.str; + default = "http+unix://${lib.replaceStrings ["/"] ["%2F"] sock}"; + defaultText = lib.literalExpression '' + "http+unix://''${lib.replaceStrings ["/"] ["%2F"] config.${option}}" ''; example = "http://localhost:40772"; description = "URL to connect to Mirakurun."; - }); + }; - options.encode = mkOption { - type = with types; listOf attrs; + options.encodeProcessNum = lib.mkOption { + type = lib.types.ints.positive; + default = 4; + description = '' + The maximum number of processes that EPGStation would allow to run + at the same time for encoding or streaming videos. + ''; + }; + + options.concurrentEncodeNum = lib.mkOption { + type = lib.types.ints.positive; + default = 1; + description = '' + The maximum number of encoding jobs that EPGStation would run at the + same time. + ''; + }; + + options.encode = lib.mkOption { + type = with lib.types; listOf attrs; description = "Encoding presets for recorded videos."; default = [ { - name = "H264"; - cmd = "${pkgs.epgstation}/libexec/enc.sh main"; + name = "H.264"; + cmd = "%NODE% ${cfg.package}/libexec/enc.js"; suffix = ".mp4"; - default = true; - } - { - name = "H264-sub"; - cmd = "${pkgs.epgstation}/libexec/enc.sh sub"; - suffix = "-sub.mp4"; } ]; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' [ { - name = "H264"; - cmd = "''${pkgs.epgstation}/libexec/enc.sh main"; + name = "H.264"; + cmd = "%NODE% config.${opt.package}/libexec/enc.js"; suffix = ".mp4"; - default = true; - } - { - name = "H264-sub"; - cmd = "''${pkgs.epgstation}/libexec/enc.sh sub"; - suffix = "-sub.mp4"; } ] ''; @@ -229,14 +241,25 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !(lib.hasAttr "readOnlyOnce" cfg.settings); + message = '' + The option config.${opt.settings}.readOnlyOnce can no longer be used + since it's been removed. No replacements are available. + ''; + } + ]; + environment.etc = { - "epgstation/operatorLogConfig.json".text = builtins.toJSON logConfig; - "epgstation/serviceLogConfig.json".text = builtins.toJSON logConfig; + "epgstation/epgUpdaterLogConfig.yml".source = logConfig; + "epgstation/operatorLogConfig.yml".source = logConfig; + "epgstation/serviceLogConfig.yml".source = logConfig; }; - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = with cfg; [ port socketioPort ]; + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = with cfg.settings; [ port socketioPort ]; }; users.users.epgstation = { @@ -245,13 +268,13 @@ in isSystemUser = true; }; - users.groups.epgstation = {}; + users.groups.epgstation = { }; - services.mirakurun.enable = mkDefault true; + services.mirakurun.enable = lib.mkDefault true; services.mysql = { - enable = mkDefault true; - package = mkDefault pkgs.mariadb; + enable = lib.mkDefault true; + package = lib.mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; # FIXME: enable once mysqljs supports auth_socket # ensureUsers = [ { @@ -260,39 +283,28 @@ in # } ]; }; - services.epgstation.settings = let - defaultSettings = { - serverPort = cfg.port; - socketioPort = cfg.socketioPort; - clientSocketioPort = cfg.clientSocketioPort; + services.epgstation.settings = + let + defaultSettings = { + dbtype = lib.mkDefault "mysql"; + mysql = { + socketPath = lib.mkDefault "/run/mysqld/mysqld.sock"; + user = username; + password = lib.mkDefault "@dbPassword@"; + database = cfg.database.name; + }; - dbType = mkDefault "mysql"; - mysql = { - user = username; - database = cfg.database.name; - socketPath = mkDefault "/run/mysqld/mysqld.sock"; - password = mkDefault "@dbPassword@"; - connectTimeout = mkDefault 1000; - connectionLimit = mkDefault 10; + ffmpeg = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg"; + ffprobe = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe"; + + # for disambiguation with TypeScript files + recordedFileExtension = lib.mkDefault ".m2ts"; }; - - basicAuth = mkIf (cfg.basicAuth.user != null) { - user = mkDefault cfg.basicAuth.user; - password = mkDefault "@password@"; - }; - - ffmpeg = mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg"; - ffprobe = mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe"; - - fileExtension = mkDefault ".m2ts"; - maxEncode = mkDefault 2; - maxStreaming = mkDefault 2; - }; - in - mkMerge [ - defaultSettings - (mkIf cfg.usePreconfiguredStreaming streamingConfig) - ]; + in + lib.mkMerge [ + defaultSettings + (lib.mkIf cfg.usePreconfiguredStreaming streamingConfig) + ]; systemd.tmpfiles.rules = [ "d '/var/lib/epgstation/streamfiles' - ${username} ${groupname} - -" @@ -301,15 +313,15 @@ in ]; systemd.services.epgstation = { - description = pkgs.epgstation.meta.description; + inherit description; + wantedBy = [ "multi-user.target" ]; - after = [ - "network.target" - ] ++ optional config.services.mirakurun.enable "mirakurun.service" - ++ optional config.services.mysql.enable "mysql.service"; + after = [ "network.target" ] + ++ lib.optional config.services.mirakurun.enable "mirakurun.service" + ++ lib.optional config.services.mysql.enable "mysql.service"; serviceConfig = { - ExecStart = "${pkgs.epgstation}/bin/epgstation start"; + ExecStart = "${cfg.package}/bin/epgstation start"; ExecStartPre = "+${preStartScript}"; User = username; Group = groupname; diff --git a/nixos/modules/services/video/epgstation/streaming.json b/nixos/modules/services/video/epgstation/streaming.json index 8eb99cf85584..6c6f9b261b2f 100644 --- a/nixos/modules/services/video/epgstation/streaming.json +++ b/nixos/modules/services/video/epgstation/streaming.json @@ -1,119 +1,140 @@ { - "liveHLS": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + "urlscheme": { + "m2ts": { + "ios": "vlc-x-callback://x-callback-url/stream?url=PROTOCOL://ADDRESS", + "android": "intent://ADDRESS#Intent;package=org.videolan.vlc;type=video;scheme=PROTOCOL;end" }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + "video": { + "ios": "infuse://x-callback-url/play?url=PROTOCOL://ADDRESS", + "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=PROTOCOL;end" }, - { - "name": "180p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 48k -ac 2 -c:v libx264 -vf yadif,scale=-2:180 -b:v 100k -preset veryfast -maxrate 110k -bufsize 1000k -flags +loop-global_header %OUTPUT%" + "download": { + "ios": "vlc-x-callback://x-callback-url/download?url=PROTOCOL://ADDRESS&filename=FILENAME" } - ], - "liveMP4": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" - } - ], - "liveWebM": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" - } - ], - "mpegTsStreaming": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" - }, - { - "name": "Original" - } - ], - "mpegTsViewer": { - "ios": "vlc-x-callback://x-callback-url/stream?url=http://ADDRESS", - "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end" }, - "recordedDownloader": { - "ios": "vlc-x-callback://x-callback-url/download?url=http://ADDRESS&filename=FILENAME", - "android": "intent://ADDRESS#Intent;package=com.dv.adm;type=video;scheme=http;end" - }, - "recordedStreaming": { - "webm": [ - { - "name": "720p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "vb": "3000k", - "ab": "192k" - }, - { - "name": "360p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "vb": "1500k", - "ab": "128k" + "stream": { + "live": { + "ts": { + "m2ts": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" + }, + { + "name": "無変換" + } + ], + "m2tsll": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -f mpegts -analyzeduration 500000 -i pipe:0 -map 0 -c:s copy -c:d copy -ignore_unknown -fflags nobuffer -flags low_delay -max_delay 250000 -max_interleave_delta 1 -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -flags +cgop -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -f mpegts -analyzeduration 500000 -i pipe:0 -map 0 -c:s copy -c:d copy -ignore_unknown -fflags nobuffer -flags low_delay -max_delay 250000 -max_interleave_delta 1 -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -flags +cgop -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" + } + ], + "webm": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + } + ], + "hls": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + } + ] } - ], - "mp4": [ - { - "name": "720p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", - "vb": "3000k", - "ab": "192k" - }, - { - "name": "360p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", - "vb": "1500k", - "ab": "128k" - } - ], - "mpegTs": [ - { - "name": "720p (H.264)", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", - "vb": "3000k", - "ab": "192k" - }, - { - "name": "360p (H.264)", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", - "vb": "1500k", - "ab": "128k" - } - ] - }, - "recordedHLS": [ - { - "name": "720p", - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" }, - { - "name": "480p", - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" - }, - { - "name": "480p(h265)", - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_type fmp4 -hls_fmp4_init_filename stream%streamNum%-init.mp4 -hls_segment_filename stream%streamNum%-%09d.m4s -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx265 -vf yadif,scale=-2:480 -b:v 350k -preset veryfast -tag:v hvc1 %OUTPUT%" + "recorded": { + "ts": { + "webm": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + } + ], + "hls": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + } + ] + }, + "encoded": { + "webm": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + } + ], + "hls": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf scale=-2:480 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + } + ] + } } - ], - "recordedViewer": { - "ios": "infuse://x-callback-url/play?url=http://ADDRESS", - "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end" } -} +} \ No newline at end of file From 561c0c28519c7b378078d5ee510c6727fb310d28 Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 14 Feb 2022 00:49:15 +0900 Subject: [PATCH 133/329] nixos/rl-2205: add entries for EPGStation v2 --- .../from_md/release-notes/rl-2205.section.xml | 53 +++++++++++++++++++ .../manual/release-notes/rl-2205.section.md | 24 +++++++++ .../services/video/epgstation/default.nix | 8 +-- 3 files changed, 81 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 9cf27e56827a..b4b31ad4b66f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -826,6 +826,59 @@ include serif fonts. + + + pkgs.epgstation has been upgraded from v1 + to v2, resulting in incompatible changes in the database + scheme and configuration format. + + + + + Some top-level settings under + services.epgstation + is now deprecated because it was redudant due to the same + options being present in + services.epgstation.settings. + + + + + The option + services.epgstation.basicAuth + was removed because basic authentication support was dropped + by upstream. + + + + + The option + services.epgstation.database.passwordFile + no longer has a default value. Make sure to set this option + explicitly before upgrading. Change the database password if + necessary. + + + + + The + services.epgstation.settings + option now expects options for config.yml + in EPGStation v2. + + + + + Existing data for the + services.epgstation + module would have to be backed up prior to the upgrade. To + back up exising data to + /tmp/epgstation.bak, run + sudo -u epgstation epgstation run backup /tmp/epgstation.bak. + To import that data after to the upgrade, run + sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak + + switch-to-configuration (the script that is diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 58a1b23d17bf..1c4a87352776 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -321,6 +321,30 @@ In addition to numerous new and upgraded packages, this release has the followin `pkgs.noto-fonts-cjk` is currently an alias of `pkgs.noto-fonts-cjk-sans` and doesn't include serif fonts. +- `pkgs.epgstation` has been upgraded from v1 to v2, resulting in incompatible + changes in the database scheme and configuration format. + +- Some top-level settings under [services.epgstation](#opt-services.epgstation) + is now deprecated because it was redudant due to the same options being + present in [services.epgstation.settings](#opt-services.epgstation.settings). + +- The option [services.epgstation.basicAuth](#opt-services.epgstation.basicAuth) + was removed because basic authentication support was dropped by upstream. + +- The option [services.epgstation.database.passwordFile](#opt-services.epgstation.database.passwordFile) + no longer has a default value. Make sure to set this option explicitly before + upgrading. Change the database password if necessary. + +- The [services.epgstation.settings](#opt-services.epgstation.settings) + option now expects options for `config.yml` in EPGStation v2. + +- Existing data for the [services.epgstation](#opt-services.epgstation.enable) + module would have to be backed up prior to the upgrade. To back up exising + data to `/tmp/epgstation.bak`, run + `sudo -u epgstation epgstation run backup /tmp/epgstation.bak`. + To import that data after to the upgrade, run + `sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak` + - `switch-to-configuration` (the script that is run when running `nixos-rebuild switch` for example) has been reworked * The interface that allows activation scripts to restart units has been streamlined. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units. * Preferring to reload instead of restarting can still be achieved using `/run/nixos/activation-reload-list`. diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 71428a00e4df..191f6eb52e57 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -171,20 +171,20 @@ in options.socketioPort = lib.mkOption { type = lib.types.port; default = cfg.settings.port + 1; - defaultText = lib.literalExpression "config.${opt.settings.port} + 1"; + defaultText = lib.literalExpression "config.${opt.settings}.port + 1"; description = '' Socket.io port for EPGStation to listen on. It is valid to share - ports with . + ports with . ''; }; options.clientSocketioPort = lib.mkOption { type = lib.types.port; default = cfg.settings.socketioPort; - defaultText = lib.literalExpression "config.${opt.settings.socketioPort}"; + defaultText = lib.literalExpression "config.${opt.settings}.socketioPort"; description = '' Socket.io port that the web client is going to connect to. This may - be different from if + be different from if EPGStation is hidden behind a reverse proxy. ''; }; From 697ea7c69cf260f2a6719b212d97ff7d07090a66 Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 14 Feb 2022 05:19:16 +0900 Subject: [PATCH 134/329] epgstation: make updateScript create EditorConfig-compliant files --- nixos/modules/services/video/epgstation/streaming.json | 2 +- pkgs/applications/video/epgstation/update.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/video/epgstation/streaming.json b/nixos/modules/services/video/epgstation/streaming.json index 6c6f9b261b2f..7f8df0817fc3 100644 --- a/nixos/modules/services/video/epgstation/streaming.json +++ b/nixos/modules/services/video/epgstation/streaming.json @@ -137,4 +137,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index bbce54ce1dcc..5eb23be6c52b 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -58,5 +58,8 @@ in writers.writeBash "update-epgstation" '' ${yq}/bin/yq -j '{ urlscheme , stream }' \ "$SRC/config/config.yml.template" \ > streaming.json + + # Fix generated output for EditorConfig compliance + printf '\n' >> streaming.json # rule: insert_final_newline popd '' From 552c9930626feca85abf7075f4b925fa6c50238c Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 27 Feb 2022 15:31:43 +0900 Subject: [PATCH 135/329] nixos/rl-2205: fix invalid link --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 5 ++--- nixos/doc/manual/release-notes/rl-2205.section.md | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index b4b31ad4b66f..4a2177ca9e24 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -836,7 +836,7 @@ Some top-level settings under - services.epgstation + services.epgstation is now deprecated because it was redudant due to the same options being present in services.epgstation.settings. @@ -844,8 +844,7 @@ - The option - services.epgstation.basicAuth + The option services.epgstation.basicAuth was removed because basic authentication support was dropped by upstream. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 1c4a87352776..b8fa641a565c 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -324,12 +324,12 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.epgstation` has been upgraded from v1 to v2, resulting in incompatible changes in the database scheme and configuration format. -- Some top-level settings under [services.epgstation](#opt-services.epgstation) +- Some top-level settings under [services.epgstation](#opt-services.epgstation.enable) is now deprecated because it was redudant due to the same options being present in [services.epgstation.settings](#opt-services.epgstation.settings). -- The option [services.epgstation.basicAuth](#opt-services.epgstation.basicAuth) - was removed because basic authentication support was dropped by upstream. +- The option `services.epgstation.basicAuth` was removed because basic + authentication support was dropped by upstream. - The option [services.epgstation.database.passwordFile](#opt-services.epgstation.database.passwordFile) no longer has a default value. Make sure to set this option explicitly before From a9c161f1306bc83a6caa5860928bb0b0c5675b19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 06:12:43 +0000 Subject: [PATCH 136/329] delve: 1.8.1 -> 1.8.2 --- pkgs/development/tools/delve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 9681bfe75bd2..478ef3b6fc68 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.8.1"; + version = "1.8.2"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-GIwu3G8cy2xKqFzN/7d/mbpS+5oGJa3QexoELlEwWRA="; + sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik="; }; subPackages = [ "cmd/dlv" ]; From dbd2169f7e4df87ba6a86489504c9dc8801f6f7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 06:20:55 +0000 Subject: [PATCH 137/329] hubstaff: 1.6.4-6681f81d -> 1.6.5-31be26f1 --- pkgs/applications/misc/hubstaff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 5110815023a0..a164654b1a67 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.4-6681f81d/Hubstaff-1.6.4-6681f81d.sh"; - version = "1.6.4-6681f81d"; - sha256 = "1j0rzyqm9zm2w44zwxq61fy19m27ghlv11mbfl7yzh2ccmxljxjm"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.5-31be26f1/Hubstaff-1.6.5-31be26f1.sh"; + version = "1.6.5-31be26f1"; + sha256 = "1z1binnqppyxavmjg0l1cvy64ylzy2v454sws2x1am2qhhbnycjm"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft From 5bfba52a152824196245eea5a28df3d7e25c3320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 06:30:41 +0000 Subject: [PATCH 138/329] dnsproxy: 0.41.3 -> 0.41.4 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index ee2a87b9d54f..d6ec3c3f75d5 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.41.3"; + version = "0.41.4"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p5kfpqqTg1wXPYTBScjUGClSKT6yb7ZSnzia2xTQwfo="; + sha256 = "sha256-aVYjYEAEANAMGv7frZWfYWLzX7rcI8phpjvrENK8cc4="; }; vendorSha256 = null; From 8078702f3db8c5b197d820b15b65e5043c72faca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 06:30:54 +0000 Subject: [PATCH 139/329] python310Packages.ropgadget: 6.6 -> 6.7 --- pkgs/development/python-modules/ropgadget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index aaf31f06a1cc..170ff13948da 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "ropgadget"; - version = "6.6"; + version = "6.7"; src = fetchFromGitHub { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "v${version}"; - sha256 = "1i0gx0cwhxk6d8byvck17hh83szz3k6ndd118ha3q0r0msap0lz1"; + sha256 = "sha256-zOTbncsOvmLQMZGpcRLviSZP/d1cQTQHXCLUKyEgVBk="; }; propagatedBuildInputs = [ From c8081af93fdae2f00e1d1083eb69df0fbadb2451 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 06:35:37 +0000 Subject: [PATCH 140/329] docker-buildx: 0.7.1 -> 0.8.0 --- pkgs/applications/virtualization/docker/buildx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index a149b5e4b334..440d094b4301 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-5EV0Rw1+ufxQ1wmQ0EJXQ7HVtXVbB4do/tet0QFRi08="; + sha256 = "sha256-PSqVe4m2na6BjNxIKKZG1ja6zEzwI2AwgJlaMfaW2EM="; }; vendorSha256 = null; From fe930783079813736cf3ae0318ac086cb09579e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 06:58:34 +0000 Subject: [PATCH 141/329] jenkins: 2.319.3 -> 2.332.1 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 2b61d377e9fc..9c87c5f08f4c 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.319.3"; + version = "2.332.1"; src = fetchurl { url = "http://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "sha256-c92Rs5W89i/iXm0wdHZfFRDJ5YTswen69EBRBkGBtDQ="; + sha256 = "0xrrqdwfz19mr4wl4sdzk0qnq9rjdh65vd1386qsn6a4axwv652s"; }; nativeBuildInputs = [ makeWrapper ]; From 11dc86007242d782e42e8f851be2e79dfddc015a Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 12 Mar 2022 11:13:22 +0800 Subject: [PATCH 142/329] boringtun: 0.3.0 -> 0.4.0 --- pkgs/tools/networking/boringtun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index a071b5b4a3a9..b5c5b5389fc3 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "boringtun"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "0b57c7z87xwrirmq9aa9jswqyj5bavkifmq7a9hgfphcmwcskmdb"; + sha256 = "sha256-fZchh02CsVC5sdnR3blojslsKi7OxFcblHMuyuHsH/4="; }; - cargoSha256 = "1xn6scc8nrb9xk89hsp9v67jvyww23rjaq5fcagpbqdwf5dvg4ja"; + cargoSha256 = "sha256-iJbzvhRPVDHXqianQ6UbmYEfmZCS/obxFZV/PsJMhD0="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; From a19f7b41c867e9191d53244b3f367162ace14638 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 12 Mar 2022 11:38:11 +0800 Subject: [PATCH 143/329] eksctl: 0.86.0 -> 0.87.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 04f128e7bd09..035dfe183e60 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.86.0"; + version = "0.87.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-AvBfj3/dPq/iokuRBDQRh2b3g5KBH/oFBDEDaVwQ51A="; + sha256 = "sha256-909cInKo6X8yzpXlumDYIi8yCYLqr1CVcsGgYSd2pnQ="; }; - vendorSha256 = "sha256-bqyT6RXPBDPZt9ogS97G0jHJs7VdvVlHCXMaqJjnU2s="; + vendorSha256 = "sha256-3pEKG5YW83YMSkAjiJQDW1eQbMl6SkokHTXn+kJ/3l4="; doCheck = false; From 3c2a4bcd476047a5a3fd358620243b4dc7630b97 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 12 Mar 2022 11:24:02 +0800 Subject: [PATCH 144/329] just: 1.0.1 -> 1.1.0 --- pkgs/development/tools/just/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 050b971af94b..29694c08ed8d 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,17 +1,25 @@ -{ lib, fetchFromGitHub, stdenv, rustPlatform, coreutils, bash, installShellFiles, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, coreutils +, bash +, installShellFiles +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-ssc6djhSk0xV4jdlTmehWX6UMBPAuebtYlzWRZ/32mM="; + sha256 = "sha256-hbBAbk0n80BbbIx81427bRz4x6enBsxJ0bHJKww44oc="; }; - cargoSha256 = "sha256-ynYK37nCfIiy1CHBEQ/vMHOAPY/pp/lF/tSl9MJD7fY="; + cargoSha256 = "sha256-lZyFoOCWUE2ahU/lS+bIdrZXNm/sFEfLsQm1BxREg5w="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 8d2b4a00180a6a01a6e38e399e1577f223acc602 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 07:15:49 +0000 Subject: [PATCH 145/329] python310Packages.python-juicenet: 1.0.2 -> 1.1.0 --- pkgs/development/python-modules/python-juicenet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-juicenet/default.nix b/pkgs/development/python-modules/python-juicenet/default.nix index 1547c8914617..2f0d071abd7b 100644 --- a/pkgs/development/python-modules/python-juicenet/default.nix +++ b/pkgs/development/python-modules/python-juicenet/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "python-juicenet"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "jesserockz"; repo = "python-juicenet"; rev = "v${version}"; - sha256 = "04547pj51ds31yhyc7ng47v9giz16h2s3wgb6szc8ivhb5rclqz2"; + sha256 = "sha256-5RKnVwOfEHzFZCiC8OUpS8exKrENK+I3Ok45HlKEvtU="; }; propagatedBuildInputs = [ From ceafc68dce513166735c1dee86e8bc48e30b64df Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:19:08 +0000 Subject: [PATCH 146/329] linux: 4.14.270 -> 4.14.271 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 4336e6297f5c..e31d1035857c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.270"; + version = "4.14.271"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17fj5aif5f0z0xgb321ghpv5p6drqxz0w948dr4hql4cj193r2zv"; + sha256 = "1mzxcjzw6y7b3fffz0hbgsl6328w3m5yv5xb21z57kr9vm828y80"; }; } // (args.argsOverride or {})) From 3d434fc0d91719aad30d1ddca5528e3dd34ed186 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:19:15 +0000 Subject: [PATCH 147/329] linux: 4.19.233 -> 4.19.234 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index ff3b8ea22b61..1ea6bedc0032 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.233"; + version = "4.19.234"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0dyf1xapmhly9gpygyjzj5yhn6s5xb0gss033sgllwn243q6bxmq"; + sha256 = "12rd468wvmmdmgzy9vs2ny155yp9wxrf15lrslpc8xm4wimrd0h0"; }; } // (args.argsOverride or {})) From 5de1f9ac31797d1e72dbebd705dfd75a5b47479f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:19:22 +0000 Subject: [PATCH 148/329] linux: 4.9.305 -> 4.9.306 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 1a8be19098f7..df73833dc8e6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.305"; + version = "4.9.306"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0yspfrqlgpsa3a591bk9c2xqq5xf70lqfgj8wrnhd42agfxanr8k"; + sha256 = "1cvsz3sf24g2623m7fxc6ilzsdmzi8s8lnks3sg68sax0qdx0ny7"; }; } // (args.argsOverride or {})) From a9e63526e22e0736b79247eeadeb2d147d37e520 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:19:31 +0000 Subject: [PATCH 149/329] linux: 5.10.104 -> 5.10.105 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 07061ec05bcb..3b59a11e3c15 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.104"; + version = "5.10.105"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1wb2ql58md45wi49bp3rck7ppgisyjdl7lxarzqd094fx9kr4jir"; + sha256 = "11fb9y6sqrf0hvak83ym7sbbacjl3q51w523vxjdpjmrn850xp1x"; }; } // (args.argsOverride or {})) From eafbf2255890bf2be0b5d2ab33d2c37309b0ec40 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:19:41 +0000 Subject: [PATCH 150/329] linux: 5.15.27 -> 5.15.28 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index b1a0b1bdcf0c..76e624f89694 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.27"; + version = "5.15.28"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "01ksvmcwljzphbdll0pd9zg8ys8jy5xy29b54pxqjs3wq3n8zj9k"; + sha256 = "1rhhn2a7799nnvx8dj83glb0p0qakxanhxvvl7crznvip7rvp8nq"; }; } // (args.argsOverride or { })) From 51d907345ac12cd6b27e5d436a2f2d317cefbc69 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:19:50 +0000 Subject: [PATCH 151/329] linux: 5.16.13 -> 5.16.14 --- pkgs/os-specific/linux/kernel/linux-5.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index 43aca96805e2..94b61a1ba934 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.13"; + version = "5.16.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1fvz4v3mcm9yxfak6mshl764piadgz46y71wprb85b1shc09i2ig"; + sha256 = "1xkl0mfjby7w6r3fqyjds94h2lmc77nzp970w7wz1rfmb63ab2vs"; }; } // (args.argsOverride or { })) From c01eed31bac6ee18a557ad76d36f125705dc492d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:19:57 +0000 Subject: [PATCH 152/329] linux: 5.4.183 -> 5.4.184 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index f9e655423902..ae2fecf96132 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.183"; + version = "5.4.184"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "17691h1575spgwh88mk189ars6gyjcl9nnaz585l2da8civhnjrd"; + sha256 = "128laiqkr6z3pya8ws7r2ddrpbc3xyn80zwclz2wlrf6wqwwm546"; }; } // (args.argsOverride or {})) From 3d1e0b2e177d21c8fea192a1d53aade7b81f1f74 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:20:35 +0000 Subject: [PATCH 153/329] linux-rt_5_10: 5.10.100-rt62 -> 5.10.104-rt63 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 70be0e58ebce..50b3f18e9e21 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.100-rt62"; # updated by ./update-rt.sh + version = "5.10.104-rt63"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "16892wnfkdpqy3v4xmdzlqn5zlfrgz9wqh6vadnx58xnr6pnasfm"; + sha256 = "1wb2ql58md45wi49bp3rck7ppgisyjdl7lxarzqd094fx9kr4jir"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1wimp4ckaqp5cfvkf50gv3s5biyr0sjifz4faw23m07ciydm15k0"; + sha256 = "17ivd6dm49axc9k6cqf39wjjqrjqbj5xd3n7lqk7vv95rg9fg0g7"; }; }; in [ rt-patch ] ++ kernelPatches; From 4bf71faa0641a458ec4c816a6dedc787d29d1a88 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:21:06 +0000 Subject: [PATCH 154/329] linux-rt_5_4: 5.4.182-rt70 -> 5.4.182-rt71 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index c1534838b72f..747563e3c01f 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.182-rt70"; # updated by ./update-rt.sh + version = "5.4.182-rt71"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -21,7 +21,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "193glhb0bkaa7qggkj2vpp3r6avf0sh8fasj8byww7xwkhm7cncq"; + sha256 = "1lxj63v37bhdgynr8ffyd5g8vp5a79dnzi6fng7jsjapfriywzqh"; }; }; in [ rt-patch ] ++ kernelPatches; From 75db6298949c5505f4ad0140cbe8da146b3c34b9 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 12 Mar 2022 07:21:25 +0000 Subject: [PATCH 155/329] linux_latest-libre: 18613 -> 18627 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 165779808091..288ba1b7214a 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18613"; - sha256 = "1qgvhrh4nnn56aykaxqmlnzy8s111b5vn277n7qm4ldyr312g4hs"; + rev = "18627"; + sha256 = "0qlalxpw2a24625ck5mxchpxl6i6cgmzkzfgyp9apmhdy8590fv5"; } , ... }: From 4ce60ae27c1d8ae5b1415d07442ccc0fee93b1f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 07:21:28 +0000 Subject: [PATCH 156/329] efm-langserver: 0.0.40 -> 0.0.41 --- pkgs/development/tools/efm-langserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index 96a8d694e778..29304d7d2654 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.40"; + version = "0.0.41"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-0C7iSWO7zzOhPgzxj9k2MK6poi4XaCbMjTGah3ohVJg="; + sha256 = "sha256-0s6GmMbjtXGUcChzc8Pkqvmt3iU5uDUqe76OUDngboU="; }; vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; From e3daaada3f170d8ded772cf85173672278083bfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 07:24:48 +0000 Subject: [PATCH 157/329] klipper: unstable-2022-02-07 -> unstable-2022-03-11 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index fd80dc4b87c6..e2932c16a109 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2022-02-07"; + version = "unstable-2022-03-11"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "6d7c03365ad13c4661675aaccd0a3dc5be544493"; - sha256 = "sha256-xFSZkOFETGcJXA6CUCReoyNZXhDAfgKkWoeDRqueBVw="; + rev = "e3beafbdb4f2ac3f889f81aec0cad5ec473c8612"; + sha256 = "sha256-xZSZUJ2TNaUzfwEFpnzr5EPlOvILLyiQ/3K1iiup7kU="; }; sourceRoot = "source/klippy"; From 1f6b85cbaea5f1a973ccd977c8192aba3499f6e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 07:33:30 +0000 Subject: [PATCH 158/329] endlessh-go: 20220213 -> 20220308.1 --- pkgs/servers/endlessh-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix index ba0dc66a7405..7a32b7dbfc4d 100644 --- a/pkgs/servers/endlessh-go/default.nix +++ b/pkgs/servers/endlessh-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "endlessh-go"; - version = "20220213"; + version = "20220308.1"; src = fetchFromGitHub { owner = "shizunge"; repo = "endlessh-go"; rev = version; - sha256 = "sha256-x/38w0GtzYBGWr0ZkfY2HmDEAUI54R833aH0RZSCTC0="; + sha256 = "sha256-U+h/WmTVwwUIBEOiNa/EKS6HvkeoGNmP3NpeP1fcqYw="; }; vendorSha256 = "sha256-h/DpbXO+LUsB9NOAXUfNx3VOfEsiolfBEMBrAqVlU3A="; proxyVendor = true; From c2d7363d366b457848638c64d211735bc8d10645 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 07:43:50 +0000 Subject: [PATCH 159/329] python310Packages.sabyenc3: 5.0.1 -> 5.1.0 --- pkgs/development/python-modules/sabyenc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index 99f5d522baf0..531cd3e173c2 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonPackage rec { pname = "sabyenc3"; - version = "5.0.1"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MIKBSPs3CtETDefiozN758hmJhdmw0UqVyG9t224tfw="; + sha256 = "sha256-y2I/kSyPIPSz7PrwW/AbP4BsEXHWQgXRb1VT0nTHQcE="; }; # tests are not included in pypi distribution From d0c86f51147e6d414fc5ec2dcc9eb3861f765cef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 08:17:04 +0000 Subject: [PATCH 160/329] fioctl: 0.23 -> 0.24 --- pkgs/tools/admin/fioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 03a77f624be5..95f5ee789f2d 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.23"; + version = "0.24"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-00HWby1LwKEz4BgwD3yv0IMW9mzkTj4FMFgYAn7kLac="; + sha256 = "sha256-nlSJ6JxC5MTS/ltSB9qnhtoRjDL1A5NlXWM/2A4duGU="; }; - vendorSha256 = "sha256-oA8/9LjMRM1RXKKDWhcbt2qr/4T7YgOq92U2mF9E+sw="; + vendorSha256 = "sha256-Cr9etq9E16vj2AL9OkIQom/gATjj9QT9+keUR1WQJR0="; ldflags = [ "-s" "-w" "-X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev}" From 6107d3894b7bfb66b47fedf13d628c895f0aee1d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 5 Mar 2022 07:40:39 +0100 Subject: [PATCH 161/329] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F12.ocaml:?= =?UTF-8?q?=204.12.0=20=E2=86=92=204.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix index 0662e66e0b6a..4be2bcf5f9d0 100644 --- a/pkgs/development/compilers/ocaml/4.12.nix +++ b/pkgs/development/compilers/ocaml/4.12.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "12"; - patch_version = "0"; - sha256 = "1hxy349jfa2vkfgmxf6pvd9w4z5bmcgsg0fxfdabcghyvjw9vvir"; + patch_version = "1"; + sha256 = "1jbjjnmqq6ymsy81x188i256bz4z5jrz1pws8g1qf59c32ganjkf"; } From 036ee2b9e186e1353f77ce2f2322763743c1c0c1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 11 Mar 2022 14:10:20 -0800 Subject: [PATCH 162/329] libvirt: 7.10.0 -> 8.1.0 --- ...n-install-prefix-for-building-on-nix.patch | 326 ------------------ .../0002-meson-patch-ch-install-prefix.patch | 14 - .../development/libraries/libvirt/default.nix | 80 +++-- .../libvirt/do-not-use-sysconfig.patch | 211 ++++++++++++ ...n-fault-in-virtqemud-executing-qemuD.patch | 50 +++ 5 files changed, 306 insertions(+), 375 deletions(-) delete mode 100644 pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch delete mode 100644 pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch create mode 100644 pkgs/development/libraries/libvirt/do-not-use-sysconfig.patch create mode 100644 pkgs/development/libraries/libvirt/qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch deleted file mode 100644 index 86dd461ea07d..000000000000 --- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ /dev/null @@ -1,326 +0,0 @@ -From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 -From: Euan Kemp -Date: Thu, 14 Jan 2021 00:32:00 -0800 -Subject: [PATCH] meson: patch in an install prefix for building on nix - -Used in the nixpkgs version of libvirt so that we can install things in -the nix store, but read them from the root filesystem. ---- - meson.build | 9 +++++++++ - meson_options.txt | 2 ++ - src/libxl/meson.build | 6 +++--- - src/locking/meson.build | 8 ++++---- - src/lxc/meson.build | 6 +++--- - src/meson.build | 18 +++++++++--------- - src/network/meson.build | 12 ++++++------ - src/nwfilter/xml/meson.build | 2 +- - src/qemu/meson.build | 14 +++++++------- - src/remote/meson.build | 6 +++--- - src/security/apparmor/meson.build | 8 ++++---- - tools/meson.build | 4 ++-- - 12 files changed, 53 insertions(+), 42 deletions(-) - -diff --git a/meson.build b/meson.build -index b5164f6..33719f1 100644 ---- a/meson.build -+++ b/meson.build -@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' - conf.set('WINVER', '0x0600') # Win Vista / Server 2008 - endif - -+# patched in for nix -+install_prefix = get_option('install_prefix') - - # set various paths - -@@ -57,6 +59,13 @@ else - sysconfdir = prefix / get_option('sysconfdir') - endif - -+# nix: don't prefix the localstatedir; some things need to write to it, so it -+# can't be in the nix store, and that's what the prefix is. -+# We'll prefix things ourselves where needed -+localstatedir = get_option('localstatedir') -+# Same for sysconfidr -+sysconfdir = get_option('sysconfdir') -+ - # if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for - # sysconfdir as this makes a lot of things break in testing situations - if prefix == '/usr' -diff --git a/meson_options.txt b/meson_options.txt -index e5d79c2..081cd32 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,5 @@ -+option('install_prefix', type: 'string', value: '', description: 'prefix for nix store installation') -+ - option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') - option('packager', type: 'string', value: '', description: 'Extra packager name') - option('packager_version', type: 'string', value: '', description: 'Extra packager version') -diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 3bb6cc5..78d7be0 100644 ---- a/src/libxl/meson.build -+++ b/src/libxl/meson.build -@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'libxl', -- runstatedir / 'libvirt' / 'libxl', -- localstatedir / 'log' / 'libvirt' / 'libxl', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', -+ install_prefix + runstatedir / 'libvirt' / 'libxl', -+ install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', - ] - endif -diff --git a/src/locking/meson.build b/src/locking/meson.build -index 8a28310..9da81cc 100644 ---- a/src/locking/meson.build -+++ b/src/locking/meson.build -@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'lockd', -- localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', -- runstatedir / 'libvirt' / 'lockd', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', -+ install_prefix + runstatedir / 'libvirt' / 'lockd', - ] - - if conf.has('WITH_SANLOCK') - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'sanlock', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'sanlock', - ] - endif - endif -diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index f8e2a88..96d6687 100644 ---- a/src/lxc/meson.build -+++ b/src/lxc/meson.build -@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'lxc', -- runstatedir / 'libvirt' / 'lxc', -- localstatedir / 'log' / 'libvirt' / 'lxc', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', -+ install_prefix + runstatedir / 'libvirt' / 'lxc', -+ install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', - ] - endif -diff --git a/src/meson.build b/src/meson.build -index 7c47821..d33d16a 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -669,7 +669,7 @@ endforeach - - virt_conf_files += 'libvirt.conf' - --install_data(virt_conf_files, install_dir: confdir) -+install_data(virt_conf_files, install_dir: install_prefix + confdir) - install_data(virt_aug_files, install_dir: virt_aug_dir) - - # augeas_test_data: -@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs - output: '@0@.conf'.format(data['name']), - configuration: daemon_conf, - install: true, -- install_dir: confdir, -+ install_dir: install_prefix + confdir, - ) - - if data.get('with_ip', false) -@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') - - install_data( - init_file, -- install_dir: sysconfdir / 'init.d', -+ install_dir: install_prefix + sysconfdir / 'init.d', - rename: [ init['name'] ], - ) - - if init.has_key('confd') - install_data( - init['confd'], -- install_dir: sysconfdir / 'conf.d', -+ install_dir: install_prefix + sysconfdir / 'conf.d', - rename: [ init['name'] ], - ) - endif -@@ -872,7 +872,7 @@ if init_script != 'none' - foreach sysconf : sysconf_files - install_data( - sysconf['file'], -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: [ sysconf['name'] ], - ) - endforeach -@@ -897,10 +897,10 @@ endif - # Install empty directories - - virt_install_dirs += [ -- localstatedir / 'cache' / 'libvirt', -- localstatedir / 'lib' / 'libvirt' / 'images', -- localstatedir / 'lib' / 'libvirt' / 'filesystems', -- localstatedir / 'lib' / 'libvirt' / 'boot', -+ install_prefix + localstatedir / 'cache' / 'libvirt', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'images', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'filesystems', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'boot', - ] - - meson.add_install_script( -diff --git a/src/network/meson.build b/src/network/meson.build -index 3ec598c..b02040b 100644 ---- a/src/network/meson.build -+++ b/src/network/meson.build -@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'network', -- localstatedir / 'lib' / 'libvirt' / 'dnsmasq', -- runstatedir / 'libvirt' / 'network', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', -+ install_prefix + runstatedir / 'libvirt' / 'network', - ] - - configure_file( -@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') - output: '@BASENAME@', - copy: true, - install: true, -- install_dir: confdir / 'qemu' / 'networks', -+ install_dir: install_prefix + confdir / 'qemu' / 'networks', - ) - - meson.add_install_script( - meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), -- confdir / 'qemu' / 'networks' / 'autostart', -+ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', - '../default.xml', 'default.xml', - ) - -diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build -index 0d96c54..66c92a1 100644 ---- a/src/nwfilter/xml/meson.build -+++ b/src/nwfilter/xml/meson.build -@@ -25,4 +25,4 @@ nwfilter_xml_files = [ - 'qemu-announce-self.xml', - ] - --install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') -+install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') -diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 90640b0..8802cec 100644 ---- a/src/qemu/meson.build -+++ b/src/qemu/meson.build -@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'qemu', -- runstatedir / 'libvirt' / 'qemu', -- localstatedir / 'cache' / 'libvirt' / 'qemu', -- localstatedir / 'log' / 'libvirt' / 'qemu', -- localstatedir / 'lib' / 'libvirt' / 'swtpm', -- runstatedir / 'libvirt' / 'qemu' / 'swtpm', -- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', -+ install_prefix + runstatedir / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', -+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', -+ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', - ] - endif -diff --git a/src/remote/meson.build b/src/remote/meson.build -index 9ad2f6a..429a15b 100644 ---- a/src/remote/meson.build -+++ b/src/remote/meson.build -@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') - } - - virt_install_dirs += [ -- localstatedir / 'log' / 'libvirt', -+ install_prefix + localstatedir / 'log' / 'libvirt', - ] - - logrotate_conf = configuration_data() -@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') - ) - install_data( - log_file, -- install_dir: sysconfdir / 'logrotate.d', -+ install_dir: install_prefix + sysconfdir / 'logrotate.d', - rename: [ name ], - ) - endforeach -@@ -309,7 +309,7 @@ endif - if conf.has('WITH_SASL') - install_data( - 'libvirtd.sasl', -- install_dir: sysconfdir / 'sasl2', -+ install_dir: install_prefix + sysconfdir / 'sasl2', - rename: [ 'libvirt.conf' ], - ) - endif -diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build -index af43780..e2d6c81 100644 ---- a/src/security/apparmor/meson.build -+++ b/src/security/apparmor/meson.build -@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles - output: name, - configuration: apparmor_gen_profiles_conf, - install: true, -- install_dir: apparmor_dir, -+ install_dir: install_prefix + apparmor_dir, - ) - endforeach - - install_data( - [ 'libvirt-qemu', 'libvirt-lxc' ], -- install_dir: apparmor_dir / 'abstractions', -+ install_dir: install_prefix + apparmor_dir / 'abstractions', - ) - - install_data( - [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], -- install_dir: apparmor_dir / 'libvirt', -+ install_dir: install_prefix + apparmor_dir / 'libvirt', - ) - - install_data( - 'usr.lib.libvirt.virt-aa-helper.local', -- install_dir: apparmor_dir / 'local', -+ install_dir: install_prefix + apparmor_dir / 'local', - rename: 'usr.lib.libvirt.virt-aa-helper', - ) -diff --git a/tools/meson.build b/tools/meson.build -index b8c6802..dacd0ff 100644 ---- a/tools/meson.build -+++ b/tools/meson.build -@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') - install_rpath: libvirt_rpath, - ) - -- install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt') -+ install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt') - endif - - if host_machine.system() == 'windows' -@@ -274,7 +274,7 @@ configure_file( - if init_script == 'systemd' - install_data( - 'libvirt-guests.sysconf', -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: 'libvirt-guests', - ) diff --git a/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch b/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch deleted file mode 100644 index ae97c6455c6b..000000000000 --- a/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ch/meson.build b/src/ch/meson.build -index e34974d56c..4767763c2c 100644 ---- a/src/ch/meson.build -+++ b/src/ch/meson.build -@@ -68,7 +68,7 @@ if conf.has('WITH_CH') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'ch', -- runstatedir / 'libvirt' / 'ch', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', -+ install_prefix + runstatedir / 'libvirt' / 'ch', - ] - endif diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 03d0e17cb4c3..c12ee9e554ff 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -36,9 +36,6 @@ , numactl , perlPackages , curl -, libiconv -, gmp -, zfs , parted , bridge-utils , dmidecode @@ -52,34 +49,39 @@ , cmake , bash-completion , pkg-config -, enableXen ? false -, xen ? null -, enableIscsi ? false -, openiscsi -, enableCeph ? false -, ceph -, enableGlusterfs ? false -, glusterfs -, Carbon -, AppKit +, enableCeph ? false, ceph ? null +, enableGlusterfs ? false, glusterfs ? null +, enableIscsi ? false, openiscsi ? null +, enableXen ? false, xen ? null +, enableZfs ? true, zfs ? null +# Darwin +, gmp +, libiconv +, Carbon ? null +, AppKit ? null }: with lib; +assert enableXen -> stdenv.isLinux && stdenv.isx86_64; +assert enableCeph -> stdenv.isLinux; +assert enableGlusterfs -> stdenv.isLinux; +assert enableZfs -> stdenv.isLinux; + # if you update, also bump and SysVirt in let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "7.10.0"; + version = "8.1.0"; src = if buildFromTarball then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "sha256-yzGAFK8JcyeSjG49cpIuO+AqPmQBJHsqpS2auOC0gPk="; + sha256 = "sha256-PGxDvs/+s0o/OXxhYgaqaaiT/4v16CCDk8hOjnU1KTQ="; } else fetchFromGitLab @@ -87,13 +89,13 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bB8LsjZFeJbMmmC0YRPyMag2MBhwagUFC7aB1KhZEkA="; + sha256 = "sha256-nk8pBlss+g4EMy+RnAOyz6YlGGvlBvl5aBpcytsK1wY="; fetchSubmodules = true; }; patches = [ - ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch - ./0002-meson-patch-ch-install-prefix.patch + ./do-not-use-sysconfig.patch + ./qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch ]; nativeBuildInputs = [ @@ -136,21 +138,22 @@ stdenv.mkDerivation rec { systemd libnl numad - zfs libapparmor libcap_ng numactl attr parted libtirpc - ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ - xen - ] ++ optionals enableIscsi [ - openiscsi ] ++ optionals enableCeph [ ceph ] ++ optionals enableGlusterfs [ glusterfs + ] ++ optionals enableIscsi [ + openiscsi + ] ++ optionals enableXen [ + xen + ] ++ optionals enableZfs [ + zfs ] ++ optionals stdenv.isDarwin [ libiconv gmp @@ -187,23 +190,15 @@ stdenv.mkDerivation rec { mesonFlags = let opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; + enableDrivers = map (name: opt "driver_${name}" true); in [ - "--sysconfdir=/var/lib" - "-Dinstall_prefix=${placeholder "out"}" - "-Dlocalstatedir=/var" - "-Drunstatedir=/run" + "--localstatedir=${placeholder "out"}/var/" + "-Drunstatedir=${placeholder "out"}/run/" "-Dlibpcap=enabled" - "-Ddriver_qemu=enabled" - "-Ddriver_vmware=enabled" - "-Ddriver_vbox=enabled" - "-Ddriver_test=enabled" - "-Ddriver_esx=enabled" - "-Ddriver_remote=enabled" "-Dpolkit=enabled" (opt "storage_iscsi" enableIscsi) ] ++ optionals stdenv.isLinux [ - (opt "storage_zfs" (zfs != null)) "-Dattr=enabled" "-Dapparmor=enabled" "-Dsecdriver_apparmor=enabled" @@ -211,9 +206,24 @@ stdenv.mkDerivation rec { "-Dstorage_disk=enabled" (opt "glusterfs" enableGlusterfs) (opt "storage_rbd" enableCeph) + (opt "storage_zfs" enableZfs) ] ++ optionals stdenv.isDarwin [ "-Dinit_script=none" - ]; + ] ++ (enableDrivers [ + "ch" + "esx" + "interface" + "libvirtd" + "lxc" + "network" + "openvz" + "qemu" + "remote" + "secrets" + "test" + "vbox" + "vmware" + ] ++ lib.optional enableXen "libxl"); postInstall = let diff --git a/pkgs/development/libraries/libvirt/do-not-use-sysconfig.patch b/pkgs/development/libraries/libvirt/do-not-use-sysconfig.patch new file mode 100644 index 000000000000..fae61294584e --- /dev/null +++ b/pkgs/development/libraries/libvirt/do-not-use-sysconfig.patch @@ -0,0 +1,211 @@ +From 10d65f10a76c7478c4ec0c65ffeec7f4b18929f9 Mon Sep 17 00:00:00 2001 +Message-Id: <10d65f10a76c7478c4ec0c65ffeec7f4b18929f9.1646212419.git.mprivozn@redhat.com> +From: Michal Privoznik +Date: Wed, 2 Mar 2022 10:01:04 +0100 +Subject: [PATCH] libvirt-8.2.0-do-not-use-sysconfig.patch + +Signed-off-by: Michal Privoznik +--- + src/interface/virtinterfaced.service.in | 1 - + src/libxl/virtxend.service.in | 1 - + src/locking/virtlockd.service.in | 1 - + src/logging/virtlogd.service.in | 3 +-- + src/lxc/virtlxcd.service.in | 1 - + src/network/virtnetworkd.service.in | 1 - + src/node_device/virtnodedevd.service.in | 1 - + src/nwfilter/virtnwfilterd.service.in | 1 - + src/qemu/virtqemud.service.in | 1 - + src/remote/libvirtd.service.in | 1 - + src/remote/virtproxyd.service.in | 1 - + src/secret/virtsecretd.service.in | 1 - + src/storage/virtstoraged.service.in | 1 - + src/vbox/virtvboxd.service.in | 1 - + tools/libvirt-guests.service.in | 2 +- + 15 files changed, 2 insertions(+), 16 deletions(-) + +diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in +index cb860ff1c4..090b198ac7 100644 +--- a/src/interface/virtinterfaced.service.in ++++ b/src/interface/virtinterfaced.service.in +@@ -14,7 +14,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTINTERFACED_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced + ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in +index 6b083c414f..597f5d1905 100644 +--- a/src/libxl/virtxend.service.in ++++ b/src/libxl/virtxend.service.in +@@ -19,7 +19,6 @@ ConditionPathExists=/proc/xen/capabilities + [Service] + Type=notify + Environment=VIRTXEND_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtxend + ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in +index 19271d1e7d..87193952cb 100644 +--- a/src/locking/virtlockd.service.in ++++ b/src/locking/virtlockd.service.in +@@ -8,7 +8,6 @@ Documentation=https://libvirt.org + + [Service] + Environment=VIRTLOCKD_ARGS= +-EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd + ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS + ExecReload=/bin/kill -USR1 $MAINPID + # Losing the locks is a really bad thing that will +diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in +index 8ab5478517..fe5c58b8ed 100644 +--- a/src/logging/virtlogd.service.in ++++ b/src/logging/virtlogd.service.in +@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) + Documentation=https://libvirt.org + + [Service] +-EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd +-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS ++ExecStart=@sbindir@/virtlogd + ExecReload=/bin/kill -USR1 $MAINPID + # Losing the logs is a really bad thing that will + # cause the machine to be fenced (rebooted), so make +diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in +index 334c34db44..1b9689017e 100644 +--- a/src/lxc/virtlxcd.service.in ++++ b/src/lxc/virtlxcd.service.in +@@ -19,7 +19,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTLXCD_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd + ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + KillMode=process +diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in +index 05ce672b73..ee4cd9bca1 100644 +--- a/src/network/virtnetworkd.service.in ++++ b/src/network/virtnetworkd.service.in +@@ -17,7 +17,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTNETWORKD_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd + ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in +index cd9de362fd..7693aa52c4 100644 +--- a/src/node_device/virtnodedevd.service.in ++++ b/src/node_device/virtnodedevd.service.in +@@ -14,7 +14,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTNODEDEVD_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd + ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in +index ab65419e0c..16d8b377b0 100644 +--- a/src/nwfilter/virtnwfilterd.service.in ++++ b/src/nwfilter/virtnwfilterd.service.in +@@ -14,7 +14,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTNWFILTERD_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd + ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in +index 5ad968ace9..c63147d31f 100644 +--- a/src/qemu/virtqemud.service.in ++++ b/src/qemu/virtqemud.service.in +@@ -21,7 +21,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTQEMUD_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud + ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + KillMode=process +diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in +index 5d4d412fcc..27cfc34b90 100644 +--- a/src/remote/libvirtd.service.in ++++ b/src/remote/libvirtd.service.in +@@ -29,7 +29,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=LIBVIRTD_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd + ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + KillMode=process +diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in +index f9bb6b84a9..0eddf5ee93 100644 +--- a/src/remote/virtproxyd.service.in ++++ b/src/remote/virtproxyd.service.in +@@ -14,7 +14,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTPROXYD_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd + ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in +index 6d298c5334..92e54f175f 100644 +--- a/src/secret/virtsecretd.service.in ++++ b/src/secret/virtsecretd.service.in +@@ -14,7 +14,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTSECRETD_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd + ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in +index eda4d86d37..abe91e3d80 100644 +--- a/src/storage/virtstoraged.service.in ++++ b/src/storage/virtstoraged.service.in +@@ -16,7 +16,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTSTORAGED_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged + ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in +index 6f447276e9..54fbd0be4a 100644 +--- a/src/vbox/virtvboxd.service.in ++++ b/src/vbox/virtvboxd.service.in +@@ -15,7 +15,6 @@ Documentation=https://libvirt.org + [Service] + Type=notify + Environment=VIRTVBOXD_ARGS="--timeout 120" +-EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd + ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS + ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure +diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in +index 3cf6476196..5668009ae4 100644 +--- a/tools/libvirt-guests.service.in ++++ b/tools/libvirt-guests.service.in +@@ -20,7 +20,7 @@ Documentation=man:libvirt-guests(8) + Documentation=https://libvirt.org + + [Service] +-EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests ++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf + # Hack just call traditional service until we factor + # out the code + ExecStart=@libexecdir@/libvirt-guests.sh start +-- +2.34.1 + diff --git a/pkgs/development/libraries/libvirt/qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch b/pkgs/development/libraries/libvirt/qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch new file mode 100644 index 000000000000..f37ec7065afd --- /dev/null +++ b/pkgs/development/libraries/libvirt/qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch @@ -0,0 +1,50 @@ +From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001 +Message-Id: <823a62ec8aac4fb75e6e281164f3eb56ae47597c.1646211032.git.mprivozn@redhat.com> +From: Boris Fiuczynski +Date: Tue, 1 Mar 2022 18:47:59 +0100 +Subject: [PATCH] qemu: segmentation fault in virtqemud executing + qemuDomainUndefineFlags + +Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault. + +Stack trace of thread 664419: + #0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=) at ../src/qemu/qemu_driver.c:6618 + #1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=) at ../src/libvirt-domain.c:6519 + #2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=, rerr=0x3ff8287b950, client=) + at src/remote/remote_daemon_dispatch_stubs.h:13080 + #3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=, ret=0x0) + at src/remote/remote_daemon_dispatch_stubs.h:13059 + #4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010) + at ../src/rpc/virnetserverprogram.c:428 + #5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302 + #6 0x000003ff8758c260 in virNetServerProcessMsg (msg=, prog=, client=, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140 + #7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160 + #8 0x000003ff874c49aa in virThreadPoolWorker (opaque=) at ../src/util/virthreadpool.c:164 + #9 0x000003ff874c3f62 in virThreadHelper (data=) at ../src/util/virthread.c:256 + #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6 + #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6 + +Signed-off-by: Boris Fiuczynski +Reviewed-by: Jim Fehlig +Reviewed-by: Michal Privoznik +Signed-off-by: Michal Privoznik +--- + src/qemu/qemu_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index bcd9bdb436..8337eed510 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, + } + } + +- if (vm->def->os.loader->nvram) { ++ if (vm->def->os.loader && vm->def->os.loader->nvram) { + nvram_path = g_strdup(vm->def->os.loader->nvram); + } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { + qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); +-- +2.34.1 + From 9ab606adcf05b2ac65ff367ff66e476cde6795db Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 12 Mar 2022 00:32:01 -0800 Subject: [PATCH 163/329] python3Packages.libvirt: 7.10.0 -> 8.1.0 --- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index a8e21a698f7f..d69885fcb0f3 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "7.10.0"; + version = "8.1.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw="; + sha256 = "sha256-/uGxjptiqm5B823z4mcjredj9ZLZC2WTTqhQrQPVfDU="; }; nativeBuildInputs = [ pkg-config ]; From 97829a8bf6fe98e70b7a9f2e0f571a3ba0a128b2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 12 Mar 2022 00:34:28 -0800 Subject: [PATCH 164/329] perlPackages.SysVirt: 7.10.0 -> 8.1.0 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 943ad79cc286..d106a1897e42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20782,12 +20782,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "7.10.0"; + version = "8.1.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; - rev = "v7.10.0"; - sha256 = "sha256-cXuzg4bBwCftdZhz3e50L+4fO0RWX5Tl8zDOoydECd4="; + rev = "v${version}"; + sha256 = "sha256-9cjH4hIIxB+Pv9+ck6xg8KmfM8jtVFKVQNGLYr2AnAM="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From 7e64ba9dc802c1e107d8a71d5a7a45774f89b2a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 08:40:00 +0000 Subject: [PATCH 165/329] meshcentral: 0.9.79 -> 0.9.98 --- pkgs/tools/admin/meshcentral/default.nix | 4 +- pkgs/tools/admin/meshcentral/package.json | 4 +- pkgs/tools/admin/meshcentral/yarn.lock | 349 +++++++++++----------- pkgs/tools/admin/meshcentral/yarn.nix | 328 ++++++++++---------- 4 files changed, 339 insertions(+), 346 deletions(-) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 496f478be8a6..b1c14d6c8aad 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,11 +1,11 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage rec { - version = "0.9.79"; + version = "0.9.98"; src = fetchzip { url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz"; - sha256 = "17f34ifzdrkbap2hhd0y0rdcn8j0svxzsqw0qhcp3h68z3098hdv"; + sha256 = "0bvd6fin05dkh6x5qx2f58c0zsmxpdlwb8wqm0y04bax1mhm1bsf"; }; packageJSON = ./package.json; diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 4a0f5bf6137a..3b08a4ccbc52 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.9.79", + "version": "0.9.98", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -41,7 +41,7 @@ "compression": "^1.7.4", "cookie-session": "^1.4.0", "express": "^4.17.0", - "express-handlebars": "^3.1.0", + "express-handlebars": "^5.3.5", "express-ws": "^4.0.0", "ipcheck": "^0.1.0", "minimist": "^1.2.5", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index 219114d50fef..55b08db09a90 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@alloc/quick-lru@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" + integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== + "@babel/code-frame@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" @@ -9,10 +14,10 @@ dependencies: "@babel/highlight" "^7.16.7" -"@babel/generator@^7.17.0", "@babel/generator@^7.4.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e" - integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw== +"@babel/generator@^7.17.3", "@babel/generator@^7.4.0": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200" + integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg== dependencies: "@babel/types" "^7.17.0" jsesc "^2.5.1" @@ -69,10 +74,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.4.3": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c" - integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw== +"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.4.3": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" + integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA== "@babel/template@^7.16.7", "@babel/template@^7.4.0": version "7.16.7" @@ -84,17 +89,17 @@ "@babel/types" "^7.16.7" "@babel/traverse@^7.4.3": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30" - integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg== + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" + integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== dependencies: "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.0" + "@babel/generator" "^7.17.3" "@babel/helper-environment-visitor" "^7.16.7" "@babel/helper-function-name" "^7.16.7" "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.0" + "@babel/parser" "^7.17.3" "@babel/types" "^7.17.0" debug "^4.1.0" globals "^11.1.0" @@ -115,35 +120,35 @@ google-protobuf "3.14.0" parsimmon "1.16.0" -"@sendgrid/client@^7.6.1": - version "7.6.1" - resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.1.tgz#de17fe9f04af3bdb69aca44fc407316de87cea3b" - integrity sha512-q4U5OhcbJjs+lLVv/LhZSc28feiVCFMgvG9aYcRI5X4tKArnrrGDWb5HMITR9vaAtX42TXhyPFjHr1fk/Q1loQ== +"@sendgrid/client@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.2.tgz#5d08949120dad679f34260f1b875b4f57a8d688e" + integrity sha512-Yw3i3vPBBwfiIi+4i7+1f1rwQoLlLsu3qW16d1UuRp6RgX6H6yHYb2/PfqwNyCC0qzqIWGUKPWwYe5ggcr5Guw== dependencies: - "@sendgrid/helpers" "^7.6.0" - axios "^0.21.4" + "@sendgrid/helpers" "^7.6.2" + axios "^0.26.0" -"@sendgrid/helpers@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.0.tgz#b381bfab391bcd66c771811b22bb6bb2d5c1dfc6" - integrity sha512-0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA== +"@sendgrid/helpers@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.2.tgz#e4abdd4e259611ed549ae8e0f4a46cd4f587e5d1" + integrity sha512-kGW0kM2AOHfXjcvB6Lgwa/nMv8IALu0KyNY9X4HSa3MtLohymuhbG9HgjrOh66+BkbsfA03H3bcT0+sPVJ0GKQ== dependencies: deepmerge "^4.2.2" "@sendgrid/mail@*": - version "7.6.1" - resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.1.tgz#f7bbfc93781b0b6126549bf4b3649805295b02aa" - integrity sha512-F+HXpDLIU4PGZyZznOiFLDGJDwLn2qh7/wD5MvwurrldDx5DaGQHrYBKHopceOl15FVuq9ElU9VIxQJF8SMvTg== + version "7.6.2" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.2.tgz#118650afbb58be82e3178fa172869d929d937118" + integrity sha512-IHHZFvgU95aqb11AevQvAfautj2pb8iW8UCiUJ2ae9pRF37e6EkBmU9NgdFjbQ/8Xhhm+KDVDzn/JLxDN/GiBw== dependencies: - "@sendgrid/client" "^7.6.1" - "@sendgrid/helpers" "^7.6.0" + "@sendgrid/client" "^7.6.2" + "@sendgrid/helpers" "^7.6.2" "@tootallnate/once@2": version "2.0.0" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@types/geojson@^7946.0.7": +"@types/geojson@^7946.0.8": version "7946.0.8" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== @@ -155,15 +160,15 @@ dependencies: "@types/node" "*" -"@types/node@*": - version "17.0.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz#a8ddf6e0c2341718d74ee3dc413a13a042c45a0c" - integrity sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw== +"@types/node@*", "@types/node@^17.0.10": + version "17.0.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" + integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== -"@types/node@^14.14.14", "@types/node@^14.14.28": - version "14.18.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz#9bd810a959e1728d78df0f68b5c825b8ea7156f4" - integrity sha512-zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg== +"@types/node@^14.14.14": + version "14.18.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" + integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== "@types/webidl-conversions@*": version "6.1.1" @@ -431,7 +436,7 @@ abstract-logging@^2.0.0: resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== -accepts@~1.3.5, accepts@~1.3.7: +accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -578,9 +583,9 @@ ansi-regex@^2.0.0: integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" + integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== ansi-styles@^2.2.1: version "2.2.1" @@ -779,7 +784,7 @@ arrify@^2.0.0: resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== -asap@^2.0.0, asap@~2.0.3, asap@~2.0.6: +asap@^2.0.0, asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= @@ -853,7 +858,7 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -axios@0.21.4, axios@^0.21.1, axios@^0.21.4: +axios@0.21.4, axios@^0.21.1: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== @@ -874,6 +879,13 @@ axios@^0.25.0: dependencies: follow-redirects "^1.14.7" +axios@^0.26.0: + version "0.26.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" + integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== + dependencies: + follow-redirects "^1.14.8" + babel-cli@^6.16.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" @@ -1474,20 +1486,20 @@ bn.js@^4.0.0: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -body-parser@1.19.1, body-parser@^1.19.0: - version "1.19.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4" - integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA== +body-parser@1.19.2, body-parser@^1.19.0: + version "1.19.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" + integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== dependencies: - bytes "3.1.1" + bytes "3.1.2" content-type "~1.0.4" debug "2.6.9" depd "~1.1.2" http-errors "1.8.1" iconv-lite "0.4.24" on-finished "~2.3.0" - qs "6.9.6" - raw-body "2.4.2" + qs "6.9.7" + raw-body "2.4.3" type-is "~1.6.18" brace-expansion@^1.0.0, brace-expansion@^1.1.7: @@ -1598,10 +1610,10 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= -bytes@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" - integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== cache-base@^1.0.1: version "1.0.1" @@ -2080,10 +2092,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" - integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +cookie@0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" + integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== cookies@0.8.0: version "0.8.0" @@ -2237,9 +2249,9 @@ dateformat@~3.0.3: integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== dayjs@^1.8.29: - version "1.10.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" - integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== + version "1.10.8" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz#267df4bc6276fcb33c04a6735287e3f429abec41" + integrity sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow== ddata@~0.1.25: version "0.1.28" @@ -2318,13 +2330,6 @@ defer-promise@^1.0.0: resolved "https://registry.yarnpkg.com/defer-promise/-/defer-promise-1.0.2.tgz#b79521c59cadadaed2d305385d30f8b05cbf9196" integrity sha512-5a0iWJvnon50nLLqHPW83pX45BLb4MmlSa1sIg05NBhZoK5EZGz1s8qoZ3888dVGGOT0Ni01NdETuAgdJUZknA== -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -2357,6 +2362,11 @@ denque@^1.4.1, denque@^1.5.0: resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf" integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== +denque@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/denque/-/denque-2.0.1.tgz#bcef4c1b80dc32efe97515744f21a4229ab8934a" + integrity sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ== + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -2592,16 +2602,14 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -express-handlebars@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-3.1.0.tgz#c177ee9a81f6a2abada6b550b77b3e30c6bc0796" - integrity sha512-7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg== +express-handlebars@^5.3.5: + version "5.3.5" + resolved "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-5.3.5.tgz#a04a1e670aa97d5b3a8080de8336f79228593540" + integrity sha512-r9pzDc94ZNJ7FVvtsxLfPybmN0eFAUnR61oimNPRpD0D7nkLcezrkpZzoXS5TI75wYHRbflPLTU39B62pwB4DA== dependencies: - glob "^7.1.3" - graceful-fs "^4.1.2" - handlebars "^4.1.2" - object.assign "^4.1.0" - promise "^8.0.2" + glob "^7.2.0" + graceful-fs "^4.2.8" + handlebars "^4.7.7" express-ws@4.0.0: version "4.0.0" @@ -2611,16 +2619,16 @@ express-ws@4.0.0: ws "^5.2.0" express@^4.17.0: - version "4.17.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3" - integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg== + version "4.17.3" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" + integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== dependencies: - accepts "~1.3.7" + accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.19.1" + body-parser "1.19.2" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.1" + cookie "0.4.2" cookie-signature "1.0.6" debug "2.6.9" depd "~1.1.2" @@ -2635,7 +2643,7 @@ express@^4.17.0: parseurl "~1.3.3" path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.9.6" + qs "6.9.7" range-parser "~1.2.1" safe-buffer "5.2.1" send "0.17.2" @@ -2900,10 +2908,10 @@ flagged-respawn@^1.0.1: resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== -follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.7: - version "1.14.8" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" - integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== +follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.7, follow-redirects@^1.14.8: + version "1.14.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -3106,7 +3114,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -3171,10 +3179,10 @@ globals@^9.18.0: resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== -google-auth-library@^7.0.2: - version "7.12.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.12.0.tgz#7965db6bc20cb31f2df05a08a296bbed6af69426" - integrity sha512-RS/whvFPMoF1hQNxnoVET3DWKPBt1Xgqe2rY0k+Jn7TNhoHlwdnSe7Rlcbo2Nub3Mt2lUVz26X65aDQrWp6x8w== +google-auth-library@^7.0.2, google-auth-library@^7.14.0: + version "7.14.0" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.0.tgz#9d6a20592f7b4d4c463cd3e93934c4b1711d5dc6" + integrity sha512-or8r7qUqGVI3W8lVSdPh0ZpeFyQHeE73g5c0p+bLNTTUFXJ+GSeDQmZRZ2p4H8cF/RJYa4PNvi/A1ar1uVNLFA== dependencies: arrify "^2.0.0" base64-js "^1.3.0" @@ -3199,26 +3207,26 @@ google-protobuf@3.14.0: integrity sha512-bwa8dBuMpOxg7COyqkW6muQuvNnWgVN8TX/epDRGW5m0jcrmq2QJyCyiV8ZE2/6LaIIqJtiv9bYokFhfpy/o6w== googleapis-common@^5.0.2: - version "5.0.5" - resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.5.tgz#4c7160be1ed7e4cc8cdbcdb6eac8a4b3a61dd782" - integrity sha512-o2dgoW4x4fLIAN+IVAOccz3mEH8Lj1LP9c9BSSvkNJEn+U7UZh0WSr4fdH08x5VH7+sstIpd1lOYFZD0g7j4pw== + version "5.1.0" + resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.1.0.tgz#845a79471c787e522e03c50d415467140e9e356a" + integrity sha512-RXrif+Gzhq1QAzfjxulbGvAY3FPj8zq/CYcvgjzDbaBNCD6bUl+86I7mUs4DKWHGruuK26ijjR/eDpWIDgNROA== dependencies: extend "^3.0.2" gaxios "^4.0.0" - google-auth-library "^7.0.2" + google-auth-library "^7.14.0" qs "^6.7.0" url-template "^2.0.8" uuid "^8.0.0" googleapis@*: - version "95.0.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-95.0.0.tgz#63f6e28e78874044585f1e86c100a308a44fb385" - integrity sha512-ZpFZW7FDwcjQa2+xZNS2SC5sK2s46iWKA5QSFVJSK3RELQec4PYHhzKwzbeCzt4urnjYp6udPif95zXTFxbtRA== + version "96.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-96.0.0.tgz#95bdf0e57bc912581ba7bc10eb202301f2b05dc1" + integrity sha512-tEQtcukxA4sW1OXh35teJbui+BIjMTghH6i0tvUctyXgMDO0Upu3+hrytrw9JqZJxtXReM3Wr5+g4U7veqHpBQ== dependencies: google-auth-library "^7.0.2" googleapis-common "^5.0.2" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.8: version "4.2.9" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== @@ -3349,7 +3357,7 @@ handlebars@^3.0.0, handlebars@^3.0.3: optionalDependencies: uglify-js "^2.6" -handlebars@^4.1.2: +handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== @@ -3392,9 +3400,9 @@ has-flag@^4.0.0: integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-symbols@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-value@^0.3.1: version "0.3.1" @@ -4294,9 +4302,9 @@ ldapauth-fork@*: lru-cache "^6.0.0" ldapjs@^2.2.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz#04136815fb1f21d692ac87fab5961a04d86e8b04" - integrity sha512-kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ== + version "2.3.2" + resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.2.tgz#a599d081519f70462941cc33a50e9354c32f35b7" + integrity sha512-FU+GR/qbQ96WUZ2DUb7FzaEybYvv3240wTVPcbsdELB3o4cK92zGVjntsh68siVkLeCmlCcsd/cIQzyGXSS7LA== dependencies: abstract-logging "^2.0.0" asn1 "^0.2.4" @@ -4454,11 +4462,6 @@ lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -4526,16 +4529,16 @@ map-visit@^1.0.0: object-visit "^1.0.0" mariadb@*: - version "2.5.5" - resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.5.tgz#a9aff9f1e57231a415a21254489439beb501c803" - integrity sha512-6dklvcKWuuaV1JjAwnE2ezR+jTt7JrZHftgeHHBmjB0wgfaUpdxol1DPWclwMcCrsO9yoM0FuCOiCcCgXc//9Q== + version "3.0.0" + resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.0.0.tgz#0738b14036be097991172b22c0ce1d43e261c014" + integrity sha512-1uIqD6AWLP5ojMY67XP4+4uRLe9L92HD1ZGU8fidi8cGdYIC+Ghx1JliAtf7lc/tGjOh6J400f/1M4BXVtZFvA== dependencies: - "@types/geojson" "^7946.0.7" - "@types/node" "^14.14.28" - denque "^1.5.0" + "@alloc/quick-lru" "^5.2.0" + "@types/geojson" "^7946.0.8" + "@types/node" "^17.0.10" + denque "^2.0.1" iconv-lite "^0.6.3" - long "^4.0.0" - moment-timezone "^0.5.33" + moment-timezone "^0.5.34" please-upgrade-node "^3.2.0" marked@~0.3.6: @@ -4639,11 +4642,16 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": +mime-db@1.51.0: version "1.51.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== +"mime-db@>= 1.43.0 < 2": + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.34" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" @@ -4683,10 +4691,10 @@ minimalistic-assert@^1.0.0: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -"minimatch@2 || 3", minimatch@^3.0.4, minimatch@~3.0.4: - version "3.0.5" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" - integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== +"minimatch@2 || 3", minimatch@^3.0.4: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" @@ -4697,6 +4705,13 @@ minimatch@^2.0.1: dependencies: brace-expansion "^1.0.0" +minimatch@~3.0.4: + version "3.0.8" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" + integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q== + dependencies: + brace-expansion "^1.1.7" + minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" @@ -4739,7 +4754,7 @@ modern-syslog@*: dependencies: nan "^2.13.2" -moment-timezone@^0.5.33: +moment-timezone@^0.5.34: version "0.5.34" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c" integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg== @@ -5102,11 +5117,6 @@ object-inspect@^1.9.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - object-to-spawn-args@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/object-to-spawn-args/-/object-to-spawn-args-1.1.1.tgz#77da8827f073d011c9e1b173f895781470246785" @@ -5138,16 +5148,6 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" - object.defaults@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" @@ -5672,9 +5672,9 @@ please-upgrade-node@^3.2.0: semver-compare "^1.0.0" plivo@*: - version "4.27.0" - resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.27.0.tgz#af41278962b858bccf2bc04a9e28fd6008a0bd9a" - integrity sha512-bmtc/GSQsxBW5aarr8z8lS07vl4HWtgTZTb8W5/dfsm9Z3dG3VDswkFIeu+n0ZkJ+FEbVGPkCV4EJ7jfRA+2Cw== + version "4.28.0" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.28.0.tgz#917813c55b45d33d291ee55dc7cfd868d53130c5" + integrity sha512-FQCc5TG5QUlNq1r0OlLvAHgJo15M+ou+dt7bWheataObxUxPqpga316zCOYR/sGzVzREPSB/ThpT9/cZeUcYgg== dependencies: "@types/node" "^14.14.14" axios "^0.21.1" @@ -5764,13 +5764,6 @@ promise.prototype.finally@^1.0.1: dependencies: asap "~2.0.3" -promise@^8.0.2: - version "8.1.0" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" - integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== - dependencies: - asap "~2.0.6" - proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -5821,10 +5814,10 @@ qlobber@^3.0.2, qlobber@^3.1.0: resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211" integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug== -qs@6.9.6: - version "6.9.6" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" - integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== +qs@6.9.7: + version "6.9.7" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" + integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: version "6.10.3" @@ -5881,12 +5874,12 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" - integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== +raw-body@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" + integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== dependencies: - bytes "3.1.1" + bytes "3.1.2" http-errors "1.8.1" iconv-lite "0.4.24" unpipe "1.0.0" @@ -6615,9 +6608,9 @@ sqlstring@2.3.1: integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= ssh2@*: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.6.0.tgz#61aebc3a6910fe488f9c85cd8355bdf8d4724e05" - integrity sha512-lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q== + version "1.7.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.7.0.tgz#7aa30f2a5266f0ffd93944621b4eb1f403330fd4" + integrity sha512-u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g== dependencies: asn1 "^0.2.4" bcrypt-pbkdf "^1.0.2" @@ -7026,9 +7019,9 @@ tweetnacl@^1.0.1: integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== twilio@*: - version "3.74.0" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.74.0.tgz#df912476543b7004cd765d566449c27174289091" - integrity sha512-r79CWIug+x2/1uGOdAzGESvUvycxPCvVJ9rm4y1TsAocshTh+f5+ipULxyT3T5q4wJNT+k2OEiUBkKFA+cpQ/A== + version "3.75.1" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.75.1.tgz#7b9880e31a98c326f17dad3f1778f2a00805d351" + integrity sha512-q9h8AzJekL2etE4hPiZ3IOz9V6MkrY5d5cLvTra+Xe+jtDjQgarKbMUOYFhVHb/zXycf9qqW+Qk9de0ekgLwrQ== dependencies: axios "^0.25.0" dayjs "^1.8.29" @@ -7039,7 +7032,7 @@ twilio@*: qs "^6.9.4" rootpath "^0.1.2" scmp "^2.1.0" - url-parse "^1.5.3" + url-parse "^1.5.6" xmlbuilder "^13.0.2" type-check@~0.3.2: @@ -7073,9 +7066,9 @@ uglify-js@^2.6: uglify-to-browserify "~1.0.0" uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.15.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz#9403dc6fa5695a6172a91bc983ea39f0f7c9086d" - integrity sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ== + version "3.15.3" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz#9aa82ca22419ba4c0137642ba0df800cb06e0471" + integrity sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg== uglify-to-browserify@~1.0.0: version "1.0.2" @@ -7172,10 +7165,10 @@ url-join@^4.0.1: resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== -url-parse@^1.5.3: - version "1.5.4" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz#e4f645a7e2a0852cc8a66b14b292a3e9a11a97fd" - integrity sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg== +url-parse@^1.5.3, url-parse@^1.5.6: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" @@ -7329,9 +7322,9 @@ weak-daemon@1.0.3: integrity sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ== weak-map@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz#79691584d98607f5070bd3b70a40e6bb22e401eb" - integrity sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes= + version "1.0.8" + resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz#394c18a9e8262e790544ed8b55c6a4ddad1cb1a3" + integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== web-push@*: version "3.4.5" diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix index c9d5925b6580..84a2393cf7cd 100644 --- a/pkgs/tools/admin/meshcentral/yarn.nix +++ b/pkgs/tools/admin/meshcentral/yarn.nix @@ -1,6 +1,14 @@ { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ + { + name = "_alloc_quick_lru___quick_lru_5.2.0.tgz"; + path = fetchurl { + name = "_alloc_quick_lru___quick_lru_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz"; + sha512 = "UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="; + }; + } { name = "_babel_code_frame___code_frame_7.16.7.tgz"; path = fetchurl { @@ -10,11 +18,11 @@ }; } { - name = "_babel_generator___generator_7.17.0.tgz"; + name = "_babel_generator___generator_7.17.3.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz"; - sha512 = "I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw=="; + name = "_babel_generator___generator_7.17.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz"; + sha512 = "+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg=="; }; } { @@ -74,11 +82,11 @@ }; } { - name = "_babel_parser___parser_7.17.0.tgz"; + name = "_babel_parser___parser_7.17.3.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz"; - sha512 = "VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw=="; + name = "_babel_parser___parser_7.17.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz"; + sha512 = "7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA=="; }; } { @@ -90,11 +98,11 @@ }; } { - name = "_babel_traverse___traverse_7.17.0.tgz"; + name = "_babel_traverse___traverse_7.17.3.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz"; - sha512 = "fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg=="; + name = "_babel_traverse___traverse_7.17.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz"; + sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; }; } { @@ -114,27 +122,27 @@ }; } { - name = "_sendgrid_client___client_7.6.1.tgz"; + name = "_sendgrid_client___client_7.6.2.tgz"; path = fetchurl { - name = "_sendgrid_client___client_7.6.1.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.1.tgz"; - sha512 = "q4U5OhcbJjs+lLVv/LhZSc28feiVCFMgvG9aYcRI5X4tKArnrrGDWb5HMITR9vaAtX42TXhyPFjHr1fk/Q1loQ=="; + name = "_sendgrid_client___client_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.2.tgz"; + sha512 = "Yw3i3vPBBwfiIi+4i7+1f1rwQoLlLsu3qW16d1UuRp6RgX6H6yHYb2/PfqwNyCC0qzqIWGUKPWwYe5ggcr5Guw=="; }; } { - name = "_sendgrid_helpers___helpers_7.6.0.tgz"; + name = "_sendgrid_helpers___helpers_7.6.2.tgz"; path = fetchurl { - name = "_sendgrid_helpers___helpers_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.0.tgz"; - sha512 = "0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA=="; + name = "_sendgrid_helpers___helpers_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.2.tgz"; + sha512 = "kGW0kM2AOHfXjcvB6Lgwa/nMv8IALu0KyNY9X4HSa3MtLohymuhbG9HgjrOh66+BkbsfA03H3bcT0+sPVJ0GKQ=="; }; } { - name = "_sendgrid_mail___mail_7.6.1.tgz"; + name = "_sendgrid_mail___mail_7.6.2.tgz"; path = fetchurl { - name = "_sendgrid_mail___mail_7.6.1.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.1.tgz"; - sha512 = "F+HXpDLIU4PGZyZznOiFLDGJDwLn2qh7/wD5MvwurrldDx5DaGQHrYBKHopceOl15FVuq9ElU9VIxQJF8SMvTg=="; + name = "_sendgrid_mail___mail_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.2.tgz"; + sha512 = "IHHZFvgU95aqb11AevQvAfautj2pb8iW8UCiUJ2ae9pRF37e6EkBmU9NgdFjbQ/8Xhhm+KDVDzn/JLxDN/GiBw=="; }; } { @@ -162,19 +170,19 @@ }; } { - name = "_types_node___node_17.0.17.tgz"; + name = "_types_node___node_17.0.21.tgz"; path = fetchurl { - name = "_types_node___node_17.0.17.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz"; - sha512 = "e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw=="; + name = "_types_node___node_17.0.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; }; } { - name = "_types_node___node_14.18.11.tgz"; + name = "_types_node___node_14.18.12.tgz"; path = fetchurl { - name = "_types_node___node_14.18.11.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz"; - sha512 = "zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg=="; + name = "_types_node___node_14.18.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz"; + sha512 = "q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="; }; } { @@ -610,11 +618,11 @@ }; } { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; + name = "ansi_regex___ansi_regex_4.1.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + name = "ansi_regex___ansi_regex_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz"; + sha512 = "ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="; }; } { @@ -945,6 +953,14 @@ sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; }; } + { + name = "axios___axios_0.26.1.tgz"; + path = fetchurl { + name = "axios___axios_0.26.1.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz"; + sha512 = "fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA=="; + }; + } { name = "babel_cli___babel_cli_6.26.0.tgz"; path = fetchurl { @@ -1490,11 +1506,11 @@ }; } { - name = "body_parser___body_parser_1.19.1.tgz"; + name = "body_parser___body_parser_1.19.2.tgz"; path = fetchurl { - name = "body_parser___body_parser_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz"; - sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; + name = "body_parser___body_parser_1.19.2.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; }; } { @@ -1618,11 +1634,11 @@ }; } { - name = "bytes___bytes_3.1.1.tgz"; + name = "bytes___bytes_3.1.2.tgz"; path = fetchurl { - name = "bytes___bytes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz"; - sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; + name = "bytes___bytes_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz"; + sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; } { @@ -2090,11 +2106,11 @@ }; } { - name = "cookie___cookie_0.4.1.tgz"; + name = "cookie___cookie_0.4.2.tgz"; path = fetchurl { - name = "cookie___cookie_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz"; - sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + name = "cookie___cookie_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; }; } { @@ -2266,11 +2282,11 @@ }; } { - name = "dayjs___dayjs_1.10.7.tgz"; + name = "dayjs___dayjs_1.10.8.tgz"; path = fetchurl { - name = "dayjs___dayjs_1.10.7.tgz"; - url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz"; - sha512 = "P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="; + name = "dayjs___dayjs_1.10.8.tgz"; + url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz"; + sha512 = "wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="; }; } { @@ -2369,14 +2385,6 @@ sha512 = "5a0iWJvnon50nLLqHPW83pX45BLb4MmlSa1sIg05NBhZoK5EZGz1s8qoZ3888dVGGOT0Ni01NdETuAgdJUZknA=="; }; } - { - name = "define_properties___define_properties_1.1.3.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; - }; - } { name = "define_property___define_property_0.2.5.tgz"; path = fetchurl { @@ -2417,6 +2425,14 @@ sha512 = "XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="; }; } + { + name = "denque___denque_2.0.1.tgz"; + path = fetchurl { + name = "denque___denque_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/denque/-/denque-2.0.1.tgz"; + sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; + }; + } { name = "depd___depd_1.1.2.tgz"; path = fetchurl { @@ -2698,11 +2714,11 @@ }; } { - name = "express_handlebars___express_handlebars_3.1.0.tgz"; + name = "express_handlebars___express_handlebars_5.3.5.tgz"; path = fetchurl { - name = "express_handlebars___express_handlebars_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-3.1.0.tgz"; - sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg=="; + name = "express_handlebars___express_handlebars_5.3.5.tgz"; + url = "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-5.3.5.tgz"; + sha512 = "r9pzDc94ZNJ7FVvtsxLfPybmN0eFAUnR61oimNPRpD0D7nkLcezrkpZzoXS5TI75wYHRbflPLTU39B62pwB4DA=="; }; } { @@ -2714,11 +2730,11 @@ }; } { - name = "express___express_4.17.2.tgz"; + name = "express___express_4.17.3.tgz"; path = fetchurl { - name = "express___express_4.17.2.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz"; - sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; + name = "express___express_4.17.3.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz"; + sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; }; } { @@ -2994,11 +3010,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.8.tgz"; + name = "follow_redirects___follow_redirects_1.14.9.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.8.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz"; - sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="; + name = "follow_redirects___follow_redirects_1.14.9.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz"; + sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; }; } { @@ -3290,11 +3306,11 @@ }; } { - name = "google_auth_library___google_auth_library_7.12.0.tgz"; + name = "google_auth_library___google_auth_library_7.14.0.tgz"; path = fetchurl { - name = "google_auth_library___google_auth_library_7.12.0.tgz"; - url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.12.0.tgz"; - sha512 = "RS/whvFPMoF1hQNxnoVET3DWKPBt1Xgqe2rY0k+Jn7TNhoHlwdnSe7Rlcbo2Nub3Mt2lUVz26X65aDQrWp6x8w=="; + name = "google_auth_library___google_auth_library_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.0.tgz"; + sha512 = "or8r7qUqGVI3W8lVSdPh0ZpeFyQHeE73g5c0p+bLNTTUFXJ+GSeDQmZRZ2p4H8cF/RJYa4PNvi/A1ar1uVNLFA=="; }; } { @@ -3314,19 +3330,19 @@ }; } { - name = "googleapis_common___googleapis_common_5.0.5.tgz"; + name = "googleapis_common___googleapis_common_5.1.0.tgz"; path = fetchurl { - name = "googleapis_common___googleapis_common_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.5.tgz"; - sha512 = "o2dgoW4x4fLIAN+IVAOccz3mEH8Lj1LP9c9BSSvkNJEn+U7UZh0WSr4fdH08x5VH7+sstIpd1lOYFZD0g7j4pw=="; + name = "googleapis_common___googleapis_common_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.1.0.tgz"; + sha512 = "RXrif+Gzhq1QAzfjxulbGvAY3FPj8zq/CYcvgjzDbaBNCD6bUl+86I7mUs4DKWHGruuK26ijjR/eDpWIDgNROA=="; }; } { - name = "googleapis___googleapis_95.0.0.tgz"; + name = "googleapis___googleapis_96.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_95.0.0.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-95.0.0.tgz"; - sha512 = "ZpFZW7FDwcjQa2+xZNS2SC5sK2s46iWKA5QSFVJSK3RELQec4PYHhzKwzbeCzt4urnjYp6udPif95zXTFxbtRA=="; + name = "googleapis___googleapis_96.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-96.0.0.tgz"; + sha512 = "tEQtcukxA4sW1OXh35teJbui+BIjMTghH6i0tvUctyXgMDO0Upu3+hrytrw9JqZJxtXReM3Wr5+g4U7veqHpBQ=="; }; } { @@ -3498,11 +3514,11 @@ }; } { - name = "has_symbols___has_symbols_1.0.2.tgz"; + name = "has_symbols___has_symbols_1.0.3.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + name = "has_symbols___has_symbols_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; } { @@ -4514,11 +4530,11 @@ }; } { - name = "ldapjs___ldapjs_2.3.1.tgz"; + name = "ldapjs___ldapjs_2.3.2.tgz"; path = fetchurl { - name = "ldapjs___ldapjs_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz"; - sha512 = "kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ=="; + name = "ldapjs___ldapjs_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.2.tgz"; + sha512 = "FU+GR/qbQ96WUZ2DUb7FzaEybYvv3240wTVPcbsdELB3o4cK92zGVjntsh68siVkLeCmlCcsd/cIQzyGXSS7LA=="; }; } { @@ -4705,14 +4721,6 @@ sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } - { - name = "long___long_4.0.0.tgz"; - path = fetchurl { - name = "long___long_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz"; - sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; - }; - } { name = "longest___longest_1.0.1.tgz"; path = fetchurl { @@ -4794,11 +4802,11 @@ }; } { - name = "mariadb___mariadb_2.5.5.tgz"; + name = "mariadb___mariadb_3.0.0.tgz"; path = fetchurl { - name = "mariadb___mariadb_2.5.5.tgz"; - url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.5.tgz"; - sha512 = "6dklvcKWuuaV1JjAwnE2ezR+jTt7JrZHftgeHHBmjB0wgfaUpdxol1DPWclwMcCrsO9yoM0FuCOiCcCgXc//9Q=="; + name = "mariadb___mariadb_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mariadb/-/mariadb-3.0.0.tgz"; + sha512 = "1uIqD6AWLP5ojMY67XP4+4uRLe9L92HD1ZGU8fidi8cGdYIC+Ghx1JliAtf7lc/tGjOh6J400f/1M4BXVtZFvA=="; }; } { @@ -4905,6 +4913,14 @@ sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; } + { + name = "mime_db___mime_db_1.52.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.52.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; + }; + } { name = "mime_types___mime_types_2.1.34.tgz"; path = fetchurl { @@ -4946,11 +4962,11 @@ }; } { - name = "minimatch___minimatch_3.0.5.tgz"; + name = "minimatch___minimatch_3.1.2.tgz"; path = fetchurl { - name = "minimatch___minimatch_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz"; - sha512 = "tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw=="; + name = "minimatch___minimatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; } { @@ -4961,6 +4977,14 @@ sha1 = "jQh8OcazjAAbl/ynzm0OHoCvusc="; }; } + { + name = "minimatch___minimatch_3.0.8.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz"; + sha512 = "6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q=="; + }; + } { name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { @@ -5401,14 +5425,6 @@ sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; }; } - { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - } { name = "object_to_spawn_args___object_to_spawn_args_1.1.1.tgz"; path = fetchurl { @@ -5441,14 +5457,6 @@ sha1 = "95xEk68MU3e1n+OdOV5BBC3QRbs="; }; } - { - name = "object.assign___object.assign_4.1.2.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; - sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; - }; - } { name = "object.defaults___object.defaults_1.1.0.tgz"; path = fetchurl { @@ -6050,11 +6058,11 @@ }; } { - name = "plivo___plivo_4.27.0.tgz"; + name = "plivo___plivo_4.28.0.tgz"; path = fetchurl { - name = "plivo___plivo_4.27.0.tgz"; - url = "https://registry.yarnpkg.com/plivo/-/plivo-4.27.0.tgz"; - sha512 = "bmtc/GSQsxBW5aarr8z8lS07vl4HWtgTZTb8W5/dfsm9Z3dG3VDswkFIeu+n0ZkJ+FEbVGPkCV4EJ7jfRA+2Cw=="; + name = "plivo___plivo_4.28.0.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.28.0.tgz"; + sha512 = "FQCc5TG5QUlNq1r0OlLvAHgJo15M+ou+dt7bWheataObxUxPqpga316zCOYR/sGzVzREPSB/ThpT9/cZeUcYgg=="; }; } { @@ -6169,14 +6177,6 @@ sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; }; } - { - name = "promise___promise_8.1.0.tgz"; - path = fetchurl { - name = "promise___promise_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; - sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; - }; - } { name = "proxy_addr___proxy_addr_2.0.7.tgz"; path = fetchurl { @@ -6242,11 +6242,11 @@ }; } { - name = "qs___qs_6.9.6.tgz"; + name = "qs___qs_6.9.7.tgz"; path = fetchurl { - name = "qs___qs_6.9.6.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + name = "qs___qs_6.9.7.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz"; + sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; }; } { @@ -6322,11 +6322,11 @@ }; } { - name = "raw_body___raw_body_2.4.2.tgz"; + name = "raw_body___raw_body_2.4.3.tgz"; path = fetchurl { - name = "raw_body___raw_body_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz"; - sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; + name = "raw_body___raw_body_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz"; + sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; } { @@ -7130,11 +7130,11 @@ }; } { - name = "ssh2___ssh2_1.6.0.tgz"; + name = "ssh2___ssh2_1.7.0.tgz"; path = fetchurl { - name = "ssh2___ssh2_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.6.0.tgz"; - sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q=="; + name = "ssh2___ssh2_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.7.0.tgz"; + sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g=="; }; } { @@ -7610,11 +7610,11 @@ }; } { - name = "twilio___twilio_3.74.0.tgz"; + name = "twilio___twilio_3.75.1.tgz"; path = fetchurl { - name = "twilio___twilio_3.74.0.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.74.0.tgz"; - sha512 = "r79CWIug+x2/1uGOdAzGESvUvycxPCvVJ9rm4y1TsAocshTh+f5+ipULxyT3T5q4wJNT+k2OEiUBkKFA+cpQ/A=="; + name = "twilio___twilio_3.75.1.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.75.1.tgz"; + sha512 = "q9h8AzJekL2etE4hPiZ3IOz9V6MkrY5d5cLvTra+Xe+jtDjQgarKbMUOYFhVHb/zXycf9qqW+Qk9de0ekgLwrQ=="; }; } { @@ -7650,11 +7650,11 @@ }; } { - name = "uglify_js___uglify_js_3.15.1.tgz"; + name = "uglify_js___uglify_js_3.15.3.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.15.1.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz"; - sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; + name = "uglify_js___uglify_js_3.15.3.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; }; } { @@ -7786,11 +7786,11 @@ }; } { - name = "url_parse___url_parse_1.5.4.tgz"; + name = "url_parse___url_parse_1.5.10.tgz"; path = fetchurl { - name = "url_parse___url_parse_1.5.4.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz"; - sha512 = "ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg=="; + name = "url_parse___url_parse_1.5.10.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; } { @@ -7978,11 +7978,11 @@ }; } { - name = "weak_map___weak_map_1.0.5.tgz"; + name = "weak_map___weak_map_1.0.8.tgz"; path = fetchurl { - name = "weak_map___weak_map_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz"; - sha1 = "eWkVhNmGB/UHC9O3CkDmuyLkAes="; + name = "weak_map___weak_map_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz"; + sha512 = "lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw=="; }; } { From 660fe8742a384969738cbeccc28def62af30f4cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 10:08:30 +0100 Subject: [PATCH 166/329] python3Packages.python-juicenet: disable on older Python releases --- .../python-modules/python-juicenet/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-juicenet/default.nix b/pkgs/development/python-modules/python-juicenet/default.nix index 2f0d071abd7b..ad27a913257e 100644 --- a/pkgs/development/python-modules/python-juicenet/default.nix +++ b/pkgs/development/python-modules/python-juicenet/default.nix @@ -1,18 +1,22 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "python-juicenet"; version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jesserockz"; repo = "python-juicenet"; rev = "v${version}"; - sha256 = "sha256-5RKnVwOfEHzFZCiC8OUpS8exKrENK+I3Ok45HlKEvtU="; + hash = "sha256-5RKnVwOfEHzFZCiC8OUpS8exKrENK+I3Ok45HlKEvtU="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "pyjuicenet" ]; + pythonImportsCheck = [ + "pyjuicenet" + ]; meta = with lib; { description = "Read and control Juicenet/Juicepoint/Juicebox based EVSE devices"; From 405e295cd3c8bff559a2a4e14186e7c7a2720c76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 10:10:13 +0100 Subject: [PATCH 167/329] python3Packages.ropgadget: disable on older Python releases --- pkgs/development/python-modules/ropgadget/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index 170ff13948da..4d0a4aa94f11 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , capstone +, pythonOlder }: buildPythonPackage rec { pname = "ropgadget"; version = "6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "v${version}"; - sha256 = "sha256-zOTbncsOvmLQMZGpcRLviSZP/d1cQTQHXCLUKyEgVBk="; + hash = "sha256-zOTbncsOvmLQMZGpcRLviSZP/d1cQTQHXCLUKyEgVBk="; }; propagatedBuildInputs = [ From 8c5892cee474366d14839a92441f27e3a7c3b4de Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 12 Mar 2022 12:19:06 +0300 Subject: [PATCH 168/329] =?UTF-8?q?kirc:=200.2.9=20=E2=86=92=200.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/irc/kirc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix index 08823cab5735..71bd96d3b70e 100644 --- a/pkgs/applications/networking/irc/kirc/default.nix +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -5,18 +5,18 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.2.9"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-KRCVjz59SHjk86VgfGxYKk/Ti3o77dV7fdRu9mB3FSo="; + hash = "sha256-bLBrkbW/Iv1v9z5NOiMAA/dH5/9FlqusRV5rSqjdlPw="; }; dontConfigure = true; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { homepage = "http://kirc.io/"; From 399477b7673b0f7f241e9befc7d80038d7883f23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 09:29:19 +0000 Subject: [PATCH 169/329] go-chromecast: 0.2.11 -> 0.2.12 --- pkgs/applications/video/go-chromecast/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 0ffb5170dc29..99ddd7b24b69 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "vishen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BCOyeXo3uoR4ry/nFbF+//U62/hHnPK+tbG+8Rv6Rv0="; + sha256 = "sha256-h8qWwMaEhXnj6ZSrKAXBVbrMR0je41EoOtFeN9XlCuk="; }; - vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; + vendorSha256 = "sha256-PpMLHuJR6irp+QHhzguwGtBy30HM7DR0tNGiwB07M5E="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; From a2b32abc156324d9e779ee581c1e488379b932cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 09:47:13 +0000 Subject: [PATCH 170/329] oh-my-zsh: 2022-01-18 -> 2022-03-10 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 83ef9ea65e19..f85797f76356 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2022-01-18"; + version = "2022-03-10"; pname = "oh-my-zsh"; - rev = "22c11da108764336d92d03d3113c1f486cdb5911"; + rev = "c10241f3d1d7bf77d483e11869a6a00f1d2e5e88"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "Tnwy+3lCWjzDhjXtgLIiX3SxpJG6shxmmPFyeWkO2R0="; + sha256 = "HVV3zhEZ4NU4Dk7zHv+NeatTJUbzxqOvM4cYNzjuTfo="; }; installPhase = '' From ca612cf5ff09e4f2b23a65e401899bb6f9b383e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 10:57:26 +0100 Subject: [PATCH 171/329] python3Packages.sabyenc3: add pythonImportsCheck --- .../python-modules/sabyenc3/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index 531cd3e173c2..2e44326acc40 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -1,22 +1,32 @@ -{ lib, fetchPypi, python3Packages }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "sabyenc3"; version = "5.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-y2I/kSyPIPSz7PrwW/AbP4BsEXHWQgXRb1VT0nTHQcE="; + hash = "sha256-y2I/kSyPIPSz7PrwW/AbP4BsEXHWQgXRb1VT0nTHQcE="; }; - # tests are not included in pypi distribution + # Tests are not included in pypi distribution doCheck = false; - meta = { + pythonImportsCheck = [ + "sabyenc3" + ]; + + meta = with lib; { description = "yEnc Decoding for Python 3"; homepage = "https://github.com/sabnzbd/sabyenc/"; - license = lib.licenses.lgpl3; - maintainers = [ lib.maintainers.lovek323 ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ lovek323 ]; }; - } From b04bfa7048310c406621bc9615b9edcd9aa44fe9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 11:01:28 +0100 Subject: [PATCH 172/329] endlessh-go: clarify license --- pkgs/servers/endlessh-go/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix index 7a32b7dbfc4d..eae3cd6a8d51 100644 --- a/pkgs/servers/endlessh-go/default.nix +++ b/pkgs/servers/endlessh-go/default.nix @@ -1,4 +1,7 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "endlessh-go"; @@ -8,15 +11,17 @@ buildGoModule rec { owner = "shizunge"; repo = "endlessh-go"; rev = version; - sha256 = "sha256-U+h/WmTVwwUIBEOiNa/EKS6HvkeoGNmP3NpeP1fcqYw="; + hash = "sha256-U+h/WmTVwwUIBEOiNa/EKS6HvkeoGNmP3NpeP1fcqYw="; }; + vendorSha256 = "sha256-h/DpbXO+LUsB9NOAXUfNx3VOfEsiolfBEMBrAqVlU3A="; + proxyVendor = true; meta = with lib; { - homepage = "https://github.com/shizunge/endlessh-go"; description = "An implementation of endlessh exporting Prometheus metrics"; - license = licenses.gpl3; + homepage = "https://github.com/shizunge/endlessh-go"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ azahi ]; }; } From 9533b97a8c729b55571fde0c88813bf22e281884 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 10:10:22 +0000 Subject: [PATCH 173/329] flat-remix-gtk: 20220215 -> 20220310 --- pkgs/data/themes/flat-remix-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index 59b2714285ed..fec900a2d7e7 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220215"; + version = "20220310"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-J9PAHQ/MbdDuX16ioQQnzZpIZs/NJVkJjLL4nfaeNkU="; + sha256 = "sha256-fKkqMGb1UopjM7hTTury1I3oD5AlHqKP+WLmgAZIQxo="; }; dontBuild = true; From 4c6772e2a1152f5c4cede5aeca89d1e3bab8c8a7 Mon Sep 17 00:00:00 2001 From: Ian Kerins Date: Tue, 8 Mar 2022 03:11:47 -0500 Subject: [PATCH 174/329] nixos/oci-containers: improve description of imageFile As a novice to using this module, I found the existing description to be quite misleading. It does not at all disable pulling from the registry, it just loads some image archive that may or may not be related to the container you're specifying. I had thought there was extra magic behind this option, but it's just a `docker load`. You need foreknowledge of the contents of the archive so that whatever it contained is actually used to run the container. I've reworded the description to hopefully make this behavior clearer. --- nixos/modules/virtualisation/oci-containers.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 5af9baff8bc1..f40481727830 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -22,11 +22,13 @@ let type = with types; nullOr package; default = null; description = '' - Path to an image file to load instead of pulling from a registry. - If defined, do not pull from registry. + Path to an image file to load before running the image. This can + be used to bypass pulling the image from the registry. - You still need to set the image attribute, as it - will be used as the image name for docker to start a container. + The image attribute must match the name and + tag of the image contained in this file, as they will be used to + run the container with that image. If they do not match, the + image will be pulled from the registry as usual. ''; example = literalExpression "pkgs.dockerTools.buildImage {...};"; }; From a81cd19ce74ce254118dab0b6ff7f8b702bfae44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:25:58 +0100 Subject: [PATCH 175/329] python3Packages.pyroute2-core: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/pyroute2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index d8820e6d9d0f..758c848c7ecc 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.core"; inherit version; - hash = "sha256-N74cQcWx57lYIPiQTL+/Ec5Kf1rgdMrRkkYIdyaLjN4="; + hash = "sha256-gkvr1FgFWI1eurjbuUYhYj0D4eZTIBsDMRXSWrKiCP4="; }; # pyroute2 sub-modules have no tests From a169f42499c8f55b53408941ed00935d30cbcdc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:26:19 +0100 Subject: [PATCH 176/329] python3Packages.pyroute2-ethtool: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/pyroute2-ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index fe4eac248700..4838b6690424 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - hash = "sha256-jwPg7xcmQU3F4cVrs2GVUxBXV6waMkrnmyZkHo2kLR0="; + hash = "sha256-+/B+YQOluzyGYmnwAZonsjgZeiZPYl8LhJ9OjnvV/64="; }; propagatedBuildInputs = [ From c5784a1da0506838cdbdba1b8f6c367339030837 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:26:38 +0100 Subject: [PATCH 177/329] python3Packages.pyroute2-ipdb: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/pyroute2-ipdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index cb40f0b4eff1..4704d95279ff 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - hash = "sha256-uMEPUleEBIaIV4bCejTmeHYhKeaN9SNcUMzBAODNBEU="; + hash = "sha256-sjlJ1eBoMQaJzEF/4Qk9ZwZB0s/yvR5wUUDP3UWBA50="; }; propagatedBuildInputs = [ From fb0c6bd3b1442010dc3368d87a9471c98a89f970 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:26:56 +0100 Subject: [PATCH 178/329] python3Packages.pyroute2-ndb: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/pyroute2-ndb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 2564e4601199..86bbde3e52ab 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - hash = "sha256-o/rmbOwfRUPw/g1Cc/5otqKvGe3Br3y4iSXad/PfTPw="; + hash = "sha256-90DAbXCkoIFUbWZotKYkCSGsQvb7LrEpf6xGCviP40w="; }; propagatedBuildInputs = [ From 07aa5ce5516b57f5c8d3c3888bcb28d921baae71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:27:19 +0100 Subject: [PATCH 179/329] python3Packages.pyroute2-nftables: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/pyroute2-nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 6b0b4bc35c92..4a3d58c896c2 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.7"; + version = "0.6.8"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-d9LdXxBQGa40MmGuK2cFOOEI7X4Y1pPv0ObW9n7ZUjo="; + sha256 = "sha256-SNebxs0mCFEI4bejuLMeU3wrO8KZZT1frnfQw8Gko6E="; }; propagatedBuildInputs = [ From f9c2a258e48c115a5ee9939d32f3e2a76d52cad4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:27:32 +0100 Subject: [PATCH 180/329] python3Packages.pyroute2-nslink: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/pyroute2-nslink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 0050c4aa795e..0f47e7228d34 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - hash = "sha256-p+U3Y5vKCxuvMl/yNKlay57tlU4GKttCJrAwctKa5TY="; + hash = "sha256-bTGzXouEdVUFaT5mxGfonFu3aOMxZKRTDMaHFciofec="; }; propagatedBuildInputs = [ From 7c417b7d70e4db29ce5cceb78d73ba1c941da94e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:27:45 +0100 Subject: [PATCH 181/329] python3Packages.pyroute2-protocols: 0.6.7 -> 0.6.8 --- .../development/python-modules/pyroute2-protocols/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 39308e162e2d..84c9813b5eaa 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - hash = "sha256-GdququbQcU+exzxifb8UGamkSUMhR94j+auF8I6e7/Q="; + hash = "sha256-l07CEwZzDxym+QAnKFFEpX690RStOA+rAwMXiEd7FOs="; }; propagatedBuildInputs = [ From 02d16c88293811a32ec9ca0a83fa5339a7b8719b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:28:02 +0100 Subject: [PATCH 182/329] python3Packages.pyroute2: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 1fda8265428a..a2ae4d3c3857 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qBv9jshyg0S9IThdrXHTFcb2neQPDmURmtSbqYCKlWo="; + hash = "sha256-WhqjvCwKrUUBLKvjpva7pc94UIZvTf7j705Bt2DHyKQ="; }; propagatedBuildInputs = [ From 3f7b755f52a25522fcbad7efd5fca726c17eed97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:28:15 +0100 Subject: [PATCH 183/329] python3Packages.pyroute2-ipset: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/pyroute2-ipset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 300b1d21fa1d..1889b5ead881 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - hash = "sha256-roNLNXmnW27a+TgxtMi8HO5hF4agxdjQ0DMsYW6O44c="; + hash = "sha256-j2vEQyfuuMH0QRtXw6acX9AMureQwgeS+Ap7m2uP9OY="; }; propagatedBuildInputs = [ From ae5063fc07fdf67dab60899a1634395c074eeca9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:28:22 +0100 Subject: [PATCH 184/329] checkov: 2.0.936 -> 2.0.938 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 49c999b00bfd..3b833addc6ba 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.936"; + version = "2.0.938"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-erpVJTnWUfoY4Ymdf7fZyri2NGAYs0NF+r3DMFFYURM="; + hash = "sha256-N8jEEtO2fRFtNS3lInEa/9IwtqBb9yDkg7hHp7bhH+s="; }; nativeBuildInputs = with py.pkgs; [ From 8af3673aeff80cb2949adf0d8bc52d1c30ee0227 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 12 Mar 2022 12:27:58 +0100 Subject: [PATCH 185/329] python3Packages.pymediaroom: 0.6.4.1 -> 0.6.5.4 Migrate to PyPi sdist because Git is missing tags. --- .../python-modules/pymediaroom/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pymediaroom/default.nix b/pkgs/development/python-modules/pymediaroom/default.nix index e977cb23d752..364063f78628 100644 --- a/pkgs/development/python-modules/pymediaroom/default.nix +++ b/pkgs/development/python-modules/pymediaroom/default.nix @@ -1,21 +1,19 @@ { lib , async-timeout , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder , xmltodict }: buildPythonPackage rec { pname = "pymediaroom"; - version = "0.6.4.1"; + version = "0.6.5.4"; disabled = pythonOlder "3.5"; - src = fetchFromGitHub { - owner = "dgomes"; - repo = pname; - rev = version; - sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy"; + src = fetchPypi { + inherit pname version; + hash = "sha256-CZh2knpLT7xt5s6+kTQ4Mq9LcpKgWvgdFCkPtMucJTM="; }; propagatedBuildInputs = [ From 84750aa8d952dfc840b6432da0bd0561b5c9b09c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 12 Mar 2022 12:28:25 +0100 Subject: [PATCH 186/329] python3Packages.zwave-js-server-python: 0.35.1 -> 0.35.2 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 171e838fa321..5f4203634acb 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.35.1"; + version = "0.35.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-WmpXQttcQ3Z/SFkNPfmvPWPGzWectQBoI9+bL2QYeaY="; + sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA="; }; propagatedBuildInputs = [ From 0f4f3a397f1779555e8266335efab5e1818ad1bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 12 Mar 2022 12:31:26 +0100 Subject: [PATCH 187/329] home-assistant: 2022.3.3 -> 2022.3.4 https://github.com/home-assistant/core/releases/tag/2022.3.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f12dcb87fb2c..bb750635d5d9 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 = "2022.3.3"; + version = "2022.3.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2bb621615474..b6ceb02270ae 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -158,7 +158,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.3.3"; + hassVersion = "2022.3.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -176,7 +176,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-qe9/VFcEBDfSa7AYrkmj1b6UGLHcm7CtLHiPwzZz8jg="; + hash = "sha256-7de1m7pvPkgCcZN/Slhy26Y1j2NtkebkGanSTl9jN1M="; }; # leave this in, so users don't have to constantly update their downstream patch handling From d32e10102539c7d73489032b1550d13a97b8275a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 11:41:40 +0000 Subject: [PATCH 188/329] python310Packages.persistent: 4.8.0 -> 4.9.0 --- pkgs/development/python-modules/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index d70fa2826d64..5b5462cf4757 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.8.0"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nRd+rT+jwfXWKjbUUmdUs3bgUEx9S3XLmqUvt3HexrI="; + hash = "sha256-RwGzHYHBBCJlclrzkEUOnZFq10ucF4twEAU4U1keDGo="; }; nativeBuildInputs = [ From a599e10c49259efdda1085ad87360a3d063605dd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 11 Mar 2022 18:25:21 +1000 Subject: [PATCH 189/329] lima: 0.8.3 -> 0.9.0 https://github.com/lima-vm/lima/releases/tag/v0.9.0 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 4f58f0127166..7feea9b4a348 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hzoc5zbdnHHTY04aGn+77lHvPh+KNOPoZmW19YIZHv8="; + sha256 = "sha256-jbWz4HVYR3OEze2fFgG6Tg4p50IL0NStmaa8+GUPkNw="; }; - vendorSha256 = "sha256-eJnwXXYWMaIfM8SW4MtmG4wsPA/9sx4j2AkOd6GpnsY="; + vendorSha256 = "sha256-RX8HfeDVvLUX4Ez2ma04gTl+8+lM7WGNSpmFNnf+5Xs="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 1cc14ccdd49e6c4b4eb904d108707f3c512d1188 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 12:57:03 +0100 Subject: [PATCH 190/329] natscli: 0.0.29 -> 0.0.30 --- pkgs/tools/system/natscli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix index ad10f0c6c9bf..411c1054434d 100644 --- a/pkgs/tools/system/natscli/default.nix +++ b/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.29"; + version = "0.0.30"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q1T+bDOOPs4eLnRWkYG6VY0AwfG/W2boSY5DZhMv+ZI="; + sha256 = "sha256-+WvJWHRQr5wYV9TG5e379trBO2Gwy0/4bAEJNwDun7s="; }; - vendorSha256 = "sha256-YTvgofZoWGDZL/ujjZ9RqAgv6UH2caZBrV9/uav3KVw="; + vendorSha256 = "sha256-IHDJp+cjukX916dvffpv4Wit9kmuY101fasN+ChMxWQ="; meta = with lib; { description = "NATS Command Line Interface"; From a5c7dcdf969fd40819754652c97ef17beb93b009 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 13:29:31 +0100 Subject: [PATCH 191/329] sdlookup: init at unstable-2022-03-10 --- pkgs/tools/security/sdlookup/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/sdlookup/default.nix diff --git a/pkgs/tools/security/sdlookup/default.nix b/pkgs/tools/security/sdlookup/default.nix new file mode 100644 index 000000000000..80b6d3ba6881 --- /dev/null +++ b/pkgs/tools/security/sdlookup/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "sdlookup"; + version = "unstable-2022-03-10"; + + src = fetchFromGitHub { + owner = "j3ssie"; + repo = pname; + rev = "8554bfa27284c4764401dbd8da23800d4ae968a2"; + hash = "sha256-c6xAgOxle51waiFsSWvwO9eyt1KXuM0dEeepVsRQHkk="; + }; + + vendorSha256 = "sha256-j0UzucZ6kDwM+6U0ZyIW9u8XG/Bn+VUCO2vV1BbnQo0="; + + meta = with lib; { + description = "IP lookups for open ports and vulnerabilities from internetdb.shodan.io"; + homepage = "https://github.com/j3ssie/sdlookup"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 575ca2a4c020..01a242e4539f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1087,6 +1087,8 @@ with pkgs; redfang = callPackage ../tools/networking/redfang { }; + sdlookup = callPackage ../tools/security/sdlookup { }; + sx-go = callPackage ../tools/security/sx-go { }; tauon = callPackage ../applications/audio/tauon { }; From db725d892e6f7a90686e9f5b7dddf9f78f0c3a2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 05:55:51 +0000 Subject: [PATCH 192/329] gtk-frdp: unstable-2021-10-01 -> unstable-2021-10-28 --- pkgs/development/libraries/gtk-frdp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index b7c2d5d3aa9c..ffb4e5bbbf90 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2021-10-01"; + version = "unstable-2021-10-28"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0"; - sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko="; + rev = "a44d84ec687f41ad37e43697b28a018f65780780"; + sha256 = "7J4jf3gDiorsc4zs6zwC+j/Zg0oZWKAFAz9vvJJ2CYM="; }; nativeBuildInputs = [ From 898307e862d09213996172f6f3324af9bf740c9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 12:46:24 +0000 Subject: [PATCH 193/329] libdnf: 0.65.0 -> 0.66.0 --- pkgs/tools/package-management/libdnf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 3de0bb399d83..7176d7f608e9 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-vGXK4pOkff4yGaRZE+FFFIqEizUeCID+lxiE/TWt0Bs="; + sha256 = "sha256-fQyNm51roz6wn9QAE8/ZIrutyWP45xiKVHzn8n0LcwE="; }; nativeBuildInputs = [ From e86acfa7251d7158381fb1de394ccf82c88c178b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 12:55:31 +0000 Subject: [PATCH 194/329] python310Packages.awsiotpythonsdk: 1.5.0 -> 1.5.1 --- pkgs/development/python-modules/awsiotpythonsdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 70161d3fd6a0..fc188ae683c6 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "AWSIoTPythonSDK"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; rev = "v${version}"; - sha256 = "0bmvwv471mvlwj2rfz08j9qvzsp4vyjz67cbzkvsy6kmihx3wfqh"; + sha256 = "sha256-UpfgoCVbweOpWbgaqNebAAkWmhjkZu3txVoTZ/qhl3g="; }; # Module has no tests From c16653f880dbfe006a6db154ea92a0f052e10b02 Mon Sep 17 00:00:00 2001 From: Jan Schmitt Date: Sat, 12 Mar 2022 12:08:24 +0100 Subject: [PATCH 195/329] sipp: 3.6.0 -> 3.6.1 * no autoconf and friends but cmake * deleted old patches which are no part of cmake build * all feature flags are enabled * sctp support currently only works under linux Co-authored-by: Martin Weinelt --- pkgs/development/tools/misc/sipp/default.nix | 27 ++++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 22bf244662b3..0d5ceba12530 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -1,29 +1,29 @@ -{lib, stdenv, fetchurl, ncurses, libpcap }: +{ lib, stdenv, fetchurl, ncurses, libpcap, cmake, openssl, git, lksctp-tools }: stdenv.mkDerivation rec { - version = "3.6.0"; - + version = "3.6.1"; pname = "sipp"; src = fetchurl { url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1fx1iy2n0m2kr91n1ii30frbscq375k3lqihdgvrqxn0zq8pnzp4"; + sha256 = "sha256-alYOg6/5gvMx3byt+zvVMMWJbNW3V91utoITPMhg7LE="; }; postPatch = '' - sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp + cp version.h src/version.h ''; - configureFlags = [ - "--with-pcap" + cmakeFlags = [ + "-DUSE_GSL=1" + "-DUSE_PCAP=1" + "-DUSE_SSL=1" + "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}" ]; + enableParallelBuilding = true; - postInstall = '' - mkdir -pv $out/share/pcap - cp pcap/* $out/share/pcap - ''; - - buildInputs = [ncurses libpcap]; + nativeBuildInputs = [ cmake git ]; + buildInputs = [ ncurses libpcap openssl ] + ++ lib.optional (stdenv.isLinux) lksctp-tools; meta = with lib; { homepage = "http://sipp.sf.net"; @@ -32,4 +32,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - From 1037236e65cb903750a37d55a8eb668721bde866 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 18 Jan 2022 20:38:32 +0800 Subject: [PATCH 196/329] noto-fonts-emoji: fix cross compilation --- pkgs/data/fonts/noto-fonts/default.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 9c9996db39e0..248d076b997a 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -5,12 +5,12 @@ , fetchurl , cairo , nixosTests -, python3 , pkg-config , pngquant , which , imagemagick , zopfli +, buildPackages }: let @@ -130,8 +130,8 @@ in noto-fonts-emoji = let version = "2.034"; emojiPythonEnv = - python3.withPackages (p: with p; [ fonttools nototools ]); - in stdenv.mkDerivation { + buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); + in stdenvNoCC.mkDerivation { pname = "noto-fonts-emoji"; inherit version; @@ -142,13 +142,17 @@ in sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; }; - nativeBuildInputs = [ + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config cairo + ]; + + nativeBuildInputs = [ imagemagick zopfli pngquant which - pkg-config emojiPythonEnv ]; @@ -159,14 +163,6 @@ in # python requirements using python.withPackages sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile - # Remove check for missing zopfli, it doesn't - # work and we guarantee its presence already. - sed -i '/ifdef MISSING_ZOPFLI/,+2d' Makefile - sed -i '/ifeq (,$(shell which $(ZOPFLIPNG)))/,+4d' Makefile - - sed -i '/ZOPFLIPNG = zopflipng/d' Makefile - echo "ZOPFLIPNG = ${zopfli}/bin/zopflipng" >> Makefile - # Make the build verbose so it won't get culled by Hydra thinking that # it somehow got stuck doing nothing. sed -i 's;\t@;\t;' Makefile From 4f90ac5734715f965bdcba8e7a016c2c52eec5b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 13:43:12 +0000 Subject: [PATCH 197/329] lightburn: 1.1.01 -> 1.1.03 --- pkgs/applications/graphics/lightburn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index bbc0c2d91283..05a99527e5f7 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.1.01"; + version = "1.1.03"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-HgyqpZTf9GTsbDi1+e20YNoFIPYtTHQd8KC626G0038="; + sha256 = "sha256-X7hAkzVqIABpyFokiYaMGZqSda69cKhKghFDWDEVOow="; }; buildInputs = [ From 26fe586d53ce14782ea378c51023352581939613 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 10:03:17 +0000 Subject: [PATCH 198/329] grails: 5.1.2 -> 5.1.3 --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index fecf7610d172..0efa2b41a983 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-S8YDGShglCB8zMHBwLlvPwq9dIAgQq2Xb8G1Pf0dXiQ="; + sha256 = "sha256-BacAVAnS3qdmzHGVUdZI2hn4Arp9Qep6cAXRabpB10M="; }; nativeBuildInputs = [ unzip ]; From fa6becdfa36069368a1911ff4128b42c7bc574a0 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 12 Mar 2022 10:35:43 -0300 Subject: [PATCH 199/329] k3s: fix update script --- pkgs/applications/networking/cluster/k3s/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index eb79778c963d..8f199bf9cc0c 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -7,7 +7,7 @@ WORKDIR=$(mktemp -d) trap "rm -rf ${WORKDIR}" EXIT NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ -NIXPKGS_K3S_FOLDER=${NIXPKGS_ROOT}$(dirname "${BASH_SOURCE[0]}")/ +NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ cd ${NIXPKGS_K3S_FOLDER} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json From a610331778b6c7160b66f160bb0fc42a3da20a38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 05:15:47 +0000 Subject: [PATCH 200/329] gnome.gnome-todo: unstable-2022-02-01 -> unstable-2022-03-11 --- pkgs/desktops/gnome/apps/gnome-todo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index 32a7a2fb3435..cdcf0d69a33b 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-todo"; - version = "unstable-2022-02-01"; + version = "unstable-2022-03-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-todo"; - rev = "2cd071ad35efdef72038730d658f013dd0fc7daa"; - sha256 = "FMG9ju+LsglAvbBhdgDF+2ZxB633EwnatwCFgW+VOTk="; + rev = "07791399742366b4e3a6897430054d91df4594b4"; + sha256 = "821KgxkkW4T6bdGuttAz9ao/WStM1QEfn4hY/b0d0jI="; }; patches = [ From 5294f556395b9d0552f60322a19c1efb41d3b687 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 12 Mar 2022 15:16:35 +0100 Subject: [PATCH 201/329] slurm: 21.08.5.1 -> 21.08.6.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index c1e092dedcb8..1179e86351a4 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "21.08.5.1"; + version = "21.08.6.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-2ctJnCZCziPnfWeDNvvcE0tPGVdhzjjhqMWJhWhitGo="; + sha256 = "1pdj2nxxky2g9j0y5h6f7fvpypbh0a4g76z90115yr770yf4g2hz"; }; outputs = [ "out" "dev" ]; From 3f4faa39a0346bb879b33d28af217507b5fa0f20 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 12 Mar 2022 12:08:21 +0300 Subject: [PATCH 202/329] =?UTF-8?q?crow-translate:=202.9.1=20=E2=86=92=202?= =?UTF-8?q?.9.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/crow-translate/default.nix | 8 ++++---- .../misc/crow-translate/dont-fetch-external-libs.patch | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 71142727a83e..8505c97e1bc1 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -34,8 +34,8 @@ let qonlinetranslator = fetchFromGitHub { owner = "crow-translate"; repo = "QOnlineTranslator"; - rev = "1.5.2"; - sha256 = "sha256-iGi25aKwff2hNNx6o4kHZV8gVbEQcMgpTTvop3CoLjM="; + rev = "1.5.3"; + sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM="; }; circleflags = fetchFromGitHub { owner = "HatScripts"; @@ -52,13 +52,13 @@ let in mkDerivation rec { pname = "crow-translate"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "crow-translate"; repo = pname; rev = version; - sha256 = "sha256-7Zb6PZO8eLeGPEZD37ja+LZydIQdsgy5gMAMtlS4k5Y="; + sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw="; }; patches = [ diff --git a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch index 1eb1f464e55f..0bfdc9ef2f74 100644 --- a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch +++ b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch @@ -46,7 +46,7 @@ index c92e745..f265f03 100644 FetchContent_Declare(QOnlineTranslator - GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator -- GIT_TAG 1.5.2 +- GIT_TAG 1.5.3 + SOURCE_DIR @qonlinetranslator@ ) From ee21acc36a18112504bf0719c87cda33030cc64a Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Mon, 28 Feb 2022 23:13:51 +0100 Subject: [PATCH 203/329] remmina: Set WITH_VTE=true, so remmina usable as ssh client --- pkgs/applications/networking/remote/remmina/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index efce24a06f9a..29d80c25ef58 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 -, freerdp, libssh, libgcrypt, gnutls +, freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core @@ -8,6 +8,7 @@ # The themes here are soft dependencies; only icons are missing without them. , gnome , withLibsecret ? true +, withVte ? true }: with lib; @@ -33,10 +34,11 @@ stdenv.mkDerivation rec { libsoup spice-protocol spice-gtk libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz - ] ++ optionals withLibsecret [ libsecret ]; + ] ++ optionals withLibsecret [ libsecret ] + ++ optionals withVte [ vte ]; cmakeFlags = [ - "-DWITH_VTE=OFF" + "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" From 5bc6b38ee014b4645dde62a5d18e873a034bedf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 09:17:05 +0000 Subject: [PATCH 204/329] gnunet: 0.15.3 -> 0.16.0 --- pkgs/applications/networking/p2p/gnunet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 2ccf4ff4b860..f24f74e5ae05 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.15.3"; + version = "0.16.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-1iZpqPQeB46qIgznejL08/gB4wmTV66McFSY/nOITsU="; + sha256 = "sha256-0y2m8T/xzYZwUlcZ6g956fdtLef2Bphg4Kd/xpo2AGg="; }; enableParallelBuilding = true; From 1ac817481388d2bf53fd3ec13f49e7f118806a40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 14:59:20 +0000 Subject: [PATCH 205/329] microdnf: 3.8.0 -> 3.8.1 --- pkgs/tools/package-management/microdnf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/tools/package-management/microdnf/default.nix index 03324a447105..6a3d5808c73c 100644 --- a/pkgs/tools/package-management/microdnf/default.nix +++ b/pkgs/tools/package-management/microdnf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microdnf"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-Ip1XcE8fPXhdgVaR4VPH+ElP6JbnK4JekZuWyT5ot/M="; + sha256 = "sha256-yKIhXjeiCOq5JsAquaPnYAJZk53FioOKGIAT2xYfLO8="; }; nativeBuildInputs = [ pkg-config cmake gettext help2man ]; From a521e116c4034e4f6fe25a0eb33f7f25a16a0306 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 15:09:57 +0000 Subject: [PATCH 206/329] minio-client: 2022-03-03T21-12-24Z -> 2022-03-09T02-08-36Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 4fbdec621b4b..eb73a33e01f7 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-03-03T21-12-24Z"; + version = "2022-03-09T02-08-36Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-z+t8aMyGlqXcooCzJgn0xxOhuS+p3/qMTBJByDJPd40="; + sha256 = "sha256-OaV0Xb3nNeZJLayGperQah0JQ7BlGFPWa1//Kt5+EiU="; }; - vendorSha256 = "sha256-mk0ga3o6LeZ4uwV3vlP6qyFXLiORwNQLhXoCxSmvXsU="; + vendorSha256 = "sha256-Wdw9mZ3UupoJ4yDwS4f3mOmCn+7TvHmx4aRu+96pHM4="; subPackages = [ "." ]; From a40de4b146815c15e3c601625c9f4818c4be44d7 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Sat, 15 Jan 2022 11:57:18 +0100 Subject: [PATCH 207/329] xschem: init at version 3.0.0 Co-authored-by: Sandro --- .../science/electronics/xschem/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/science/electronics/xschem/default.nix diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/applications/science/electronics/xschem/default.nix new file mode 100644 index 000000000000..25fa0aca4677 --- /dev/null +++ b/pkgs/applications/science/electronics/xschem/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, lib +, bison +, cairo +, flex +, libX11 +, libXpm +, pkg-config +, tcl +, tk +}: + +stdenv.mkDerivation rec { + pname = "xschem"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "StefanSchippers"; + repo = "xschem"; + rev = version; + sha256 = "sha256-C57jo8tAbiqQAgf4Xp2lpFGOr6F1knPpFcYxPiqSM4k="; + }; + + nativeBuildInputs = [ bison flex pkg-config ]; + + buildInputs = [ cairo libX11 libXpm tcl tk ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = "Schematic capture and netlisting EDA tool"; + longDescription = '' + Xschem is a schematic capture program, it allows creation of + hierarchical representation of circuits with a top down approach. + By focusing on interfaces, hierarchy and instance properties a + complex system can be described in terms of simpler building + blocks. A VHDL or Verilog or Spice netlist can be generated from + the drawn schematic, allowing the simulation of the circuit. + ''; + homepage = "https://xschem.sourceforge.io/stefan/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14b813124822..6a21596d4fba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32734,6 +32734,8 @@ with pkgs; xoscope = callPackage ../applications/science/electronics/xoscope { }; + xschem = callPackage ../applications/science/electronics/xschem { }; + xyce = callPackage ../applications/science/electronics/xyce { }; xyce-parallel = callPackage ../applications/science/electronics/xyce { From 5d702c6b2344b4bac4a4428c5d424d62c65e39e0 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Sat, 12 Mar 2022 15:27:57 +0100 Subject: [PATCH 208/329] gaw: init at version 20200922 Co-authored-by: Sandro --- .../science/electronics/gaw/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/science/electronics/gaw/default.nix diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/applications/science/electronics/gaw/default.nix new file mode 100644 index 000000000000..928613737b47 --- /dev/null +++ b/pkgs/applications/science/electronics/gaw/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchurl +, lib +, gtk3 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "gaw"; + version = "20200922"; + + src = fetchurl { + url = "https://download.tuxfamily.org/gaw/download/gaw3-${version}.tar.gz"; + sha256 = "0qmap11v470a1yj4ypfvdq6wkfni77ijqpknka8b4fndi62sl4wa"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ]; + + meta = with lib; { + description = "Gtk Analog Wave viewer"; + longDescription = '' + Gaw is a software tool for displaying analog waveforms from + sampled datas, for example from the output of simulators or + input from sound cards. Data can be imported to gaw using files, + direct tcp/ip connection or directly from the sound card. + ''; + homepage = "http://gaw.tuxfamily.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a21596d4fba..07eb1d6a1a43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32701,6 +32701,8 @@ with pkgs; fped = callPackage ../applications/science/electronics/fped { }; + gaw = callPackage ../applications/science/electronics/gaw {}; + horizon-eda = callPackage ../applications/science/electronics/horizon-eda {}; # this is a wrapper for kicad.base and kicad.libraries From b1f34660f324290ecd315dcb2d4e308a23194fac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 17:31:21 +0000 Subject: [PATCH 209/329] python310Packages.sqlite-utils: 3.25 -> 3.25.1 --- pkgs/development/python-modules/sqlite-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index b23f24ca5014..5d96f8e1505c 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.25"; + version = "3.25.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OKlwuXwXGU2WBauE33SYAuHzvPBhNdwYB3nQo5V2sUI="; + sha256 = "sha256-32lfUJoTbkflztLU/BDhbHbuOkW66OGpHLuiyAKFy8k="; }; propagatedBuildInputs = [ From 29d7a27d9f34ab48d801b7b5f69e8dbff8018640 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 17:44:51 +0000 Subject: [PATCH 210/329] opensmt: 2.2.0 -> 2.3.0 --- pkgs/applications/science/logic/opensmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index e701fb2711f0..ef6f9b157d2f 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-6VkBGDzqG3mplpvFh5DIR0I1I2/J0Pi7xYk/yVn04Kg="; + sha256 = "sha256-5Gw9+J+3LHNUNbcHxsQR/ivWndL2P7yBt/Q35fBMg58="; }; nativeBuildInputs = [ cmake bison flex ]; From f5e999d5a05273cd4a7c47eafdf2f4008f20743a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 11 Mar 2022 15:24:01 -0800 Subject: [PATCH 211/329] libvirt: cleanup --- .../development/libraries/libvirt/default.nix | 374 ++++++++++-------- 1 file changed, 217 insertions(+), 157 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c12ee9e554ff..7d2bc995da6a 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,83 +1,115 @@ { lib -, stdenv -, fetchurl -, fetchFromGitLab -, makeWrapper , autoreconfHook -, fetchpatch +, bash-completion +, bridge-utils +, cmake , coreutils -, libxml2 -, gnutls -, perl -, python3 -, attr -, glib +, curl +, darwin +, dbus +, dnsmasq , docutils -, iproute2 -, readline -, lvm2 -, util-linux -, systemd -, libpciaccess +, fetchFromGitLab +, fetchurl , gettext -, libtasn1 +, glib +, gnutls +, iproute2 , iptables , libgcrypt -, yajl -, pmutils -, libcap_ng -, libapparmor -, dnsmasq -, libnl , libpcap +, libtasn1 +, libxml2 , libxslt -, xhtml1 -, numad -, numactl -, perlPackages -, curl -, parted -, bridge-utils -, dmidecode -, dbus -, libtirpc -, rpcsvc-proto -, darwin +, makeWrapper , meson , ninja -, audit -, cmake -, bash-completion +, perl +, perlPackages , pkg-config -, enableCeph ? false, ceph ? null -, enableGlusterfs ? false, glusterfs ? null -, enableIscsi ? false, openiscsi ? null -, enableXen ? false, xen ? null -, enableZfs ? true, zfs ? null -# Darwin -, gmp -, libiconv +, pmutils +, python3 +, readline +, rpcsvc-proto +, stdenv +, xhtml1 +, yajl + + # Linux +, acl ? null +, attr ? null +, audit ? null +, dmidecode ? null +, fuse ? null +, kmod ? null +, libapparmor ? null +, libcap_ng ? null +, libnl ? null +, libpciaccess ? null +, libtirpc ? null +, lvm2 ? null +, numactl ? null +, numad ? null +, parted ? null +, systemd ? null +, util-linux ? null + + # Darwin +, gmp ? null +, libiconv ? null , Carbon ? null , AppKit ? null + + # Options +, enableCeph ? false +, ceph ? null +, enableGlusterfs ? false +, glusterfs ? null +, enableIscsi ? false +, openiscsi ? null +, libiscsi ? null +, enableXen ? false +, xen ? null +, enableZfs ? stdenv.isLinux +, zfs ? null }: with lib; -assert enableXen -> stdenv.isLinux && stdenv.isx86_64; -assert enableCeph -> stdenv.isLinux; -assert enableGlusterfs -> stdenv.isLinux; -assert enableZfs -> stdenv.isLinux; +let + inherit (stdenv) isDarwin isLinux isx86_64; + binPath = makeBinPath ([ + dnsmasq + ] ++ optionals isLinux [ + bridge-utils + dmidecode + dnsmasq + iproute2 + iptables + kmod + lvm2 + numactl + numad + pmutils + systemd + ] ++ optionals enableIscsi [ + libiscsi + openiscsi + ]); +in + +assert enableXen -> isLinux && isx86_64; +assert enableCeph -> isLinux; +assert enableGlusterfs -> isLinux; +assert enableZfs -> isLinux; # if you update, also bump and SysVirt in -let - buildFromTarball = stdenv.isDarwin; -in stdenv.mkDerivation rec { pname = "libvirt"; version = "8.1.0"; src = - if buildFromTarball then + if isDarwin then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; @@ -99,67 +131,64 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - ninja meson + cmake - makeWrapper - pkg-config docutils - ] ++ optional (!stdenv.isDarwin) [ - rpcsvc-proto - ] ++ optionals stdenv.isDarwin [ - darwin.developer_cmds # needed for rpcgen - ]; + makeWrapper + ninja + pkg-config + ] + ++ optional (!isDarwin) rpcsvc-proto + # NOTE: needed for rpcgen + ++ optional isDarwin darwin.developer_cmds; buildInputs = [ bash-completion - pkg-config - libxml2 + curl + dbus + gettext + glib gnutls + libgcrypt + libpcap + libtasn1 + libxml2 + libxslt perl + perlPackages.XMLXPath + pkg-config python3 readline - gettext - libtasn1 - libgcrypt - yajl - libxslt xhtml1 - perlPackages.XMLXPath - curl - libpcap - glib - dbus - ] ++ optionals stdenv.isLinux [ + yajl + ] ++ optionals isLinux [ + acl + attr audit - libpciaccess - lvm2 - util-linux - systemd - libnl - numad + fuse libapparmor libcap_ng - numactl - attr - parted + libnl + libpciaccess libtirpc - ] ++ optionals enableCeph [ - ceph - ] ++ optionals enableGlusterfs [ - glusterfs - ] ++ optionals enableIscsi [ - openiscsi - ] ++ optionals enableXen [ - xen - ] ++ optionals enableZfs [ - zfs - ] ++ optionals stdenv.isDarwin [ - libiconv - gmp - Carbon + lvm2 + numactl + numad + parted + systemd + util-linux + ] ++ optionals isDarwin [ AppKit - ]; + Carbon + gmp + libiconv + ] + ++ optionals enableCeph [ ceph ] + ++ optionals enableGlusterfs [ glusterfs ] + ++ optionals enableIscsi [ libiscsi openiscsi ] + ++ optionals enableXen [ xen ] + ++ optionals enableZfs [ zfs ]; preConfigure = let @@ -167,87 +196,118 @@ stdenv.mkDerivation rec { QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; }; + patchBuilder = var: value: '' sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH="${binPath}:$PATH" # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + substituteInPlace build-aux/meson.build \ --replace "gsed" "sed" \ --replace "gmake" "make" \ --replace "ggrep" "grep" + patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); - mesonAutoFeatures = "auto"; + mesonAutoFeatures = "disabled"; mesonFlags = let - opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; - enableDrivers = map (name: opt "driver_${name}" true); + cfg = option: val: "-D${option}=${val}"; + feat = option: enable: cfg option (if enable then "enabled" else "disabled"); + driver = name: feat "driver_${name}"; + storage = name: feat "storage_${name}"; in [ "--localstatedir=${placeholder "out"}/var/" - "-Drunstatedir=${placeholder "out"}/run/" - "-Dlibpcap=enabled" - "-Dpolkit=enabled" - (opt "storage_iscsi" enableIscsi) - ] ++ optionals stdenv.isLinux [ - "-Dattr=enabled" - "-Dapparmor=enabled" - "-Dsecdriver_apparmor=enabled" - "-Dnumad=enabled" - "-Dstorage_disk=enabled" - (opt "glusterfs" enableGlusterfs) - (opt "storage_rbd" enableCeph) - (opt "storage_zfs" enableZfs) - ] ++ optionals stdenv.isDarwin [ - "-Dinit_script=none" - ] ++ (enableDrivers [ - "ch" - "esx" - "interface" - "libvirtd" - "lxc" - "network" - "openvz" - "qemu" - "remote" - "secrets" - "test" - "vbox" - "vmware" - ] ++ lib.optional enableXen "libxl"); + (cfg "init_script" (if isDarwin then "none" else "systemd")) - postInstall = - let - binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; - in - '' - substituteInPlace $out/bin/virt-xml-validate \ - --replace xmllint ${libxml2}/bin/xmllint + (feat "apparmor" isLinux) + (feat "attr" isLinux) + (feat "audit" isLinux) + (feat "bash_completion" true) + (feat "blkid" isLinux) + (feat "capng" isLinux) + (feat "curl" true) + (feat "docs" true) + (feat "expensive_tests" true) + (feat "firewalld" isLinux) + (feat "firewalld_zone" isLinux) + (feat "fuse" isLinux) + (feat "glusterfs" enableGlusterfs) + (feat "host_validate" true) + (feat "libiscsi" enableIscsi) + (feat "libnl" isLinux) + (feat "libpcap" true) + (feat "libssh2" true) + (feat "login_shell" isLinux) + (feat "nss" isLinux) + (feat "numactl" isLinux) + (feat "numad" isLinux) + (feat "pciaccess" isLinux) + (feat "polkit" true) + (feat "readline" true) + (feat "secdriver_apparmor" isLinux) + (feat "tests" true) + (feat "udev" isLinux) + (feat "yajl" true) - substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ - --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ - --replace "$out/bin" '${gettext}/bin' \ - --replace 'lock/subsys' 'lock' \ - --replace 'gettext.sh' 'gettext.sh - # Added in nixpkgs: - gettext() { "${gettext}/bin/gettext" "$@"; } - ' - '' + optionalString stdenv.isLinux '' - substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill - rm $out/lib/systemd/system/{virtlockd,virtlogd}.* - wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} - ''; + (driver "ch" isLinux) + (driver "esx" true) + (driver "interface" isLinux) + (driver "libvirtd" true) + (driver "libxl" enableXen) + (driver "lxc" isLinux) + (driver "network" true) + (driver "openvz" isLinux) + (driver "qemu" true) + (driver "remote" true) + (driver "secrets" true) + (driver "test" true) + (driver "vbox" true) + (driver "vmware" true) + + (storage "dir" true) + (storage "disk" isLinux) + (storage "fs" isLinux) + (storage "gluster" enableGlusterfs) + (storage "iscsi" enableIscsi) + (storage "iscsi_direct" enableIscsi) + (storage "lvm" isLinux) + (storage "mpath" isLinux) + (storage "rbd" enableCeph) + (storage "scsi" true) + (storage "vstorage" isLinux) + (storage "zfs" enableZfs) + ]; + + postInstall = '' + substituteInPlace $out/bin/virt-xml-validate \ + --replace xmllint ${libxml2}/bin/xmllint + + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + optionalString isLinux '' + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${binPath} + ''; meta = { homepage = "https://libvirt.org/"; @@ -258,6 +318,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin lovesegfault ]; }; } From c451480cb1ffbd08b9f176c80bae787393c12e63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 18:01:34 +0000 Subject: [PATCH 212/329] python310Packages.google-cloud-texttospeech: 2.10.2 -> 2.11.0 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 73c09e61c7cb..a7c49f0cabe9 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.10.2"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EykIDxoO8ePp4hLtINTz/RahfS4KU7GhwS4gkMBA32w="; + sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From 95de56ba01159bcb7044cd0f7d48eb04f9ac2d46 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Sat, 12 Mar 2022 18:44:05 +0000 Subject: [PATCH 213/329] fish: 3.3.1 -> 3.4.0 --- pkgs/shells/fish/default.nix | 6 ++---- pkgs/shells/fish/tests-pcre2-update.patch | 7 ------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 pkgs/shells/fish/tests-pcre2-update.patch diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 622521781c1b..b26695cab0e2 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -134,7 +134,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,11 +144,9 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok="; + sha256 = "sha256-tbSKuEhrGe9xajL39GuIuepTVhVfDpZ+6Z9Ak2RUE8U="; }; - patches = [ ./tests-pcre2-update.patch ]; # should be included in >= 3.4 - # Fix FHS paths in tests postPatch = '' # src/fish_tests.cpp diff --git a/pkgs/shells/fish/tests-pcre2-update.patch b/pkgs/shells/fish/tests-pcre2-update.patch deleted file mode 100644 index 5e0c327c540a..000000000000 --- a/pkgs/shells/fish/tests-pcre2-update.patch +++ /dev/null @@ -1,7 +0,0 @@ -Adapted formating to 3.3.1 from -https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a ---- a/src/fish_tests.cpp -+++ b/src/fish_tests.cpp -@@ -5726,2 +5725,0 @@ -- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"}, -- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"}, From 4ad8b43ce2480aa6649e2ec364f5515bd036b796 Mon Sep 17 00:00:00 2001 From: Teo Ljungberg Date: Tue, 1 Mar 2022 11:57:50 +0100 Subject: [PATCH 214/329] ruby: 3.1.0 -> 3.1.1 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index c676a7b05e55..ea31f354d0d7 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -268,10 +268,10 @@ in { }; ruby_3_1 = generic { - version = rubyVersion "3" "1" "0" ""; + version = rubyVersion "3" "1" "1" ""; sha256 = { - src = "sha256-UKBQTG7ctNYc5rjP292qlXBxlfqw7Ne16SZUsqlBKFQ="; - git = "sha256-TcsoWY+zVZeue1/ypV1L0WERp1UVK35WtVtYPYiJh4c="; + src = "sha256-/m5Hgt6XRDl43bqLpL440iKqJNw+PwKmqOdwHA7rYZ0="; + git = "sha256-76t/tGyK5nz7nvcRdHJTjjckU+Kv+/kbTMiNWJ93jU8="; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 2e51670a9f81..b76dc1a23b16 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -10,6 +10,6 @@ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; - "3.1.0" = ops useRailsExpress [ # no patches yet (2021-12-25) + "3.1.1" = ops useRailsExpress [ # no patches yet (2021-12-25) ]; } From b3a757a21a738a3700069ca53c6acc3c564bf1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Mar 2022 20:55:28 +0000 Subject: [PATCH 215/329] python3Packages.imap-tools: 0.51.1 -> 0.52.0 https://github.com/ikvk/imap_tools/releases/tag/v0.52.0 --- pkgs/development/python-modules/imap-tools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 866721b09f5b..9d017b242235 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,15 +7,17 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.51.1"; + version = "0.52.0"; disabled = isPy27; + format = "setuptools"; + src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-ppxQtFK7U006z7qonm3B5gN99CHB9mEX3l0XjrhZQo8="; + hash = "sha256-la2+cpTnHZQn/FXtySp+3zDCBTONiLC16Tm+hDiIERc="; }; checkInputs = [ From 29beb0e46ed72707a768e8c4f2ad3ddb0a6c1cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 9 Mar 2022 19:56:27 +0000 Subject: [PATCH 216/329] python3Packages.volvooncall: 0.9.2 -> 0.10.0 https://github.com/molobrakos/volvooncall/releases/tag/v0.10.0 --- .../python-modules/volvooncall/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 9fe43d16f926..247a192588de 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -5,7 +5,6 @@ , setuptools , geopy , docopt -, pyyaml , certifi , amqtt , websockets @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.9.2"; + version = "0.10.0"; disabled = pythonOlder "3.8"; @@ -27,24 +26,30 @@ buildPythonPackage rec { owner = "molobrakos"; repo = "volvooncall"; rev = "v${version}"; - hash = "sha256-OTs282z7qzILl/xxM3whaxiQr8FZOfgceO2EY3NJKbA="; + hash = "sha256-HLSanXJs1yPSgYo4oX0zJtrV5sKkxV2yLPhc2dVRHY8="; }; propagatedBuildInputs = [ - geopy - docopt - pyyaml - certifi - amqtt - websockets aiohttp ]; + passthru.extras-require = { + console = [ + certifi + docopt + geopy + ]; + mqtt = [ + amqtt + certifi + ]; + }; + checkInputs = [ - pytestCheckHook asynctest pytest-asyncio - ]; + pytestCheckHook + ] ++ passthru.extras-require.mqtt; pythonImportsCheck = [ "volvooncall" ]; From 52cbeeda30efb48b473495db9371178ec898108c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 6 Mar 2022 17:57:44 +0100 Subject: [PATCH 217/329] signal-desktop: Transfer maintainership I was actively maintaining the package but stopped using it since the Ozone/Wayland support broke (e06082eda06 - and I was already migrating away from Signal anyway). Mic92 kindly offered to take over and equirosa also offered to become active again. So it should be in good hands :) And thank you ixmatus for packaging Signal-Desktop in Nixpkgs. --- .../networking/instant-messengers/signal-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 6d1bb0af147f..9c453ba4236e 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -147,7 +147,7 @@ in stdenv.mkDerivation rec { homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ ixmatus primeos equirosa ]; + maintainers = with lib.maintainers; [ mic92 equirosa ]; platforms = [ "x86_64-linux" ]; }; } From f443859b725bd5054cdc6db51c5ee462d166d717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 8 Mar 2022 06:46:35 +0000 Subject: [PATCH 218/329] bubblewrap: 0.5.0 -> 0.6.1 --- pkgs/tools/admin/bubblewrap/default.nix | 49 +++++++++++++++++++++---- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 4c6c6971fc92..fda6113b5984 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -1,21 +1,54 @@ -{ lib, stdenv, fetchurl, libxslt, docbook_xsl, libcap }: +{ lib +, stdenv +, fetchFromGitHub +, docbook_xsl +, libxslt +, meson +, ninja +, pkg-config +, bash-completion +, libcap +, libselinux +}: stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.5.0"; + version = "0.6.1"; - src = fetchurl { - url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Fv2vM3mdYxBONH4BM/kJGW/pDQxQUV0BC8tCLrWgCBg="; + src = fetchFromGitHub { + owner = "containers"; + repo = "bubblewrap"; + rev = "v${version}"; + sha256 = "sha256-YmK/Tq9/JTJr5gLNKEH5t6TvvXlNSTDz5Ui7d3ewv2s="; }; - nativeBuildInputs = [ libxslt docbook_xsl ]; - buildInputs = [ libcap ]; + postPatch = '' + substituteInPlace tests/libtest.sh \ + --replace "/var/tmp" "$TMPDIR" + ''; + + nativeBuildInputs = [ + docbook_xsl + libxslt + meson + ninja + pkg-config + ]; + + buildInputs = [ + bash-completion + libcap + libselinux + ]; + + # incompatible with Nix sandbox + doCheck = false; meta = with lib; { description = "Unprivileged sandboxing tool"; homepage = "https://github.com/containers/bubblewrap"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.linux; }; } From bf7831578d0ac4fe9b3d1339fdb529c7c3c2451a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 8 Mar 2022 07:06:12 +0000 Subject: [PATCH 219/329] python3Packages.mat2: only use bubblewrap on Linux --- .../python-modules/mat2/bubblewrap-path.patch | 35 +++++++++++++++++++ .../python-modules/mat2/default.nix | 7 +++- .../python-modules/mat2/paths.patch | 35 ------------------- 3 files changed, 41 insertions(+), 36 deletions(-) create mode 100644 pkgs/development/python-modules/mat2/bubblewrap-path.patch diff --git a/pkgs/development/python-modules/mat2/bubblewrap-path.patch b/pkgs/development/python-modules/mat2/bubblewrap-path.patch new file mode 100644 index 000000000000..2c71930b6df8 --- /dev/null +++ b/pkgs/development/python-modules/mat2/bubblewrap-path.patch @@ -0,0 +1,35 @@ +diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py +index 970d5dd..5d3c0b7 100644 +--- a/libmat2/bubblewrap.py ++++ b/libmat2/bubblewrap.py +@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError + + + def _get_bwrap_path() -> str: +- which_path = shutil.which('bwrap') +- if which_path: +- return which_path +- +- raise RuntimeError("Unable to find bwrap") # pragma: no cover ++ return '@bwrap@' + + + def _get_bwrap_args(tempdir: str, +@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, + + # XXX: use --ro-bind-try once all supported platforms + # have a bubblewrap recent enough to support it. +- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] ++ ro_bind_dirs = ['/nix/store', cwd] + for bind_dir in ro_bind_dirs: + if os.path.isdir(bind_dir): # pragma: no cover + ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) + +- ro_bind_files = ['/etc/ld.so.cache'] +- for bind_file in ro_bind_files: +- if os.path.isfile(bind_file): # pragma: no cover +- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) +- + args = ro_bind_args + \ + ['--dev', '/dev', + '--proc', '/proc', diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 97b52855f6ba..1d5a76b7b804 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , python , pythonOlder @@ -37,7 +38,6 @@ buildPythonPackage rec { # hardcode paths to some binaries (substituteAll ({ src = ./paths.patch; - bwrap = "${bubblewrap}/bin/bwrap"; exiftool = "${exiftool}/bin/exiftool"; ffmpeg = "${ffmpeg}/bin/ffmpeg"; } // lib.optionalAttrs dolphinIntegration { @@ -52,6 +52,11 @@ buildPythonPackage rec { src = ./fix_poppler.patch; poppler_path = "${poppler_gi}/lib/girepository-1.0"; }) + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ + (substituteAll { + src = ./bubblewrap-path.patch; + bwrap = "${bubblewrap}/bin/bwrap"; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch index 50b0c9aaa789..784e04cda383 100644 --- a/pkgs/development/python-modules/mat2/paths.patch +++ b/pkgs/development/python-modules/mat2/paths.patch @@ -12,41 +12,6 @@ index 41c8de4..11df258 100644 +Icon=@mat2svg@ +Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U +Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U -diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py -index 970d5dd..5d3c0b7 100644 ---- a/libmat2/bubblewrap.py -+++ b/libmat2/bubblewrap.py -@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError - - - def _get_bwrap_path() -> str: -- which_path = shutil.which('bwrap') -- if which_path: -- return which_path -- -- raise RuntimeError("Unable to find bwrap") # pragma: no cover -+ return '@bwrap@' - - - def _get_bwrap_args(tempdir: str, -@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, - - # XXX: use --ro-bind-try once all supported platforms - # have a bubblewrap recent enough to support it. -- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] -+ ro_bind_dirs = ['/nix/store', cwd] - for bind_dir in ro_bind_dirs: - if os.path.isdir(bind_dir): # pragma: no cover - ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) - -- ro_bind_files = ['/etc/ld.so.cache'] -- for bind_file in ro_bind_files: -- if os.path.isfile(bind_file): # pragma: no cover -- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) -- - args = ro_bind_args + \ - ['--dev', '/dev', - '--proc', '/proc', diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py index eb65b2a..51a0fa1 100644 --- a/libmat2/exiftool.py From 8db28de91911514e9fe2e03b16128322ba322e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Mar 2022 05:05:24 +0000 Subject: [PATCH 220/329] metadata-cleaner: 2.1.4 -> 2.1.5 https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v2.1.5/CHANGELOG.md --- pkgs/applications/misc/metadata-cleaner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 4412af583b3e..9602fee5b5c0 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.1.4"; + version = "2.1.5"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-46J0iLXzZX5tww4CK8WhrADql023rauO0fpW7Asn5ZY="; + hash = "sha256-G7Azeh8+OQILoYEmlIeacoDzN0NRt5NTGavYM9CH8WA="; }; nativeBuildInputs = [ From 7d5e470e1fdd564d725f1b8db82fe126efcd649f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 12 Mar 2022 20:35:00 +0100 Subject: [PATCH 221/329] chromiumBeta: 100.0.4896.20 -> 100.0.4896.30 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 33284faf14e8..ee9306f1941e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "100.0.4896.20", - "sha256": "0g16xzimp39vk5b27bj12rh14520wihj4m4mwxf387rv0yp03cnr", - "sha256bin64": "1qkz32xvgbnd7xck0hm2mcrgdawn6xilldjgfckaaavvj4zinnk9", + "version": "100.0.4896.30", + "sha256": "06zfx9f6wv4j4fz7ss8pjlxfcsrwrvwqkmdk5bin7slxg4sq31fl", + "sha256bin64": "06s2p81grqrxl3p9ksy9q7s3s42ijmcw316nb51f7zx4ijk5hzya", "deps": { "gn": { "version": "2022-01-21", From 7d5373b0bab22db3e708fe9dc3cfbdf5d9b0982e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 12 Mar 2022 20:35:00 +0100 Subject: [PATCH 222/329] chromiumDev: 101.0.4919.0 -> 101.0.4929.5 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 33284faf14e8..b28095c86015 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "101.0.4919.0", - "sha256": "01dp3pkpf2m6r6vfyqgcg99xcii0qi3qm0g69r3nnj2hrs7ziqv2", - "sha256bin64": "1x7bfcnhrbakcbdyp1sc79jx6qysnnyj1by6qnl7gyffh8xyb95g", + "version": "101.0.4929.5", + "sha256": "0330vs0np23x390lfnc5gzmbnkdak590rzqpa7abpfx1gzj1rd3s", + "sha256bin64": "0670z86sz2wxpfxda32cirara7yg87g67cymh8ik3w99g5q7cb1d", "deps": { "gn": { "version": "2022-03-01", From 1307c79a1472100901f8dfec52845db660e6adfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 19:39:04 +0000 Subject: [PATCH 223/329] libhdhomerun: 20210624 -> 20220303 --- pkgs/development/libraries/libhdhomerun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 187382e1f3e9..0c84cb7e0b18 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20210624"; + version = "20220303"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256-3q9GO7zD7vpy+XGZ77YhP3sOLI6R8bPSy/UgVqhxXRU="; + sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc="; }; patchPhase = lib.optionalString stdenv.isDarwin '' From 06b3a5ac7de61529914f1ca360cac6605b8db4f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Mar 2022 20:53:30 +0100 Subject: [PATCH 224/329] expliot: relax dependency constraints --- pkgs/tools/security/expliot/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index 848ee536380f..eb5fd03416f1 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { owner = "expliot_framework"; repo = pname; rev = version; - sha256 = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY="; + hash = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY="; }; propagatedBuildInputs = [ @@ -51,7 +51,10 @@ buildPythonApplication rec { postPatch = '' # https://gitlab.com/expliot_framework/expliot/-/merge_requests/113 substituteInPlace setup.py \ - --replace "pynetdicom>=1.5.1,<2" "pynetdicom>=2,<3" + --replace "pynetdicom>=1.5.1,<2" "pynetdicom>=2,<3" \ + --replace "cryptography>=3.0,<4" "cryptography>=35,<40" \ + --replace "python-can>=3.3.3,<4" "python-can>=3.3.3,<5" \ + --replace "pyparsing>=2.4.7,<3" "pyparsing>=2.4.7,<4" ''; # Project has no tests From 9ec5ffb4642e4e10032da4c7001e5d004d7f9728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 12 Mar 2022 22:02:18 +0100 Subject: [PATCH 225/329] qrcp: 0.8.5 -> 0.9.0 --- pkgs/tools/networking/qrcp/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index 15fe181eed11..ddbba0650f4f 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "qrcp"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "sha256-5HW0OtDlqUvsKMTjxmIDpmlKdo0GFj7b+6jh9TlLllI="; + sha256 = "sha256-vem9aXyRIV/2O3sfZ5zpcxs9GSc+uqUgFedyY1O4hWw="; }; vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4"; @@ -24,9 +24,10 @@ buildGoModule rec { ]; postInstall = '' - installShellCompletion --bash --cmd qrcp <($out/bin/qrcp completion bash) - installShellCompletion --fish --cmd qrcp <($out/bin/qrcp completion fish) - installShellCompletion --zsh --cmd qrcp <($out/bin/qrcp completion zsh) + installShellCompletion --cmd qrcp \ + --bash <($out/bin/qrcp completion bash) \ + --fish <($out/bin/qrcp completion fish) \ + --zsh <($out/bin/qrcp completion zsh) ''; meta = with lib; { From 3abf98e46ca54da890eaf0b3059b9ff15a6f35b8 Mon Sep 17 00:00:00 2001 From: Jan Schmitt Date: Thu, 10 Mar 2022 22:19:13 +0100 Subject: [PATCH 226/329] sngrep: 1.4.9 -> 1.4.10 * the deleted patch is part of 1.4.10 --- .../networking/sniffers/sngrep/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 5bcbac74ca7c..401d6dfa32cd 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -3,7 +3,6 @@ , autoconf , automake , fetchFromGitHub -, fetchpatch , libpcap , ncurses , openssl @@ -12,25 +11,15 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-92wPRDFSoIOYFv3XKdsuYH8j3D8kXyg++q6VpIIMGDg="; + sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es="; }; - patches = [ - # Pull fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/irontec/sngrep/pull/382 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/irontec/sngrep/commit/d09e1c323dbd7fc899e8985899baec568f045601.patch"; - sha256 = "sha256-nY5i3WQh/oKboEAh4wvxF5Imf2BHYEKdFj+WF1M3SSA="; - }) - ]; - nativeBuildInputs = [ autoconf automake From a75d0a2fa6d92bfbed9d073a8cd8570e5bc098c1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 12 Mar 2022 13:39:20 -0800 Subject: [PATCH 227/329] virt-manager: disable tests that rely on unfiltered sgio --- pkgs/applications/virtualization/virt-manager/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 4fd30b367524..d3ccc248c31f 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -62,11 +62,9 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ cpio cdrtools pytestCheckHook ]; disabledTestPaths = [ - "tests/test_cli.py" - "tests/test_disk.py" - "tests/test_checkprops.py" - "tests/test_storage.py" - ]; # Error logs: https://gist.github.com/superherointj/fee040872beaafaaa19b8bf8f3ff0be5 + "tests/test_misc.py" + "tests/test_xmlparse.py" + ]; preCheck = '' export HOME=. From 2837d2401443b05c8243a25ce434ce9e096a67f3 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 12 Mar 2022 13:21:21 -0800 Subject: [PATCH 228/329] Revert "fish: 3.3.1 -> 3.4.0" --- pkgs/shells/fish/default.nix | 6 ++++-- pkgs/shells/fish/tests-pcre2-update.patch | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 pkgs/shells/fish/tests-pcre2-update.patch diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index b26695cab0e2..622521781c1b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -134,7 +134,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.4.0"; + version = "3.3.1"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,9 +144,11 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tbSKuEhrGe9xajL39GuIuepTVhVfDpZ+6Z9Ak2RUE8U="; + sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok="; }; + patches = [ ./tests-pcre2-update.patch ]; # should be included in >= 3.4 + # Fix FHS paths in tests postPatch = '' # src/fish_tests.cpp diff --git a/pkgs/shells/fish/tests-pcre2-update.patch b/pkgs/shells/fish/tests-pcre2-update.patch new file mode 100644 index 000000000000..5e0c327c540a --- /dev/null +++ b/pkgs/shells/fish/tests-pcre2-update.patch @@ -0,0 +1,7 @@ +Adapted formating to 3.3.1 from +https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a +--- a/src/fish_tests.cpp ++++ b/src/fish_tests.cpp +@@ -5726,2 +5725,0 @@ +- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"}, +- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"}, From d713f47b99749f15441d447642169af6535c5258 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 12 Mar 2022 14:13:21 -0800 Subject: [PATCH 229/329] virt-manager: compile gsettings schemas --- pkgs/applications/virtualization/virt-manager/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index d3ccc248c31f..af28e5f461b4 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -49,8 +49,7 @@ python3.pkgs.buildPythonApplication rec { dontWrapGApps = true; preFixup = '' - mkdir -p $out/share/glib-2.0/schemas - cp $src/data/*.gschema.xml $out/share/glib-2.0/schemas/ + glib-compile-schemas $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") # these are called from virt-install in initrdinject.py From c2fba64b200cf1476169629e3535f2612b7a1a4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 22:22:20 +0000 Subject: [PATCH 230/329] ytcc: 2.5.4 -> 2.5.5 --- pkgs/tools/networking/ytcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 46b6e649b5c6..028c50a352c0 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "sha256-nYHfmksZnIZGMSSFDhW7ajvv1F5h3aJo8IXw6yYOEw0="; + sha256 = "sha256-DjyVcjU2dVku5ademm6DygMnzWHB7iMqPfU56BBjAwU="; }; nativeBuildInputs = [ gettext installShellFiles ]; From 316b6f84c22aa022210b7b317a7df02458c266fc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 12 Mar 2022 14:24:01 -0800 Subject: [PATCH 231/329] Revert "Merge pull request #163714 from lovesegfault/libvirt-8.1.0" This reverts commit cdd51022ab68f40f18e1b11c875369d603f7031b, reversing changes made to 8db28de91911514e9fe2e03b16128322ba322e62. --- ...n-install-prefix-for-building-on-nix.patch | 326 +++++++++++++++ .../0002-meson-patch-ch-install-prefix.patch | 14 + .../development/libraries/libvirt/default.nix | 380 +++++++----------- .../libvirt/do-not-use-sysconfig.patch | 211 ---------- ...n-fault-in-virtqemud-executing-qemuD.patch | 50 --- .../python-modules/libvirt/default.nix | 4 +- pkgs/top-level/perl-packages.nix | 6 +- 7 files changed, 500 insertions(+), 491 deletions(-) create mode 100644 pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch create mode 100644 pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch delete mode 100644 pkgs/development/libraries/libvirt/do-not-use-sysconfig.patch delete mode 100644 pkgs/development/libraries/libvirt/qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch new file mode 100644 index 000000000000..86dd461ea07d --- /dev/null +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -0,0 +1,326 @@ +From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Thu, 14 Jan 2021 00:32:00 -0800 +Subject: [PATCH] meson: patch in an install prefix for building on nix + +Used in the nixpkgs version of libvirt so that we can install things in +the nix store, but read them from the root filesystem. +--- + meson.build | 9 +++++++++ + meson_options.txt | 2 ++ + src/libxl/meson.build | 6 +++--- + src/locking/meson.build | 8 ++++---- + src/lxc/meson.build | 6 +++--- + src/meson.build | 18 +++++++++--------- + src/network/meson.build | 12 ++++++------ + src/nwfilter/xml/meson.build | 2 +- + src/qemu/meson.build | 14 +++++++------- + src/remote/meson.build | 6 +++--- + src/security/apparmor/meson.build | 8 ++++---- + tools/meson.build | 4 ++-- + 12 files changed, 53 insertions(+), 42 deletions(-) + +diff --git a/meson.build b/meson.build +index b5164f6..33719f1 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' + conf.set('WINVER', '0x0600') # Win Vista / Server 2008 + endif + ++# patched in for nix ++install_prefix = get_option('install_prefix') + + # set various paths + +@@ -57,6 +59,13 @@ else + sysconfdir = prefix / get_option('sysconfdir') + endif + ++# nix: don't prefix the localstatedir; some things need to write to it, so it ++# can't be in the nix store, and that's what the prefix is. ++# We'll prefix things ourselves where needed ++localstatedir = get_option('localstatedir') ++# Same for sysconfidr ++sysconfdir = get_option('sysconfdir') ++ + # if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for + # sysconfdir as this makes a lot of things break in testing situations + if prefix == '/usr' +diff --git a/meson_options.txt b/meson_options.txt +index e5d79c2..081cd32 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,5 @@ ++option('install_prefix', type: 'string', value: '', description: 'prefix for nix store installation') ++ + option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') + option('packager', type: 'string', value: '', description: 'Extra packager name') + option('packager_version', type: 'string', value: '', description: 'Extra packager version') +diff --git a/src/libxl/meson.build b/src/libxl/meson.build +index 3bb6cc5..78d7be0 100644 +--- a/src/libxl/meson.build ++++ b/src/libxl/meson.build +@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'libxl', +- runstatedir / 'libvirt' / 'libxl', +- localstatedir / 'log' / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', ++ install_prefix + runstatedir / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', + ] + endif +diff --git a/src/locking/meson.build b/src/locking/meson.build +index 8a28310..9da81cc 100644 +--- a/src/locking/meson.build ++++ b/src/locking/meson.build +@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lockd', +- localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', +- runstatedir / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', ++ install_prefix + runstatedir / 'libvirt' / 'lockd', + ] + + if conf.has('WITH_SANLOCK') + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'sanlock', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'sanlock', + ] + endif + endif +diff --git a/src/lxc/meson.build b/src/lxc/meson.build +index f8e2a88..96d6687 100644 +--- a/src/lxc/meson.build ++++ b/src/lxc/meson.build +@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lxc', +- runstatedir / 'libvirt' / 'lxc', +- localstatedir / 'log' / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', ++ install_prefix + runstatedir / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', + ] + endif +diff --git a/src/meson.build b/src/meson.build +index 7c47821..d33d16a 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -669,7 +669,7 @@ endforeach + + virt_conf_files += 'libvirt.conf' + +-install_data(virt_conf_files, install_dir: confdir) ++install_data(virt_conf_files, install_dir: install_prefix + confdir) + install_data(virt_aug_files, install_dir: virt_aug_dir) + + # augeas_test_data: +@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs + output: '@0@.conf'.format(data['name']), + configuration: daemon_conf, + install: true, +- install_dir: confdir, ++ install_dir: install_prefix + confdir, + ) + + if data.get('with_ip', false) +@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') + + install_data( + init_file, +- install_dir: sysconfdir / 'init.d', ++ install_dir: install_prefix + sysconfdir / 'init.d', + rename: [ init['name'] ], + ) + + if init.has_key('confd') + install_data( + init['confd'], +- install_dir: sysconfdir / 'conf.d', ++ install_dir: install_prefix + sysconfdir / 'conf.d', + rename: [ init['name'] ], + ) + endif +@@ -872,7 +872,7 @@ if init_script != 'none' + foreach sysconf : sysconf_files + install_data( + sysconf['file'], +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: [ sysconf['name'] ], + ) + endforeach +@@ -897,10 +897,10 @@ endif + # Install empty directories + + virt_install_dirs += [ +- localstatedir / 'cache' / 'libvirt', +- localstatedir / 'lib' / 'libvirt' / 'images', +- localstatedir / 'lib' / 'libvirt' / 'filesystems', +- localstatedir / 'lib' / 'libvirt' / 'boot', ++ install_prefix + localstatedir / 'cache' / 'libvirt', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'images', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'filesystems', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'boot', + ] + + meson.add_install_script( +diff --git a/src/network/meson.build b/src/network/meson.build +index 3ec598c..b02040b 100644 +--- a/src/network/meson.build ++++ b/src/network/meson.build +@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'network', +- localstatedir / 'lib' / 'libvirt' / 'dnsmasq', +- runstatedir / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', ++ install_prefix + runstatedir / 'libvirt' / 'network', + ] + + configure_file( +@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') + output: '@BASENAME@', + copy: true, + install: true, +- install_dir: confdir / 'qemu' / 'networks', ++ install_dir: install_prefix + confdir / 'qemu' / 'networks', + ) + + meson.add_install_script( + meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), +- confdir / 'qemu' / 'networks' / 'autostart', ++ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', + '../default.xml', 'default.xml', + ) + +diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build +index 0d96c54..66c92a1 100644 +--- a/src/nwfilter/xml/meson.build ++++ b/src/nwfilter/xml/meson.build +@@ -25,4 +25,4 @@ nwfilter_xml_files = [ + 'qemu-announce-self.xml', + ] + +-install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') ++install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') +diff --git a/src/qemu/meson.build b/src/qemu/meson.build +index 90640b0..8802cec 100644 +--- a/src/qemu/meson.build ++++ b/src/qemu/meson.build +@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu', +- localstatedir / 'cache' / 'libvirt' / 'qemu', +- localstatedir / 'log' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'swtpm', +- runstatedir / 'libvirt' / 'qemu' / 'swtpm', +- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + ] + endif +diff --git a/src/remote/meson.build b/src/remote/meson.build +index 9ad2f6a..429a15b 100644 +--- a/src/remote/meson.build ++++ b/src/remote/meson.build +@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') + } + + virt_install_dirs += [ +- localstatedir / 'log' / 'libvirt', ++ install_prefix + localstatedir / 'log' / 'libvirt', + ] + + logrotate_conf = configuration_data() +@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') + ) + install_data( + log_file, +- install_dir: sysconfdir / 'logrotate.d', ++ install_dir: install_prefix + sysconfdir / 'logrotate.d', + rename: [ name ], + ) + endforeach +@@ -309,7 +309,7 @@ endif + if conf.has('WITH_SASL') + install_data( + 'libvirtd.sasl', +- install_dir: sysconfdir / 'sasl2', ++ install_dir: install_prefix + sysconfdir / 'sasl2', + rename: [ 'libvirt.conf' ], + ) + endif +diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build +index af43780..e2d6c81 100644 +--- a/src/security/apparmor/meson.build ++++ b/src/security/apparmor/meson.build +@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles + output: name, + configuration: apparmor_gen_profiles_conf, + install: true, +- install_dir: apparmor_dir, ++ install_dir: install_prefix + apparmor_dir, + ) + endforeach + + install_data( + [ 'libvirt-qemu', 'libvirt-lxc' ], +- install_dir: apparmor_dir / 'abstractions', ++ install_dir: install_prefix + apparmor_dir / 'abstractions', + ) + + install_data( + [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], +- install_dir: apparmor_dir / 'libvirt', ++ install_dir: install_prefix + apparmor_dir / 'libvirt', + ) + + install_data( + 'usr.lib.libvirt.virt-aa-helper.local', +- install_dir: apparmor_dir / 'local', ++ install_dir: install_prefix + apparmor_dir / 'local', + rename: 'usr.lib.libvirt.virt-aa-helper', + ) +diff --git a/tools/meson.build b/tools/meson.build +index b8c6802..dacd0ff 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') + install_rpath: libvirt_rpath, + ) + +- install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt') ++ install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt') + endif + + if host_machine.system() == 'windows' +@@ -274,7 +274,7 @@ configure_file( + if init_script == 'systemd' + install_data( + 'libvirt-guests.sysconf', +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: 'libvirt-guests', + ) diff --git a/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch b/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch new file mode 100644 index 000000000000..ae97c6455c6b --- /dev/null +++ b/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch @@ -0,0 +1,14 @@ +diff --git a/src/ch/meson.build b/src/ch/meson.build +index e34974d56c..4767763c2c 100644 +--- a/src/ch/meson.build ++++ b/src/ch/meson.build +@@ -68,7 +68,7 @@ if conf.has('WITH_CH') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'ch', +- runstatedir / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', ++ install_prefix + runstatedir / 'libvirt' / 'ch', + ] + endif diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 7d2bc995da6a..03d0e17cb4c3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,119 +1,85 @@ { lib -, autoreconfHook -, bash-completion -, bridge-utils -, cmake -, coreutils -, curl -, darwin -, dbus -, dnsmasq -, docutils -, fetchFromGitLab +, stdenv , fetchurl -, gettext -, glib +, fetchFromGitLab +, makeWrapper +, autoreconfHook +, fetchpatch +, coreutils +, libxml2 , gnutls +, perl +, python3 +, attr +, glib +, docutils , iproute2 +, readline +, lvm2 +, util-linux +, systemd +, libpciaccess +, gettext +, libtasn1 , iptables , libgcrypt +, yajl +, pmutils +, libcap_ng +, libapparmor +, dnsmasq +, libnl , libpcap -, libtasn1 -, libxml2 , libxslt -, makeWrapper +, xhtml1 +, numad +, numactl +, perlPackages +, curl +, libiconv +, gmp +, zfs +, parted +, bridge-utils +, dmidecode +, dbus +, libtirpc +, rpcsvc-proto +, darwin , meson , ninja -, perl -, perlPackages +, audit +, cmake +, bash-completion , pkg-config -, pmutils -, python3 -, readline -, rpcsvc-proto -, stdenv -, xhtml1 -, yajl - - # Linux -, acl ? null -, attr ? null -, audit ? null -, dmidecode ? null -, fuse ? null -, kmod ? null -, libapparmor ? null -, libcap_ng ? null -, libnl ? null -, libpciaccess ? null -, libtirpc ? null -, lvm2 ? null -, numactl ? null -, numad ? null -, parted ? null -, systemd ? null -, util-linux ? null - - # Darwin -, gmp ? null -, libiconv ? null -, Carbon ? null -, AppKit ? null - - # Options -, enableCeph ? false -, ceph ? null -, enableGlusterfs ? false -, glusterfs ? null -, enableIscsi ? false -, openiscsi ? null -, libiscsi ? null , enableXen ? false , xen ? null -, enableZfs ? stdenv.isLinux -, zfs ? null +, enableIscsi ? false +, openiscsi +, enableCeph ? false +, ceph +, enableGlusterfs ? false +, glusterfs +, Carbon +, AppKit }: with lib; -let - inherit (stdenv) isDarwin isLinux isx86_64; - binPath = makeBinPath ([ - dnsmasq - ] ++ optionals isLinux [ - bridge-utils - dmidecode - dnsmasq - iproute2 - iptables - kmod - lvm2 - numactl - numad - pmutils - systemd - ] ++ optionals enableIscsi [ - libiscsi - openiscsi - ]); -in - -assert enableXen -> isLinux && isx86_64; -assert enableCeph -> isLinux; -assert enableGlusterfs -> isLinux; -assert enableZfs -> isLinux; - # if you update, also bump and SysVirt in +let + buildFromTarball = stdenv.isDarwin; +in stdenv.mkDerivation rec { pname = "libvirt"; - version = "8.1.0"; + version = "7.10.0"; src = - if isDarwin then + if buildFromTarball then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "sha256-PGxDvs/+s0o/OXxhYgaqaaiT/4v16CCDk8hOjnU1KTQ="; + sha256 = "sha256-yzGAFK8JcyeSjG49cpIuO+AqPmQBJHsqpS2auOC0gPk="; } else fetchFromGitLab @@ -121,74 +87,76 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-nk8pBlss+g4EMy+RnAOyz6YlGGvlBvl5aBpcytsK1wY="; + sha256 = "sha256-bB8LsjZFeJbMmmC0YRPyMag2MBhwagUFC7aB1KhZEkA="; fetchSubmodules = true; }; patches = [ - ./do-not-use-sysconfig.patch - ./qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch + ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + ./0002-meson-patch-ch-install-prefix.patch ]; nativeBuildInputs = [ - meson - - cmake - docutils - makeWrapper ninja + meson + cmake + makeWrapper pkg-config - ] - ++ optional (!isDarwin) rpcsvc-proto - # NOTE: needed for rpcgen - ++ optional isDarwin darwin.developer_cmds; + docutils + ] ++ optional (!stdenv.isDarwin) [ + rpcsvc-proto + ] ++ optionals stdenv.isDarwin [ + darwin.developer_cmds # needed for rpcgen + ]; buildInputs = [ bash-completion - curl - dbus - gettext - glib - gnutls - libgcrypt - libpcap - libtasn1 - libxml2 - libxslt - perl - perlPackages.XMLXPath pkg-config + libxml2 + gnutls + perl python3 readline - xhtml1 + gettext + libtasn1 + libgcrypt yajl - ] ++ optionals isLinux [ - acl - attr + libxslt + xhtml1 + perlPackages.XMLXPath + curl + libpcap + glib + dbus + ] ++ optionals stdenv.isLinux [ audit - fuse + libpciaccess + lvm2 + util-linux + systemd + libnl + numad + zfs libapparmor libcap_ng - libnl - libpciaccess - libtirpc - lvm2 numactl - numad + attr parted - systemd - util-linux - ] ++ optionals isDarwin [ - AppKit - Carbon - gmp + libtirpc + ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ + xen + ] ++ optionals enableIscsi [ + openiscsi + ] ++ optionals enableCeph [ + ceph + ] ++ optionals enableGlusterfs [ + glusterfs + ] ++ optionals stdenv.isDarwin [ libiconv - ] - ++ optionals enableCeph [ ceph ] - ++ optionals enableGlusterfs [ glusterfs ] - ++ optionals enableIscsi [ libiscsi openiscsi ] - ++ optionals enableXen [ xen ] - ++ optionals enableZfs [ zfs ]; + gmp + Carbon + AppKit + ]; preConfigure = let @@ -196,118 +164,80 @@ stdenv.mkDerivation rec { QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; }; - patchBuilder = var: value: '' sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH="${binPath}:$PATH" + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' - substituteInPlace build-aux/meson.build \ --replace "gsed" "sed" \ --replace "gmake" "make" \ --replace "ggrep" "grep" - patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); - mesonAutoFeatures = "disabled"; + mesonAutoFeatures = "auto"; mesonFlags = let - cfg = option: val: "-D${option}=${val}"; - feat = option: enable: cfg option (if enable then "enabled" else "disabled"); - driver = name: feat "driver_${name}"; - storage = name: feat "storage_${name}"; + opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; in [ - "--localstatedir=${placeholder "out"}/var/" - (cfg "init_script" (if isDarwin then "none" else "systemd")) - - (feat "apparmor" isLinux) - (feat "attr" isLinux) - (feat "audit" isLinux) - (feat "bash_completion" true) - (feat "blkid" isLinux) - (feat "capng" isLinux) - (feat "curl" true) - (feat "docs" true) - (feat "expensive_tests" true) - (feat "firewalld" isLinux) - (feat "firewalld_zone" isLinux) - (feat "fuse" isLinux) - (feat "glusterfs" enableGlusterfs) - (feat "host_validate" true) - (feat "libiscsi" enableIscsi) - (feat "libnl" isLinux) - (feat "libpcap" true) - (feat "libssh2" true) - (feat "login_shell" isLinux) - (feat "nss" isLinux) - (feat "numactl" isLinux) - (feat "numad" isLinux) - (feat "pciaccess" isLinux) - (feat "polkit" true) - (feat "readline" true) - (feat "secdriver_apparmor" isLinux) - (feat "tests" true) - (feat "udev" isLinux) - (feat "yajl" true) - - (driver "ch" isLinux) - (driver "esx" true) - (driver "interface" isLinux) - (driver "libvirtd" true) - (driver "libxl" enableXen) - (driver "lxc" isLinux) - (driver "network" true) - (driver "openvz" isLinux) - (driver "qemu" true) - (driver "remote" true) - (driver "secrets" true) - (driver "test" true) - (driver "vbox" true) - (driver "vmware" true) - - (storage "dir" true) - (storage "disk" isLinux) - (storage "fs" isLinux) - (storage "gluster" enableGlusterfs) - (storage "iscsi" enableIscsi) - (storage "iscsi_direct" enableIscsi) - (storage "lvm" isLinux) - (storage "mpath" isLinux) - (storage "rbd" enableCeph) - (storage "scsi" true) - (storage "vstorage" isLinux) - (storage "zfs" enableZfs) + "--sysconfdir=/var/lib" + "-Dinstall_prefix=${placeholder "out"}" + "-Dlocalstatedir=/var" + "-Drunstatedir=/run" + "-Dlibpcap=enabled" + "-Ddriver_qemu=enabled" + "-Ddriver_vmware=enabled" + "-Ddriver_vbox=enabled" + "-Ddriver_test=enabled" + "-Ddriver_esx=enabled" + "-Ddriver_remote=enabled" + "-Dpolkit=enabled" + (opt "storage_iscsi" enableIscsi) + ] ++ optionals stdenv.isLinux [ + (opt "storage_zfs" (zfs != null)) + "-Dattr=enabled" + "-Dapparmor=enabled" + "-Dsecdriver_apparmor=enabled" + "-Dnumad=enabled" + "-Dstorage_disk=enabled" + (opt "glusterfs" enableGlusterfs) + (opt "storage_rbd" enableCeph) + ] ++ optionals stdenv.isDarwin [ + "-Dinit_script=none" ]; - postInstall = '' - substituteInPlace $out/bin/virt-xml-validate \ - --replace xmllint ${libxml2}/bin/xmllint + postInstall = + let + binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; + in + '' + substituteInPlace $out/bin/virt-xml-validate \ + --replace xmllint ${libxml2}/bin/xmllint - substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ - --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ - --replace "$out/bin" '${gettext}/bin' \ - --replace 'lock/subsys' 'lock' \ - --replace 'gettext.sh' 'gettext.sh - # Added in nixpkgs: - gettext() { "${gettext}/bin/gettext" "$@"; } - ' - '' + optionalString isLinux '' - substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill - rm $out/lib/systemd/system/{virtlockd,virtlogd}.* - wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${binPath} - ''; + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + optionalString stdenv.isLinux '' + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} + ''; meta = { homepage = "https://libvirt.org/"; @@ -318,6 +248,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz globin lovesegfault ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/development/libraries/libvirt/do-not-use-sysconfig.patch b/pkgs/development/libraries/libvirt/do-not-use-sysconfig.patch deleted file mode 100644 index fae61294584e..000000000000 --- a/pkgs/development/libraries/libvirt/do-not-use-sysconfig.patch +++ /dev/null @@ -1,211 +0,0 @@ -From 10d65f10a76c7478c4ec0c65ffeec7f4b18929f9 Mon Sep 17 00:00:00 2001 -Message-Id: <10d65f10a76c7478c4ec0c65ffeec7f4b18929f9.1646212419.git.mprivozn@redhat.com> -From: Michal Privoznik -Date: Wed, 2 Mar 2022 10:01:04 +0100 -Subject: [PATCH] libvirt-8.2.0-do-not-use-sysconfig.patch - -Signed-off-by: Michal Privoznik ---- - src/interface/virtinterfaced.service.in | 1 - - src/libxl/virtxend.service.in | 1 - - src/locking/virtlockd.service.in | 1 - - src/logging/virtlogd.service.in | 3 +-- - src/lxc/virtlxcd.service.in | 1 - - src/network/virtnetworkd.service.in | 1 - - src/node_device/virtnodedevd.service.in | 1 - - src/nwfilter/virtnwfilterd.service.in | 1 - - src/qemu/virtqemud.service.in | 1 - - src/remote/libvirtd.service.in | 1 - - src/remote/virtproxyd.service.in | 1 - - src/secret/virtsecretd.service.in | 1 - - src/storage/virtstoraged.service.in | 1 - - src/vbox/virtvboxd.service.in | 1 - - tools/libvirt-guests.service.in | 2 +- - 15 files changed, 2 insertions(+), 16 deletions(-) - -diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in -index cb860ff1c4..090b198ac7 100644 ---- a/src/interface/virtinterfaced.service.in -+++ b/src/interface/virtinterfaced.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTINTERFACED_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced - ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in -index 6b083c414f..597f5d1905 100644 ---- a/src/libxl/virtxend.service.in -+++ b/src/libxl/virtxend.service.in -@@ -19,7 +19,6 @@ ConditionPathExists=/proc/xen/capabilities - [Service] - Type=notify - Environment=VIRTXEND_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtxend - ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index 19271d1e7d..87193952cb 100644 ---- a/src/locking/virtlockd.service.in -+++ b/src/locking/virtlockd.service.in -@@ -8,7 +8,6 @@ Documentation=https://libvirt.org - - [Service] - Environment=VIRTLOCKD_ARGS= --EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd - ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS - ExecReload=/bin/kill -USR1 $MAINPID - # Losing the locks is a really bad thing that will -diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in -index 8ab5478517..fe5c58b8ed 100644 ---- a/src/logging/virtlogd.service.in -+++ b/src/logging/virtlogd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd --ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS -+ExecStart=@sbindir@/virtlogd - ExecReload=/bin/kill -USR1 $MAINPID - # Losing the logs is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in -index 334c34db44..1b9689017e 100644 ---- a/src/lxc/virtlxcd.service.in -+++ b/src/lxc/virtlxcd.service.in -@@ -19,7 +19,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTLXCD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd - ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process -diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in -index 05ce672b73..ee4cd9bca1 100644 ---- a/src/network/virtnetworkd.service.in -+++ b/src/network/virtnetworkd.service.in -@@ -17,7 +17,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTNETWORKD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd - ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in -index cd9de362fd..7693aa52c4 100644 ---- a/src/node_device/virtnodedevd.service.in -+++ b/src/node_device/virtnodedevd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTNODEDEVD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd - ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in -index ab65419e0c..16d8b377b0 100644 ---- a/src/nwfilter/virtnwfilterd.service.in -+++ b/src/nwfilter/virtnwfilterd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTNWFILTERD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd - ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in -index 5ad968ace9..c63147d31f 100644 ---- a/src/qemu/virtqemud.service.in -+++ b/src/qemu/virtqemud.service.in -@@ -21,7 +21,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTQEMUD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud - ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process -diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 5d4d412fcc..27cfc34b90 100644 ---- a/src/remote/libvirtd.service.in -+++ b/src/remote/libvirtd.service.in -@@ -29,7 +29,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=LIBVIRTD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd - ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process -diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in -index f9bb6b84a9..0eddf5ee93 100644 ---- a/src/remote/virtproxyd.service.in -+++ b/src/remote/virtproxyd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTPROXYD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd - ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in -index 6d298c5334..92e54f175f 100644 ---- a/src/secret/virtsecretd.service.in -+++ b/src/secret/virtsecretd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTSECRETD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd - ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in -index eda4d86d37..abe91e3d80 100644 ---- a/src/storage/virtstoraged.service.in -+++ b/src/storage/virtstoraged.service.in -@@ -16,7 +16,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTSTORAGED_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged - ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in -index 6f447276e9..54fbd0be4a 100644 ---- a/src/vbox/virtvboxd.service.in -+++ b/src/vbox/virtvboxd.service.in -@@ -15,7 +15,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTVBOXD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd - ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 3cf6476196..5668009ae4 100644 ---- a/tools/libvirt-guests.service.in -+++ b/tools/libvirt-guests.service.in -@@ -20,7 +20,7 @@ Documentation=man:libvirt-guests(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests -+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf - # Hack just call traditional service until we factor - # out the code - ExecStart=@libexecdir@/libvirt-guests.sh start --- -2.34.1 - diff --git a/pkgs/development/libraries/libvirt/qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch b/pkgs/development/libraries/libvirt/qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch deleted file mode 100644 index f37ec7065afd..000000000000 --- a/pkgs/development/libraries/libvirt/qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001 -Message-Id: <823a62ec8aac4fb75e6e281164f3eb56ae47597c.1646211032.git.mprivozn@redhat.com> -From: Boris Fiuczynski -Date: Tue, 1 Mar 2022 18:47:59 +0100 -Subject: [PATCH] qemu: segmentation fault in virtqemud executing - qemuDomainUndefineFlags - -Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault. - -Stack trace of thread 664419: - #0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=) at ../src/qemu/qemu_driver.c:6618 - #1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=) at ../src/libvirt-domain.c:6519 - #2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=, rerr=0x3ff8287b950, client=) - at src/remote/remote_daemon_dispatch_stubs.h:13080 - #3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=, ret=0x0) - at src/remote/remote_daemon_dispatch_stubs.h:13059 - #4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010) - at ../src/rpc/virnetserverprogram.c:428 - #5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302 - #6 0x000003ff8758c260 in virNetServerProcessMsg (msg=, prog=, client=, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140 - #7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160 - #8 0x000003ff874c49aa in virThreadPoolWorker (opaque=) at ../src/util/virthreadpool.c:164 - #9 0x000003ff874c3f62 in virThreadHelper (data=) at ../src/util/virthread.c:256 - #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6 - #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6 - -Signed-off-by: Boris Fiuczynski -Reviewed-by: Jim Fehlig -Reviewed-by: Michal Privoznik -Signed-off-by: Michal Privoznik ---- - src/qemu/qemu_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index bcd9bdb436..8337eed510 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, - } - } - -- if (vm->def->os.loader->nvram) { -+ if (vm->def->os.loader && vm->def->os.loader->nvram) { - nvram_path = g_strdup(vm->def->os.loader->nvram); - } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { - qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); --- -2.34.1 - diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index d69885fcb0f3..a8e21a698f7f 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "8.1.0"; + version = "7.10.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-/uGxjptiqm5B823z4mcjredj9ZLZC2WTTqhQrQPVfDU="; + sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d106a1897e42..943ad79cc286 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20782,12 +20782,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "8.1.0"; + version = "7.10.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; - rev = "v${version}"; - sha256 = "sha256-9cjH4hIIxB+Pv9+ck6xg8KmfM8jtVFKVQNGLYr2AnAM="; + rev = "v7.10.0"; + sha256 = "sha256-cXuzg4bBwCftdZhz3e50L+4fO0RWX5Tl8zDOoydECd4="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From ee1081340409aebb6b58806ee6ea82477d1b3831 Mon Sep 17 00:00:00 2001 From: SaltyKitkat <56984513+SaltyKitkat@users.noreply.github.com> Date: Sun, 13 Mar 2022 06:32:10 +0800 Subject: [PATCH 232/329] logseq: 0.6.1 -> 0.6.3 (#163754) --- pkgs/applications/misc/logseq/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index f4e43a79a8f7..81c9e9d55156 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, curl, expat, gcc, openssl, zlib }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.1"; + version = "0.6.3"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "ccLqOKH10hmROnxlnNxuD5/AqAcFIILIoW/9yZLEep0="; + sha256 = "o3tBHk7bauNczz6lPS3lV0mpYEaBa0lh/mAJKJM2eWU="; name = "${pname}-${version}.AppImage"; }; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc curl expat openssl zlib ]; installPhase = '' runHook preInstall From 9506646f14d351239b73020f3094b15e3f38d7b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 22:38:45 +0000 Subject: [PATCH 233/329] sockperf: 3.7 -> 3.8 --- pkgs/tools/networking/sockperf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/tools/networking/sockperf/default.nix index 598fb482c382..48eea919b14e 100644 --- a/pkgs/tools/networking/sockperf/default.nix +++ b/pkgs/tools/networking/sockperf/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "sockperf"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "Mellanox"; repo = "sockperf"; rev = version; - sha256 = "MtpV21lCEAv7ARxk0dAxoOxxlqDM+skdQnPlqOvksjw="; + sha256 = "sha256-S5ZSGctOOnMD+AqlSAkRHMW8O1Rt8/952fali0kv/EU="; }; nativeBuildInputs = [ autoreconfHook doxygen ]; From 1a0517507818f0ca726f8daf3708e732e8511ccd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 22:51:02 +0000 Subject: [PATCH 234/329] sops: 3.7.1 -> 3.7.2 --- pkgs/tools/security/sops/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 1cf89143925a..9752d78a1838 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sops"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "mozilla"; repo = pname; - sha256 = "0z3jcyl245yjszzjf2h6l1dwa092vxzvfmnivmwi6jvpsdcv33h1"; + sha256 = "sha256-NMuYMvaBSxKHvpqFkMfnMDvcXxTstqzracuSTT1VB1A="; }; - vendorSha256 = "1mnwgsbpi56ql0lbpn7dkaps96x9b1lmhlk5cd6d40da7xj616n7"; + vendorSha256 = "sha256-00/7O9EcGojUExJPtYWndb16VqrNby/5GsVs8Ak/Isc="; doCheck = false; From 5497a9278617bcad5151fcb0f628fb7c5dcd1f65 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Tue, 1 Feb 2022 15:40:45 +1300 Subject: [PATCH 235/329] jetbrains: add support for Apple M1 --- .../applications/editors/jetbrains/darwin.nix | 37 +++ .../editors/jetbrains/default.nix | 147 ++++----- .../jetbrains/{common.nix => linux.nix} | 14 +- pkgs/applications/editors/jetbrains/update.pl | 101 ------ pkgs/applications/editors/jetbrains/update.py | 97 ++++++ .../editors/jetbrains/versions.json | 296 ++++++++++++++++++ 6 files changed, 512 insertions(+), 180 deletions(-) create mode 100644 pkgs/applications/editors/jetbrains/darwin.nix rename pkgs/applications/editors/jetbrains/{common.nix => linux.nix} (83%) delete mode 100755 pkgs/applications/editors/jetbrains/update.pl create mode 100755 pkgs/applications/editors/jetbrains/update.py create mode 100644 pkgs/applications/editors/jetbrains/versions.json diff --git a/pkgs/applications/editors/jetbrains/darwin.nix b/pkgs/applications/editors/jetbrains/darwin.nix new file mode 100644 index 000000000000..b1002e235824 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/darwin.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, undmg +, ... +}: + +{ meta +, name +, product +, productShort ? product +, src +, version +, ... +}: + +let + loname = lib.toLower productShort; +in + stdenvNoCC.mkDerivation { + inherit meta src version; + desktopName = product; + installPhase = '' + runHook preInstall + APP_DIR="$out/Applications/${product}.app" + mkdir -p "$APP_DIR" + cp -Tr "${product}.app" "$APP_DIR" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/${loname}" + open -na '$APP_DIR' --args "\$@" + EOF + chmod +x "$out/bin/${loname}" + runHook postInstall + ''; + nativeBuildInputs = [ undmg ]; + pname = lib.concatStringsSep "-" (lib.init (lib.splitString "-" name)); + sourceRoot = "."; + } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5f4700c1662b..b47c12707904 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -10,7 +10,18 @@ with lib; let - mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; }; + platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; + ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" ]; + + inherit (stdenv.hostPlatform) system; + + versions = builtins.fromJSON (readFile (./versions.json)); + versionKey = if stdenv.isLinux then "linux" else system; + products = versions.${versionKey} or (throw "Unsupported system: ${system}"); + + package = if stdenv.isDarwin then ./darwin.nix else ./linux.nix; + mkJetBrainsProduct = callPackage package { inherit vmopts; }; + # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: @@ -19,13 +30,12 @@ let product = "CLion"; meta = with lib; { homepage = "https://www.jetbrains.com/clion/"; - inherit description license; + inherit description license platforms; longDescription = '' Enhancing productivity for every C and C++ developer on Linux, macOS and Windows. ''; maintainers = with maintainers; [ edwtjo mic92 ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ @@ -58,14 +68,13 @@ let product = "DataGrip"; meta = with lib; { homepage = "https://www.jetbrains.com/datagrip/"; - inherit description license; + inherit description license platforms; longDescription = '' DataGrip is a new IDE from JetBrains built for database admins. It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more. ''; maintainers = with maintainers; [ ]; - platforms = platforms.linux; }; }); @@ -75,7 +84,7 @@ let product = "Goland"; meta = with lib; { homepage = "https://www.jetbrains.com/go/"; - inherit description license; + inherit description license platforms; longDescription = '' Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development. @@ -83,10 +92,9 @@ let and tool integrations specific for the Go language ''; maintainers = [ maintainers.miltador ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + '' + postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv @@ -98,10 +106,10 @@ let ''; }); - buildIdea = { name, version, src, license, description, wmClass, ... }: + buildIdea = { name, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; - product = "IDEA"; + inherit name version src wmClass jdk product; + productShort = "IDEA"; extraLdPath = [ zlib ]; extraWrapperArgs = [ ''--set M2_HOME "${maven}/maven"'' @@ -116,18 +124,18 @@ let with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ. ''; - maintainers = with maintainers; [ edwtjo gytis-ivaskevicius ]; - platforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot ]; + platforms = ideaPlatforms; }; }); - buildMps = { name, version, src, license, description, wmClass, ... }: + buildMps = { name, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct rec { - inherit name version src wmClass jdk; - product = "MPS"; + inherit name version src wmClass jdk product; + productShort = "MPS"; meta = with lib; { homepage = "https://www.jetbrains.com/mps/"; - inherit license description; + inherit license description platforms; longDescription = '' A metaprogramming system which uses projectional editing which allows users to overcome the limits of language @@ -135,7 +143,6 @@ let diagrams. ''; maintainers = with maintainers; [ rasendubi ]; - platforms = platforms.linux; }; }); @@ -145,24 +152,23 @@ let product = "PhpStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/phpstorm/"; - inherit description license; + inherit description license platforms; longDescription = '' PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ''; maintainers = with maintainers; [ schristo ma27 ]; - platforms = platforms.linux; }; }); - buildPycharm = { name, version, src, license, description, wmClass, ... }: + buildPycharm = { name, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; - product = "PyCharm"; + inherit name version src wmClass jdk product; + productShort = "PyCharm"; meta = with lib; { homepage = "https://www.jetbrains.com/pycharm/"; - inherit description license; + inherit description license platforms; longDescription = '' Python IDE with complete set of tools for productive development with Python programming language. In addition, the @@ -177,11 +183,8 @@ let and productive development! ''; maintainers = with maintainers; [ ]; - platforms = platforms.linux; }; - }).override { - propagatedUserEnvPkgs = [ python3 ]; - }; + }); buildRider = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { @@ -189,7 +192,7 @@ let product = "Rider"; meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; - inherit description license; + inherit description license platforms; longDescription = '' JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. Rider supports .NET Core, @@ -199,7 +202,6 @@ let ASP.NET Core web applications. ''; maintainers = [ maintainers.miltador ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' @@ -215,10 +217,9 @@ let product = "RubyMine"; meta = with lib; { homepage = "https://www.jetbrains.com/ruby/"; - inherit description license; + inherit description license platforms; longDescription = description; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; }; }); @@ -228,14 +229,13 @@ let product = "WebStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/webstorm/"; - inherit description license; + inherit description license platforms; longDescription = '' WebStorm provides an editor for HTML, JavaScript (incl. Node.js), and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code. ''; maintainers = with maintainers; [ abaldeau ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) '' @@ -244,6 +244,7 @@ let rm -r jbr ''; }); + in { @@ -251,12 +252,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.3.3"; /* updated by script */ + version = products.clion.version; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "03gil00srq3jljc13iyb7v1yc6l6yhdhqm9d1ld2j2pympl6p61m"; /* updated by script */ + url = products.clion.url; + sha256 = products.clion.sha256; }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -264,12 +265,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.3.4"; /* updated by script */ + version = products.datagrip.version; description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "09dkxj5vn99gkgc1yd18w7gqkw2vzci0z9q2fcih0zn7lvqp0im3"; /* updated by script */ + url = products.datagrip.url; + sha256 = products.datagrip.sha256; }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -277,12 +278,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.3.3"; /* updated by script */ + version = products.goland.version; description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "18z4mvxhds5fgdwcfywc4pj8s9ifvsknhradgzmxsvji0fbp0awx"; /* updated by script */ + url = products.goland.url; + sha256 = products.goland.sha256; }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -290,12 +291,13 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "IntelliJ IDEA CE"; + version = products.idea-community.version; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1j889b2r950bl9wiqq1z8v8s2qicidfcdar300cy666i8rc25qlr"; /* updated by script */ + url = products.idea-community.url; + sha256 = products.idea-community.sha256; }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -303,12 +305,13 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "IntelliJ IDEA"; + version = products.idea-ultimate.version; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0w36qnqgkvw6j1ks09h515237bhqfaixrimzg2r494ic98amvkps"; /* updated by script */ + url = products.idea-ultimate.url; + sha256 = products.idea-ultimate.sha256; }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -316,13 +319,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.3"; /* updated by script */ - versionMajorMinor = "2021.3"; /* updated by script */ + product = "MPS ${products.mps.version-major-minor}"; + version = products.mps.version; description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "0zw5xqdlhjfg0smfjl8xy7drf9spiwqbmqq8z22x4zb61lpvdbp9"; /* updated by script */ + url = products.mps.url; + sha256 = products.mps.sha256; }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -330,12 +333,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.3.2"; /* updated by script */ + version = products.phpstorm.version; description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1qi0zq3gzcfnikky37g2dqgmzm7r1883k6asris8nph389qk86vn"; /* updated by script */ + url = products.phpstorm.url; + sha256 = products.phpstorm.sha256; }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -343,12 +346,13 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "PyCharm CE"; + version = products.pycharm-community.version; description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1s36basydp7cxgbgdapjhkslx0x9vv3639xhm84ny76hf7s03bpi"; /* updated by script */ + url = products.pycharm-community.url; + sha256 = products.pycharm-community.sha256; }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -356,12 +360,13 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "PyCharm"; + version = products.pycharm-professional.version; description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0rwykngqgby05mh47kls8wzi68gfka2z04k6kdmsxwn1hhx5gnbb"; /* updated by script */ + url = products.pycharm-professional.url; + sha256 = products.pycharm-professional.sha256; }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -369,12 +374,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.3.3"; /* updated by script */ + version = products.rider.version; description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "13q6hk5l3fqmz818z5wj014jd5iglpdcpi8zlpgaim1jg5fpvi8x"; /* updated by script */ + url = products.rider.url; + sha256 = products.rider.sha256; }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -382,12 +387,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.3.2"; /* updated by script */ + version = products.ruby-mine.version; description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "18ny40zl9hgkynkc5yyy2xqngl9diifh2gqrfnz7rfq14kp10xb9"; /* updated by script */ + url = products.ruby-mine.url; + sha256 = products.ruby-mine.sha256; }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -395,12 +400,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.3.2"; /* updated by script */ + version = products.webstorm.version; description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0q2hn48499hv7licpl84ly0bhiizya8a69dl2vjvgscj3cdkr98q"; /* updated by script */ + url = products.webstorm.url; + sha256 = products.webstorm.sha256; }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/linux.nix similarity index 83% rename from pkgs/applications/editors/jetbrains/common.nix rename to pkgs/applications/editors/jetbrains/linux.nix index a5e0a2611f01..d150368ca820 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -3,17 +3,15 @@ , vmopts ? null }: -{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: +{ name, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: with lib; -let loName = toLower product; - hiName = toUpper product; +let loName = toLower productShort; + hiName = toUpper productShort; mainProgram = concatStringsSep "-" (init (splitString "-" name)); vmoptsName = loName - + ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) - then "" - else "64" ) + + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; in @@ -36,7 +34,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { nativeBuildInputs = [ makeWrapper patchelf unzip ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = '' get_file_size() { local fname="$1" echo $(ls -l $fname | cut -d ' ' -f5) @@ -73,7 +71,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { item=${desktopItem} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \ - --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix PATH : "$out/libexec/${name}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl deleted file mode 100755 index 201c51094dc3..000000000000 --- a/pkgs/applications/editors/jetbrains/update.pl +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i perl -p perl perlPackages.LWPProtocolHttps perlPackages.FileSlurp - -use strict; -use List::Util qw(reduce); -use File::Slurp; -use LWP::Simple; - -my $only_free = grep { $_ eq "--only-free" } @ARGV; - -sub semantic_less { - my ($a, $b) = @_; - $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; - $b =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; - return $a lt $b; -} - -sub get_latest_versions { - my @channels = get("https://www.jetbrains.com/updates/updates.xml") =~ /()/gs; - my %h = {}; - for my $ch (@channels) { - my ($id) = $ch =~ /^)/gs; - my $latest_build = reduce { - my ($aversion) = $a =~ /^]*version="([^"]+)"/; die "no version in $a" unless $aversion; - my ($bversion) = $b =~ /^]*version="([^"]+)"/; die "no version in $b" unless $bversion; - semantic_less($aversion, $bversion) ? $b : $a; - } @builds; - next unless $latest_build; - - # version as in download url - my ($version) = $latest_build =~ /^]*version="([^"]+)"/; - my ($fullNumber) = $latest_build =~ /^]*fullNumber="([^"]+)"/; - my $latest_version_full1 = "$version-$fullNumber"; - $latest_version_full1 =~ s/\s*EAP//; - - my ($latest_version) = $latest_build =~ /^]*version="([^"]+)"/; - ($latest_version) = $latest_build =~ /^]*fullNumber="([^"]+)"/ if $latest_version =~ / /; - - $h{$id} = $latest_version; - $h{"full1_" . $id} = $latest_version_full1; - } - return %h; -} - -my %latest_versions = get_latest_versions(); -# for my $ch (sort keys %latest_versions) { -# print("$ch $latest_versions{$ch}\n"); -# } - -sub update_nix_block { - my ($block) = @_; - my ($channel) = $block =~ /update-channel\s*=\s*"([^"]+)"/; - if ($channel) { - if ($latest_versions{$channel}) { - my ($version) = $block =~ /version\s*=\s*"([^"]+)"/; - die "no version in $block" unless $version; - if ($version eq $latest_versions{$channel}) { - print("$channel is up to date at $version\n"); - } elsif ($only_free && $block =~ /licenses\.unfree/) { - print("$channel is unfree, skipping\n"); - } else { - my $version_string = $latest_versions{$channel}; - my $versionMajorMinor = $version_string =~ s/^([0-9]+[.][0-9]+).*/$1/r; - - print("updating $channel: $version -> $version_string\n"); - my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; - # try to interpret some nix - my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; - $name =~ s/\$\{version\}/$version_string/; - # Some url pattern contain variables more than once - $url =~ s/\$\{name\}/$name/g; - $url =~ s/\$\{version\}/$version_string/g; - $url =~ s/\$\{versionMajorMinor\}/$versionMajorMinor/g; - die "$url still has some interpolation" if $url =~ /\$/; - my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - unless ( $sha256 ) { - my $full_version = $latest_versions{"full1_" . $channel}; - $url =~ s/$version_string/$full_version/; - ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - $version_string = $full_version; - } - die "invalid sha256 in $url.sha256" unless $sha256; - my ($sha256Base32) = readpipe("nix-hash --type sha256 --to-base32 $sha256"); - chomp $sha256Base32; - print "Jetbrains published SHA256: $sha256\n"; - print "Conversion into base32 yields: $sha256Base32\n"; - $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m; - $block =~ s#versionMajorMinor\s*=\s*"([^"]+)".+$#versionMajorMinor = "$versionMajorMinor"; /* updated by script */#m; - $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m; - } - } else { - warn "unknown update-channel $channel"; - } - } - return $block; -} - -my $nix = read_file 'default.nix'; -$nix =~ s/(= build\w+ rec \{.+?\n \};\n)/update_nix_block($1)/gse; -write_file 'default.nix', $nix; diff --git a/pkgs/applications/editors/jetbrains/update.py b/pkgs/applications/editors/jetbrains/update.py new file mode 100755 index 000000000000..5301a85ba9a2 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/update.py @@ -0,0 +1,97 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests python3.pkgs.xmltodict +import hashlib +import json +import pathlib +import logging +import requests +import sys +import xmltodict +from packaging import version + +updates_url = "https://www.jetbrains.com/updates/updates.xml" +versions_file_path = pathlib.Path(__file__).parent.joinpath("versions.json").resolve() + +logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) + + +def one_or_more(x): + return x if isinstance(x, list) else [x] + + +def download_channels(): + logging.info("Checking for updates from %s", updates_url) + updates_response = requests.get(updates_url) + updates_response.raise_for_status() + root = xmltodict.parse(updates_response.text) + products = root["products"]["product"] + return { + channel["@name"]: channel + for product in products + for channel in one_or_more(product["channel"]) + } + + +def build_version(build): + return version.parse(build["@version"]) + + +def latest_build(channel): + builds = one_or_more(channel["build"]) + latest = max(builds, key=build_version) + return latest + + +def download_sha256(url): + download_response = requests.get(url) + download_response.raise_for_status() + h = hashlib.sha256() + h.update(download_response.content) + return h.hexdigest() + + +channels = download_channels() + + +def update_product(name, product): + update_channel = product["update-channel"] + logging.info("Updating %s", name) + channel = channels.get(update_channel) + if channel is None: + logging.error("Failed to find channel %s.", update_channel) + logging.error("Check that the update-channel in %s matches the name in %s", versions_file_path, updates_url) + else: + try: + build = latest_build(channel) + version = build["@version"] + parsed_version = build_version(build) + version_major_minor = f"{parsed_version.major}.{parsed_version.minor}" + download_url = product["url-template"].format(version = version, versionMajorMinor = version_major_minor) + product["url"] = download_url + product["version-major-minor"] = version_major_minor + if "sha256" not in product or product.get("version") != version: + logging.info("Found a newer version %s.", version) + product["version"] = version + product["sha256"] = download_sha256(download_url) + else: + logging.info("Already at the latest version %s.", version) + except Exception as e: + logging.exception("Update failed:", exc_info=e) + logging.warning("Skipping %s due to the above error.", name) + logging.warning("It may be out-of-date. Fix the error and rerun.") + + +def update_products(products): + for name, product in products.items(): + update_product(name, product) + + +with open(versions_file_path, "r") as versions_file: + versions = json.load(versions_file) + +for products in versions.values(): + update_products(products) + +with open(versions_file_path, "w") as versions_file: + json.dump(versions, versions_file, indent=2) + versions_file.write("\n") diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json new file mode 100644 index 000000000000..83f486edfcf9 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -0,0 +1,296 @@ +{ + "linux": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", + "version": "2021.3.4", + "sha256": "a34670f1a6c77e00237302a70f22fb5bf089dfe128341fd89b2f25bb8becb325", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.tar.gz", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "9d2b709703516eddeb7f4d6568a7de2e268de4258c7bc7787baee806fbaee4a3", + "url": "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "99e2225846d118e3190023abc65c8b2c62a1d1463f601c79a20b9494c54a08c9", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", + "version": "2021.3.2", + "sha256": "face5d154a2c9244b278bfc6dca37218ae3344090526a0679086eff9b0c56670", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-no-jbr.tar.gz", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", + "version": "2021.3", + "sha256": "e9aeb62f0d667dd285f808e3ba308f572797dbf11d51e9aa06cf49481bee857f", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.tar.gz", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "761b347142035e8b74cc5a9939100af9d45f1f6ee29de1e78cd6b1ff06fe20e2", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "f1ae01f471d01c6f09aab0a761c6dea9834ef584f2aaf6d6ebecdce6b55a66e8", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "6bd9573a84c1f2ae6b9b6612f0859aee21133f479ace43602dc0af879f9d9e67", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "1dc57d5d7932d4a8dea51fc5cbdaa52f9626490092978f02fa15bb41cb84068f", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "697510ee2401bb7cbe75193f015d8c2dd1677117defbc2a6f5f3c1443f20dea2", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "18a53c1b1b92e9b7e516b425a390f23f46b880a704d1cb223d1ba64410b15060", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + } + }, + "x86_64-darwin": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", + "version": "2021.3.3", + "sha256": "342a4d8549ae4623a5edfa7f9737887cf0a25c1a61bb414b54b742b1c5a1a84d", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", + "version": "2021.3.4", + "sha256": "27e709d2ced66d37a615d8c56885828e49a08962708e28df1a20f324c626bf52", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.dmg", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", + "version": "2021.3.3", + "sha256": "4b245b6fe0cf588adbf36e68f12397d5fd311b0b6d49f17ba374ebaa10d207c9", + "url": "https://download.jetbrains.com/go/goland-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", + "version": "2021.3.2", + "sha256": "20d8cee2bbedaeb0ea388f795e13d08eca5b59e59d4e980ac2d8bc07c9fed3e9", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", + "version": "2021.3.2", + "sha256": "9f574562b866e6ccc3d2f9b4c245c45844d1d0fd54be3dbdcc893d40ba1cf54a", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", + "version": "2021.3", + "sha256": "2c5517518fec31ac960e4309fa848ad831f9048ef15df1b362e12aa8f41d9dbd", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos.dmg", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", + "version": "2021.3.2", + "sha256": "596a9d5fdc30d5fba65ddd482da90f9d555fed748b930587562022bfe7df4e14", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", + "version": "2021.3.2", + "sha256": "b8f41f5dddeda0ed5f5c81ba57d2560ccc6e227987882fb6bf305b5d1d8c6909", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", + "version": "2021.3.2", + "sha256": "188b998660e7cfb7ac1364c818c008a5608ab2aeb17c6cc19d1d9dda547d3775", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", + "version": "2021.3.3", + "sha256": "41a0939cb6258a0fb303268c5a466a663cf3588af14bcbb351be4c3a1d158094", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", + "version": "2021.3.2", + "sha256": "ba27c14b21d66ca96a64ceb7dc5d9f0952254a5f405b3201f51d2ad3cc749a96", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", + "version": "2021.3.2", + "sha256": "932d4920f831d1ceae68a474444c37d986277d8d3288d3aab93dd43d99336a36", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.dmg", + "version-major-minor": "2021.3" + } + }, + "aarch64-darwin": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "fbf651fa4a5925fe729be30ca8a6fa3be84dc4d7827dbcf74f4d28c52b903cc2", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", + "version": "2021.3.4", + "sha256": "7a77ba9fce56c781ae6a4fc65eaab4bcc10780b6bd679b04d74146719e42890a", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "54397d48e20fb534206e13f84b35868b1eaea13175176487b1239b23db4e13db", + "url": "https://download.jetbrains.com/go/goland-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "79e540fb0cd480837b3a954e4802f4f252073955393e8927c9c1b28c37112d51", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "511c6aed9c5cd4c7665a9bac9ba94582977013244cbe88b820eb5464fce91a1c", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", + "version": "2021.3", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos-aarch64.dmg", + "sha256": "3ace6d45db718dffd80bf126a76735fb65099de292112a01cc078aa61c475a70", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "ba15c3f843c85141a9adaec1c4611224a853bd98649148751e34ac304591a314", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "407bf395cfb6d61f1c0861c7679b197238780e82a019e10162b8cd7130edb15a", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "12fa34d1e60a555bac230acea9cd46c7adfe9ca42ff3e458c79d33e5b88eb8db", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "65603860d1fd3134c5659f5a06de7cac17f3183a01056b79cfe72242b99adb37", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "33773222b2fa14300de5ed12ca96c3442b933f66cef67cebc9610e5cef51c75e", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "f4788ec0c55123b1f4e14934792f65bf8040e2a2ee673e985b50b8feded60408", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + } + } +} From b6a95da0934e9675a072f388f76c5c37addafff1 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 13 Mar 2022 02:00:37 +0100 Subject: [PATCH 236/329] firecracker: fix aarch64 sha --- pkgs/applications/virtualization/firecracker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index c2769a0ccf3b..9d35e87f1614 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0="; - aarch64-linux = "sha256-75UC+HeVUfUk1HRvTJsOHbHHkgr6me1OtxDF7lahf68="; + aarch64-linux = "sha256-9ggRmijwXE9adVFv5XommgvdpeeWnWUFES+Ep2GrBVo="; }; dontConfigure = true; From cfb40928716ba1228661c21fc1a50198a86ceda9 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Sat, 12 Mar 2022 20:01:14 -0500 Subject: [PATCH 237/329] open-vm-tools: 11.3.5 -> 12.0.0 (#163685) Co-authored-by: Sandro --- .../virtualization/open-vm-tools/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index c3721bbe36e5..6018608a3f16 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook -, bash, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto +{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook +, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which , libdrm, udev @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.3.5"; + version = "12.0.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "03fahljrijq4ij8a4v8d7806mpf22ppkgr61n5s974g3xfdvpl13"; + sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -22,10 +22,24 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - buildInputs = [ fuse glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] + buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + patches = [ + # glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow + # Will be fixed in the release after 12.0.0 + (fetchpatch { + url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch"; + sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh"; + }) + ]; + + prePatch = '' + cd .. + ''; + postPatch = '' + cd open-vm-tools sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am @@ -43,6 +57,7 @@ stdenv.mkDerivation rec { "--without-kernel-modules" "--without-xmlsecurity" "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" + "--with-fuse=fuse3" ] ++ lib.optional (!withX) "--without-x"; enableParallelBuilding = true; From 82ad78ca03090322893953cb6bfa267a3715f15a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 12 Mar 2022 20:01:25 -0500 Subject: [PATCH 238/329] flintlock: init at 0.1.0-alpha.9 (#163625) Co-authored-by: Sandro --- .../virtualization/flintlock/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/virtualization/flintlock/default.nix diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/applications/virtualization/flintlock/default.nix new file mode 100644 index 000000000000..d258604496eb --- /dev/null +++ b/pkgs/applications/virtualization/flintlock/default.nix @@ -0,0 +1,49 @@ +{ lib +, cni-plugins +, buildGoModule +, firecracker +, containerd +, runc +, makeWrapper +, fetchFromGitHub +}: + +buildGoModule rec{ + pname = "flintlock"; + version = "0.1.0-alpha.9"; + + src = fetchFromGitHub { + owner = "weaveworks"; + repo = "flintlock"; + rev = "v${version}"; + sha256 = "sha256-Xw3g2wh0fPUknSuAKoJL3jxVZS50wSPZ9Wz05zkTVXM="; + }; + + vendorSha256 = "sha256-EjVlM6AD+O/z6+R5TRBmmRWbrP4C+qyvsnEjwOkDkUE="; + + subPackages = [ "cmd/flintlock-metrics" "cmd/flintlockd" ]; + + ldflags = [ "-s" "-w" "-X github.com/weaveworks/flintlock/internal/version.Version=v${version}" ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + firecracker + ]; + + postInstall = '' + for prog in flintlockd flintlock-metrics; do + wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ cni-plugins firecracker containerd runc ]} + done + ''; + + meta = with lib; { + description = "Create and manage the lifecycle of MicroVMs backed by containerd"; + homepage = "https://github.com/weaveworks/flintlock"; + license = licenses.mpl20; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f0204a518d3..b594e768a35d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5543,6 +5543,8 @@ with pkgs; flawfinder = callPackage ../development/tools/flawfinder { }; + flintlock = callPackage ../applications/virtualization/flintlock { }; + flip-link = callPackage ../development/tools/flip-link { }; flips = callPackage ../tools/compression/flips { }; From cb75063bccb562b289a90c91ddf350151d69b3a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 01:24:36 +0000 Subject: [PATCH 239/329] v2ray-geoip: 202203020509 -> 202203100039 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 121636916683..b92014b30e06 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202203020509"; + version = "202203100039"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "9dce4df2c1f409bad67f579910a4edf522251e7b"; - sha256 = "sha256-fR0lzvVQjWA3KbzLhuvoB15Z+7RAv34Wf5W7KRZ//QA="; + rev = "564c2c8de36d3680a1d5f209d6bb05e4f3f70dfc"; + sha256 = "sha256-JPpzIppgKQox8T6VC/kzhpLy+YAcuHdH5L6zqciOXow="; }; installPhase = '' From fa40338259e5a43cab1d87527e86e885e77a016b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 01:40:46 +0000 Subject: [PATCH 240/329] python310Packages.parts: 1.2.2 -> 1.3.0 --- pkgs/development/python-modules/parts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 4c798f43c25c..088510714a0f 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "parts"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "6463d5c49142d14029196a6a781b57bc98ba5b3d93244f4ed637f534d08129c1"; + sha256 = "sha256-NrhNpWyzqwn1bNnuqmcyKcUED0A4v7VJE4ZlTHFafJY="; }; # Project has no tests From d09489e5f18b20022da9f4ff97f002d03edfb742 Mon Sep 17 00:00:00 2001 From: Jakub Dupak Date: Sun, 13 Mar 2022 02:08:40 +0000 Subject: [PATCH 241/329] QtRvSim: init at 0.9.1 (#163128) Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 6 ++++ .../computer-architecture/qtrvsim/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/applications/science/computer-architecture/qtrvsim/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dd22c099e689..47547d7f409b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5631,6 +5631,12 @@ github = "jduan"; githubId = 452450; }; + jdupak = { + name = "Jakub Dupak"; + email = "dev@jakubdupak.com"; + github = "jdupak"; + githubId = 22683640; + }; jecaro = { email = "jeancharles.quillet@gmail.com"; github = "jecaro"; diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix new file mode 100644 index 000000000000..24d9f642ec56 --- /dev/null +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: + +stdenv.mkDerivation rec { + pname = "QtRVSim"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "cvut"; + repo = "qtrvsim"; + rev = "refs/tags/v${version}"; + sha256 = "AOksVS0drIBnK4RCxZw40yVxf4E8GjG9kU0rIZsY9gA="; + }; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ qtbase ]; + + meta = with lib; { + description = "RISC-V CPU simulator for education purposes"; + longDescription = '' + RISC-V CPU simulator for education purposes with pipeline and cache visualization. + Developed at FEE CTU for computer architecture classes. + ''; + homepage = "https://github.com/cvut/qtrvsim"; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ jdupak ]; + mainProgram = "qtrvsim_gui"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b594e768a35d..ed0eb99d8a2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33798,6 +33798,8 @@ with pkgs; qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { }; + qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { }; + py-wmi-client = callPackage ../tools/networking/py-wmi-client { }; qdl = callPackage ../tools/misc/qdl { }; From 34774452aa83da548f239faa9ddb41c7075f686f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 02:12:16 +0000 Subject: [PATCH 242/329] python310Packages.pex: 2.1.69 -> 2.1.71 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 7648a7440a75..4a03d60f1eea 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.69"; + version = "2.1.71"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JbQ8yn/uALjjVSRgqKXsQOC4rOCGkMPxb50KqWg89kM="; + sha256 = "sha256-jJ7J4upDL1X1Eut1kUWdJu3Ih2mheNFt0wI+QTZMKow="; }; nativeBuildInputs = [ From 2da9a53905b0b561f84c5c5a4e7c00399ff24b9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 02:14:12 +0000 Subject: [PATCH 243/329] waybar: 0.9.10 -> 0.9.12 --- pkgs/applications/misc/waybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index ad43a1e897e8..01b7af16409d 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.10"; + version = "0.9.12"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-KiRtU32h3AvThDWnCw55LnqbWVAZLXY/7fU1HxLMjLo="; + sha256 = "sha256-NQ/d+eXmc+GRxl5zby97S4U/YQnsRWGpwNZZL0Sqby8="; }; nativeBuildInputs = [ From 2b6cb18901b97bb019741d533207d4bec7518ffe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 02:48:24 +0000 Subject: [PATCH 244/329] x11docker: 7.1.1 -> 7.1.3 --- pkgs/applications/virtualization/x11docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 67345952655c..bad1e98296c2 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "7.1.1"; + version = "7.1.3"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-SUHWqcDL/oDljCpngkhUvzOvMIlZSc1p0j0wjupPBqw="; + sha256 = "sha256-eSarw5RG2ckup9pNlZtAyZAN8IPZy94RRfej9ppiLfo="; }; nativeBuildInputs = [ makeWrapper ]; From 5f95fee80eff6b224af62488d5610a8f8c88c3bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 03:14:41 +0000 Subject: [PATCH 245/329] python310Packages.pudb: 2022.1 -> 2022.1.1 --- pkgs/development/python-modules/pudb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 0ae60b381c64..4e5839f7feed 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2022.1"; + version = "2022.1.1"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e827a4b489dcad561189535db6677becbf32164b2b44df00786eb2d5e00c587e"; + sha256 = "sha256-2zvdZkI8nSkHTBwsSfyyJL0Nbwgxn+0bTn6taDkUCD8="; }; propagatedBuildInputs = [ From 729ef3246afc4d65121fbffce5ff187a0bbd8062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 03:19:58 +0000 Subject: [PATCH 246/329] zellij: 0.25.0 -> 0.26.0 --- pkgs/tools/misc/zellij/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 3463c5ccb6de..7fc1c6e335a5 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-MTSM8fYAcNcmjg6bkOEN+U5+WilaEy52EJOfyoIy3Zg="; + sha256 = "sha256-8PgEsRh2nBOIvKeX9SJ853NN8Szb4geKwv2qvTtkMxk="; }; - cargoSha256 = "sha256-2QEDrxTz7I9hF+WfVKkGLXHWZjQ5by/zuO16NGOJSKk="; + cargoSha256 = "sha256-YaqaXn1Ol5RfwAzWi7767vt1je+wqWFtfgxMOSIy9UI="; nativeBuildInputs = [ mandown From c409ce5eb8e7a74f3b3d9fb42468fe67334d997f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 03:30:34 +0000 Subject: [PATCH 247/329] python310Packages.pyathena: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/pyathena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index c9db28324e9e..fe9d3276e1be 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAthena"; inherit version; - sha256 = "sha256-2Z0KjJm6cWhMTKXa2zBs3Ef2i/e1tqQYZx5sSKIT9a4="; + sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA="; }; propagatedBuildInputs = [ From e46bfadd6d089d4d3c830f4779172dca0b92a0ac Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 12 Mar 2022 21:52:18 -0600 Subject: [PATCH 248/329] signal-desktop: 5.34.0 -> 5.35.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 228627ec5c32..f76bac26dc18 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.34.0"; # Please backport all updates to the stable channel. + version = "5.35.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-uU4WJtd9qwrjHgsK0oDg/pCf/5lfNhoMDEd/lHUnLwk="; + sha256 = "sha256-2KF2OLq6/vHElgloxn+kgQisJC+HAkpOBfsKfEPW35c="; }; nativeBuildInputs = [ From 65f9112d6b22b9fb38d77a20ec2d1387d7cfc92e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 13 Mar 2022 12:50:17 +0800 Subject: [PATCH 249/329] nixos/pantheon: enable xdg desktop integration This prevents the embarrassing situation in https://github.com/NixOS/nixpkgs/pull/163828 from happening again. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 6a7d2a8aa6cd..8ff9b0b756d3 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -227,6 +227,7 @@ in # Settings from elementary-default-settings environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; + xdg.portal.enable = true; xdg.portal.extraPortals = with pkgs.pantheon; [ elementary-files elementary-settings-daemon From 52bc965878cbf9ba32f0b940af5f42cab87ef96f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 06:04:27 +0000 Subject: [PATCH 250/329] docker-compose_2: 2.3.0 -> 2.3.3 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 2f0ff8cc5f5a..e2a3f1e1077d 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.3.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-DbZzVyTafBVsXvm1/aSdXJruKxBq5Ff8AIfDREFFVh0="; + sha256 = "sha256-PFR7EcRkqn/d6gYlMNN36nRIslYEN0JFSbFU9niGc+Y="; }; - vendorSha256 = "sha256-ePL1L/A+48JEu6jpbzy8UBWrFY10iqITILSclfYs8Lw="; + vendorSha256 = "sha256-L6PNKK1ID7ZVX/4sG72wn9ZjWlx0lsNuiBc/EtCN03E="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From 71b07eaac3552d41c92a604059840e3c5589a657 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 13 Mar 2022 07:55:25 +0000 Subject: [PATCH 251/329] freedroidrpg: add upstream fix for -fno-common toolchains Without the upstream change build fails on toolchains that default to `-fno-common` (like clang-13 or upstream gcc-10+): $ nix build --impure --expr 'with import ./.{}; freedroidrpg.override { stdenv = clang13Stdenv; }' -L ... freedroidrpg> ld: addon_crafting_ui.o:/build/freedroidrpg-0.16.1/src/./struct.h:1025: multiple definition of `tux_rendering'; action.o:/build/freedroidrpg-0.16.1/src/./struct.h:1025: first defined here ... --- pkgs/games/freedroidrpg/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index e0582c524eca..84fd9c154a24 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: let version = "0.16.1"; @@ -11,6 +11,15 @@ in stdenv.mkDerivation { sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"; }; + patches = [ + # Pull upstream fix for -fno-common tolchains. + (fetchpatch { + name = "fno-common.patch"; + url = "https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761.patch"; + sha256 = "1s7sw4dkc7b6i72j6x47driq6v0k3wss48l9ivd4fw40n3iaxjb1"; + }) + ]; + nativeBuildInputs = [ pkg-config gettext python3 ]; buildInputs = [ From 4fd04a19f1dcd6d1ee21a5b99a79747611bd3dd8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 13 Mar 2022 16:53:10 +0800 Subject: [PATCH 252/329] Revert "deno: 1.19.1 -> 1.19.3" --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index b813d6451eec..fa2fe98f76cc 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.19.3"; + version = "1.19.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mm4hCRjQitFvSA3ow/p/N+UgG3P7FC440Obfqz3KVbQ="; + sha256 = "sha256-BqwiconG5hn5RPV+hlKu6e6+GjZA4Im/dD+no3IduYw="; }; - cargoSha256 = "sha256-tSIYs52pZk/h2hVJLHUbwlsl2gdu2Mszs9OBR52EQKQ="; + cargoSha256 = "sha256-q/5AezLQgN7WdGsbHoxX5riJMlxw3cTFhVs5OvCeI5U="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index ce8209ab650d..a1ea206fabdc 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.40.2"; + version = "0.40.0"; shas = { - x86_64-linux = "sha256-RtEKNDQdL0orI0B4953RaT18KeWPZJIdhPnYbJGj2eM="; - aarch64-linux = "sha256-TL5boy1X/OgOt17H6PYEA5D3MJbChCULrB38ykC5Ghk="; - x86_64-darwin = "sha256-ABnHMABtggrHoTjeFB8YVH6PV2HvVlPZTQWaeRnRZaE="; - aarch64-darwin = "sha256-PGrRmNJxS49K9jviQTxRJlTq1SAn+8epXXNJaexTAWU="; + x86_64-linux = "sha256-VHkopvK6f5lxdFLBywHe0Z+su2g5hgBsLcTxrwFgq0Y="; + aarch64-linux = "sha256-awWjziqqUDAl9fcLADUjytLFds1y93y5gZoOtvReL9w="; + x86_64-darwin = "sha256-WlRnGiJK3iFgTjNzr25rvmmiPAICPRLaD5hbys7MoJA="; + aarch64-darwin = "sha256-zblcAQVwnLQWh85wajg8CalqxycSR+4WGoSC2dnX7jA="; }; } From 78e4513c3d03dc21ba47284a99cd92a94ec86348 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Mar 2022 10:41:49 +0100 Subject: [PATCH 253/329] python3Packages.pudb: disable on older Python releeases --- pkgs/development/python-modules/pudb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 4e5839f7feed..45ab2e840a23 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , dataclasses -, isPy3k +, pythonOlder , fetchPypi , jedi , pygments @@ -17,11 +17,11 @@ buildPythonPackage rec { version = "2022.1.1"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2zvdZkI8nSkHTBwsSfyyJL0Nbwgxn+0bTn6taDkUCD8="; + hash = "sha256-2zvdZkI8nSkHTBwsSfyyJL0Nbwgxn+0bTn6taDkUCD8="; }; propagatedBuildInputs = [ From bc72629eee81ce75520f835dbb09257ad3be65b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Mar 2022 10:45:53 +0100 Subject: [PATCH 254/329] python3Packages.pudb: remove duplicate input --- pkgs/development/python-modules/pudb/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 45ab2e840a23..406d81e15bb0 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , dataclasses -, pythonOlder , fetchPypi , jedi , pygments From d52b93750e524b4f5c4233094b767f7630e6e11f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 09:54:56 +0000 Subject: [PATCH 255/329] gitleaks: 8.3.0 -> 8.4.0 --- pkgs/tools/security/gitleaks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index ff70782dabef..a574c3476290 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D6leHpGZNQ9Xt4PSU0Dwte6N3bMge7itkZtcUl0mIrQ="; + sha256 = "sha256-z3YGRDgBGpr2hixIayih4wxGWPtYL0EPAuTYVPByzQc="; }; - vendorSha256 = "sha256-JZOalUOIeV51Nttm6xeBos+/8fleSBpUiXa8ekVuYJA="; + vendorSha256 = "sha256-J1xX+r+Mph1QkqjK87tqGDkYvPZp0lHgdRhd88WZi1c="; ldflags = [ "-s" From aeb5eeff087d2294f20db4cae4e612f984c29425 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 10:45:01 +0000 Subject: [PATCH 256/329] elpa: 2021.11.001 -> 2021.11.002 --- pkgs/development/libraries/elpa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 76152996a1d0..2a71b82af3cb 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -18,13 +18,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.11.001"; + version = "2021.11.002"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "0bw0nwzwvjfmijfwznmrghypd3q237a3h5g5fcdncilrqnk1sdpv"; + sha256 = "sha256-V28cru14g7gTlmQP2g9QQYOGbPbL1Lxx0Tg7oiCPH5c="; }; patches = [ From 27e32bbfde6c0c27c78859b23943e79b84e3c860 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 12 Jul 2021 15:34:26 +0800 Subject: [PATCH 257/329] nixos/systembus-notify: add support for system services notifying users --- .../from_md/release-notes/rl-2205.section.xml | 11 +++++ .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/system/systembus-notify.nix | 27 ++++++++++++ .../misc/systembus-notify/default.nix | 44 ++++++++++++++++--- 5 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 nixos/modules/services/system/systembus-notify.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index bdf512113789..d3a944533ab7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -249,6 +249,17 @@ services.prosody-filer. + + + systembus-notify, + allow system level notifications to reach the users. Available + as + services.systembus-notify. + Please keep in mind that this service should only be enabled + on machines with fully trusted users, as any local user is + able to DoS user sessions by spamming notifications. + + ethercalc, diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index b8d6078a21d4..fe30cbc3cf5d 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -72,6 +72,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable). +- [systembus-notify](https://github.com/rfjakob/systembus-notify), allow system level notifications to reach the users. Available as [services.systembus-notify](opt-services.systembus-notify.enable). Please keep in mind that this service should only be enabled on machines with fully trusted users, as any local user is able to DoS user sessions by spamming notifications. + - [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ff95d6500b9c..13703968167c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -987,6 +987,7 @@ ./services/system/nscd.nix ./services/system/saslauthd.nix ./services/system/self-deploy.nix + ./services/system/systembus-notify.nix ./services/system/uptimed.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix diff --git a/nixos/modules/services/system/systembus-notify.nix b/nixos/modules/services/system/systembus-notify.nix new file mode 100644 index 000000000000..e918bc552ece --- /dev/null +++ b/nixos/modules/services/system/systembus-notify.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.systembus-notify; + + inherit (lib) mkEnableOption mkIf; + +in +{ + options.services.systembus-notify = { + enable = mkEnableOption '' + System bus notification support + + WARNING: enabling this option (while convenient) should *not* be done on a + machine where you do not trust the other users as it allows any other + local user to DoS your session by spamming notifications. + ''; + }; + + config = mkIf cfg.enable { + systemd = { + packages = with pkgs; [ systembus-notify ]; + + user.services.systembus-notify.wantedBy = [ "graphical-session.target" ]; + }; + }; +} diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix index 6e5405ce988e..770cd8584010 100644 --- a/pkgs/applications/misc/systembus-notify/default.nix +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -1,5 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, systemd }: +{ lib +, stdenv +, fetchFromGitHub +, formats +, systemd +}: +let + ini = formats.ini { }; + + unit = ini.generate "systembus-notify.service" { + Unit = { + Description = "system bus notification daemon"; + }; + + Service = { + Type = "exec"; + ExecStart = "@out@/bin/systembus-notify"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "strict"; + Restart = "on-failure"; + Slice = "background.slice"; + }; + }; + +in stdenv.mkDerivation rec { pname = "systembus-notify"; version = "1.1"; @@ -8,23 +33,32 @@ stdenv.mkDerivation rec { owner = "rfjakob"; repo = "systembus-notify"; rev = "v${version}"; - sha256 = "1pdn45rfpwhrf20hs87qmk2j8sr7ab8161f81019wnypnb1q2fsv"; + sha256 = "sha256-WzuBw7LXW54CCMgFE9BSJ2skxaz4IA2BcBny63Ihtt0="; }; buildInputs = [ systemd ]; installPhase = '' runHook preInstall - install -Dm755 systembus-notify -t $out/bin - install -Dm644 systembus-notify.desktop -t $out/etc/xdg/autostart + + install -Dm555 -t $out/bin systembus-notify + install -Dm444 -t $out/share/systembus-notify systembus-notify.desktop + + install -d $out/lib/systemd/user + substitute ${unit} $out/lib/systemd/user/${unit.name} \ + --subst-var out + runHook postInstall ''; + # requires a running dbus instance + doCheck = false; + meta = with lib; { description = "System bus notification daemon"; homepage = "https://github.com/rfjakob/systembus-notify"; license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - maintainers = with maintainers; []; }; } From 895090bf89cd1a9cd7bc3ea7edd3bd2a0ae9d88f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 12 Jul 2021 15:36:22 +0800 Subject: [PATCH 258/329] nixos/earlyoom: use the newly introduced systembus-notify option Also some cleanups. --- nixos/modules/services/system/earlyoom.nix | 155 ++++++++++----------- 1 file changed, 70 insertions(+), 85 deletions(-) diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix index b355df056bc1..ddd5bcebcdd5 100644 --- a/nixos/modules/services/system/earlyoom.nix +++ b/nixos/modules/services/system/earlyoom.nix @@ -1,81 +1,73 @@ { config, lib, pkgs, ... }: -with lib; - let - ecfg = config.services.earlyoom; + cfg = config.services.earlyoom; + + inherit (lib) + mkDefault mkEnableOption mkIf mkOption types + mkRemovedOptionModule + concatStringsSep optional; + in { - options = { - services.earlyoom = { + options.services.earlyoom = { + enable = mkEnableOption "Early out of memory killing"; - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable early out of memory killing. - ''; - }; + freeMemThreshold = mkOption { + type = types.ints.between 1 100; + default = 10; + description = '' + Minimum of availabe memory (in percent). + If the free memory falls below this threshold and the analog is true for + + the killing begins. + ''; + }; - freeMemThreshold = mkOption { - type = types.int; - default = 10; - description = '' - Minimum of availabe memory (in percent). - If the free memory falls below this threshold and the analog is true for - - the killing begins. - ''; - }; + freeSwapThreshold = mkOption { + type = types.ints.between 1 100; + default = 10; + description = '' + Minimum of availabe swap space (in percent). + If the available swap space falls below this threshold and the analog + is true for + the killing begins. + ''; + }; - freeSwapThreshold = mkOption { - type = types.int; - default = 10; - description = '' - Minimum of availabe swap space (in percent). - If the available swap space falls below this threshold and the analog - is true for - the killing begins. - ''; - }; + # TODO: remove or warn after 1.7 (https://github.com/rfjakob/earlyoom/commit/7ebc4554) + ignoreOOMScoreAdjust = mkOption { + type = types.bool; + default = false; + description = '' + Ignore oom_score_adjust values of processes. + ''; + }; - # TODO: remove or warn after 1.7 (https://github.com/rfjakob/earlyoom/commit/7ebc4554) - ignoreOOMScoreAdjust = mkOption { - type = types.bool; - default = false; - description = '' - Ignore oom_score_adjust values of processes. - ''; - }; + enableDebugInfo = mkOption { + type = types.bool; + default = false; + description = '' + Enable debugging messages. + ''; + }; - enableDebugInfo = mkOption { - type = types.bool; - default = false; - description = '' - Enable debugging messages. - ''; - }; + enableNotifications = mkOption { + type = types.bool; + default = false; + description = '' + Send notifications about killed processes via the system d-bus. - notificationsCommand = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - This option is deprecated and ignored by earlyoom since 1.6. - Use instead. - ''; - }; + WARNING: enabling this option (while convenient) should *not* be done on a + machine where you do not trust the other users as it allows any other + local user to DoS your session by spamming notifications. - enableNotifications = mkOption { - type = types.bool; - default = false; - description = '' - Send notifications about killed processes via the system d-bus. - To actually see the notifications in your GUI session, you need to have - systembus-notify running as your user. + To actually see the notifications in your GUI session, you need to have + systembus-notify running as your user which this + option handles. - See README for details. - ''; - }; + See README for details. + ''; }; }; @@ -83,37 +75,30 @@ in (mkRemovedOptionModule [ "services" "earlyoom" "useKernelOOMKiller" ] '' This option is deprecated and ignored by earlyoom since 1.2. '') + (mkRemovedOptionModule [ "services" "earlyoom" "notificationsCommand" ] '' + This option is deprecated and ignored by earlyoom since 1.6. + '') ]; - config = mkIf ecfg.enable { - assertions = [ - { assertion = ecfg.freeMemThreshold > 0 && ecfg.freeMemThreshold <= 100; - message = "Needs to be a positive percentage"; } - { assertion = ecfg.freeSwapThreshold > 0 && ecfg.freeSwapThreshold <= 100; - message = "Needs to be a positive percentage"; } - ]; - - # TODO: reimplement this option as -N after 1.7 (https://github.com/rfjakob/earlyoom/commit/afe03606) - warnings = optional (ecfg.notificationsCommand != null) - "`services.earlyoom.notificationsCommand` is deprecated and ignored by earlyoom since 1.6."; + config = mkIf cfg.enable { + services.systembus-notify.enable = mkDefault cfg.enableNotifications; systemd.services.earlyoom = { description = "Early OOM Daemon for Linux"; wantedBy = [ "multi-user.target" ]; - path = optional ecfg.enableNotifications pkgs.dbus; + path = optional cfg.enableNotifications pkgs.dbus; serviceConfig = { - StandardOutput = "null"; StandardError = "journal"; ExecStart = concatStringsSep " " ([ "${pkgs.earlyoom}/bin/earlyoom" - "-m ${toString ecfg.freeMemThreshold}" - "-s ${toString ecfg.freeSwapThreshold}" - ] ++ optional ecfg.ignoreOOMScoreAdjust "-i" - ++ optional ecfg.enableDebugInfo "-d" - ++ optional ecfg.enableNotifications "-n"); + "-m ${toString cfg.freeMemThreshold}" + "-s ${toString cfg.freeSwapThreshold}" + ] + ++ optional cfg.ignoreOOMScoreAdjust "-i" + ++ optional cfg.enableDebugInfo "-d" + ++ optional cfg.enableNotifications "-n" + ); }; }; - - environment.systemPackages = optional ecfg.enableNotifications pkgs.systembus-notify; }; } From 80b9bfdfb1f72dc7067e355fbc89cb68ea0be118 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 8 Mar 2022 11:56:13 +0800 Subject: [PATCH 259/329] nixos/captive-browser: add to menu bar --- nixos/modules/programs/captive-browser.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index dc054504ea48..aad554c2bd66 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -1,8 +1,12 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.programs.captive-browser; + + inherit (lib) + concatStringsSep escapeShellArgs optionalString + literalExpression mkEnableOption mkIf mkOption mkOptionDefault types; + browserDefault = chromium: concatStringsSep " " [ ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"'' ''${chromium}/bin/chromium'' @@ -15,6 +19,15 @@ let ''-no-default-browser-check'' ''http://cache.nixos.org/'' ]; + + desktopItem = pkgs.makeDesktopItem { + name = "captive-browser"; + desktopName = "Captive Portal Browser"; + exec = "/run/wrappers/bin/captive-browser"; + icon = "nix-snowflake"; + categories = [ "Network" ]; + }; + in { ###### interface @@ -84,6 +97,11 @@ in ###### implementation config = mkIf cfg.enable { + environment.systemPackages = [ + (pkgs.runCommandNoCC "captive-browser-desktop-item" { } '' + install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop + '') + ]; programs.captive-browser.dhcp-dns = let From 90d9b7c8dc770611f744aa6fad2e1f32a167e807 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 13 Mar 2022 13:33:21 +0100 Subject: [PATCH 260/329] llvmPackages: Fix the update script --- pkgs/development/compilers/llvm/14/llvm/default.nix | 3 +++ pkgs/development/compilers/llvm/update.sh | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index d2059cc66ba2..05aac728b452 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -209,6 +209,9 @@ in stdenv.mkDerivation (rec { checkTarget = "check-all"; + # For the update script: + passthru.monorepoSrc = monorepoSrc; + requiredSystemFeatures = [ "big-parallel" ]; meta = llvm_meta // { homepage = "https://llvm.org/"; diff --git a/pkgs/development/compilers/llvm/update.sh b/pkgs/development/compilers/llvm/update.sh index 603c603f275b..95ad356dbd9a 100755 --- a/pkgs/development/compilers/llvm/update.sh +++ b/pkgs/development/compilers/llvm/update.sh @@ -20,7 +20,11 @@ sed -Ei \ readonly ATTRSET="llvmPackages_$VERSION_MAJOR" -if [ "$VERSION_MAJOR" -ge "13" ]; then +if [ "$VERSION_MAJOR" -ge "14" ]; then + readonly SOURCES=( + "llvm.monorepoSrc" + ) +elif [ "$VERSION_MAJOR" -eq "13" ]; then readonly SOURCES=( "llvm.src" ) @@ -43,7 +47,7 @@ fi for SOURCE in "${SOURCES[@]}"; do echo "Updating the hash of $SOURCE:" declare ATTR="$ATTRSET.$SOURCE" - declare OLD_HASH="$(nix eval -f . $ATTR.outputHash)" + declare OLD_HASH="$(nix --extra-experimental-features nix-command eval -f . $ATTR.outputHash)" declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\"" find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} + done From f0c2e464685a4e638f088d4b18e57a32a7014239 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 13 Mar 2022 13:34:02 +0100 Subject: [PATCH 261/329] llvmPackages_14: 14.0.0-rc2 -> 14.0.0-rc4 --- pkgs/development/compilers/llvm/14/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 5a91fb17fe61..ce126f7b502f 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -19,7 +19,7 @@ let release_version = "14.0.0"; - candidate = "rc2"; # empty or "rcN" + candidate = "rc4"; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit rev-version = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "sha256-5wJEaWvwJohtjqlIsBkqQ5rE6rcWw07MaQnN1RxPb5w="; + sha256 = "0xm3hscg6xv48rjdi7sg9ky960af1qyg5k3jyavnaqimlaj9wxgp"; }; llvm_meta = { From 884b37844e88dfc45d31cd2661576e7e17338348 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 13 Mar 2022 13:39:31 +0100 Subject: [PATCH 262/329] nix-output-monitor: 1.1.1.0 -> 1.1.2.0 --- pkgs/tools/nix/nix-output-monitor/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index caa9abb9a1d6..0f78600a0506 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -6,6 +6,7 @@ async, attoparsec, base, + bytestring, cassava, containers, data-default, @@ -36,13 +37,14 @@ unix, vector, wcwidth, + word8, }: mkDerivation { pname = "nix-output-monitor"; - version = "1.1.1.0"; + version = "1.1.2.0"; src = fetchzip { - url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.1.0.tar.gz"; - sha256 = "1zw7x1snyycl1bp5w7jh8wwnynqvw3g4glr293bnzi5jyirj5wlg"; + url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.2.0.tar.gz"; + sha256 = "03qhy4xzika41pxlmvpz3psgy54va72ipn9v1lv33l6369ikrhl1"; }; isLibrary = true; isExecutable = true; @@ -51,6 +53,7 @@ mkDerivation { async attoparsec base + bytestring cassava containers data-default @@ -74,12 +77,14 @@ mkDerivation { unix vector wcwidth + word8 ]; executableHaskellDepends = [ ansi-terminal async attoparsec base + bytestring cassava containers data-default @@ -103,12 +108,14 @@ mkDerivation { unix vector wcwidth + word8 ]; testHaskellDepends = [ ansi-terminal async attoparsec base + bytestring cassava containers data-default @@ -134,6 +141,7 @@ mkDerivation { unix vector wcwidth + word8 ]; homepage = "https://github.com/maralorn/nix-output-monitor"; description = "Parses output of nix-build to show additional information"; @@ -148,11 +156,9 @@ mkDerivation { ${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom EOF chmod a+x $out/bin/nom-build - installShellCompletion --zsh --name _nom-build ${ - builtins.toFile "completion.zsh" '' - #compdef nom-build - compdef nom-build=nix-build - '' - } + installShellCompletion --zsh --name _nom-build ${builtins.toFile "completion.zsh" '' + #compdef nom-build + compdef nom-build=nix-build + ''} ''; } From 3f25903151bb8db613fe93a20dba79c63b0ddb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Wallez?= Date: Sun, 13 Mar 2022 13:59:51 +0100 Subject: [PATCH 263/329] nixos/nixpkgs/doc: fix typo in the signature of attrsets.zipAttrs --- doc/functions/library/attrsets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index a30f4edf4c19..052bfa1f6ae3 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1474,7 +1474,7 @@ lib.attrsets.zipAttrsWith
<function>lib.attrsets.zipAttrs</function> - zipAttrsWith :: [ AttrSet ] -> AttrSet + zipAttrs :: [ AttrSet ] -> AttrSet From d12186a6017e7fddaa0e97db90c4924485aca92c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 12 Mar 2022 00:56:44 +0100 Subject: [PATCH 264/329] nixos/tomcat: configure default group and fix broken default package reference Without this fix, evaluating a NixOS configuration with Tomcat enabled and the default settings results in the following evaluation error: Failed assertions: - users.users.tomcat.group is unset. This used to default to nogroup, but this is unsafe. For example you can create a group for this user with: users.users.tomcat.group = "tomcat"; users.groups.tomcat = {}; --- nixos/modules/services/web-servers/tomcat.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index f9446fe125a3..877097cf3781 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -23,8 +23,8 @@ in package = mkOption { type = types.package; - default = pkgs.tomcat85; - defaultText = literalExpression "pkgs.tomcat85"; + default = pkgs.tomcat9; + defaultText = literalExpression "pkgs.tomcat9"; example = lib.literalExpression "pkgs.tomcat9"; description = '' Which tomcat package to use. @@ -127,7 +127,7 @@ in webapps = mkOption { type = types.listOf types.path; default = [ tomcat.webapps ]; - defaultText = literalExpression "[ pkgs.tomcat85.webapps ]"; + defaultText = literalExpression "[ config.services.tomcat.package.webapps ]"; description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; @@ -201,6 +201,7 @@ in { uid = config.ids.uids.tomcat; description = "Tomcat user"; home = "/homeless-shelter"; + group = "tomcat"; extraGroups = cfg.extraGroups; }; From 158211b6a1b78966a8291eaad9c48f6ddec43b68 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 9 Feb 2021 12:52:09 +0800 Subject: [PATCH 265/329] squeezelite: 1.9.6.1196 -> 1.9.9.1401 Regular update as well as adding support for pulseaudio in addition to the regular ALSA backend. --- .../audio/squeezelite/default.nix | 78 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 51 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 31fe69b00de5..5fc0d6f4200f 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,39 +1,50 @@ -{ lib, stdenv, fetchFromGitHub -, alsa-lib, flac, libmad, libvorbis, mpg123 +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, flac +, libmad +, libpulseaudio +, libvorbis +, mpg123 +, audioBackend ? "alsa" , dsdSupport ? true -, faad2Support ? true, faad2 -, ffmpegSupport ? true, ffmpeg -, opusSupport ? true, opusfile -, resampleSupport ? true, soxr -, sslSupport ? true, openssl +, faad2Support ? true +, faad2 +, ffmpegSupport ? true +, ffmpeg +, opusSupport ? true +, opusfile +, resampleSupport ? true +, soxr +, sslSupport ? true +, openssl }: let - concatStringsSep = lib.concatStringsSep; - optional = lib.optional; - opts = [ "-DLINKALL" ] - ++ optional dsdSupport "-DDSD" - ++ optional (!faad2Support) "-DNO_FAAD" - ++ optional ffmpegSupport "-DFFMPEG" - ++ optional opusSupport "-DOPUS" - ++ optional resampleSupport "-DRESAMPLE" - ++ optional sslSupport "-DUSE_SSL"; + inherit (lib) optional optionalString; -in stdenv.mkDerivation { - pname = "squeezelite"; + pulseSupport = audioBackend == "pulse"; + binName = "squeezelite${optionalString pulseSupport "-pulse"}"; + +in +stdenv.mkDerivation { + # the nixos module uses the pname as the binary name + pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.6.1196"; + version = "1.9.9.1401"; src = fetchFromGitHub { - owner = "ralph-irving"; - repo = "squeezelite"; - rev = "2b508464dce2cbdb2a3089c58df2a6fbc36328c0"; - sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i"; + owner = "ralph-irving"; + repo = "squeezelite"; + rev = "894df3ea80f66a27a9ae5fab918acf62a6798b8b"; + hash = "sha256-LIi+9vb0+56AGvVrLx4gQaUkUNjIi6PmqrLViLT1DSU="; }; - buildInputs = [ alsa-lib flac libmad libvorbis mpg123 ] + buildInputs = [ flac libmad libvorbis mpg123 ] + ++ lib.singleton (if pulseSupport then libpulseaudio else alsa-lib) ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile @@ -47,15 +58,22 @@ in stdenv.mkDerivation { --replace "" "" ''; - preBuild = '' - export OPTS="${concatStringsSep " " opts}" - ''; + EXECUTABLE = binName; + + OPTS = [ "-DLINKALL" ] + ++ optional dsdSupport "-DDSD" + ++ optional (!faad2Support) "-DNO_FAAD" + ++ optional ffmpegSupport "-DFFMPEG" + ++ optional opusSupport "-DOPUS" + ++ optional pulseSupport "-DPULSEAUDIO" + ++ optional resampleSupport "-DRESAMPLE" + ++ optional sslSupport "-DUSE_SSL"; installPhase = '' runHook preInstall - install -Dm755 -t $out/bin squeezelite - install -Dm644 -t $out/share/doc/squeezelite *.txt *.md + install -Dm555 -t $out/bin ${binName} + install -Dm444 -t $out/share/doc/squeezelite *.txt *.md runHook postInstall ''; @@ -63,7 +81,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Lightweight headless squeezebox client emulator"; homepage = "https://github.com/ralph-irving/squeezelite"; - license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2; + license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; maintainers = with maintainers; [ samdoshi ]; platforms = platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40f7cc930a43..eda0775dd6f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29068,7 +29068,9 @@ with pkgs; psst = callPackage ../applications/audio/psst { }; - squeezelite = callPackage ../applications/audio/squeezelite { }; + squeezelite = callPackage ../applications/audio/squeezelite { audioBackend = "alsa"; }; + + squeezelite-pulse = callPackage ../applications/audio/squeezelite { audioBackend = "pulse"; }; ltunify = callPackage ../tools/misc/ltunify { }; From d853dc52d87692619412a074846144262d6a48b3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 10 Feb 2021 10:30:38 +0800 Subject: [PATCH 266/329] nixos/squeezelite: add support for PulseAudio version --- nixos/modules/services/audio/squeezelite.nix | 38 +++++++++----------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index 05506f5bcc7a..36295e21c60f 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -1,50 +1,46 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkEnableOption mkIf mkOption optionalString types; + dataDir = "/var/lib/squeezelite"; cfg = config.services.squeezelite; + pkg = if cfg.pulseAudio then pkgs.squeezelite-pulse else pkgs.squeezelite; + bin = "${pkg}/bin/${pkg.pname}"; -in { +in +{ ###### interface - options = { + options.services.squeezelite = { + enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; - services.squeezelite= { - - enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; - - extraArguments = mkOption { - default = ""; - type = types.str; - description = '' - Additional command line arguments to pass to Squeezelite. - ''; - }; + pulseAudio = mkEnableOption "pulseaudio support"; + extraArguments = mkOption { + default = ""; + type = types.str; + description = '' + Additional command line arguments to pass to Squeezelite. + ''; }; - }; ###### implementation config = mkIf cfg.enable { - - systemd.services.squeezelite= { + systemd.services.squeezelite = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "sound.target" ]; description = "Software Squeezebox emulator"; serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${dataDir}/player-name ${cfg.extraArguments}"; + ExecStart = "${bin} -N ${dataDir}/player-name ${cfg.extraArguments}"; StateDirectory = builtins.baseNameOf dataDir; SupplementaryGroups = "audio"; }; }; - }; - } From f332895cd18bdc2f0020039068d95dd1d3bfa84e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 13:25:58 +0000 Subject: [PATCH 267/329] python310Packages.types-requests: 2.27.11 -> 2.27.12 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 165c65f3a9ef..c62190ff5dab 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.11"; + version = "2.27.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-an7SSyF4CvSlteJMMQss2IX7YS31/ZVYTQPYfl8qGVo="; + sha256 = "sha256-/ROC+i4o6shI+u2wMyhAIE8G8MtRcAjjx7goLKU+VtI="; }; propagatedBuildInputs = [ From 99dacc15d301f9e3f6d4576e8b16a72ebd47bfbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 13:30:53 +0000 Subject: [PATCH 268/329] python310Packages.types-urllib3: 1.26.10 -> 1.26.11 --- pkgs/development/python-modules/types-urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 7bffc7826a3c..235535ce9716 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.10"; + version = "1.26.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-omiY9TDmw/Q/JbkH8riESGho/9Vqn6qUy/mz624WXWo="; + hash = "sha256-JNZORBFohR6wXx0CLeGK4xVY9WScjxEX44TC6F4xMVs="; }; # Module doesn't have tests From 86fafe5f5026651ae5139f4880f177b350c8ec83 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 13 Mar 2022 14:31:43 +0100 Subject: [PATCH 269/329] nixos/tomcat: add basic test case using the example app --- nixos/tests/all-tests.nix | 1 + nixos/tests/tomcat.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 nixos/tests/tomcat.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 043d8a56d0c6..23116a6253d3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -524,6 +524,7 @@ in tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; tinywl = handleTest ./tinywl.nix {}; + tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; # traefik test relies on docker-containers traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {}; diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix new file mode 100644 index 000000000000..e383f224e3d1 --- /dev/null +++ b/nixos/tests/tomcat.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "tomcat"; + + machine = { pkgs, ... }: { + services.tomcat.enable = true; + }; + + testScript = '' + machine.wait_for_unit("tomcat.service") + machine.wait_for_open_port(8080) + machine.wait_for_file("/var/tomcat/webapps/examples"); + machine.succeed( + "curl --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'" + ) + machine.succeed( + "curl --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'" + ) + ''; +}) From 529b09a729d06c3a18ce16526992d4e693257734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlys=20Bras=20de=20fer?= Date: Sun, 23 Jan 2022 22:42:54 +0100 Subject: [PATCH 270/329] sdboot-builder: fix crash in exception handling --- .../systemd-boot/systemd-boot-builder.py | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index adc893063098..fa879437fd81 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -15,9 +15,12 @@ import re import datetime import glob import os.path -from typing import Tuple, List, Optional +from typing import NamedTuple, List, Optional -SystemIdentifier = Tuple[Optional[str], int, Optional[str]] +class SystemIdentifier(NamedTuple): + profile: Optional[str] + generation: int + specialisation: Optional[str] def copy_if_not_exists(source: str, dest: str) -> None: @@ -151,7 +154,14 @@ def get_generations(profile: Optional[str] = None) -> List[SystemIdentifier]: gen_lines.pop() configurationLimit = @configurationLimit@ - configurations: List[SystemIdentifier] = [ (profile, int(line.split()[0]), None) for line in gen_lines ] + configurations = [ + SystemIdentifier( + profile=profile, + generation=int(line.split()[0]), + specialisation=None + ) + for line in gen_lines + ] return configurations[-configurationLimit:] @@ -160,7 +170,7 @@ def get_specialisations(profile: Optional[str], generation: int, _: Optional[str system_dir(profile, generation, None), "specialisation") if not os.path.exists(specialisations_dir): return [] - return [(profile, generation, spec) for spec in os.listdir(specialisations_dir)] + return [SystemIdentifier(profile, generation, spec) for spec in os.listdir(specialisations_dir)] def remove_old_entries(gens: List[SystemIdentifier]) -> None: @@ -271,7 +281,8 @@ def main() -> None: if os.readlink(system_dir(*gen)) == args.default_config: write_loader_conf(*gen) except OSError as e: - print("ignoring generation '{}' in the list of boot entries because of the following error:\n{}".format(*gen, e), file=sys.stderr) + profile = f"profile '{gen.profile}'" if gen.profile else "default profile" + print("ignoring {} in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr) for root, _, files in os.walk('@efiSysMountPoint@/efi/nixos/.extra-files', topdown=False): relative_root = root.removeprefix("@efiSysMountPoint@/efi/nixos/.extra-files").removeprefix("/") From 164c966f4b47dbcf661b511a8a5205dacfb48eec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 13:43:34 +0000 Subject: [PATCH 271/329] python310Packages.unidiff: 0.7.0 -> 0.7.3 --- pkgs/development/python-modules/unidiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 7dfd5c9d276a..4c776070ae6e 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.7.0"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447"; + sha256 = "sha256-1fLlOpoA2zIkqMNjSbU4Dg4i0a7GxpSxT7lIPuk8YgU="; }; pythonImportsCheck = [ "unidiff" ]; From 18670375d09cfa4ec4c1b9b44bcd4204947e4890 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 19:57:38 +0000 Subject: [PATCH 272/329] qtox: 1.17.5 -> 1.17.6 --- .../networking/instant-messengers/qtox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index e315938c5719..3f6d374c3996 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -28,13 +28,13 @@ mkDerivation rec { pname = "qtox"; - version = "1.17.5"; + version = "1.17.6"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "sha256-H3qFEw/TkzOxEXtZs0k89wWMnhrOkF7VapUKtCUhGns="; + sha256 = "sha256-naKWoodSMw0AEtACvkASFmw9t0H0d2pcqOW79NNTYF0="; }; buildInputs = [ From 79c1b6b96d2a6a543348dd4fdec77275dff179d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 14:42:29 +0000 Subject: [PATCH 273/329] python310Packages.wled: 0.13.0 -> 0.13.1 --- pkgs/development/python-modules/wled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 3b88afa7e65c..3bd0d5b55b90 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.13.0"; + version = "0.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "sha256-n+TIzlnyPeSywTQr7wlGNezsbQ2+S/WYt1H95+Id2Rw="; + sha256 = "sha256-QQPrAfk+BX8mjqn9ISim9hLEZR2nbgxbkwCv+91yeRY="; }; nativeBuildInputs = [ From 46c9fe7d0873a3952a97840a076685e253f92874 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 11 Mar 2022 15:49:30 -0500 Subject: [PATCH 274/329] pythonPackages.allure_behave: init at 2.9.45 --- .../python-modules/allure-behave/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/allure-behave/default.nix diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix new file mode 100644 index 000000000000..e7cd81d5b5d5 --- /dev/null +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, behave +, allure-python-commons +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "allure-behave"; + version = "2.9.45"; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-aK0SgQIXpuUoSTz8jg5IPKQM2Xvk2EfkSGigsy/GFNo="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + pythonImportsCheck = [ "allure_behave" ]; + + propagatedBuildInputs = [ + allure-python-commons + behave + ]; + + meta = with lib; { + description = "Allure behave integration."; + homepage = "https://github.com/allure-framework/allure-python"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e9fb29a35f5..57c8e10d0b49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -466,6 +466,8 @@ in { allpairspy = callPackage ../development/python-modules/allpairspy { }; + allure-behave = callPackage ../development/python-modules/allure-behave { }; + allure-python-commons = callPackage ../development/python-modules/allure-python-commons { }; allure-python-commons-test = callPackage ../development/python-modules/allure-python-commons-test { }; From cf2e8652bcca9ed133e62e7d4f796660f466d623 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 13 Mar 2022 10:21:33 -0500 Subject: [PATCH 275/329] wllvm: 1.2.8 -> 1.3.1 (#163879) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sandro Co-authored-by: Jörg Thalheim --- pkgs/development/tools/wllvm/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 85dbc4f731a1..0234c936dc15 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,13 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.2.8"; + version = "1.3.1"; pname = "wllvm"; - name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591"; + sha256 = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; meta = with lib; { From a6aceda140cd6846fb9cf0338dcfeeb539c5dd31 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 13 Mar 2022 11:33:30 +0100 Subject: [PATCH 276/329] php.packages.phive: init at 0.15.0 --- .../php-packages/phive/default.nix | 31 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/php-packages/phive/default.nix diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix new file mode 100644 index 000000000000..f564cb536922 --- /dev/null +++ b/pkgs/development/php-packages/phive/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: + +mkDerivation rec { + pname = "phive"; + version = "0.15.0"; + + src = fetchurl { + url = "https://github.com/phar-io/phive/releases/download/${version}/phive-${version}.phar"; + sha256 = "sha256-crMr8d5nsVt7+zQ5xPeph/JXmTEn6jJFVtp3mOgylB4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/phive/phive.phar + makeWrapper ${php}/bin/php $out/bin/phive \ + --add-flags "$out/libexec/phive/phive.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "The Phar Installation and Verification Environment (PHIVE)"; + homepage = "https://github.com/phar-io/phive"; + license = licenses.bsd3; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 81628686a315..1da6e934c24b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -144,6 +144,8 @@ lib.makeScope pkgs.newScope (self: with self; { phing = callPackage ../development/php-packages/phing { }; + phive = callPackage ../development/php-packages/phive { }; + php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { }; From a45244eb8e952e0c3ae20cc30737a5faabaf410d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 13 Mar 2022 16:39:37 +0100 Subject: [PATCH 277/329] mediaelch: 2.8.14 -> 2.8.16 --- pkgs/applications/misc/mediaelch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 7cfe873a44e6..2381e89640af 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "mediaelch"; - version = "2.8.14"; + version = "2.8.16"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "sha256-yHThX5Xs+8SijNKgmg+4Mawbwi3zHA/DJQoIBy0Wchs="; + sha256 = "sha256-83bHfIRVAC+3RkCYmV+TBjjQxaFMHfVyxt5Jq44dzeI="; fetchSubmodules = true; }; From d0e0d14a1953d7eeadb05c15d0e010583b41f3be Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 13 Mar 2022 10:57:41 -0500 Subject: [PATCH 278/329] nncp: 8.7.1 -> 8.7.2 --- pkgs/tools/misc/nncp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index 3fda2a6cdadb..a3b010b13fba 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "8.7.1"; + version = "8.7.2"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - hash = "sha256-zrTRl69ajZ6Tt0nVwPULU+Z0ajGK9Hs2S/XLMj1sTr0="; + hash = "sha256-oO7JsPMwWd4z8TCEWZgF0PShyMN56SW6z+jclNHdwj0="; }; nativeBuildInputs = [ go redo-apenwarr ]; From 01e69e9113354820690ac02512ab693edd034edd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 16:01:08 +0000 Subject: [PATCH 279/329] rocclr: 4.5.2 -> 5.0.2 --- pkgs/development/libraries/rocclr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 4d78209f1411..b55c2ef81527 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-fsQANBND/oDeC/+wmCH/aLlDTxPIi7Z/oN1HnNHHnm0="; + hash = "sha256-x6XwYxgiCoy6Q7gIevSTEWgUQ0aEjPFhKSqMqQahHig="; }; prePatch = '' From f0a3f8627ebfe6029b66abb44fdcfe6c73309388 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 16:10:20 +0000 Subject: [PATCH 280/329] rocm-smi: 4.5.2 -> 5.0.0 --- pkgs/tools/system/rocm-smi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index c91f5d818b17..9280da44311c 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "4.5.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${version}"; - hash = "sha256-zfsNGDAwBD91w0loWxd8AwuZ3kZSPCXMxxQnX6ktOiE="; + hash = "sha256-SQ6eBQzZ8CBD9RlIjt25FrOuWUSybBzx6ZzCOzHbxdI="; }; nativeBuildInputs = [ cmake wrapPython ]; From 70ce1775f328de1552abd0be8538022850670e20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 16:14:23 +0000 Subject: [PATCH 281/329] rocm-thunk: 4.5.2 -> 5.0.2 --- pkgs/development/libraries/rocm-thunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index e76b7c1993ae..9ceb1360cda0 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-s/N1wkAgpxYCK6rIiWH8cGQU5YFGj0q4Dxj9j3yIys8="; + hash = "sha256-hhDLy92jS/akp1Ozun45OEjVbVcjufkRIfC8bqqFjp4="; }; preConfigure = '' From 7db19e78ff8a87ff316fa8f8b1724101740ac78a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 22:10:02 +0000 Subject: [PATCH 282/329] sigil: 1.9.1 -> 1.9.2 --- pkgs/applications/editors/sigil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 0da5a2c25502..b93fbd6110f1 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-PsHliyJu61QFTFZUgDtxguu18GBVTOGMW6pPYjHhvG0="; + sha256 = "sha256-LfP3qUzoHuYSpkTz1queVGTWOP9v9kbgbgvvtiMK6Eo="; }; pythonPath = with python3Packages; [ lxml ]; From b77494badb8995a024b72afccc597fffac6bc041 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Thu, 10 Mar 2022 20:02:13 +0000 Subject: [PATCH 283/329] nixos/jellyfin: Disable PrivateDevices from hardening to allow GPU endpoints to be accessed --- nixos/modules/services/misc/jellyfin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index 64b74ddd7082..04cf82f8a46b 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -70,7 +70,8 @@ in LockPersonality = true; PrivateTmp = true; - PrivateDevices = true; + # Disabled to allow Jellyfin to access hw accel devices endpoints + # PrivateDevices = true; PrivateUsers = true; # Disabled as it does not allow Jellyfin to interface with CUDA devices From 40195e1c4e85d6eb1fc4fc14e424e16e4a89de7e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 13 Mar 2022 16:37:51 +0100 Subject: [PATCH 284/329] php.packages: Add missing hooks. --- pkgs/development/php-packages/box/default.nix | 2 ++ pkgs/development/php-packages/deployer/default.nix | 2 ++ pkgs/development/php-packages/phing/default.nix | 2 ++ pkgs/development/php-packages/php-cs-fixer/default.nix | 2 ++ pkgs/development/php-packages/php-parallel-lint/default.nix | 4 ++++ pkgs/development/php-packages/phpcbf/default.nix | 2 ++ pkgs/development/php-packages/phpcs/default.nix | 2 ++ pkgs/development/php-packages/phpmd/default.nix | 2 ++ pkgs/development/php-packages/phpstan/default.nix | 2 ++ pkgs/development/php-packages/psalm/default.nix | 2 ++ pkgs/development/php-packages/psysh/default.nix | 2 ++ 11 files changed, 24 insertions(+) diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index b19b275019df..bc0f4ac636c6 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/box/box.phar makeWrapper ${php}/bin/php $out/bin/box \ --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/deployer/default.nix b/pkgs/development/php-packages/deployer/default.nix index 7679fb5ea51b..661a6310958c 100644 --- a/pkgs/development/php-packages/deployer/default.nix +++ b/pkgs/development/php-packages/deployer/default.nix @@ -14,6 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/deployer/deployer.phar makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar" @@ -22,6 +23,7 @@ mkDerivation rec { installShellCompletion --cmd dep \ --bash <($out/bin/dep autocomplete --install) \ --zsh <($out/bin/dep autocomplete --install) + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix index a8835241d098..6c5af7d5d275 100644 --- a/pkgs/development/php-packages/phing/default.nix +++ b/pkgs/development/php-packages/phing/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phing/phing.phar makeWrapper ${php}/bin/php $out/bin/phing \ --add-flags "$out/libexec/phing/phing.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 292d0b2ca08f..90bd1af00789 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \ --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index 50fd23540ee5..d0335142490e 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -20,15 +20,19 @@ mkDerivation { ]; buildPhase = '' + runHook preBuild composer dump-autoload box build + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \ --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix index cef7c2986e8f..1cc6f46bd09d 100644 --- a/pkgs/development/php-packages/phpcbf/default.nix +++ b/pkgs/development/php-packages/phpcbf/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpcbf/phpcbf.phar makeWrapper ${php}/bin/php $out/bin/phpcbf \ --add-flags "$out/libexec/phpcbf/phpcbf.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix index baad111cec55..877f587717da 100644 --- a/pkgs/development/php-packages/phpcs/default.nix +++ b/pkgs/development/php-packages/phpcs/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpcs/phpcs.phar makeWrapper ${php}/bin/php $out/bin/phpcs \ --add-flags "$out/libexec/phpcs/phpcs.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index 763fd857c357..228fd25ea553 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpmd/phpmd.phar makeWrapper ${php}/bin/php $out/bin/phpmd \ --add-flags "$out/libexec/phpmd/phpmd.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 41840f5ba9e8..bced843d9559 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpstan/phpstan.phar makeWrapper ${php}/bin/php $out/bin/phpstan \ --add-flags "$out/libexec/phpstan/phpstan.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index a772ae441a5f..01f79c36397d 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/psalm/psalm.phar makeWrapper ${php}/bin/php $out/bin/psalm \ --add-flags "$out/libexec/psalm/psalm.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index 5b7c02eefd82..f1105dea9113 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin tar -xzf $src -C $out/bin chmod +x $out/bin/psysh wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}" + runHook postInstall ''; meta = with lib; { From cdf8fde65753dd453894cf3e31eebf8a077d22b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 13 Mar 2022 18:26:09 +0100 Subject: [PATCH 285/329] nix-eval-jobs: 0.0.3 -> 0.0.4 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index dfcf11045cb1..1023d23432c2 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256:0flnqn1vkr55sipii82vwjfkhv4p835d01f6yhlpbalxwy2kr14r"; + hash = "sha256-SCwvFlBYUlxCucjMO4GHhEQWZFZt0lRKJncm6hvDx9I="; }; buildInputs = [ boost From 540de8542d60c31aad9198a95d0e799474fe927a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 18:33:12 +0000 Subject: [PATCH 286/329] python310Packages.aio-geojson-client: 0.16 -> 0.17 --- .../development/python-modules/aio-geojson-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index f00a75961b9c..b0629483d014 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "v${version}"; - hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM="; + hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; }; propagatedBuildInputs = [ From 953de2094635feba95fc2a64d5b4bf10d8b0f1f6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 13:29:15 -0300 Subject: [PATCH 287/329] pkgs/build-support/fetchurl/mirrors.nix: reoder --- pkgs/build-support/fetchurl/mirrors.nix | 513 ++++++++++++------------ 1 file changed, 264 insertions(+), 249 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index e4d6f02a94bd..fc7bce0ce56a 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -1,6 +1,6 @@ { - # Content-addressable Nix mirrors. + # Content-addressable Nix mirrors hashedMirrors = [ "https://tarballs.nixos.org" ]; @@ -8,52 +8,48 @@ # Mirrors for mirror://site/filename URIs, where "site" is # "sourceforge", "gnu", etc. - luarocks = [ - "https://luarocks.org/" - "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/" - "https://luafr.org/moonrocks/" - "http://luarocks.logiceditor.com/rocks/" + # Alsa Project + alsa = [ + "https://www.alsa-project.org/files/pub/" + "ftp://ftp.alsa-project.org/pub/" + "http://alsa.cybermirror.org/" + "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/" ]; - # SourceForge. - sourceforge = [ - "https://downloads.sourceforge.net/" - "https://prdownloads.sourceforge.net/" - "https://netcologne.dl.sourceforge.net/sourceforge/" - "https://versaweb.dl.sourceforge.net/sourceforge/" - "https://freefr.dl.sourceforge.net/sourceforge/" - "https://osdn.dl.sourceforge.net/sourceforge/" - "https://kent.dl.sourceforge.net/sourceforge/" + # Apache + apache = [ + "https://www-eu.apache.org/dist/" + "https://ftp.wayne.edu/apache/" + "https://www.apache.org/dist/" + "https://archive.apache.org/dist/" # fallback for old releases + "https://apache.cs.uu.nl/" + "https://apache.cs.utah.edu/" + "http://ftp.tudelft.nl/apache/" + "ftp://ftp.funet.fi/pub/mirrors/apache.org/" ]; - # OSDN (formerly SourceForge.jp). - osdn = [ - "https://osdn.dl.osdn.jp/" - "https://osdn.mirror.constant.com/" - "https://mirrors.gigenet.com/OSDN/" - "https://osdn.dl.sourceforge.jp/" - "https://jaist.dl.sourceforge.jp/" + # Bioconductor mirrors (from https://bioconductor.org/about/mirrors/) + # The commented-out ones don't seem to allow direct package downloads; + # they serve error messages that result in hash mismatches instead + bioc = [ + # http://bioc.ism.ac.jp/ + # http://bioc.openanalytics.eu/ + # http://bioconductor.fmrp.usp.br/ + # http://mirror.aarnet.edu.au/pub/bioconductor/ + # http://watson.nci.nih.gov/bioc_mirror/ + "https://bioconductor.statistik.tu-dortmund.de/packages/" + "https://mirrors.ustc.edu.cn/bioc/" + "http://bioconductor.jp/packages/" ]; - # GNU (https://www.gnu.org/prep/ftp.html). - gnu = [ - # This one redirects to a (supposedly) nearby and (supposedly) up-to-date - # mirror. - "https://ftpmirror.gnu.org/" - - "https://ftp.nluug.nl/pub/gnu/" - "https://mirrors.kernel.org/gnu/" - "https://mirror.ibcp.fr/pub/gnu/" - "https://mirror.dogado.de/gnu/" - "https://mirror.tochlab.net/pub/gnu/" - - # This one is the master repository, and thus it's always up-to-date. - "https://ftp.gnu.org/pub/gnu/" - - "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/" + # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html + bitlbee = [ + "https://get.bitlbee.org/" + "https://ftp.snt.utwente.nl/pub/software/bitlbee/" + "http://bitlbee.intergenia.de/" ]; - # GCC. + # GCC gcc = [ "https://bigsearcher.com/mirrors/gcc/" "https://mirror.koddos.net/gcc/" @@ -63,7 +59,37 @@ "ftp://gcc.gnu.org/pub/gcc/" ]; - # GnuPG. + # GNOME + gnome = [ + # This one redirects to some mirror closeby, so it should be all you need + "https://download.gnome.org/" + + "https://fr2.rpmfind.net/linux/gnome.org/" + "https://ftp.acc.umu.se/pub/GNOME/" + "https://ftp.belnet.be/mirror/ftp.gnome.org/" + "ftp://ftp.cse.buffalo.edu/pub/Gnome/" + "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/" + ]; + + # GNU (https://www.gnu.org/prep/ftp.html) + gnu = [ + # This one redirects to a (supposedly) nearby and (supposedly) up-to-date + # mirror + "https://ftpmirror.gnu.org/" + + "https://ftp.nluug.nl/pub/gnu/" + "https://mirrors.kernel.org/gnu/" + "https://mirror.ibcp.fr/pub/gnu/" + "https://mirror.dogado.de/gnu/" + "https://mirror.tochlab.net/pub/gnu/" + + # This one is the master repository, and thus it's always up-to-date + "https://ftp.gnu.org/pub/gnu/" + + "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/" + ]; + + # GnuPG gnupg = [ "https://gnupg.org/ftp/gcrypt/" "https://mirrors.dotsrc.org/gcrypt/" @@ -72,11 +98,13 @@ "http://www.ring.gr.jp/pub/net/" ]; - # kernel.org's /pub (/pub/{linux,software}) tree. - kernel = [ - "https://cdn.kernel.org/pub/" - "http://linux-kernel.uio.no/pub/" - "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" + # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php + imagemagick = [ + "https://www.imagemagick.org/download/" + "https://mirror.checkdomain.de/imagemagick/" + "https://ftp.nluug.nl/ImageMagick/" + "https://ftp.sunet.se/mirror/imagemagick.org/ftp/" + "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors ]; # Mirrors from https://download.kde.org/ls-lR.mirrorlist @@ -89,195 +117,47 @@ "https://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/" ]; - # Gentoo files. - gentoo = [ - "https://ftp.snt.utwente.nl/pub/os/linux/gentoo/" - "https://distfiles.gentoo.org/" - "https://mirrors.kernel.org/gentoo/" - ]; - - savannah = [ - # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html - "https://mirror.easyname.at/nongnu/" - "https://savannah.c3sl.ufpr.br/" - "https://mirror.csclub.uwaterloo.ca/nongnu/" - "https://mirror.cedia.org.ec/nongnu/" - "https://ftp.igh.cnrs.fr/pub/nongnu/" - "https://mirror6.layerjet.com/nongnu" - "https://mirror.netcologne.de/savannah/" - "https://ftp.cc.uoc.gr/mirrors/nongnu.org/" - "https://nongnu.uib.no/" - "https://ftp.acc.umu.se/mirror/gnu.org/savannah/" - "http://mirror2.klaus-uwe.me/nongnu/" - "http://mirrors.fe.up.pt/pub/nongnu/" - "http://ftp.twaren.net/Unix/NonGNU/" - "http://savannah-nongnu-org.ip-connect.vn.ua/" - "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/" - "http://gnu.mirrors.pair.com/savannah/savannah/" - "ftp://mirror.easyname.at/nongnu/" - "ftp://mirror2.klaus-uwe.me/nongnu/" - "ftp://mirror.csclub.uwaterloo.ca/nongnu/" - "ftp://ftp.igh.cnrs.fr/pub/nongnu/" - "ftp://mirror.netcologne.de/savannah/" - "ftp://nongnu.uib.no/pub/nongnu/" - "ftp://mirrors.fe.up.pt/pub/nongnu/" - "ftp://ftp.twaren.net/Unix/NonGNU/" - "ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/" - "ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/" - ]; - - samba = [ - "https://www.samba.org/ftp/" - "http://www.samba.org/ftp/" - ]; - - # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . - bitlbee = [ - "https://get.bitlbee.org/" - "https://ftp.snt.utwente.nl/pub/software/bitlbee/" - "http://bitlbee.intergenia.de/" - ]; - - # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php - imagemagick = [ - "https://www.imagemagick.org/download/" - "https://mirror.checkdomain.de/imagemagick/" - "https://ftp.nluug.nl/ImageMagick/" - "https://ftp.sunet.se/mirror/imagemagick.org/ftp/" - "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors - ]; - - # CPAN mirrors. - cpan = [ - "https://cpan.metacpan.org/" - "https://cpan.perl.org/" - "https://mirrors.kernel.org/CPAN/" - "https://backpan.perl.org/" # for old releases - ]; - - # CentOS. - centos = [ - # For old releases - "https://vault.centos.org/" - "https://archive.kernel.org/centos-vault/" - "https://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/" - "https://mirrors.aliyun.com/centos-vault/" - "https://mirror.chpc.utah.edu/pub/vault.centos.org/" - "https://mirror.math.princeton.edu/pub/centos-vault/" - "https://mirrors.tripadvisor.com/centos-vault/" - "http://mirror.centos.org/centos/" - ]; - - # Debian. - debian = [ - "https://httpredir.debian.org/debian/" - "https://ftp.debian.org/debian/" - "https://mirrors.edge.kernel.org/debian/" - "ftp://ftp.de.debian.org/debian/" - "ftp://ftp.fr.debian.org/debian/" - "ftp://ftp.nl.debian.org/debian/" - "ftp://ftp.ru.debian.org/debian/" - "http://archive.debian.org/debian-archive/debian/" - "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/" - ]; - - # Ubuntu. - ubuntu = [ - "https://nl.archive.ubuntu.com/ubuntu/" - "https://old-releases.ubuntu.com/ubuntu/" - "https://mirrors.edge.kernel.org/ubuntu/" - "http://de.archive.ubuntu.com/ubuntu/" - "http://archive.ubuntu.com/ubuntu/" - ]; - - # Fedora (please only add full mirrors that carry old Fedora distributions as well). - # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content). - fedora = [ - "https://archives.fedoraproject.org/pub/fedora/" - "https://fedora.osuosl.org/" - "https://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/" - "https://ftp.linux.cz/pub/linux/fedora/" - "https://archives.fedoraproject.org/pub/archive/fedora/" - "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/" - "http://mirror.csclub.uwaterloo.ca/fedora/" - "http://mirror.1000mbps.com/fedora/" - ]; - - # openSUSE. - opensuse = [ - "https://opensuse.hro.nl/opensuse/distribution/" - "https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/" - "https://ftp.opensuse.org/pub/opensuse/distribution/" - "https://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/" - "https://mirrors.edge.kernel.org/opensuse/distribution/" - "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/" - ]; - - gnome = [ - # This one redirects to some mirror closeby, so it should be all you need. - "https://download.gnome.org/" - - "https://fr2.rpmfind.net/linux/gnome.org/" - "https://ftp.acc.umu.se/pub/GNOME/" - "https://ftp.belnet.be/mirror/ftp.gnome.org/" - "ftp://ftp.cse.buffalo.edu/pub/Gnome/" - "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/" - ]; - - xfce = [ - "https://archive.xfce.org/" - "https://mirror.netcologne.de/xfce/" - "https://archive.be.xfce.org/xfce/" - "https://archive.al-us.xfce.org/" - "http://archive.se.xfce.org/xfce/" - "http://mirror.perldude.de/archive.xfce.org/" - "http://archive.be2.xfce.org/" - "http://ftp.udc.es/xfce/" - ]; - - # X.org. - xorg = [ - "https://xorg.freedesktop.org/releases/" - "https://ftp.x.org/archive/" - ]; - - apache = [ - "https://www-eu.apache.org/dist/" - "https://ftp.wayne.edu/apache/" - "https://www.apache.org/dist/" - "https://archive.apache.org/dist/" # fallback for old releases - "https://apache.cs.uu.nl/" - "https://apache.cs.utah.edu/" - "http://ftp.tudelft.nl/apache/" - "ftp://ftp.funet.fi/pub/mirrors/apache.org/" - ]; - - postgresql = [ - "https://ftp.postgresql.org/pub/" + # kernel.org's /pub (/pub/{linux,software}) tree + kernel = [ + "https://cdn.kernel.org/pub/" + "http://linux-kernel.uio.no/pub/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" ]; + # Metalab, now IBiblio metalab = [ "ftp://ftp.gwdg.de/pub/linux/metalab/" "ftp://ftp.metalab.unc.edu/pub/linux/" ]; - # Bioconductor mirrors (from https://bioconductor.org/about/mirrors/) - # The commented-out ones don't seem to allow direct package downloads; - # they serve error messages that result in hash mismatches instead. - bioc = [ - # http://bioc.ism.ac.jp/ - # http://bioc.openanalytics.eu/ - # http://bioconductor.fmrp.usp.br/ - # http://mirror.aarnet.edu.au/pub/bioconductor/ - # http://watson.nci.nih.gov/bioc_mirror/ - "https://bioconductor.statistik.tu-dortmund.de/packages/" - "https://mirrors.ustc.edu.cn/bioc/" - "http://bioconductor.jp/packages/" + # MySQL + mysql = [ + "https://cdn.mysql.com/Downloads/" ]; - # Hackage mirrors - hackage = [ - "https://hackage.haskell.org/package/" + # Maven Central + maven = [ + "https://repo1.maven.org/maven2/" + ]; + + # Mozilla projects + mozilla = [ + "https://download.cdn.mozilla.net/pub/mozilla.org/" + "https://archive.mozilla.org/pub/" + ]; + + # OSDN (formerly SourceForge.jp) + osdn = [ + "https://osdn.dl.osdn.jp/" + "https://osdn.mirror.constant.com/" + "https://mirrors.gigenet.com/OSDN/" + "https://osdn.dl.sourceforge.jp/" + "https://jaist.dl.sourceforge.jp/" + ]; + + # PostgreSQL + postgresql = [ + "https://ftp.postgresql.org/pub/" ]; # Roy marples mirrors @@ -329,25 +209,102 @@ "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/" ]; - # MySQL mirrors - mysql = [ - "https://cdn.mysql.com/Downloads/" + # SAMBA + samba = [ + "https://www.samba.org/ftp/" + "http://www.samba.org/ftp/" ]; - # OpenBSD mirrors - openbsd = [ - "https://ftp.openbsd.org/pub/OpenBSD/" - "ftp://ftp.nluug.nl/pub/OpenBSD/" - "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/" + # GNU Savannah + savannah = [ + # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html + "https://mirror.easyname.at/nongnu/" + "https://savannah.c3sl.ufpr.br/" + "https://mirror.csclub.uwaterloo.ca/nongnu/" + "https://mirror.cedia.org.ec/nongnu/" + "https://ftp.igh.cnrs.fr/pub/nongnu/" + "https://mirror6.layerjet.com/nongnu" + "https://mirror.netcologne.de/savannah/" + "https://ftp.cc.uoc.gr/mirrors/nongnu.org/" + "https://nongnu.uib.no/" + "https://ftp.acc.umu.se/mirror/gnu.org/savannah/" + "http://mirror2.klaus-uwe.me/nongnu/" + "http://mirrors.fe.up.pt/pub/nongnu/" + "http://ftp.twaren.net/Unix/NonGNU/" + "http://savannah-nongnu-org.ip-connect.vn.ua/" + "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/" + "http://gnu.mirrors.pair.com/savannah/savannah/" + "ftp://mirror.easyname.at/nongnu/" + "ftp://mirror2.klaus-uwe.me/nongnu/" + "ftp://mirror.csclub.uwaterloo.ca/nongnu/" + "ftp://ftp.igh.cnrs.fr/pub/nongnu/" + "ftp://mirror.netcologne.de/savannah/" + "ftp://nongnu.uib.no/pub/nongnu/" + "ftp://mirrors.fe.up.pt/pub/nongnu/" + "ftp://ftp.twaren.net/Unix/NonGNU/" + "ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/" + "ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/" ]; - # Steam Runtime mirrors + # SourceForge + sourceforge = [ + "https://downloads.sourceforge.net/" + "https://prdownloads.sourceforge.net/" + "https://netcologne.dl.sourceforge.net/sourceforge/" + "https://versaweb.dl.sourceforge.net/sourceforge/" + "https://freefr.dl.sourceforge.net/sourceforge/" + "https://osdn.dl.sourceforge.net/sourceforge/" + "https://kent.dl.sourceforge.net/sourceforge/" + ]; + + # Steam Runtime steamrt = [ "https://repo.steampowered.com/steamrt/" "https://public.abbradar.moe/steamrt/" ]; - # Python PyPI mirrors + # XFCE + xfce = [ + "https://archive.xfce.org/" + "https://mirror.netcologne.de/xfce/" + "https://archive.be.xfce.org/xfce/" + "https://archive.al-us.xfce.org/" + "http://archive.se.xfce.org/xfce/" + "http://mirror.perldude.de/archive.xfce.org/" + "http://archive.be2.xfce.org/" + "http://ftp.udc.es/xfce/" + ]; + + # X.org + xorg = [ + "https://xorg.freedesktop.org/releases/" + "https://ftp.x.org/archive/" + ]; + + ### Programming languages' package repos + + # Perl CPAN + cpan = [ + "https://cpan.metacpan.org/" + "https://cpan.perl.org/" + "https://mirrors.kernel.org/CPAN/" + "https://backpan.perl.org/" # for old releases + ]; + + # Haskell Hackage + hackage = [ + "https://hackage.haskell.org/package/" + ]; + + # Lua Rocks + luarocks = [ + "https://luarocks.org/" + "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/" + "https://luafr.org/moonrocks/" + "http://luarocks.logiceditor.com/rocks/" + ]; + + # Python PyPI pypi = [ "https://files.pythonhosted.org/packages/source/" # pypi.io is a more semantic link, but atm it’s referencing @@ -355,27 +312,85 @@ "https://pypi.io/packages/source/" ]; - # Python Test-PyPI mirror + # Python Test-PyPI testpypi = [ "https://test.pypi.io/packages/source/" ]; - # Mozilla projects. - mozilla = [ - "https://download.cdn.mozilla.net/pub/mozilla.org/" - "https://archive.mozilla.org/pub/" + ### Linux distros + + # CentOS + centos = [ + # For old releases + "https://vault.centos.org/" + "https://archive.kernel.org/centos-vault/" + "https://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/" + "https://mirrors.aliyun.com/centos-vault/" + "https://mirror.chpc.utah.edu/pub/vault.centos.org/" + "https://mirror.math.princeton.edu/pub/centos-vault/" + "https://mirrors.tripadvisor.com/centos-vault/" + "http://mirror.centos.org/centos/" ]; - # Maven Central - maven = [ - "https://repo1.maven.org/maven2/" + # Debian + debian = [ + "https://httpredir.debian.org/debian/" + "https://ftp.debian.org/debian/" + "https://mirrors.edge.kernel.org/debian/" + "ftp://ftp.de.debian.org/debian/" + "ftp://ftp.fr.debian.org/debian/" + "ftp://ftp.nl.debian.org/debian/" + "ftp://ftp.ru.debian.org/debian/" + "http://archive.debian.org/debian-archive/debian/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/" ]; - # Alsa Project - alsa = [ - "https://www.alsa-project.org/files/pub/" - "ftp://ftp.alsa-project.org/pub/" - "http://alsa.cybermirror.org/" - "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/" + # Fedora + # Please add only full mirrors that carry old Fedora distributions as well + # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content) + fedora = [ + "https://archives.fedoraproject.org/pub/fedora/" + "https://fedora.osuosl.org/" + "https://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/" + "https://ftp.linux.cz/pub/linux/fedora/" + "https://archives.fedoraproject.org/pub/archive/fedora/" + "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/" + "http://mirror.csclub.uwaterloo.ca/fedora/" + "http://mirror.1000mbps.com/fedora/" + ]; + + # Gentoo + gentoo = [ + "https://ftp.snt.utwente.nl/pub/os/linux/gentoo/" + "https://distfiles.gentoo.org/" + "https://mirrors.kernel.org/gentoo/" + ]; + + # openSUSE + opensuse = [ + "https://opensuse.hro.nl/opensuse/distribution/" + "https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/" + "https://ftp.opensuse.org/pub/opensuse/distribution/" + "https://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/" + "https://mirrors.edge.kernel.org/opensuse/distribution/" + "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/" + ]; + + # Ubuntu + ubuntu = [ + "https://nl.archive.ubuntu.com/ubuntu/" + "https://old-releases.ubuntu.com/ubuntu/" + "https://mirrors.edge.kernel.org/ubuntu/" + "http://de.archive.ubuntu.com/ubuntu/" + "http://archive.ubuntu.com/ubuntu/" + ]; + + # ... and other OSes in general + + # OpenBSD + openbsd = [ + "https://ftp.openbsd.org/pub/OpenBSD/" + "ftp://ftp.nluug.nl/pub/OpenBSD/" + "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/" ]; } From 2d88a59de11f1c16fbb31829307b6c3e560839da Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 15:39:09 -0300 Subject: [PATCH 288/329] pkgs/build-support/fetchurl/mirrors.nix: add TCSH mirrors --- pkgs/build-support/fetchurl/mirrors.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index fc7bce0ce56a..82f768daa5fa 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -263,6 +263,18 @@ "https://public.abbradar.moe/steamrt/" ]; + # TCSH shell + tcsh = [ + "https://astron.com/pub/tcsh/" + "https://astron.com/pub/tcsh/old/" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/" + "ftp://ftp.astron.com/pub/tcsh/" + "ftp://ftp.astron.com/pub/tcsh/old/" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/" + ]; + # XFCE xfce = [ "https://archive.xfce.org/" From 7b212f90e72fa665171ac591eb1cf2a7ef6166fa Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 14:12:59 -0300 Subject: [PATCH 289/329] tcsh: use tcsh mirrors --- pkgs/shells/tcsh/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 2c8548fb1fd1..4357ca605b17 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -10,17 +10,7 @@ stdenv.mkDerivation rec { version = "6.24.00"; src = fetchurl { - urls = [ - "https://astron.com/pub/tcsh/${pname}-${version}.tar.gz" - "https://astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" - "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" - "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" - - "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" - "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" - "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" - "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz" - ]; + url = "mirror://tcsh/${pname}-${version}.tar.gz"; hash = "sha256-YL4sUEvY8fpuQksZVkldfnztUqKslNtf0n9La/yPdPA="; }; @@ -29,6 +19,7 @@ stdenv.mkDerivation rec { ]; patches = lib.optional stdenv.hostPlatform.isMusl + # Use system malloc (fetchpatch { name = "sysmalloc.patch"; url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; From a77d575286a806cfcf0f69c73d5908a1ddb483f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 18:48:33 +0000 Subject: [PATCH 290/329] vala-lint: unstable-2021-12-28 -> unstable-2022-02-16 --- pkgs/development/tools/vala-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index f9c98bc4fb10..d8f316863200 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2021-12-28"; + version = "unstable-2022-02-16"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "1eeb3538b2a71addd0d8adc9f53ffe80fdfb8ce0"; - sha256 = "sha256-u2VJIDc1yvhbBgdMKL1RijoKEL4Vl8sbrGUYu5t/wJI="; + rev = "2f8a970cbf41ac54d2b4124c9d7db64543031901"; + sha256 = "sha256-jIC9nUWxs4iDpqEQGxl8JrHbBEkz60/elWHqGKQqlX8="; }; nativeBuildInputs = [ From 5240cbc0d816d12b5bb56789489e4e90ae751172 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sun, 13 Mar 2022 16:52:51 -0300 Subject: [PATCH 291/329] sage: adapt tachyon interface for 0.99.3 --- .../patches/tachyon-renamed-focallength.patch | 81 +++++++++++++++++++ .../science/math/sage/sage-src.nix | 3 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch diff --git a/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch b/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch new file mode 100644 index 000000000000..5fea88309036 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch @@ -0,0 +1,81 @@ +diff --git a/src/sage/interfaces/tachyon.py b/src/sage/interfaces/tachyon.py +index 3f1dcdb538..b6fa8d1fbd 100644 +--- a/src/sage/interfaces/tachyon.py ++++ b/src/sage/interfaces/tachyon.py +@@ -261,13 +261,13 @@ written in the sequence they are listed in the examples in this section. + The {\bf PROJECTION} keyword must be followed by one of the supported + camera projection mode identifiers {\bf PERSPECTIVE}, {\bf PERSPECTIVE_DOF}, + {\bf ORTHOGRAPHIC}, or {\bf FISHEYE}. The {\bf FISHEYE} projection mode +-requires two extra parameters {\bf FOCALLENGTH} and {\bf APERTURE} ++requires two extra parameters {\bf FOCALDIST} and {\bf APERTURE} + which precede the regular camera options. + + \begin{verbatim} + Camera + projection perspective_dof +- focallength 0.75 ++ focaldist 0.75 + aperture 0.02 + Zoom 0.666667 + Aspectratio 1.000000 +diff --git a/src/sage/plot/plot3d/tachyon.py b/src/sage/plot/plot3d/tachyon.py +index 08caf38d67..3e827411ce 100644 +--- a/src/sage/plot/plot3d/tachyon.py ++++ b/src/sage/plot/plot3d/tachyon.py +@@ -92,7 +92,7 @@ angle, right angle):: + Finally there is the ``projection='perspective_dof'`` option. :: + + sage: T = Tachyon(xres=800, antialiasing=4, raydepth=10, +- ....: projection='perspective_dof', focallength='1.0', aperture='.0025') ++ ....: projection='perspective_dof', focaldist='1.0', aperture='.0025') + sage: T.light((0,5,7), 1.0, (1,1,1)) + sage: T.texture('t1', opacity=1, specular=.3) + sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1)) +@@ -186,7 +186,7 @@ class Tachyon(WithEqualityById, SageObject): + or ``'fisheye'``. + - ``frustum`` - (default ''), otherwise list of four numbers. Only + used with projection='fisheye'. +- - ``focallength`` - (default ''), otherwise a number. Only used ++ - ``focaldist`` - (default ''), otherwise a number. Only used + with projection='perspective_dof'. + - ``aperture`` - (default ''), otherwise a number. Only used + with projection='perspective_dof'. +@@ -331,7 +331,7 @@ class Tachyon(WithEqualityById, SageObject): + Use of the ``projection='perspective_dof'`` option. This may not be + implemented correctly. :: + +- sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', focallength='1.0', aperture='.0025') ++ sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', focaldist='1.0', aperture='.0025') + sage: T.light((0,5,7), 1.0, (1,1,1)) + sage: T.texture('t1', opacity=1, specular=.3) + sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1)) +@@ -365,7 +365,7 @@ class Tachyon(WithEqualityById, SageObject): + look_at=[0, 0, 0], + viewdir=None, + projection='PERSPECTIVE', +- focallength='', ++ focaldist='', + aperture='', + frustum=''): + r""" +@@ -391,7 +391,7 @@ class Tachyon(WithEqualityById, SageObject): + self._camera_position = (-3, 0, 0) # default value + self._updir = updir + self._projection = projection +- self._focallength = focallength ++ self._focaldist = focaldist + self._aperture = aperture + self._frustum = frustum + self._objects = [] +@@ -624,9 +624,9 @@ class Tachyon(WithEqualityById, SageObject): + camera_out = r""" + camera + projection %s""" % (tostr(self._projection)) +- if self._focallength != '': ++ if self._focaldist != '': + camera_out = camera_out + r""" +- focallength %s""" % (float(self._focallength)) ++ focaldist %s""" % (float(self._focaldist)) + if self._aperture != '': + camera_out = camera_out + r""" + aperture %s""" % (float(self._aperture)) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 73a5881d2142..bae33802d301 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -155,6 +155,9 @@ stdenv.mkDerivation rec { rev = "97d7958bed441cf2ccc714d88f83d3a8426bc085"; sha256 = "sha256-y1STE0oxswnijGCsBw8eHWWqpmT1XMznIfA0vvX9pFA="; }) + + # adapted from https://trac.sagemath.org/ticket/23712#comment:22 + ./patches/tachyon-renamed-focallength.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; From 201d1632e71707929b3341b0a52e53acfcc454d9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Mar 2022 15:04:39 +0100 Subject: [PATCH 292/329] =?UTF-8?q?ocamlPackages.spacetime=5Flib:=20disabl?= =?UTF-8?q?e=20for=20OCaml=20=E2=89=A5=204.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/spacetime_lib/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix index 009b2ce32619..442d06e4f698 100644 --- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix +++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchFromGitHub, buildDunePackage, owee }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, owee }: + +lib.throwIfNot (lib.versionAtLeast "4.12" ocaml.version) + "spacetime_lib is not available for OCaml ${ocaml.version}" buildDunePackage rec { pname = "spacetime_lib"; From 804d792c44c4b7bef74cb79146c8f220b5d17959 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Mar 2022 15:04:53 +0100 Subject: [PATCH 293/329] =?UTF-8?q?ocamlPackages.owee:=200.3=20=E2=86=92?= =?UTF-8?q?=200.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/owee/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix index 9eb81003d47a..7b15437a7ed2 100644 --- a/pkgs/development/ocaml-modules/owee/default.nix +++ b/pkgs/development/ocaml-modules/owee/default.nix @@ -1,20 +1,19 @@ -{ lib, buildDunePackage, fetchFromGitHub }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; + useDune2 = true; pname = "owee"; - version = "0.3"; + version = "0.4"; - src = fetchFromGitHub { - owner = "let-def"; - repo = "owee"; - rev = "v${version}"; - sha256 = "0jp8ca57488d7sj2nqy4yxcdpda6sxx51yyi8k6888hbinhyqp0j"; + src = fetchurl { + url = "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz"; + sha256 = "sha256:055bi0yfdki1pqagbhrwmfvigyawjgsmqw04zhpp6hds8513qzvb"; }; meta = { description = "An experimental OCaml library to work with DWARF format"; - inherit (src.meta) homepage; + homepage = "https://github.com/let-def/owee/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; From 4d10c11d98b14070bac36c6cd1360a2f16083c0d Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Fri, 4 Mar 2022 11:33:22 +0100 Subject: [PATCH 294/329] ocamlPackages.ocamlfuse: 2.7.1_cvs6 -> 2.7.1_cvs7 Co-authored-by: Sandro --- pkgs/development/ocaml-modules/ocamlfuse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 4dcaca427886..13ac62f64514 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,14 +1,14 @@ { lib, buildDunePackage, fetchFromGitHub, camlidl, fuse, dune-configurator }: -buildDunePackage { +buildDunePackage rec { pname = "ocamlfuse"; - version = "2.7.1_cvs6_e35e76b"; + version = "2.7.1_cvs7"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; - rev = "e35e76bee3b06806256b5bfca108b7697267cd5c"; - sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff"; + rev = "v${version}"; + sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo="; }; # This currently fails with dune From b5359c444e881e36864c658bbcfc61259544c023 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Mar 2022 15:39:14 +0100 Subject: [PATCH 295/329] buildDunePackage: use dune_2 by default --- doc/languages-frameworks/ocaml.section.md | 4 ++-- pkgs/build-support/ocaml/dune.nix | 2 +- pkgs/development/ocaml-modules/facile/default.nix | 2 ++ pkgs/development/ocaml-modules/genspio/default.nix | 4 +++- pkgs/development/ocaml-modules/janestreet/janePackage.nix | 4 +++- .../development/ocaml-modules/janestreet/janePackage_0_12.nix | 2 ++ pkgs/development/ocaml-modules/lwt/camlp4.nix | 4 +++- pkgs/development/ocaml-modules/nonstd/default.nix | 4 +++- pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix | 2 ++ 9 files changed, 21 insertions(+), 7 deletions(-) diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 47035551d418..e4813d7dd2d4 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -38,8 +38,8 @@ Here is a simple package example. - It uses the `fetchFromGitHub` fetcher to get its source. -- `useDune2 = true` ensures that the latest version of Dune is used for the - build (this may become the default value in a future release). +- `useDune2 = true` ensures that Dune version 2 is used for the + build (this is the default; set to `false` to use Dune version 1). - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 6bdec501630e..18e8784cfab3 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -2,7 +2,7 @@ { pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args: -let Dune = if args.useDune2 or false then dune_2 else dune_1; in +let Dune = if args.useDune2 or true then dune_2 else dune_1; in if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) || (args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion) diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix index 8834de53a8fa..df228603e9f4 100644 --- a/pkgs/development/ocaml-modules/facile/default.nix +++ b/pkgs/development/ocaml-modules/facile/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "facile"; version = "1.1.4"; + useDune2 = false; + src = fetchurl { url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz"; sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp"; diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix index db3c42bca36c..963cd1dab138 100644 --- a/pkgs/development/ocaml-modules/genspio/default.nix +++ b/pkgs/development/ocaml-modules/genspio/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "genspio"; version = "0.0.2"; + useDune2 = false; + src = fetchFromGitHub { owner = "hammerlab"; repo = pname; @@ -13,7 +15,7 @@ buildDunePackage rec { sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x"; }; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; propagatedBuildInputs = [ nonstd sosa ]; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index 63c4a900fced..da2687576015 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -5,7 +5,9 @@ buildDunePackage (args // { inherit version buildInputs; - minimumOCamlVersion = "4.04"; + useDune2 = false; + + minimalOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "janestreet"; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index 3d280a509acc..5b9186835701 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -5,6 +5,8 @@ buildDunePackage (args // { inherit version; + useDune2 = false; + minimalOCamlVersion = "4.07"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/lwt/camlp4.nix b/pkgs/development/ocaml-modules/lwt/camlp4.nix index 88bb3d6759a0..e48d7cfa185a 100644 --- a/pkgs/development/ocaml-modules/lwt/camlp4.nix +++ b/pkgs/development/ocaml-modules/lwt/camlp4.nix @@ -11,7 +11,9 @@ buildDunePackage rec { sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9"; }; - minimumOCamlVersion = "4.02"; + useDune2 = false; + + minimalOCamlVersion = "4.02"; propagatedBuildInputs = [ camlp4 ]; diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index 9de535154eeb..82b1feed540b 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -4,7 +4,9 @@ buildDunePackage rec { pname = "nonstd"; version = "0.0.3"; - minimumOCamlVersion = "4.02"; + useDune2 = false; + + minimalOCamlVersion = "4.02"; src = fetchzip { url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index a08aaac832e3..39f6d5f7aa2d 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -6,6 +6,8 @@ buildDunePackage rec { version = "3.2.1"; pname = "js_of_ocaml-camlp4"; + useDune2 = false; + src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; From 961581fba4f2d09eb6109678db1fa7e03628c82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 13 Mar 2022 16:53:53 +0100 Subject: [PATCH 296/329] nixUnstable: 2.7pre20220221 -> 2.8pre20220311 --- pkgs/tools/package-management/nix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a6b7fa3a9008..8eb8fef82983 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -73,13 +73,13 @@ in lib.makeExtensible (self: { stable = self.nix_2_7; unstable = lib.lowPrio (common rec { - version = "2.7"; - suffix = "pre20220221_${lib.substring 0 7 src.rev}"; + version = "2.8"; + suffix = "pre20220311_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "caf51729450d4c57d48ddbef8e855e9bf65f8792"; - sha256 = "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw="; + rev = "d5322698a2abbc6d141e1d244e17b0d226a2f18b"; + sha256 = "sha256-7rQSktGC8+DmeyGOnzFMy1QwAYnw4JJphv+lEwFCwfU="; }; }); }) From 9d13bf5b1caedcee62cd7bb7fa71a61f0ba87403 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 6 Mar 2022 15:43:56 +0100 Subject: [PATCH 297/329] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F14.ocaml:?= =?UTF-8?q?=20init=20at=204.14.0-=CE=B21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.14.nix | 9 +++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/compilers/ocaml/4.14.nix diff --git a/pkgs/development/compilers/ocaml/4.14.nix b/pkgs/development/compilers/ocaml/4.14.nix new file mode 100644 index 000000000000..96e1c13d285b --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.14.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "14"; + patch_version = "0-beta1"; + src = fetchTarball { + url = "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~beta1.tar.xz"; + sha256 = "0jiz20hb58jbbk8j38agx11ra4hg0v3prmzc5a9j70lm09mnzfcd"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c883066ced52..cc126dc320de 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1580,6 +1580,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_13 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.13.nix { }); + ocamlPackages_4_14 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { }); + ocamlPackages_latest = ocamlPackages_4_13; ocamlPackages = ocamlPackages_4_13; From ad826d3b93b9f2d069beeb3c259d192146309ec3 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+a-m-joseph@users.noreply.github.com> Date: Sun, 13 Mar 2022 20:46:57 +0000 Subject: [PATCH 298/329] vte: respect the global systemdSupport flag This commit allows to compile vte without systemd (-D_systemd=false) if the systemdSupport attribute is set to false. This can be done globally in nixpkgs.conf, and is understood by other packages. See also PR #160972. --- pkgs/development/libraries/vte/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 0411086c78c3..eae934a4ebb1 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -21,6 +21,7 @@ , zlib , icu , systemd +, systemdSupport ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation rec { @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { pcre2 zlib icu + ] ++ lib.optionals systemdSupport [ systemd ]; @@ -73,6 +75,10 @@ stdenv.mkDerivation rec { pango ]; + mesonFlags = lib.optionals (!systemdSupport) [ + "-D_systemd=false" + ]; + postPatch = '' patchShebangs perf/* patchShebangs src/box_drawing_generate.sh From 32fe2acfab585422569bc73e4d06d51bd5e855da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 20:53:54 +0000 Subject: [PATCH 299/329] babashka: 0.7.7 -> 0.7.8 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index ce15fe4c5aff..c3dcd0a0f71f 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.7"; + version = "0.7.8"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-4aYYm2gCtfp+OiY6ouaTn4giHbX6JyULBHMpDnGMpbs="; + sha256 = "sha256-VbDivl92YYWzIbkbOgDijzf9bZ5ZyodcapPPG4EiGXc="; }; executable = "bb"; From 667902897a706e24a0e4a780a83a140cd039fb10 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:24:15 -0300 Subject: [PATCH 300/329] pkgs/build-support/fetchurl/mirrors.nix: add IBiblioPubLinux It corresponds to old Metalab/Sunsite. --- pkgs/build-support/fetchurl/mirrors.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 82f768daa5fa..8145ffa51792 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -98,6 +98,23 @@ "http://www.ring.gr.jp/pub/net/" ]; + # IBiblio (former metalab/sunsite) + # Most of the time the expressions refer to the /pub/Linux/ subdirectory; + # however there are other useful files outside it + ibiblioPubLinux = [ + "https://www.ibiblio.org/pub/Linux/" + "ftp://ftp.ibiblio.org/pub/linux/" + "ftp://ftp.gwdg.de/pub/linux/metalab/" + "ftp://ftp.metalab.unc.edu/pub/linux/" + ]; + + # Metalab (to be removed) + metalab = [ + "ftp://ftp.gwdg.de/pub/linux/metalab/" + "ftp://ftp.metalab.unc.edu/pub/linux/" + ]; + + # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php imagemagick = [ "https://www.imagemagick.org/download/" @@ -124,12 +141,6 @@ "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" ]; - # Metalab, now IBiblio - metalab = [ - "ftp://ftp.gwdg.de/pub/linux/metalab/" - "ftp://ftp.metalab.unc.edu/pub/linux/" - ]; - # MySQL mysql = [ "https://cdn.mysql.com/Downloads/" From c32a688f82fbc01f489eeeb078621f7301e1e740 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 13 Mar 2022 12:21:21 +1000 Subject: [PATCH 301/329] terraform-providers: refactor scripts - improve script output - use sri hashes, same as recent versions of `nix` --- .../terraform-providers/update-all-providers | 13 ++-- .../terraform-providers/update-provider | 70 +++++++++---------- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 57e1ab32f083..d7a05cf24a65 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -5,7 +5,7 @@ # Update all providers which have specified provider source address set -euo pipefail -providers=$( +readarray -t providers < <( jq -r 'to_entries | map_values(.value + { alias: .key }) | .[] @@ -13,10 +13,13 @@ providers=$( | .alias' providers.json ) -echo "Will update providers:" -echo "${providers}" +cat < read_attr() { - jq -r ".\"${provider_name}\".\"$1\"" providers.json + jq -r ".\"${provider}\".\"$1\"" providers.json } # Usage: update_attr update_attr() { if [[ $2 == "null" ]]; then - jq -S ".\"${provider_name}\".\"$1\" = null" providers.json | sponge providers.json + jq -S ".\"${provider}\".\"$1\" = null" providers.json | sponge providers.json else - jq -S ".\"${provider_name}\".\"$1\" = \"$2\"" providers.json | sponge providers.json + jq -S ".\"${provider}\".\"$1\" = \"$2\"" providers.json | sponge providers.json fi } -prefetch_github() { - # of a given owner, repo and rev, fetch the tarball and return the output of - # `nix-prefetch-url` - local owner=$1 - local repo=$2 - local rev=$3 - nix-prefetch-url --unpack "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz" +repo_root=$(git rev-parse --show-toplevel) + +generate_hash() { + nix-prefetch -I nixpkgs="${repo_root}" \ + "{ sha256 }: (import ${repo_root} {}).terraform-providers.${provider}.$1.overrideAttrs (_: { $2 = sha256; })" } -old_source_address="$(read_attr provider-source-address)" -old_vendor_sha256=$(read_attr vendorSha256) -old_version=$(read_attr version) +echo_provider() { + echo "== terraform-providers.${provider}: $* ==" +} if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then + echo_provider "init" source_address=registry.terraform.io/${provider} + provider=$(basename "${provider}") + update_attr "provider-source-address" "${source_address}" + update_attr version "0" + # create empty stings so nix-prefetch works + update_attr sha256 "" + update_attr vendorSha256 "" else - source_address=${old_source_address} + source_address="$(read_attr provider-source-address)" fi -if [[ ${source_address} == "null" ]]; then - echo "Could not find the source address for provider: ${provider}" - exit 1 -fi -update_attr "provider-source-address" "${source_address}" + +old_vendor_sha256=$(read_attr vendorSha256) +old_version=$(read_attr version) # The provider source address (used inside Terraform `required_providers` block) is # used to compute the registry API endpoint @@ -125,8 +126,10 @@ registry_response=$(curl -s https://"${source_address/\///v1/providers/}") version="$(jq -r '.version' <<<"${registry_response}")" if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then - echo "${provider_name} is already at version ${version}" + echo_provider "already at version ${version}" exit +else + echo_provider "updating from ${old_version} to ${version}" fi update_attr version "${version}" @@ -138,28 +141,23 @@ repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" rev="$(jq -r '.tag' <<<"${registry_response}")" update_attr rev "${rev}" -sha256=$(prefetch_github "${org}" "${repo}" "${rev}") +echo_provider "calculating sha256" +sha256=$(generate_hash src outputHash) update_attr sha256 "${sha256}" if [[ -z ${vendorSha256} ]]; then if [[ ${old_vendor_sha256} == null ]]; then vendorSha256=null - elif [[ -n ${old_vendor_sha256} ]]; then - echo "=== Calculating vendorSha256 ===" - vendorSha256=$(nix-prefetch -I nixpkgs=../../../../.. "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") - # Deal with nix unstable - if [[ ${vendorSha256} == sha256-* ]]; then - vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "${vendorSha256}") - fi + else + echo_provider "calculating vendorSha256" + vendorSha256=$(generate_hash go-modules vendorSha256) fi fi -if [[ -n ${vendorSha256} ]]; then - update_attr vendorSha256 "${vendorSha256}" -fi +update_attr vendorSha256 "${vendorSha256}" # Check that the provider builds if [[ ${build} == 1 ]]; then - echo "=== Building terraform-providers.${provider_name} ===" - nix-build --no-out-link ../../../../.. -A "terraform-providers.${provider_name}" + echo_provider "building" + nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider}" fi From 65268fe99a36f32a7c11eda40a9a18156a5c7436 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Mar 2022 08:11:17 +1000 Subject: [PATCH 302/329] .github/workflows: update cachix cache comment --- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 787f55352967..61a8a217651d 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -24,7 +24,7 @@ jobs: extra_nix_config: sandbox = true - uses: cachix/cachix-action@v10 with: - # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - name: Building NixOS manual diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 7d9273ef1398..70d9aab69828 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -24,7 +24,7 @@ jobs: extra_nix_config: sandbox = true - uses: cachix/cachix-action@v10 with: - # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - name: Building Nixpkgs manual From 1d41af9bc9f51783f5010d6d57a67908322bf3fc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 10 Mar 2022 07:46:03 +1000 Subject: [PATCH 303/329] .github/workflows/basic-eval.yml: add cachix cache Avoids rebuilding nix in every PR if it hasn't been build on hydra yet. --- .github/workflows/basic-eval.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index c48b04d8c14c..51429ae40bee 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -16,5 +16,10 @@ jobs: steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v16 + - uses: cachix/cachix-action@v10 + with: + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. + name: nixpkgs-ci + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' From 11e41ae4b2f51dfa4ccb93143d26f2e2aa62aa1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 22:12:41 +0000 Subject: [PATCH 304/329] evince: 41.3 -> 41.4 --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 28406e412844..17f02c08d654 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "41.3"; + version = "41.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M0awH5vcjy1f/qkvEQoJDGSjYklCtbVDqtRZKp3jO7A="; + sha256 = "/yRSQPIwkivsMqTXsKHZGyR6g9E0hPmbdANdUesjITA="; }; patches = lib.optionals withPantheon [ From f2ebc057eeddfe8bb207fdadc8d78ae1976d43ee Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 13 Mar 2022 15:35:37 -0700 Subject: [PATCH 305/329] mpv: add javascriptSupport option This commit adds a javascriptSupport option, allowing to compile mpv without mujs. --- pkgs/applications/video/mpv/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 576f79c47793..3ceda57fb899 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -15,7 +15,6 @@ , freetype , libass , libpthreadstubs -, mujs , nv-codec-headers , lua , libuchardet @@ -56,6 +55,7 @@ , cmsSupport ? true, lcms2 , dvdnavSupport ? stdenv.isLinux, libdvdnav , jackaudioSupport ? false, libjack2 +, javascriptSupport ? true, mujs , libpngSupport ? true, libpng , openalSupport ? true, openalSoft , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio @@ -108,6 +108,7 @@ in stdenv.mkDerivation rec { (lib.enableFeature archiveSupport "libarchive") (lib.enableFeature cddaSupport "cdda") (lib.enableFeature dvdnavSupport "dvdnav") + (lib.enableFeature javascriptSupport "javascript") (lib.enableFeature openalSupport "openal") (lib.enableFeature sdl2Support "sdl2") (lib.enableFeature sixelSupport "sixel") @@ -134,7 +135,6 @@ in stdenv.mkDerivation rec { libpthreadstubs libuchardet luaEnv - mujs ] ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals archiveSupport [ libarchive ] ++ lib.optionals bluraySupport [ libbluray ] @@ -145,6 +145,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals drmSupport [ libdrm mesa ] ++ lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ lib.optionals jackaudioSupport [ libjack2 ] + ++ lib.optionals javascriptSupport [ mujs ] ++ lib.optionals libpngSupport [ libpng ] ++ lib.optionals openalSupport [ openalSoft ] ++ lib.optionals pulseSupport [ libpulseaudio ] From 5cd57cc7c0238c176d342d8122080179b7573d52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Mar 2022 20:03:50 +0100 Subject: [PATCH 306/329] llvmPackages: update wasm to 12 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40f7cc930a43..9e1d28363511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12906,7 +12906,7 @@ with pkgs; else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 else if platform.isLinux then 11 - else if platform.isWasm then 8 + else if platform.isWasm then 12 else latest_version; # We take the "max of the mins". Why? Since those are lower bounds of the # supported version set, this is like intersecting those sets and then From 47ca51cba9d997be0be4b93f9757d3a04a1a8b79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Mar 2022 19:34:42 +0100 Subject: [PATCH 307/329] wasilibc: 20190712 -> unstable-2021-09-23 --- .../libraries/wasilibc/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index 56ed7367b2b2..e8436f9e9565 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -1,14 +1,27 @@ -{ stdenv, fetchFromGitHub, lib }: +{ stdenv, buildPackages, fetchFromGitHub, lib }: stdenv.mkDerivation { pname = "wasilibc"; - version = "20190712"; - src = fetchFromGitHub { - owner = "CraneStation"; + version = "unstable-2021-09-23"; + + src = buildPackages.fetchFromGitHub { + owner = "WebAssembly"; repo = "wasi-libc"; - rev = "8df0d4cd6a559b58d4a34b738a5a766b567448cf"; - sha256 = "1n4gvgzacpagar2mx8g9950q0brnhwz7jg2q44sa5mnjmlnkiqhh"; + rev = "ad5133410f66b93a2381db5b542aad5e0964db96"; + hash = "sha256-RiIClVXrb18jF9qCt+5iALHPCZKYcnad7JsILHBV0pA="; + fetchSubmodules = true; }; + + # clang-13: error: argument unused during compilation: '-rtlib=compiler-rt' [-Werror,-Wunused-command-line-argument] + postPatch = '' + substituteInPlace Makefile \ + --replace "-Werror" "" + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="-I$(pwd)/sysroot/include $NIX_CFLAGS_COMPILE" + ''; + makeFlags = [ "WASM_CC=${stdenv.cc.targetPrefix}cc" "WASM_NM=${stdenv.cc.targetPrefix}nm" @@ -16,6 +29,8 @@ stdenv.mkDerivation { "INSTALL_DIR=${placeholder "out"}" ]; + enableParallelBuilding = true; + postInstall = '' mv $out/lib/*/* $out/lib ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports @@ -23,9 +38,9 @@ stdenv.mkDerivation { meta = with lib; { description = "WASI libc implementation for WebAssembly"; - homepage = "https://wasi.dev"; - platforms = platforms.wasi; - maintainers = [ maintainers.matthewbauer ]; + homepage = "https://wasi.dev"; + platforms = platforms.wasi; + maintainers = with maintainers; [ matthewbauer ]; license = with licenses; [ asl20 mit llvm-exception ]; }; } From 1530477650768f41bfac6439043e5d1ec2c0bd4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Mar 2022 19:40:08 +0100 Subject: [PATCH 308/329] firefox: enable RLBox sandboxing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/ Co-authored-by: Jörg Thalheim --- .../networking/browsers/firefox/common.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index d57839b0e4b6..cace1829ccc5 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -15,7 +15,9 @@ , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , gtk3, wrapGAppsHook +, pkgsCross , debugBuild ? false +, runCommand ### optionals @@ -121,6 +123,15 @@ let }) else stdenv; + # Compile the wasm32 sysroot to build the RLBox Sandbox + # https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/ + # We only link c++ libs here, our compiler wrapper can find wasi libc and crt itself. + wasiSysRoot = runCommand "wasi-sysroot" {} '' + mkdir -p $out/lib/wasm32-wasi + for lib in ${pkgsCross.wasi32.llvmPackages.libcxx}/lib/* ${pkgsCross.wasi32.llvmPackages.libcxxabi}/lib/*; do + ln -s $lib $out/lib/wasm32-wasi + done + ''; in buildStdenv.mkDerivation ({ @@ -213,7 +224,11 @@ buildStdenv.mkDerivation ({ configureScript="$(realpath ./mach) configure" export MOZBUILD_STATE_PATH=$(pwd)/mozbuild - '' + (lib.optionalString googleAPISupport '' + '' + (lib.optionalString (lib.versionAtLeast version "95.0") '' + # RBox WASM Sandboxing + export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc + export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++ + '') + (lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # please get your own set of keys. @@ -258,6 +273,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional ltoSupport "--enable-lto=cross" # Cross-language LTO. ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld" + ++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}" ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -277,7 +293,6 @@ buildStdenv.mkDerivation ({ ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] ++ lib.optional enableOfficialBranding "--enable-official-branding" - ++ lib.optional (lib.versionAtLeast version "95") "--without-wasm-sandboxed-libraries" ++ extraConfigureFlags; postConfigure = '' @@ -356,6 +371,7 @@ buildStdenv.mkDerivation ({ inherit applicationName; inherit tests; inherit gtk3; + inherit wasiSysRoot; } // extraPassthru; hardeningDisable = [ "format" ]; # -Werror=format-security From 8996c57c202f42e0b08a7936f03ac885710a4a8d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:24:56 -0300 Subject: [PATCH 309/329] t1lib: ibiblioPubLinux mirror --- pkgs/development/libraries/t1lib/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 69940c18aafc..66c9863c38a4 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -21,19 +21,22 @@ stdenv.mkDerivation rec { version = "5.1.2"; src = fetchurl { - url = "mirror://metalab/libs/graphics/t1lib-${version}.tar.gz"; - sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; + url = "mirror://ibiblioPubLinux/libs/graphics/${pname}-${version}.tar.gz"; + hash = "sha256-ghMotQVPeJCg0M0vUoJScHBd82QdvUdtWNF+Vu2Ve1k="; }; inherit patches; buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optionalString (!stdenv.isDarwin) '' + # ?? + chmod +x $out/lib/*.so.* + ''; meta = with lib; { - description = "A type 1 font rasterizer library for UNIX/X11"; homepage = "http://www.t1lib.org/"; + description = "A type 1 font rasterizer library for UNIX/X11"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; }; From ae55f08023e44aebffd9d184ecf8e0d29537de32 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:26:20 -0300 Subject: [PATCH 310/329] bsdgames: ibiblioPubLinux mirror --- pkgs/games/bsdgames/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 837fb4e17682..c837ba39b444 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -5,13 +5,14 @@ stdenv.mkDerivation rec { version = "2.17"; src = fetchurl { - url = "ftp://metalab.unc.edu/pub/Linux/games/bsd-games-${version}.tar.gz"; - sha256 = "0q7zdyyfvn15y0w4g54kq3gza89h61py727m8slmw73cxx594vq6"; + url = "mirror://ibiblioPubLinux/games/${pname}-${version}.tar.gz"; + hash = "sha256-Bm+SSu9sHF6pRvWI428wMCH138CTlEc48CXY7bxv/2A="; }; buildInputs = [ ncurses openssl flex bison ]; patches = [ + # Remove UTMPX support on Makefrag file (fetchurl { url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch"; sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2"; From 197cb04778e894452f9b52503be85e0ba22ff8cb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:26:49 -0300 Subject: [PATCH 311/329] forktty: ibiblioPubLinux mirror --- pkgs/os-specific/linux/forktty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix index f060557cdecd..7dc1f0c3b2e4 100644 --- a/pkgs/os-specific/linux/forktty/default.nix +++ b/pkgs/os-specific/linux/forktty/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1.3"; src = fetchurl { - url = "http://sunsite.unc.edu/pub/linux/utils/terminal/forktty-${version}.tgz"; - sha256 = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk="; + url = "mirror://ibiblioPubLinux/utils/terminal/${pname}-${version}.tgz"; + hash = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk="; }; preBuild = '' From f3e1e37041b33d658c1d606658c7b74caaad0333 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:27:02 -0300 Subject: [PATCH 312/329] bsd-fingerd: ibiblioPubLinux mirror --- pkgs/servers/fingerd/bsd-fingerd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index 4fb6f44b4547..b907c67ccb73 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.17"; src = fetchurl { - url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz"; + url = "mirror://ibiblioPubLinux/system/network/finger/bsd-finger-${version}.tar.gz"; sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; }; From de6c0f0ff7cd6e0a9337a4ac20b76a9108f1b25d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:27:14 -0300 Subject: [PATCH 313/329] bsd-finger: ibiblioPubLinux mirror --- pkgs/tools/networking/bsd-finger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 4f8d946fa360..a83a02bd0978 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.17"; src = fetchurl { - url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz"; + url = "mirror://ibiblioPubLinux/system/network/finger/bsd-finger-${version}.tar.gz"; sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; }; From 638efbf778c49ec60e636d2c9d35d459a3dfe0df Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:27:23 -0300 Subject: [PATCH 314/329] wakelan: ibiblioPubLinux mirror --- pkgs/tools/networking/wakelan/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 5365e696fadc..7e9bcc1a70ca 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "mirror://metalab/system/network/misc/wakelan-${version}.tar.gz"; - sha256 = "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x"; + url = "mirror://ibiblioPubLinux/system/network/misc/${pname}-${version}.tar.gz"; + hash = "sha256-PfXrj4d2SHmatiPPFxjsxvhusML1HTRNjoYEQtzFzW8="; }; preInstall = '' @@ -15,15 +15,12 @@ stdenv.mkDerivation rec { meta = { description = "Send a wake-on-lan packet"; - - longDescription = - '' WakeLan sends a properly formatted UDP packet across the - network which will cause a wake-on-lan enabled computer to - power on. - ''; - + longDescription = '' + WakeLan sends a properly formatted UDP packet across the + network which will cause a wake-on-lan enabled computer to + power on. + ''; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.viric ]; platforms = lib.platforms.unix; }; From b988e9a1f9aab982c5adc95143df37417b82a951 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 18:41:48 -0300 Subject: [PATCH 315/329] pkgs/build-support/fetchurl/mirrors.nix: remove metalab --- pkgs/build-support/fetchurl/mirrors.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 8145ffa51792..954c88d1bafa 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -108,13 +108,6 @@ "ftp://ftp.metalab.unc.edu/pub/linux/" ]; - # Metalab (to be removed) - metalab = [ - "ftp://ftp.gwdg.de/pub/linux/metalab/" - "ftp://ftp.metalab.unc.edu/pub/linux/" - ]; - - # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php imagemagick = [ "https://www.imagemagick.org/download/" From a33e2735a17005ccbe12e67d3e1f8fb384380d97 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Mar 2022 08:56:54 +1000 Subject: [PATCH 316/329] terraform-providers: update 2022-03-14 --- .../terraform-providers/providers.json | 232 +++++++++--------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 73c76101397c..8ff0628a6615 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -40,10 +40,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.159.0", - "sha256": "0vfpmagxrlv6fqaq008lhygxd49br06d0bi1w6dsazfszw3ihj02", - "vendorSha256": "05vkn52s0x6kcyxxs0p7w6z1nclmvvla7rjv1ippzw7fgn2s19m0", - "version": "1.159.0" + "rev": "v1.160.0", + "sha256": "sha256-ijSOvBS8bcFKX0qa2Cl/xqDdwduamVdCWzgTCWao1Sg=", + "vendorSha256": "sha256-oKaghX3u8H9vDFvmo+jelTIbvuHnAt27Z9N0oEWxcxc=", + "version": "1.160.0" }, "ansible": { "owner": "nbering", @@ -94,28 +94,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.4.0", - "sha256": "082bllsihmc4jndi1hrv1chcrdm755vphlgpajg22s1ajmylqgm5", - "vendorSha256": "0j6ghjr2mhi7nixkk8v9vwm6sr78h0wnj1lxs19lkrpnvy6jc31i", - "version": "4.4.0" + "rev": "v4.5.0", + "sha256": "sha256-L1LRuinU3YrqywRGpmUqGQgjZ1JuYhECjCN6ysYPzco=", + "vendorSha256": "sha256-3akEup/M7Zc5MPf2XA+324PxQiHegIwzR05JNSjYanw=", + "version": "4.5.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.18.0", - "sha256": "06l4w9g4p48gnb9c9mmnydvpyr89f8rijpf103ndsg6ack6k4mg2", + "rev": "v2.19.1", + "sha256": "sha256-n5jDlcy5rwCcrqoL3ut+HThDLQ8hPj2mZ15d7hhALFw=", "vendorSha256": null, - "version": "2.18.0" + "version": "2.19.1" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.98.0", - "sha256": "0cfdw70q1kh6f50gsc94mh1xi7s4z47wfsmskp1ahx7av7wpz1p6", + "rev": "v2.99.0", + "sha256": "sha256-HXLr22UVciRvW1iaa46sy37ivG41hKqhrQtCXpnl8ss=", "vendorSha256": null, - "version": "2.98.0" + "version": "2.99.0" }, "azurestack": { "owner": "hashicorp", @@ -148,10 +148,10 @@ "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.4.1", - "sha256": "07y0biab2g6plkyp8scqf7b12alijnxq2zqqr05lbm6wgrc22kvk", - "vendorSha256": null, - "version": "2.4.1" + "rev": "v2.8.0", + "sha256": "sha256-W+mAud3DpBViLeFwXLWIwZ1+TOco8FWZnVrIbHUwgIU=", + "vendorSha256": "sha256-hSMVLDZXC9QMpcgREjEUjhxArtotrIrIyfdNIZw8uM4=", + "version": "2.8.0" }, "brightbox": { "owner": "brightbox", @@ -166,10 +166,10 @@ "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", - "rev": "v1.4.2", - "sha256": "1wd9834d3yi2y35yrcrgxmzijrb2ymz11gqmva9m1hd10i0aqj9f", - "vendorSha256": "0pjxrdpsn99g6hjp0flrk7czjb05ibnsjcggrvvpwzrbj55rqzgd", - "version": "1.4.2" + "rev": "v1.4.3", + "sha256": "sha256-5VF1cAFgdm2TR4wvuNlycpgQuVdHesFYnTv34MeauxY=", + "vendorSha256": "sha256-7X2cS5Erf373zu8xqe2KBSz52ZmZOnAlNC8lq2/LXV4=", + "version": "1.4.3" }, "checkpoint": { "deleteVendor": true, @@ -194,10 +194,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.9.1", - "sha256": "02kyjf2mizvxv1a2fkw2wsk0gmilj83sj3qv1d7g0wxxkxx00nd2", - "vendorSha256": "167jafxr4g43y9gvqjq5z7vd9cyf15d69wbrdvqsfzj8sszqfq5l", - "version": "3.9.1" + "rev": "v3.10.1", + "sha256": "sha256-2Ulavo82Y8dEOXtgpbgCwuCTOhAEoOFbgL4bK5HXQlY=", + "vendorSha256": "sha256-CgK1/Ddau3glxmzb7Y6o1RZbMV8dwA84F6n2OzuyZrU=", + "version": "3.10.1" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -257,10 +257,10 @@ "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.8.1", - "sha256": "0mvl80dsqzab1r3p5n446737dadzfbsyfbdy2w2xvmz4fgx6aklh", - "vendorSha256": "0p8czqb4hn5z9bfgsfajdpx46hwil0ax75j8xljlh1ccvpp2rvyz", - "version": "3.8.1" + "rev": "v3.9.0", + "sha256": "sha256-CncMqWIa1JiHkIkNAgIQl4fcKZVKZGD4BZSjuv5cw18=", + "vendorSha256": "sha256-U1gVP4o1mj21NW9z8jyV5KhuJNJRYAV1Qvg1fV1zGO4=", + "version": "3.9.0" }, "dhall": { "owner": "awakesecurity", @@ -275,10 +275,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.17.1", - "sha256": "0dfw4sjmsfzrs28gf5k4vqjs6phwa6w3pwi7fpbngnw6l2r4m6h9", + "rev": "v2.18.0", + "sha256": "sha256-MuJpBLOB8AeAlNhQC+rwT6mkZriU4+XgAqQY33xjFck=", "vendorSha256": null, - "version": "2.17.1" + "version": "2.18.0" }, "dme": { "owner": "DNSMadeEasy", @@ -329,19 +329,19 @@ "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.0-beta.4", - "sha256": "0ypw916sziy8dhvbv96f7d4as08ps18xxx8h6ip69mk74vf029sm", - "vendorSha256": "1w92k895ikrqm9n1hf36wlh9nq278vifl3r14v0rxa8g9awizfdr", - "version": "2.0.0-beta.4" + "rev": "v2.0.0", + "sha256": "sha256-wl8pRAB97JObpZvi2rdyDZP5itKcOnm6Gsbku1+5oqQ=", + "vendorSha256": "sha256-OCXTZg0JkaxJDEgoF2Qs4BcMSiYkQpLmehWdCpEmTzk=", + "version": "2.0.0" }, "exoscale": { "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.32.0", - "sha256": "1jnpbw50cqzkxr1xgxxnkg0fp65mz84v9fqxpv4j29djgvi94w2m", + "rev": "v0.33.0", + "sha256": "sha256-mih0Bo6fcNgpyeCQ+GWSPyTrPlGzmBXkEO43TOVWMds=", "vendorSha256": null, - "version": "0.32.0" + "version": "0.33.0" }, "external": { "owner": "hashicorp", @@ -356,10 +356,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v1.1.1", - "sha256": "1n7lwvfp4y0k1rh13jz94im367h6mxmvglik2nddq58pmxwns2lz", + "rev": "v1.1.2", + "sha256": "sha256-CxyVW9uE9mK+ZF8fyjAsrFKY82xAyGn9k1jOFqTaAhA=", "vendorSha256": null, - "version": "1.1.1" + "version": "1.1.2" }, "flexibleengine": { "owner": "FlexibleEngineCloud", @@ -392,39 +392,39 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.20.1", - "sha256": "1kqi41g1lw2phar7gy35rf92qb5s32p7q780d9wrmyimriwhlh4j", + "rev": "v4.21.0", + "sha256": "sha256-ayL22zlfZkGL/ycyQX384g7CjFHDgK8k010kg1fI4h4=", "vendorSha256": null, - "version": "4.20.1" + "version": "4.21.0" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.11.1", - "sha256": "19l2m1d8jn5c8kd39fhw34f805ckad36vs4a2xalpb3whj89sfwy", - "vendorSha256": "0flvda6jrq5ff8lk0405bxs90rwpaw3aci85bfd9k258sp3ign9s", - "version": "3.11.1" + "rev": "v3.12.0", + "sha256": "sha256-6CrM2Pt4yB0ZaXvcgUPreIhJrUhXCNt/xt+fExzGJqc=", + "vendorSha256": "sha256-78/7+t75xFjLt1JfoVpHVPlM7q5BX+NI/I9ugfjdv+g=", + "version": "3.12.0" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.12.0", - "sha256": "0yrzzg7b1dqfsz6wpqh869qwdwbi747hr5xwcjycl8mz4ajlwzsz", - "vendorSha256": "1rfhcapahzss8frpnyag53r5s7iqwq7ndqjv30bmhzw3ilwgdfdr", - "version": "4.12.0" + "rev": "v4.13.0", + "sha256": "sha256-QSHlnvsWmkdUE7dd6HqzYtyYC+XDW69dIp/h7u1jD9g=", + "vendorSha256": "sha256-1tiFBc03RyIAtnu/NqhU3RowM8JhuLNS+blfyjXBcW0=", + "version": "4.13.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.12.0", - "sha256": "0dbhzch3vixl8lpdd39p1crx997kdg25scliha7nj2g7a8cli73y", - "vendorSha256": "1rfhcapahzss8frpnyag53r5s7iqwq7ndqjv30bmhzw3ilwgdfdr", - "version": "4.12.0" + "rev": "v4.13.0", + "sha256": "sha256-jjYUijzUgIiSC9eL6rbgtuBSh6bbHLjeifN+GIndrVs=", + "vendorSha256": "sha256-1tiFBc03RyIAtnu/NqhU3RowM8JhuLNS+blfyjXBcW0=", + "version": "4.13.0" }, "grafana": { "owner": "grafana", @@ -511,10 +511,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.39.1", - "sha256": "1f7zhczsz9w4lk2fzcbk1w1pjwnmbgn7lk8nsyk5azkspbf4hjzv", - "vendorSha256": "1dhm99h7srnfwscdqy2zaj3wjdb0v1ybb7arv60522xvhsdnb99r", - "version": "1.39.1" + "rev": "v1.39.2", + "sha256": "sha256-9r0tt0N3m/IYq/9oepQ4DcB78ds8pb1up1TyjFYzX1U=", + "vendorSha256": "sha256-8qgm1zDdwKNE/bs1n5cpY/DUD3SKtFmnvEgwtKorASk=", + "version": "1.39.2" }, "icinga2": { "owner": "Icinga", @@ -565,10 +565,10 @@ "owner": "kingsoftcloud", "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", - "rev": "v1.3.41", - "sha256": "0p8fl7dkp2nfw73ij769svm83cpvi1rw3aykf0qx33n9si78m892", - "vendorSha256": "1pm4kld23mvgs14z54fpfdvnj0alm8frkkmf0851hi58nazc54dq", - "version": "1.3.41" + "rev": "v1.3.42", + "sha256": "sha256-wj4o2XSz8ylZJdseIi/TadlhOwFWZ6nfDOUezbeGYw4=", + "vendorSha256": "sha256-nbAEaRFtFtB4ftLgnCv3MmkjFFbcNkCuxZc+G8/ObPE=", + "version": "1.3.42" }, "kubectl": { "owner": "gavinbunney", @@ -610,10 +610,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.25.2", - "sha256": "18w9x80zary64873d1r824g28l5dhkda1qq0lr895afwh8g11dfp", - "vendorSha256": "0c882yafydhdhnp5awb8llzbmiljfdbamqlx740347ywpliy0ga2", - "version": "1.25.2" + "rev": "v1.26.1", + "sha256": "sha256-bd0raIIh/VmTlSVYnNd98fpppRKnO46g8FI5OwZPjMg=", + "vendorSha256": "sha256-SCTWvTgJ0QYh2DEbTI9coa3Fp4fBHusytF+JFzAq2XA=", + "version": "1.26.1" }, "linuxbox": { "owner": "numtide", @@ -628,10 +628,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", - "rev": "v2.1.0", - "sha256": "0lv1mvy4pkx0sc49xny4j0h30m64lvr3rnmqk85i5p0xhyn77gf2", - "vendorSha256": null, - "version": "2.1.0" + "rev": "v2.2.2", + "sha256": "sha256-JpTdRi9EagrnhYnlq6sl6+t4SE6i7T7YrGTsYCDync8=", + "vendorSha256": "sha256-Ha/MGbXwwhbVxaHbkU2xBhyNcDxLivk7vYQjfVzWOcY=", + "version": "2.2.2" }, "logicmonitor": { "deleteVendor": true, @@ -719,10 +719,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.39.0", - "sha256": "03raj9a0qxvss03ab78pdqwbkc4hc95khzi7lg1a156vxfnibdr2", - "vendorSha256": "0sch3wdgy6mx8a983miwi5ihky2j4mzvcg8wilwlp7nsgrfv6ghc", - "version": "2.39.0" + "rev": "v2.39.2", + "sha256": "sha256-NfszsBliZAjY52kPWB7yhOEYZB2V4yOp6IDffF7EG6k=", + "vendorSha256": "sha256-DD6zXX7anks5jRw9tn8lUvgJY4k81oGSQr0a/xofkGk=", + "version": "2.39.2" }, "nomad": { "owner": "hashicorp", @@ -771,22 +771,22 @@ "version": "1.3.0" }, "oci": { - "owner": "terraform-providers", + "owner": "oracle", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.66.0", - "sha256": "0iyh87ckv18f3krlhklj07shv5jwskp6fd70fq3zzfdl07jyy429", + "rev": "v4.67.0", + "sha256": "sha256-kgnyGLF6UbWRbrjXDkh7y11jx4JO3hFo7/qdJzwX0rU=", "vendorSha256": null, - "version": "4.66.0" + "version": "4.67.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.22.0", - "sha256": "1fsxdljpyb9qxc32jgi1yrwrs8rb8iz7ld11a0sm65qhh5yvl5jh", - "vendorSha256": "0l0di6cmm41z7i4d498xxc8wcrbg6r9w4vcdksqhz92s1gqs3f4z", - "version": "3.22.0" + "rev": "v3.22.1", + "sha256": "sha256-G1KJJSxJmzFlIUWOs+7htcgp61oWCu+ryCKaIHzxhzw=", + "vendorSha256": "sha256-n7ih8QtapA+xno1twlM2b2XGEesdJdJIPD+QWpmJDVA=", + "version": "3.22.1" }, "oktaasa": { "owner": "oktadeveloper", @@ -811,10 +811,10 @@ "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v0.4.1", - "sha256": "13z14p8zkrmffai5pdiwi33xsznan015nl9b9cfyxi1is4m5i41m", - "vendorSha256": "0qyzavig8wnnjzm63pny5azywqyrnjm978yg5y0sr6zw8wghjd15", - "version": "0.4.1" + "rev": "v0.4.2", + "sha256": "sha256-h2trcyXJcdWQyonjdDLkJkcawE4AoFYnzLZtKPotMY0=", + "vendorSha256": "sha256-JTQJH0f8m6yBL8+jk6q02WPuvyre3mHql9Zy9OJW32M=", + "version": "0.4.2" }, "openstack": { "owner": "terraform-provider-openstack", @@ -829,10 +829,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.27.6", - "sha256": "1vq2h4ldvskw874fdnjqh1np5z09dh3q3lrqjmfand8ksrzacjjm", - "vendorSha256": "0bkya9ckh82bacaksqbb6010fwclz9wh1b5k1s9z9d0d6bgvf60m", - "version": "1.27.6" + "rev": "v1.27.7", + "sha256": "sha256-8y++zfxRam4sZvGWajyGiPv/5G8K7D4+ReNU7DBlqe8=", + "vendorSha256": "sha256-OqN+QGclKYo4jjQi0HJ/80zVTPkcOQyl4n6i2BpDZQE=", + "version": "1.27.7" }, "opsgenie": { "owner": "opsgenie", @@ -991,10 +991,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.9.0", - "sha256": "08p33mjshi3m36yxhlvlsghnqmw2pnihglxm2p9iapi0zg3wxqbq", - "vendorSha256": "0hw7gz08k27kswbn42kab730f8gj2sjksmkc662hb9nbq8ykazbd", - "version": "6.9.0" + "rev": "v6.10.0", + "sha256": "sha256-ZfNxab95ZDz68fEPfYd+w0E/fS/FPBVIs4kHTBhG858=", + "vendorSha256": "sha256-bX01PcLLpgWFMWxWPaUW8iEHxllqCmIX1/OIicB/h0M=", + "version": "6.10.0" }, "skytap": { "owner": "skytap", @@ -1027,10 +1027,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.68.0", - "sha256": "0llyy4rskspw4cy8jdbk175rli9s53mabj4b9yarm7apg17ai399", - "vendorSha256": "0j0airkc1p0y9w1w40fbwxmymf8rbal2ycrkp31x1c06f8s4lhzm", - "version": "1.68.0" + "rev": "v1.69.0", + "sha256": "sha256-pTQvqjh52B9w383yLvhNjDujSgQI1k8WpA1vpcY7RKI=", + "vendorSha256": "sha256-X7K0eHbmGBYnJ5ovnD/y6O9r7TTHgK7f7s9w4R5ThBU=", + "version": "1.69.0" }, "stackpath": { "owner": "stackpath", @@ -1045,10 +1045,10 @@ "owner": "StatusCakeDev", "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", - "rev": "v1.0.1", - "sha256": "16pwsna1bkrdppxn2vjgbx552vsg4f2igykcb26mw3vp6n9piwfl", - "vendorSha256": null, - "version": "1.0.1" + "rev": "v2.0.0-pre", + "sha256": "sha256-S9VJRGREoRJPIb9gv822Y/8ZRa0x7WoPjU7BxLlRpOM=", + "vendorSha256": "sha256-wKrbjxRCDk8GFAR0OFz4w9UnkIXH9EO/S+p2RKNLJaM=", + "version": "2.0.0-pre" }, "sumologic": { "owner": "SumoLogic", @@ -1072,10 +1072,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.63.0", - "sha256": "1d5mzmr5r01gqf519r7f3mfcm1w7hryansymwazjbwy2rxpsn958", + "rev": "v1.65.0", + "sha256": "sha256-NpKZ4KbEDxCYmG2E4F/bHEUmK6invkcIaNkXDZjhmDI=", "vendorSha256": null, - "version": "1.63.0" + "version": "1.65.0" }, "tfe": { "owner": "hashicorp", @@ -1200,10 +1200,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v2.1.0", - "sha256": "193qprm7psx0gshv5q7idm05k78rpi2vpdg5pgs7bq1wpzlaqrpa", + "rev": "v2.1.1", + "sha256": "sha256-Xu5BMmOHEX+ctPu8374BDGsRC5hnvzji5oI69ptIi3Y=", "vendorSha256": null, - "version": "2.1.0" + "version": "2.1.1" }, "vultr": { "owner": "vultr", @@ -1218,10 +1218,10 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", - "rev": "v3.0.0", - "sha256": "1awi74b7ny021krck0vp1gv6v93a4h0rgdl5xib82lf5pxnx4wgn", - "vendorSha256": "0gbwj4cqywip22irkx9hyghy6zx9dirm6gd3i70nclchvkg9dm1x", - "version": "3.0.0" + "rev": "v3.0.1", + "sha256": "sha256-6SQjYaN0yhcHdmM+vGvIDPHKxN34ns3Yz+CMTEo13s0=", + "vendorSha256": "sha256-PdSW3tyQUWbBiaM9U3NsqX/j4fMw9ZmjEDdyjxmRfD0=", + "version": "3.0.1" }, "yandex": { "owner": "yandex-cloud", From 9bdd2f852cdcaadd65ba38876c3379e10a967290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 14 Mar 2022 02:11:10 +0100 Subject: [PATCH 317/329] nixos/switch-to-configuration: fix installBootLoader escaping Use a quoted heredoc to inject installBootLoader safely into the script, and restore the previous invocation of `system` with a single argument so that shell commands keep working. --- nixos/modules/system/activation/switch-to-configuration.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 nixos/modules/system/activation/switch-to-configuration.pl diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl old mode 100644 new mode 100755 index 07ee281feec1..459d09faa53b --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -67,7 +67,10 @@ openlog("nixos", "", LOG_USER); # Install or update the bootloader. if ($action eq "switch" || $action eq "boot") { - system('@installBootLoader@', $out) == 0 or exit 1; + chomp(my $installBootLoader = <<'EOFBOOTLOADER'); +@installBootLoader@ +EOFBOOTLOADER + system("$installBootLoader $out") == 0 or exit 1; } # Just in case the new configuration hangs the system, do a sync now. From 976a5bc9fffaad437069df4d06edf0315f7a020f Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 13 Mar 2022 12:00:00 +0000 Subject: [PATCH 318/329] nix-du: 0.4.1 -> 0.5.0 fix build with nix 2.7 --- pkgs/tools/package-management/nix-du/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index e0f2a192c232..3f5a73821cbc 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-du"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; rev = "v${version}"; - sha256 = "0v6hixj81aa6g3sddny46i0yqaaqv6krp5xadj0xz1g77cb8xy2w"; + sha256 = "sha256-NnoCoiYTXci7f9MXsxEhoYHwPsaAAuK2wSrDye2+SYM="; }; - cargoSha256 = "11jaks6adsvrvxlqqw3glvn4ff7xh9j35ayfrl89rb4achvqp7xn"; + cargoSha256 = "sha256-X5181gZtvnUHZAqMjNARRVFq12LuLJfPP5ZOWxBRxXk="; doCheck = true; checkInputs = [ nix graphviz ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { nlohmann_json ] ++ lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; meta = with lib; { description = "A tool to determine which gc-roots take space in your nix store"; From 9ae6eefd057ea84a50446ee5f5359a2d73c16d0d Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 13 Mar 2022 20:59:50 -0700 Subject: [PATCH 319/329] virt-manager: fix filtered tests --- .../virtualization/virt-manager/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index af28e5f461b4..ab38de0f9199 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio -, e2fsprogs, findutils, gzip, cdrtools +, e2fsprogs, findutils, gzip, cdrtools, xorriso , spiceSupport ? true, spice-gtk ? null }: @@ -58,11 +58,16 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3.pkgs; [ cpio cdrtools pytestCheckHook ]; + checkInputs = with python3.pkgs; [ + pytestCheckHook + cpio + cdrtools + xorriso + ]; - disabledTestPaths = [ - "tests/test_misc.py" - "tests/test_xmlparse.py" + disabledTests = [ + "testCLI0001virt_install_many_devices" + "test_disk_dir_searchable" ]; preCheck = '' From b11029f2406422188e0dea35c494a851ab9d302b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 23:31:33 +0000 Subject: [PATCH 320/329] lmodern: 2.004.5 -> 2.005 --- pkgs/data/fonts/lmodern/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 53fc456d7583..af0e70331351 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,9 +1,9 @@ { fetchzip }: fetchzip { - name = "lmodern-2.004.5"; + name = "lmodern-2.005"; - url = "mirror://debian/pool/main/l/lmodern/lmodern_2.004.5.orig.tar.gz"; + url = "mirror://debian/pool/main/l/lmodern/lmodern_2.005.orig.tar.gz"; postFetch = '' tar xzvf $downloadedFile @@ -11,13 +11,13 @@ fetchzip { mkdir -p $out/texmf-dist/ mkdir -p $out/share/fonts/ - cp -r lmodern-2.004.5/* $out/texmf-dist/ - cp -r lmodern-2.004.5/fonts/{opentype,type1} $out/share/fonts/ + cp -r lmodern-2.005/* $out/texmf-dist/ + cp -r lmodern-2.005/fonts/{opentype,type1} $out/share/fonts/ ln -s -r $out/texmf* $out/share/ ''; - sha256 = "11f10qnp8a435lhh19zc2znlf9q4isynmvjmvr63g5n5fhvhc192"; + sha256 = "sha256-ySdKUt8o5FqmpdnYSzbGJ1f9t8VmKYXqPt53e1/E/FA="; meta = { description = "Latin Modern font"; From c51d465e8b36c48f50a55303ab5bca532757faeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 05:56:57 +0000 Subject: [PATCH 321/329] dnsx: 1.0.9 -> 1.1.0 --- pkgs/tools/security/dnsx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index d81e453f692c..c316ab35b6d9 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "v${version}"; - sha256 = "sha256-8c9gDD/g5oP9GQV1ghb2UN9w5EccvxyDvJUAtgV8q7Y="; + sha256 = "sha256-tcUVJ/qcQGivcAjWkcfv1fZxc9F5cYn1stpCHDoJRps="; }; - vendorSha256 = "sha256-uvquc0bWwYzeeTuKlYaQp9r+O23MMs1Ajz1DPJ2qrnE="; + vendorSha256 = "sha256-hGV44Rx5kX2ZVBsTyeWm5SzpXzlTFNidt7bwzntboQo="; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; From 63ecdee96b5c436c2f53c32f213803ada42bb7ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 13:39:54 +0000 Subject: [PATCH 322/329] python310Packages.graphql-subscription-manager: 0.5.1 -> 0.5.4 --- .../python-modules/graphql-subscription-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix index afcbe157a1e2..660a6f51688a 100644 --- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix +++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "graphql-subscription-manager"; - version = "0.5.1"; + version = "0.5.4"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; rev = version; - sha256 = "sha256-PVQa6JmBnToXuL/wNkYO0b+K1e9yrQgRUzWNUbFN5mM="; + sha256 = "sha256-J3us0xZN1jOFRcvUQg8PQP6AVHa/swGjKU8IivmfjQE="; }; propagatedBuildInputs = [ From bc6f110f01638803b57e0f88c8e68936c9317f47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 06:39:51 +0000 Subject: [PATCH 323/329] python310Packages.pyisy: 3.0.3 -> 3.0.5 --- pkgs/development/python-modules/pyisy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 67a3892cdc02..5daadce41f44 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.3"; + version = "3.0.5"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; rev = "v${version}"; - hash = "sha256-zQ0IBfbWEGv5t+b3EKF+6tEpmwfAWFMndPqSNSQZ5b4="; + hash = "sha256-lVutG/xJvVP0qS0UnEyS/9KwwqdRX6ownTKek8/VXbU="; }; postPatch = '' From 41ca5932b3996e4dd49ae5cf578cc71d0ffd2915 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 17:15:13 +0000 Subject: [PATCH 324/329] onedrive: 2.4.15 -> 2.4.16 --- pkgs/applications/networking/sync/onedrive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 2cbf706ea78e..68af0bd2890a 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.15"; + version = "2.4.16"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nYko7htg16Sp/Fs+KuPflrpHn8WShM0OKozhr9BFH5U="; + sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; From c9f623a970cdea3e897e1ceec59854b72a2a1742 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 2 Jan 2022 17:51:56 +0100 Subject: [PATCH 325/329] nix-index: 0.1.2 -> unstable-2022-03-07 --- pkgs/tools/package-management/nix-index/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 10449a331f93..57ebcfec26d4 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,23 +4,21 @@ rustPlatform.buildRustPackage rec { pname = "nix-index"; - version = "0.1.2"; + version = "unstable-2022-03-07"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; - rev = "v${version}"; - sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; + rev = "f09548f66790d2d7d53f07ad2af62993d7cabb08"; + sha256 = "sha256-xIJCzEHQJ2kHRbT4Ejrb5R5e/VqjKrklV7XneZIiyUg="; }; - cargoSha256 = "161lz96a52s53rhhkxxhcg41bsmh8w6rv6nl8gwqmg3biszy7hah"; + cargoSha256 = "sha256-2Yhnacsx8EWsfZfcfKhV687cblyFDmsfdqGZoK6Lulo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl ] ++ lib.optional stdenv.isDarwin Security; - doCheck = !stdenv.isDarwin; - postInstall = '' mkdir -p $out/etc/profile.d cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh From cfa288b486ba814569da385041235b1d794be5c2 Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Fri, 11 Mar 2022 11:46:32 +0000 Subject: [PATCH 326/329] kubemq-community: init at 2.2.12 --- pkgs/servers/kubemq-community/default.nix | 27 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/kubemq-community/default.nix diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix new file mode 100644 index 000000000000..823f3125cbe5 --- /dev/null +++ b/pkgs/servers/kubemq-community/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubemq-community"; + version = "2.2.12"; + src = fetchFromGitHub { + owner = "kubemq-io"; + repo = pname; + rev = "v${version}"; + sha256 = "06n3avcqknqzf9y03xqcsg36pwcha29j2psp9xsnir7hrx66zww8"; + }; + + CGO_ENABLED=0; + + ldflags=[ "-w" "-s" "-X main.version=${version}" ]; + + doCheck = false; # grpc tests are flaky + + vendorSha256 = "1sh0dzz8z065964k2gzkzw9p3db3rcf6mv901zym0wqm4p71045w"; + + meta = { + homepage = "https://github.com/kubemq-io/kubemq-community"; + description = "KubeMQ Community is the open-source version of KubeMQ, the Kubernetes native message broker."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ brianmcgee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e470e437d49..150a05c64a26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15264,6 +15264,8 @@ with pkgs; kubei = callPackage ../tools/security/kubei { }; + kubemq-community = callPackage ../servers/kubemq-community { }; + kubeone = callPackage ../applications/networking/cluster/kubeone { }; kubeprompt = callPackage ../development/tools/kubeprompt { }; From e65da5e795e6fe3425c6211e05c4901478b9b789 Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Fri, 11 Mar 2022 11:47:07 +0000 Subject: [PATCH 327/329] kubemqctl: init at 3.5.1 --- .../networking/cluster/kubemqctl/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubemqctl/default.nix diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/applications/networking/cluster/kubemqctl/default.nix new file mode 100644 index 000000000000..a5ad1ea0a773 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubemqctl/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubemqctl"; + version = "3.5.1"; + src = fetchFromGitHub { + owner = "kubemq-io"; + repo = pname; + rev = "v${version}"; + sha256 = "0daqvd1y6b87xvnpdl2k0sa91zdmp48r0pgp6dvnb2l44ml8a4z0"; + }; + + ldflags = [ "-w" "-s" "-X main.version=${version}" ]; + + doCheck = false; # TODO tests are failing + + vendorSha256 = "1agn6i7cnsb5igvvbjzlaa5fgssr5h7h25y440q44bk16jxk6s74"; + + meta = { + homepage = "https://github.com/kubemq-io/kubemqctl"; + description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ brianmcgee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 150a05c64a26..0a13af03b9cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26987,6 +26987,8 @@ with pkgs; kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; + kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; + kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; kubernix = callPackage ../applications/networking/cluster/kubernix { }; From a6d04257b728bb5138f138d4662c537ebecf2487 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 10:01:16 +0000 Subject: [PATCH 328/329] php74Packages.phpstan: 1.4.8 -> 1.4.9 --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 41840f5ba9e8..21b7531949d3 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.4.8"; + version = "1.4.9"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-ghXyPo9n2oXAz7BvuvBYjyJnUqf/FvNk8nTPIRv19cw="; + sha256 = "sha256-N2oYhhcU6uCGUzJbL8/vMUlypJa/Z86d4Xddvj6k1fc="; }; dontUnpack = true; From 1a268c42c8b0550f70da78c136171799481b0d97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 11:25:48 +0000 Subject: [PATCH 329/329] flannel: 0.16.3 -> 0.17.0 --- pkgs/tools/networking/flannel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 2f406f97b34c..324b220857e9 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.16.3"; + version = "0.17.0"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-Akh1IlpLG9AZBtcZnOUfRnIvan8C9W1Dg9PqT7/VhYA="; + sha256 = "sha256-YM/cGmtHDTzgu6Bfy52oP8E1HmLNuBHNgEpz/qTj7rg="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];