From f640192affefddaa16e1ac88b936462a7678e205 Mon Sep 17 00:00:00 2001 From: Steven Pease Date: Wed, 27 Jan 2021 21:01:59 -0800 Subject: [PATCH 001/385] zfp: init at 0.5.5 --- pkgs/tools/compression/zfp/default.nix | 59 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/tools/compression/zfp/default.nix diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix new file mode 100644 index 000000000000..c46c58e7b404 --- /dev/null +++ b/pkgs/tools/compression/zfp/default.nix @@ -0,0 +1,59 @@ +{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, pythonPackages, stdenv, targetPlatform +, enableCfp ? true +, enableCuda ? false +, enableExamples ? true +, enableFortran ? builtins.elem targetPlatform.system gfortran.meta.platforms +, enableOpenMP ? true +, enablePython ? true +, enableUtilities ? true }: + +stdenv.mkDerivation rec { + pname = "zfp"; + version = "0.5.5"; + + src = fetchFromGitHub { + owner = "LLNL"; + repo = "zfp"; + rev = version; + sha256 = "19ycflz35qsrzfcvxdyy0mgbykfghfi9y5v684jb4awjp7nf562c"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optional enableCuda cudatoolkit + ++ lib.optional enableFortran gfortran + ++ lib.optional enableOpenMP llvmPackages.openmp + ++ lib.optionals enablePython [ pythonPackages.cython pythonPackages.numpy pythonPackages.python ]; + + cmakeFlags = [ + # More tests not enabled by default + ''-DZFP_BINARY_DIR=${placeholder "out"}'' + ''-DZFP_BUILD_TESTING_LARGE=ON'' + ] + ++ lib.optionals targetPlatform.isDarwin [ + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + ] + ++ lib.optional enableCfp "-DBUILD_CFP=ON" + ++ lib.optional enableCuda "-DZFP_WITH_CUDA=ON" + ++ lib.optional enableExamples "-DBUILD_EXAMPLES=ON" + ++ lib.optional enableFortran "-DBUILD_ZFORP=ON" + ++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON" + ++ lib.optional enablePython "-DBUILD_ZFPY=ON" + ++ ([ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ]); + + preCheck = lib.optional targetPlatform.isDarwin '' + export DYLD_LIBRARY_PATH="$out/lib:$DYLD_LIBRARY_PATH" + ''; + + doCheck = true; + + meta = with lib; { + homepage = "https://computing.llnl.gov/projects/zfp"; + description = "Library for random-access compression of floating-point arrays"; + license = licenses.bsd3; + maintainers = [ maintainers.spease ]; + # 64-bit only + platforms = platforms.aarch64 ++ platforms.x86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c186c5af42b..21ed4df068a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11072,6 +11072,8 @@ with pkgs; zerofree = callPackage ../tools/filesystems/zerofree { }; + zfp = callPackage ../tools/compression/zfp {}; + zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { }; zfsbackup = callPackage ../tools/backup/zfsbackup { }; From 9746d129bc8f909a2939391cb696f15cac93034d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 7 Jan 2022 14:23:59 -0800 Subject: [PATCH 002/385] p4.src: fix sha256 --- pkgs/applications/version-management/p4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 4d3e471cca24..7091f0fbc6f9 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { # actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases url = "https://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz"; - sha256 = "sha256-cmIMVek4lwVYJQbW8ziABftPZ0iIoAoSpR7cKuN4I7M="; + sha256 = "sha256-SrfI2ZD7KDyttCd8+fo8g4UZKljYYO/SbzqrS9tAcC8="; }; sourceRoot = "."; From 624eaca9b994ed39e0028127b086ab8ce76a5056 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 21 Feb 2022 11:37:19 -0800 Subject: [PATCH 003/385] wireguard: remove dependency on wireguard-go Prior to this commit, wireguard dependend on wireguard-go. This commit removes that unnecessary dependency. --- pkgs/tools/networking/wireguard-tools/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 00b91adc2738..59dafe9f9059 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -7,7 +7,6 @@ , makeWrapper , openresolv , procps -, wireguard-go }: stdenv.mkDerivation rec { @@ -40,10 +39,6 @@ stdenv.mkDerivation rec { for f in $out/bin/*; do wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]} done - '' + lib.optionalString stdenv.isDarwin '' - for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${wireguard-go}/bin - done ''; passthru = { From 369bc63ae7327833830469fc137562fba636b95e Mon Sep 17 00:00:00 2001 From: grnnja Date: Mon, 28 Feb 2022 17:07:04 -0800 Subject: [PATCH 004/385] maintainers: add grnnja --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a55256a7ea42..26eeec1e1f56 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4638,6 +4638,12 @@ githubId = 343415; name = "Greg Roodt"; }; + grnnja = { + email = "grnnja@gmail.com"; + github = "grnnja"; + githubId = 31556469; + name = "Prem Netsuwan"; + }; gruve-p = { email = "groestlcoin@gmail.com"; github = "gruve-p"; From b6c7526d3a950a206868fc611730ff3f4e498b71 Mon Sep 17 00:00:00 2001 From: grnnja Date: Mon, 28 Feb 2022 17:07:39 -0800 Subject: [PATCH 005/385] jflap: init at 7.1 --- .../science/programming/jflap/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/science/programming/jflap/default.nix diff --git a/pkgs/applications/science/programming/jflap/default.nix b/pkgs/applications/science/programming/jflap/default.nix new file mode 100644 index 000000000000..9a7922ba1205 --- /dev/null +++ b/pkgs/applications/science/programming/jflap/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "jflap"; + version = "7.1"; + + src = fetchurl { + url = "https://www.jflap.org/jflaptmp/july27-18/JFLAP7.1.jar"; + sha256 = "oiwJXdxWsYFj6Ovu7xZbOgTLVw8160a5YQUWbgbJlAY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/java + cp -s $src $out/share/java/jflap.jar + makeWrapper ${jre}/bin/java $out/bin/jflap --add-flags "-jar $out/share/java/jflap.jar" + runHook postInstall + ''; + + meta = with lib; { + description = "GUI tool for experimenting with formal languages topics"; + homepage = "https://www.jflap.org/"; + license = licenses.unfree; + maintainers = [ maintainers.grnnja ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a29312d19b3d..3fa45b4530a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32324,6 +32324,8 @@ with pkgs; groove = callPackage ../applications/science/programming/groove { }; + jflap = callPackage ../applications/science/programming/jflap { }; + plm = callPackage ../applications/science/programming/plm { }; ### SCIENCE/LOGIC From 29199091c685ec6d924331ed0d10f90b52ffc589 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 28 Feb 2022 15:42:44 +0100 Subject: [PATCH 006/385] odin2: int at unstable-2022-02-23 --- pkgs/applications/audio/odin2/default.nix | 79 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/applications/audio/odin2/default.nix diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix new file mode 100644 index 000000000000..f0bd5e015648 --- /dev/null +++ b/pkgs/applications/audio/odin2/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, freetype +, libjack2 +, lv2 +, libX11 +, libXcursor +, libXext +, libXinerama +, libXrandr +, libGL +, gcc-unwrapped +}: + +stdenv.mkDerivation rec { + pname = "odin2"; + version = "unstable-2022-02-23"; + + src = fetchFromGitHub { + owner = "baconpaul"; + repo = "odin2"; + rev = "ed02d06cfb5db8a118d291c00bd2e4cd6e262cde"; + fetchSubmodules = true; + sha256 = "sha256-VkZ+mqCmqWQafdN0nQxJdPxbiaZ37/0jOhLvVbnGLvQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + alsa-lib + freetype + libjack2 + lv2 + libX11 + libXcursor + libXext + libXinerama + libXrandr + libGL + ]; + + # JUCE dlopen's these at runtime, crashes without them + NIX_LDFLAGS = (toString [ + "-lX11" + "-lXext" + "-lXcursor" + "-lXinerama" + "-lXrandr" + ]); + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/bin $out/lib/vst3 + cd Odin2_artefacts/Release + cp -r VST3/Odin2.vst3 $out/lib/vst3 + cp -r Standalone/Odin2 $out/bin +''; + + + meta = with lib; { + description = "Odin 2 Synthesizer Plugin"; + homepage = "https://thewavewarden.com/odin2"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96fa0b7d0a2f..564d0fe67894 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27668,6 +27668,8 @@ with pkgs; odo = callPackage ../applications/networking/cluster/odo { }; + odin2 = callPackage ../applications/audio/odin2 { }; + onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; From 94adf26120fe1b0c13927839594f0962df6c52c7 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 1 Mar 2022 03:50:03 +0000 Subject: [PATCH 007/385] gojq: init at 0.12.7 --- pkgs/development/tools/gojq/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/gojq/default.nix diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix new file mode 100644 index 000000000000..d78c587cfbda --- /dev/null +++ b/pkgs/development/tools/gojq/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub, testVersion, gojq }: + +buildGoModule rec { + pname = "gojq"; + version = "0.12.7"; + + src = fetchFromGitHub { + owner = "itchyny"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aQZLuwMFnggtwHZaE6KGBKJSbtmAz+Cs1RqLgvIsO24="; + }; + + vendorSha256 = "sha256-b7TQywIOxzFnUNwgxGFR3W++QGHYUROBG7P/lTRmhGc="; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testVersion { + package = gojq; + }; + + meta = with lib; { + description = "Pure Go implementation of jq"; + homepage = "https://github.com/itchyny/gojq"; + license = licenses.mit; + maintainers = with maintainers; [ aaronjheng ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c3b79a20c3a..76866275b702 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -343,6 +343,8 @@ with pkgs; glade = callPackage ../development/tools/glade { }; + gojq = callPackage ../development/tools/gojq { }; + gpick = callPackage ../tools/misc/gpick { }; hobbes = callPackage ../development/tools/hobbes { }; From d6026416f496c3352aea5e7a14f6cf5407d414a6 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Thu, 3 Mar 2022 07:59:14 +0530 Subject: [PATCH 008/385] roundcubePlugins.carddav: v3.0.3 -> v4.3.0 --- pkgs/servers/roundcube/plugins/carddav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/roundcube/plugins/carddav/default.nix b/pkgs/servers/roundcube/plugins/carddav/default.nix index c3745c9bcc5e..b26cfce67721 100644 --- a/pkgs/servers/roundcube/plugins/carddav/default.nix +++ b/pkgs/servers/roundcube/plugins/carddav/default.nix @@ -2,10 +2,10 @@ roundcubePlugin rec { pname = "carddav"; - version = "3.0.3"; + version = "4.3.0"; src = fetchzip { - url = "https://github.com/blind-coder/rcmcarddav/releases/download/v${version}/carddav-${version}.tar.bz2"; - sha256 = "0scqxqfwv9r4ggaammmjp51mj50qc5p4jmjliwjvcwyjr36wjq3z"; + url = "https://github.com/mstilkerich/rcmcarddav/releases/download/v${version}/carddav-v${version}.tar.gz"; + sha256 = "1jk1whx155svfalf1kq8vavn7jsswmzx4ax5zbj01783rqyxkkd5"; }; } From 62f5a23f66838f6055acee8666d3649209c20b02 Mon Sep 17 00:00:00 2001 From: Jakub Darul Date: Fri, 4 Mar 2022 20:03:17 +0100 Subject: [PATCH 009/385] brave: enable native wayland support with NIXOS_OZONE_WL --- pkgs/applications/networking/browsers/brave/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 6fb29619ab9d..42efa94020f9 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -37,6 +37,7 @@ , pango , pipewire , udev +, wayland , xorg , zlib , xdg-utils @@ -82,6 +83,7 @@ rpath = lib.makeLibraryPath [ pango pipewire udev + wayland xdg-utils xorg.libxcb zlib @@ -160,6 +162,7 @@ stdenv.mkDerivation rec { preFixup = '' # Add command line args to wrapGApp. gappsWrapperArgs+=(--add-flags ${lib.escapeShellArg commandLineArgs}) + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}") ''; installCheckPhase = '' From 16e667e3495488b8f1e514d850b0b3fba0be84a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Mar 2022 21:59:28 +0000 Subject: [PATCH 010/385] python310Packages.flask-security-too: 4.1.2 -> 4.1.3 --- .../development/python-modules/flask-security-too/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index ddf5aa05c493..e88556c07d02 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "4.1.2"; + version = "4.1.3"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "16ws5n08vm7wsa2f7lrkxvc7jl3ah1xfylhhyzb4vvqmlk7x9hw8"; + sha256 = "sha256-mW2NKGeJpyR4Ri7m+KE3ElSg3E+P7qbzNTTCo3cskc8="; }; propagatedBuildInputs = [ From 9bc43e3bada7016012f6d6d13debf71a884492b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 02:37:59 +0000 Subject: [PATCH 011/385] celluloid: 0.22 -> 0.23 --- pkgs/applications/video/celluloid/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 291b4b9ebfc6..98495ca5affb 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.22"; + version = "0.23"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - hash = "sha256-QGN8YLtyb9YVNDK2ZDQwHJVg6UTIQssfNK9lQqxMNKQ="; + hash = "sha256-YKDud/UJJx9ko5k+Oux8mUUme0MXaRMngESE14Hhxv8="; }; nativeBuildInputs = [ @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs meson-post-install.py src/generate-authors.py - # Remove this for next release - substituteInPlace meson-post-install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; doCheck = true; From c4e6f834d4175c61330aa0e06468eddec6a6bdb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 18:47:40 +0000 Subject: [PATCH 012/385] prometheus-process-exporter: 0.7.5 -> 0.7.10 --- pkgs/servers/monitoring/prometheus/process-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix index e4bfed9821b7..135551db5660 100644 --- a/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "process-exporter"; - version = "0.7.5"; + version = "0.7.10"; src = fetchFromGitHub { owner = "ncabatoff"; repo = pname; rev = "v${version}"; - sha256 = "0v1q8mi8p01smzfxaf52kbqnjz9fx4rp64jqhgbcx0s45q3bph9l"; + sha256 = "sha256-TAgMA9IV3i8dpgOBDmnlt4iyGlmWN5Nj3BexXb5vzlc="; }; - vendorSha256 = "19y2w1vplf7qqkzcpi01ssawv9badhwpglh2gz69fgl6xc3mxfmp"; + vendorSha256 = "sha256-LAEnXJ3qShfCGjtsYAGyW5x/TTFQxQxXM0hebJrqiW4="; postPatch = '' substituteInPlace proc/read_test.go --replace /bin/cat cat From a6a823834b2588ae3d63ea60597f2f43b4a62bf2 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 12 Mar 2022 07:27:20 -0800 Subject: [PATCH 013/385] wpa_supplicant: rename withDbus to dbusSupport wpa_supplicant/default.nix currently uses the option "withDbus" to decide whether or not to compile with dbus support. It is the only nix package that uses this choice of name. Most other packages use dbusSupport instead. Let's rename this option to dbusSupport, so that users desiring to compile without dbus can set the option once in nixpkgs.conf and have all packages understand that directive. --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 925ec71d3fa1..1d58d47cf663 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, openssl, pkg-config, libnl , nixosTests, wpa_supplicant_gui -, withDbus ? true, dbus +, dbusSupport ? true, dbus , withReadline ? true, readline , withPcsclite ? true, pcsclite , readOnlyModeSSIDs ? false @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { CONFIG_EAP_AKA=y CONFIG_EAP_AKA_PRIME=y CONFIG_PCSC=y - '' + optionalString withDbus '' + '' + optionalString dbusSupport '' CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ openssl libnl ] - ++ optional withDbus dbus + ++ optional dbusSupport dbus ++ optional withReadline readline ++ optional withPcsclite pcsclite; From f63d93bc3d0ad73b24b2cf9c0ee0381161071395 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Mar 2022 17:20:16 +0000 Subject: [PATCH 014/385] pam_ussh: init at unstable-20210615 --- pkgs/os-specific/linux/pam_ussh/default.nix | 64 +++++++++++++++++++++ pkgs/os-specific/linux/pam_ussh/go.mod | 15 +++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 81 insertions(+) create mode 100644 pkgs/os-specific/linux/pam_ussh/default.nix create mode 100644 pkgs/os-specific/linux/pam_ussh/go.mod diff --git a/pkgs/os-specific/linux/pam_ussh/default.nix b/pkgs/os-specific/linux/pam_ussh/default.nix new file mode 100644 index 000000000000..499239500acc --- /dev/null +++ b/pkgs/os-specific/linux/pam_ussh/default.nix @@ -0,0 +1,64 @@ +{ buildGoModule +, fetchFromGitHub +, pam +, lib +}: + +buildGoModule rec { + pname = "pam_ussh"; + version = "unstable-20210615"; + + src = fetchFromGitHub { + owner = "uber"; + repo = "pam-ussh"; + rev = "e9524bda90ba19d3b9eb24f49cb63a6a56a19193"; # HEAD as of 2022-03-13 + sha256 = "0nb9hpqbghgi3zvq41kabydzyc6ffaaw9b4jkc5jrwn1klpw1xk8"; + }; + + prePatch = '' + cp ${./go.mod} go.mod + ''; + overrideModAttrs = (_: { + inherit prePatch; + }); + + vendorSha256 = "0hjifc3kbwmx7kjn858vi05cwwra6q19cqjfd94k726pwhk37qkw"; + + buildInputs = [ + pam + ]; + + buildPhase = '' + runHook preBuild + + if [ -z "$enableParallelBuilding" ]; then + export NIX_BUILD_CORES=1 + fi + go build -buildmode=c-shared -o pam_ussh.so -v -p $NIX_BUILD_CORES . + + runHook postBuild + ''; + checkPhase = '' + runHook preCheck + + go test -v -p $NIX_BUILD_CORES . + + runHook postCheck + ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/security + cp pam_ussh.so $out/lib/security + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/uber/pam-ussh"; + description = "PAM module to authenticate using SSH certificates"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ lukegb ]; + }; +} diff --git a/pkgs/os-specific/linux/pam_ussh/go.mod b/pkgs/os-specific/linux/pam_ussh/go.mod new file mode 100644 index 000000000000..9adc453560a4 --- /dev/null +++ b/pkgs/os-specific/linux/pam_ussh/go.mod @@ -0,0 +1,15 @@ +module github.com/uber/pam-ussh + +go 1.17 + +require ( + github.com/stretchr/testify v1.7.0 + golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000 +) + +require ( + github.com/davecgh/go-spew v1.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c6832ae0547..539ecd4ec481 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23052,6 +23052,8 @@ with pkgs; pam_usb = callPackage ../os-specific/linux/pam_usb { }; + pam_ussh = callPackage ../os-specific/linux/pam_ussh { }; + paxctl = callPackage ../os-specific/linux/paxctl { }; paxtest = callPackage ../os-specific/linux/paxtest { }; From 1853015550a78acbc3e9d090d174120796c4b784 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Mar 2022 17:20:23 +0000 Subject: [PATCH 015/385] nixos/pam: add support for pam-ussh pam-ussh allows authorizing using an SSH certificate stored in your SSH agent, in a similar manner to pam-ssh-agent-auth, but for certificates rather than raw public keys. --- .../from_md/release-notes/rl-2205.section.xml | 9 ++ .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/security/pam.nix | 109 ++++++++++++++++++ nixos/modules/security/sudo.nix | 2 +- nixos/tests/all-tests.nix | 1 + nixos/tests/pam/pam-ussh.nix | 70 +++++++++++ pkgs/os-specific/linux/pam_ussh/default.nix | 3 + 7 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/pam/pam-ussh.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 9cf27e56827a..ede0e10e0346 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 @@ -1286,6 +1286,15 @@ been added by default. + + + security.pam.ussh has been added, which + allows authorizing PAM sessions based on SSH + certificates held within an SSH agent, + using + pam-ussh. + + The zrepl package has been updated from diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 58a1b23d17bf..90ac7e90e729 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -470,6 +470,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.logrotate.enable` now defaults to true if any rotate path has been defined, and some paths have been added by default. +- `security.pam.ussh` has been added, which allows authorizing PAM sessions based on SSH _certificates_ held within an SSH agent, using [pam-ussh](https://github.com/uber/pam-ussh). + - The `zrepl` package has been updated from 0.4.0 to 0.5: - The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume. diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index c0ef8b5f30bd..f9697d61f1b2 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -61,6 +61,19 @@ let ''; }; + usshAuth = mkOption { + default = false; + type = types.bool; + description = '' + If set, users with an SSH certificate containing an authorized principal + in their SSH agent are able to log in. Specific options are controlled + using the options. + + Note that the must also be + set for this option to take effect. + ''; + }; + yubicoAuth = mkOption { default = config.security.pam.yubico.enable; defaultText = literalExpression "config.security.pam.yubico.enable"; @@ -475,6 +488,9 @@ let optionalString cfg.usbAuth '' auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so '' + + (let ussh = config.security.pam.ussh; in optionalString (config.security.pam.ussh.enable && cfg.usshAuth) '' + auth ${ussh.control} ${pkgs.pam_ussh}/lib/security/pam_ussh.so ${optionalString (ussh.caFile != null) "ca_file=${ussh.caFile}"} ${optionalString (ussh.authorizedPrincipals != null) "authorized_principals=${ussh.authorizedPrincipals}"} ${optionalString (ussh.authorizedPrincipalsFile != null) "authorized_principals_file=${ussh.authorizedPrincipalsFile}"} ${optionalString (ussh.group != null) "group=${ussh.group}"} + '') + (let oath = config.security.pam.oath; in optionalString cfg.oathAuth '' auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits} '') + @@ -926,6 +942,96 @@ in }; }; + security.pam.ussh = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enables Uber's USSH PAM (pam-ussh) module. + + This is similar to pam-ssh-agent, except that + the presence of a CA-signed SSH key with a valid principal is checked + instead. + + Note that this module must both be enabled using this option and on a + per-PAM-service level as well (using usshAuth). + + More information can be found here. + ''; + }; + + caFile = mkOption { + default = null; + type = with types; nullOr path; + description = '' + By default pam-ussh reads the trusted user CA keys + from /etc/ssh/trusted_user_ca. + + This should be set the same as your TrustedUserCAKeys + option for sshd. + ''; + }; + + authorizedPrincipals = mkOption { + default = null; + type = with types; nullOr commas; + description = '' + Comma-separated list of authorized principals to permit; if the user + presents a certificate with one of these principals, then they will be + authorized. + + Note that pam-ussh also requires that the certificate + contain a principal matching the user's username. The principals from + this list are in addition to those principals. + + Mutually exclusive with authorizedPrincipalsFile. + ''; + }; + + authorizedPrincipalsFile = mkOption { + default = null; + type = with types; nullOr path; + description = '' + Path to a list of principals; if the user presents a certificate with + one of these principals, then they will be authorized. + + Note that pam-ussh also requires that the certificate + contain a principal matching the user's username. The principals from + this file are in addition to those principals. + + Mutually exclusive with authorizedPrincipals. + ''; + }; + + group = mkOption { + default = null; + type = with types; nullOr str; + description = '' + If set, then the authenticating user must be a member of this group + to use this module. + ''; + }; + + control = mkOption { + default = "sufficient"; + type = types.enum [ "required" "requisite" "sufficient" "optional" ]; + description = '' + This option sets pam "control". + If you want to have multi factor authentication, use "required". + If you want to use the SSH certificate instead of the regular password, + use "sufficient". + + Read + + pam.conf + 5 + + for better understanding of this option. + ''; + }; + }; + security.pam.yubico = { enable = mkOption { default = false; @@ -1110,6 +1216,9 @@ in optionalString (isEnabled (cfg: cfg.usbAuth)) '' mr ${pkgs.pam_usb}/lib/security/pam_usb.so, '' + + optionalString (isEnabled (cfg: cfg.usshAuth)) '' + mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so, + '' + optionalString (isEnabled (cfg: cfg.oathAuth)) '' "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so, '' + diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 99e578f8adae..4bf239fca8f9 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -245,7 +245,7 @@ in environment.systemPackages = [ sudo ]; - security.pam.services.sudo = { sshAgentAuth = true; }; + security.pam.services.sudo = { sshAgentAuth = true; usshAuth = true; }; environment.etc.sudoers = { source = diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 043d8a56d0c6..1ed12c54c575 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -388,6 +388,7 @@ in pam-file-contents = handleTest ./pam/pam-file-contents.nix {}; pam-oath-login = handleTest ./pam/pam-oath-login.nix {}; pam-u2f = handleTest ./pam/pam-u2f.nix {}; + pam-ussh = handleTest ./pam/pam-ussh.nix {}; pantalaimon = handleTest ./matrix/pantalaimon.nix {}; pantheon = handleTest ./pantheon.nix {}; paperless-ng = handleTest ./paperless-ng.nix {}; diff --git a/nixos/tests/pam/pam-ussh.nix b/nixos/tests/pam/pam-ussh.nix new file mode 100644 index 000000000000..ba0570dbf97d --- /dev/null +++ b/nixos/tests/pam/pam-ussh.nix @@ -0,0 +1,70 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: + +let + testOnlySSHCredentials = pkgs.runCommand "pam-ussh-test-ca" { + nativeBuildInputs = [ pkgs.openssh ]; + } '' + mkdir $out + ssh-keygen -t ed25519 -N "" -f $out/ca + + ssh-keygen -t ed25519 -N "" -f $out/alice + ssh-keygen -s $out/ca -I "alice user key" -n "alice,root" -V 19700101:forever $out/alice.pub + + ssh-keygen -t ed25519 -N "" -f $out/bob + ssh-keygen -s $out/ca -I "bob user key" -n "bob" -V 19700101:forever $out/bob.pub + ''; + makeTestScript = user: pkgs.writeShellScript "pam-ussh-${user}-test-script" '' + set -euo pipefail + + eval $(${pkgs.openssh}/bin/ssh-agent) + + mkdir -p $HOME/.ssh + chmod 700 $HOME/.ssh + cp ${testOnlySSHCredentials}/${user}{,.pub,-cert.pub} $HOME/.ssh + chmod 600 $HOME/.ssh/${user} + chmod 644 $HOME/.ssh/${user}{,-cert}.pub + + set -x + + ${pkgs.openssh}/bin/ssh-add $HOME/.ssh/${user} + ${pkgs.openssh}/bin/ssh-add -l &>2 + + exec sudo id -u -n + ''; +in { + name = "pam-ussh"; + meta.maintainers = with lib.maintainers; [ lukegb ]; + + machine = + { ... }: + { + users.users.alice = { isNormalUser = true; extraGroups = [ "wheel" ]; }; + users.users.bob = { isNormalUser = true; extraGroups = [ "wheel" ]; }; + + security.pam.ussh = { + enable = true; + authorizedPrincipals = "root"; + caFile = "${testOnlySSHCredentials}/ca.pub"; + }; + + security.sudo = { + enable = true; + extraConfig = '' + Defaults lecture="never" + ''; + }; + }; + + testScript = + '' + with subtest("alice should be allowed to escalate to root"): + machine.succeed( + 'su -c "${makeTestScript "alice"}" -l alice | grep root' + ) + + with subtest("bob should not be allowed to escalate to root"): + machine.fail( + 'su -c "${makeTestScript "bob"}" -l bob | grep root' + ) + ''; +}) diff --git a/pkgs/os-specific/linux/pam_ussh/default.nix b/pkgs/os-specific/linux/pam_ussh/default.nix index 499239500acc..889c8bc6f57c 100644 --- a/pkgs/os-specific/linux/pam_ussh/default.nix +++ b/pkgs/os-specific/linux/pam_ussh/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , pam , lib +, nixosTests }: buildGoModule rec { @@ -54,6 +55,8 @@ buildGoModule rec { runHook postInstall ''; + passthru.tests = { inherit (nixosTests) pam-ussh; }; + meta = with lib; { homepage = "https://github.com/uber/pam-ussh"; description = "PAM module to authenticate using SSH certificates"; From 5bb6a807cc1814dd7c751cc0c71b0b484bbb456d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Mar 2022 11:54:05 +0000 Subject: [PATCH 016/385] soju: 0.3.0 -> 0.4.0 --- pkgs/applications/networking/soju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/applications/networking/soju/default.nix index f5ffc03dc0f2..dc20578cf021 100644 --- a/pkgs/applications/networking/soju/default.nix +++ b/pkgs/applications/networking/soju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soju"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "soju"; rev = "v${version}"; - sha256 = "sha256-j7LwWBBJvNUeg0+P632HaGliVtrrCD0VNxkynaZzidQ="; + sha256 = "sha256-4ixPEnSa1m52Hu1dzxMG8c0bkqGN04vRlIzvdZ/ES4A="; }; - vendorSha256 = "sha256-fDfH2pQ5MtZDjiGx26vS5dBzxejVXPfflLX8N8VcJTA="; + vendorSha256 = "sha256-UVFi/QK2zwzhBkPXEJLYc5WSu3OOvWTVVGkMhrrufyc="; subPackages = [ "cmd/soju" From 1075b17c83b0557c20dc6ffe4824c979d163c0d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 17:17:02 +0000 Subject: [PATCH 017/385] lasso: 2.7.0 -> 2.8.0 --- pkgs/development/libraries/lasso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index e5503169fd5f..74b03006f258 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lasso"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - sha256 = "138x8pmj4k1pbah32z14rd8ylyx4lgz70s93m39vd17f8sjz50lj"; + sha256 = "sha256-/8vVhR2YWGx+HK9DutZhZCEaO2HRK/hgoFmESP+fKzg="; }; From 9df2c375542e729d8d3692c34227a0e1623ea706 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 20:55:24 +0000 Subject: [PATCH 018/385] powershell: 7.2.1 -> 7.2.2 --- pkgs/shells/powershell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 4efa2cd88a72..6dbb9fa7625b 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -9,7 +9,7 @@ let archString = if stdenv.isAarch64 then "arm64" else throw "unsupported platform"; platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-h5zjn8wtgHmsJFiGq1rja6kZTZj3Q72W2kH3AexRDQs=" else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-NHM9ZUpBJb59Oq0Ke7DcvaN+bZ9MjSpXBRu5Ng9OVZ0=" - else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-kidPtDMkEZ/1r4WIApPZ/BsdJkolpSZ3f72JyDv3798=" + else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-QSL0lmxa7rGoNOx7JB310wF3VoUy96e9ZFop5rAvdBM=" else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-bUacA4DwjDNlIG7yooXxUGL9AysAogNWuQDvcTqo1sE=" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" @@ -20,7 +20,7 @@ let archString = if stdenv.isAarch64 then "arm64" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.2.1"; + version = "7.2.2"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; From af6b07431daea3c12348bfaf7a91bb5a7d453186 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 22:49:46 +0000 Subject: [PATCH 019/385] libguestfs: 1.46.2 -> 1.48.0 --- pkgs/development/libraries/libguestfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 49e76a94b001..d65ead78624c 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -12,11 +12,11 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.46.2"; + version = "1.48.0"; src = fetchurl { url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "0sq092irlj2jf64m7hjx23hn5k4iypqxmlyn9g2z0q0xab56ksp6"; + sha256 = "sha256-FoH93t/PSEym3uxUIwMwoy3vvTDCqx+BeI4lLLXQSCk="; }; strictDeps = true; From 84bbe973cc066b4007af8e65248f37db06b7e52a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Mar 2022 08:37:56 +0000 Subject: [PATCH 020/385] maven: 3.8.4 -> 3.8.5 --- .../development/tools/build-managers/apache-maven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 3cc3f374045f..001d0edf49ac 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -4,13 +4,13 @@ assert jdk != null; stdenv.mkDerivation rec { pname = "apache-maven"; - version = "3.8.4"; + version = "3.8.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-LNycUZQnuyD9wlvvWpBjt5Dkq9kw57FLTp9IY9b58Tw="; + sha256 = "sha256-iOMHAPMqP2Dg0o0PEqNSXSm3wgxy0TAVPfW11tiQxnM="; }; nativeBuildInputs = [ makeWrapper ]; From d055eda636d265fe01e420be966f97293210ec49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Mar 2022 11:17:17 +0000 Subject: [PATCH 021/385] mavproxy: 1.8.46 -> 1.8.48 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index c1e5b128fc71..802fe1f946ef 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.46"; + version = "1.8.48"; src = fetchPypi { inherit pname version; - sha256 = "c740c11551af4bcb1378772bde77ca6c846c6fd261b79d932c0ecbb164afe3bd"; + sha256 = "sha256-BigJdAz52D8hg2bQs7tngFqnITut/wENGZ0+gLlAeoY="; }; postPatch = '' From f054fb8e8b999555860cbdc5f0f8325b5ac13bb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Mar 2022 15:44:47 +0000 Subject: [PATCH 022/385] moodle: 3.11.5 -> 3.11.6 --- pkgs/servers/web-apps/moodle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 0df0b83109a4..77f02e7a78cd 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.11.5"; + version = "3.11.6"; stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version)); in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-KFitrMThEcx7pU/+jmP8casEyg6/FlhpvjfIjf31vw0="; + sha256 = "sha256-g3qHYkxiXb18vJ23THUw8ej+s5SgIkJpmjQmmARwQhs="; }; phpConfig = writeText "config.php" '' From 0f488afad28f057ce3caf771b21f379d1dcd00bb Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 19 Mar 2022 09:44:25 +0400 Subject: [PATCH 023/385] build-fhs-userenv-bubblewrap: symlink share directory when there's no need to merge There's no need to copy files if the directory won't be merged with multilib one leading to unnecessary increase of closure size --- pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index d0f88df44537..7d45e954d9ea 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -172,7 +172,7 @@ let chmod -R 755 share cp -rLTf ${staticUsrProfileTarget}/share share else - cp -rLf ${staticUsrProfileTarget}/share share + cp -rsHf ${staticUsrProfileTarget}/share share fi fi for i in bin sbin include; do From f244256dfbcf2b242948761998d02118d51a7721 Mon Sep 17 00:00:00 2001 From: tgunnoe Date: Sun, 20 Mar 2022 19:53:03 -0400 Subject: [PATCH 024/385] openjk: 2020-07-03 -> unstable-2022-01-30 --- pkgs/games/openjk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index d2844809eea8..7c69c9035a9c 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation { pname = "OpenJK"; - version = "2020-07-03"; + version = "unstable-2022-01-30"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "0a336ce4dffe6505e3f754b59732402a1db95752"; - sha256 = "1xagbz42hi3ivs208mnay2dbgh90pmwwbar2p1yfhj3zl3cghcs8"; + rev = "235fb9e1a9c4537a603b2e54e444327d20d198a3"; + sha256 = "sha256-DqP6wnu5sE7lQJGEdsEPOc6FIaJjqxt5ANKZ5eiabC4="; }; dontAddPrefix = true; From c3612bf87cb3263976ffed40455866ba70ee51dc Mon Sep 17 00:00:00 2001 From: tgunnoe Date: Sun, 20 Mar 2022 20:04:44 -0400 Subject: [PATCH 025/385] openjk: add Jedi Outcast and split up into outputs --- pkgs/games/openjk/default.nix | 44 ++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 7c69c9035a9c..ffcbb6dca3f5 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -19,6 +19,15 @@ let genericName = "Jedi Academy"; categories = [ "Game" ]; }; + josp = makeDesktopItem rec { + name = "josp"; + exec = name; + icon = "OpenJK_Icon_128"; + comment = "Open Source Jedi Outcast game released by Raven Software"; + desktopName = "Jedi Outcast (Single Player)"; + genericName = "Jedi Outcast"; + categories = [ "Game" ]; + }; in stdenv.mkDerivation { pname = "OpenJK"; version = "unstable-2022-01-30"; @@ -35,22 +44,39 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper cmake ]; buildInputs = [ libjpeg zlib libpng libGL SDL2 ]; + outputs = [ "out" "openjo" "openja" ]; + # move from $out/JediAcademy to $out/opt/JediAcademy preConfigure = '' cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$out/opt") ''; + cmakeFlags = ["-DBuildJK2SPEngine:BOOL=ON" + "-DBuildJK2SPGame:BOOL=ON" + "-DBuildJK2SPRdVanilla:BOOL=ON"]; postInstall = '' - mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/128x128/apps - prefix=$out/opt/JediAcademy + mkdir -p $out/bin $openja/bin $openjo/bin + mkdir -p $openja/share/applications $openjo/share/applications + mkdir -p $openja/share/icons/hicolor/128x128/apps $openjo/share/icons/hicolor/128x128/apps + mkdir -p $openja/opt $openjo/opt + mv $out/opt/JediAcademy $openja/opt/ + mv $out/opt/JediOutcast $openjo/opt/ + jaPrefix=$openja/opt/JediAcademy + joPrefix=$openjo/opt/JediOutcast - makeWrapper $prefix/openjk.* $out/bin/jamp --run "cd $prefix" - makeWrapper $prefix/openjk_sp.* $out/bin/jasp --run "cd $prefix" - makeWrapper $prefix/openjkded.* $out/bin/openjkded --run "cd $prefix" + makeWrapper $jaPrefix/openjk.* $openja/bin/jamp --run "cd $jaPrefix" + makeWrapper $jaPrefix/openjk_sp.* $openja/bin/jasp --run "cd $jaPrefix" + makeWrapper $jaPrefix/openjkded.* $openja/bin/openjkded --run "cd $jaPrefix" + makeWrapper $joPrefix/openjo_sp.* $openjo/bin/josp --run "cd $joPrefix" - cp $src/shared/icons/OpenJK_Icon_128.png $out/share/icons/hicolor/128x128/apps - ln -s ${jamp}/share/applications/* $out/share/applications - ln -s ${jasp}/share/applications/* $out/share/applications + cp $src/shared/icons/OpenJK_Icon_128.png $openjo/share/icons/hicolor/128x128/apps + cp $src/shared/icons/OpenJK_Icon_128.png $openja/share/icons/hicolor/128x128/apps + ln -s ${jamp}/share/applications/* $openja/share/applications + ln -s ${jasp}/share/applications/* $openja/share/applications + ln -s ${josp}/share/applications/* $openjo/share/applications + ln -s $openja/bin/* $out/bin + ln -s $openjo/bin/* $out/bin + rm -rf $out/opt ''; meta = with lib; { @@ -58,6 +84,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/JACoders/OpenJK"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ tgunnoe ]; }; } From 04afc69a29c3de7fee5ea4e1a34b2064f758a539 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 23 Mar 2022 18:58:32 +0100 Subject: [PATCH 026/385] discourse: 2.9.0.beta1 -> 2.9.0.beta3 --- nixos/modules/services/web-apps/discourse.nix | 1 + .../web-apps/discourse/admin_create.patch | 2 +- .../discourse/assets_rake_command.patch | 13 + .../discourse/auto_generated_path.patch | 4 +- pkgs/servers/web-apps/discourse/default.nix | 42 ++- .../web-apps/discourse/nixos_defaults.patch | 4 +- .../discourse/plugin_gem_api_version.patch | 2 +- .../web-apps/discourse/rubyEnv/Gemfile | 15 +- .../web-apps/discourse/rubyEnv/Gemfile.lock | 199 +++++++------- .../web-apps/discourse/rubyEnv/gemset.nix | 245 +++++++++--------- .../unicorn_logging_and_timeout.patch | 2 +- pkgs/servers/web-apps/discourse/update.py | 33 ++- 12 files changed, 306 insertions(+), 256 deletions(-) create mode 100644 pkgs/servers/web-apps/discourse/assets_rake_command.patch diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 2c2911aada3f..fa2bb06f7f48 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -609,6 +609,7 @@ in connection_reaper_interval = 30; relative_url_root = null; message_bus_max_backlog_size = 100; + message_bus_clear_every = 50; secret_key_base = cfg.secretKeyBaseFile; fallback_assets_path = null; diff --git a/pkgs/servers/web-apps/discourse/admin_create.patch b/pkgs/servers/web-apps/discourse/admin_create.patch index 651e8ce81dc9..691b806dfd65 100644 --- a/pkgs/servers/web-apps/discourse/admin_create.patch +++ b/pkgs/servers/web-apps/discourse/admin_create.patch @@ -1,5 +1,5 @@ diff --git a/lib/tasks/admin.rake b/lib/tasks/admin.rake -index 80c403616d..cba01202ac 100644 +index 37ef651f2b..b775129498 100644 --- a/lib/tasks/admin.rake +++ b/lib/tasks/admin.rake @@ -107,3 +107,43 @@ task "admin:create" => :environment do diff --git a/pkgs/servers/web-apps/discourse/assets_rake_command.patch b/pkgs/servers/web-apps/discourse/assets_rake_command.patch new file mode 100644 index 000000000000..b37b6d1d7994 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/assets_rake_command.patch @@ -0,0 +1,13 @@ +diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake +index 68b5db61ac..d460b5753e 100644 +--- a/lib/tasks/assets.rake ++++ b/lib/tasks/assets.rake +@@ -19,7 +19,7 @@ task 'assets:precompile:before' do + + if only_assets_precompile_remaining + # Using exec to free up Rails app memory during ember build +- exec "#{compile_command} && EMBER_CLI_COMPILE_DONE=1 bin/rake assets:precompile" ++ exec "#{compile_command} && EMBER_CLI_COMPILE_DONE=1 bundle exec rake assets:precompile" + else + system compile_command + end diff --git a/pkgs/servers/web-apps/discourse/auto_generated_path.patch b/pkgs/servers/web-apps/discourse/auto_generated_path.patch index e63d4a283a74..c80e4a48ecd9 100644 --- a/pkgs/servers/web-apps/discourse/auto_generated_path.patch +++ b/pkgs/servers/web-apps/discourse/auto_generated_path.patch @@ -1,8 +1,8 @@ diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb -index e59a6fbc05..c773a1356e 100644 +index 8482ff0210..826d111d65 100644 --- a/lib/plugin/instance.rb +++ b/lib/plugin/instance.rb -@@ -447,7 +447,7 @@ class Plugin::Instance +@@ -455,7 +455,7 @@ class Plugin::Instance end def auto_generated_path diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 693e638dec6e..b863a40dfc58 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -3,20 +3,21 @@ , ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk, nettools , imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, jhead -, libpsl, redis, postgresql, which, brotli, procps, rsync, icu -, nodePackages, nodejs-16_x +, oxipng, libpsl, redis, postgresql, which, brotli, procps, rsync, icu +, fetchYarnDeps, yarn, fixup_yarn_lock, nodePackages, nodejs-14_x +, nodejs-16_x , plugins ? [] }@args: let - version = "2.9.0.beta1"; + version = "2.9.0.beta3"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-mf2Niyv1H+Zq7RfnV93O1Ul9RdRrtmtAJMBJrb8hp3U="; + sha256 = "sha256-+VYHGkISY4PFScUzk6eJ7eN9cPTjNEww/kusKcufMI0="; }; runtimeDeps = [ @@ -38,6 +39,7 @@ let # Image optimization imagemagick optipng + oxipng pngquant libjpeg jpegoptim @@ -157,6 +159,11 @@ let ]; }; + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/app/assets/javascripts/yarn.lock"; + sha256 = "0xx5gncvb2mwpwwbgi4y320ji143i38vmz946xjcx5z3jxxjkymz"; + }; + assets = stdenv.mkDerivation { pname = "discourse-assets"; inherit version src; @@ -166,6 +173,8 @@ let redis nodePackages.uglify-js nodePackages.terser + yarn + nodejs-14_x ]; patches = [ @@ -177,6 +186,10 @@ let # defaults to the plugin's directory and isn't writable at the # time of asset generation ./auto_generated_path.patch + + # Fix the rake command used to recursively execute itself in the + # assets precompilation task. + ./assets_rake_command.patch ]; # We have to set up an environment that is close enough to @@ -184,8 +197,21 @@ let # run. This means that Redis and PostgreSQL has to be running and # database migrations performed. preBuild = '' + # Yarn wants a real home directory to write cache, config, etc to + export HOME=$NIX_BUILD_TOP/fake_home + + # Make yarn install packages from our offline cache, not the registry + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + + # Fixup "resolved"-entries in yarn.lock to match our offline cache + ${fixup_yarn_lock}/bin/fixup_yarn_lock app/assets/javascripts/yarn.lock + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + yarn install --offline --cwd app/assets/javascripts/discourse + + patchShebangs app/assets/javascripts/node_modules/ + redis-server >/dev/null & initdb -A trust $NIX_BUILD_TOP/postgres >/dev/null @@ -211,7 +237,7 @@ let export RAILS_ENV=production bundle exec rake db:migrate >/dev/null - rm -r tmp/* + chmod -R +w tmp ''; buildPhase = '' @@ -229,6 +255,10 @@ let runHook postInstall ''; + + passthru = { + inherit yarnOfflineCache; + }; }; discourse = stdenv.mkDerivation { @@ -309,7 +339,7 @@ let }; passthru = { - inherit rubyEnv runtimeEnv runtimeDeps rake mkDiscoursePlugin; + inherit rubyEnv runtimeEnv runtimeDeps rake mkDiscoursePlugin assets; enabledPlugins = plugins; plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; }; ruby = rubyEnv.wrappedRuby; diff --git a/pkgs/servers/web-apps/discourse/nixos_defaults.patch b/pkgs/servers/web-apps/discourse/nixos_defaults.patch index 3efca97e62c0..98dba9b54b90 100644 --- a/pkgs/servers/web-apps/discourse/nixos_defaults.patch +++ b/pkgs/servers/web-apps/discourse/nixos_defaults.patch @@ -1,8 +1,8 @@ diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb -index 89a5e923fc..b60754f50a 100644 +index a6641f967a..a45353504a 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb -@@ -26,6 +26,8 @@ class SiteSetting < ActiveRecord::Base +@@ -21,6 +21,8 @@ class SiteSetting < ActiveRecord::Base end end diff --git a/pkgs/servers/web-apps/discourse/plugin_gem_api_version.patch b/pkgs/servers/web-apps/discourse/plugin_gem_api_version.patch index ca7aa850ec51..84fb1d4dad4a 100644 --- a/pkgs/servers/web-apps/discourse/plugin_gem_api_version.patch +++ b/pkgs/servers/web-apps/discourse/plugin_gem_api_version.patch @@ -1,5 +1,5 @@ diff --git a/lib/plugin_gem.rb b/lib/plugin_gem.rb -index 855d1aca2c..8115623547 100644 +index 49882b2cd9..96672df2ea 100644 --- a/lib/plugin_gem.rb +++ b/lib/plugin_gem.rb @@ -4,7 +4,7 @@ module PluginGem diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index 9cdfbf21a9d8..c66a3f25542c 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -18,7 +18,7 @@ else # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - rails_version = '6.1.4.1' + rails_version = '6.1.4.7' gem 'actionmailer', rails_version gem 'actionpack', rails_version gem 'actionview', rails_version @@ -105,9 +105,7 @@ gem 'omniauth-oauth2', require: false gem 'omniauth-google-oauth2' -# Pinning oj until https://github.com/ohler55/oj/issues/699 is resolved. -# Segfaults and stuck processes after upgrading. -gem 'oj', '3.13.2' +gem 'oj' gem 'pg' gem 'mini_sql' @@ -135,6 +133,14 @@ gem 'cose', require: false gem 'addressable' gem 'json_schemer' +if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1") + # net-smtp, net-imap and net-pop were removed from default gems in Ruby 3.1 + gem "net-smtp", "~> 0.2.1", require: false + gem "net-imap", "~> 0.2.1", require: false + gem "net-pop", "~> 0.1.1", require: false + gem "digest", "3.0.0", require: false +end + # Gems used only for assets and not required in production environments by default. # Allow everywhere for now cause we are allowing asset debugging in production group :assets do @@ -152,7 +158,6 @@ end group :test, :development do gem 'rspec' - gem 'mock_redis' gem 'listen', require: false gem 'certified', require: false gem 'fabrication', require: false diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index e9964e0340c4..7ae505b5c194 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -8,22 +8,22 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (6.1.4.1) - actionpack (= 6.1.4.1) - actionview (= 6.1.4.1) - activejob (= 6.1.4.1) - activesupport (= 6.1.4.1) + actionmailer (6.1.4.7) + actionpack (= 6.1.4.7) + actionview (= 6.1.4.7) + activejob (= 6.1.4.7) + activesupport (= 6.1.4.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.1) - actionview (= 6.1.4.1) - activesupport (= 6.1.4.1) + actionpack (6.1.4.7) + actionview (= 6.1.4.7) + activesupport (= 6.1.4.7) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.1) - activesupport (= 6.1.4.1) + actionview (6.1.4.7) + activesupport (= 6.1.4.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -32,15 +32,15 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (6.1.4.1) - activesupport (= 6.1.4.1) + activejob (6.1.4.7) + activesupport (= 6.1.4.7) globalid (>= 0.3.6) - activemodel (6.1.4.1) - activesupport (= 6.1.4.1) - activerecord (6.1.4.1) - activemodel (= 6.1.4.1) - activesupport (= 6.1.4.1) - activesupport (6.1.4.1) + activemodel (6.1.4.7) + activesupport (= 6.1.4.7) + activerecord (6.1.4.7) + activemodel (= 6.1.4.7) + activesupport (= 6.1.4.7) + activesupport (6.1.4.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -48,8 +48,8 @@ GEM zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - annotate (3.1.1) - activerecord (>= 3.2, < 7.0) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) ast (2.4.2) aws-eventstream (1.2.0) @@ -80,8 +80,8 @@ GEM rack (>= 0.9.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.9.4) - msgpack (~> 1.0) + bootsnap (1.11.1) + msgpack (~> 1.2) builder (3.2.4) bullet (7.0.1) activesupport (>= 3.0.0) @@ -97,7 +97,7 @@ GEM cose (1.2.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) - cppjieba_rb (0.3.3) + cppjieba_rb (0.4.2) crack (0.4.5) rexml crass (1.0.6) @@ -129,14 +129,14 @@ GEM sprockets (>= 3.3, < 4.1) ember-source (2.18.2) erubi (1.10.0) - excon (0.89.0) + excon (0.92.1) execjs (2.8.1) exifr (1.3.9) - fabrication (2.24.0) - faker (2.19.0) - i18n (>= 1.6, < 2) + fabrication (2.27.0) + faker (2.20.0) + i18n (>= 1.8.11, < 2) fakeweb (1.3.0) - faraday (1.9.3) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -175,7 +175,7 @@ GEM hkdf (0.3.0) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.8.11) + i18n (1.10.0) concurrent-ruby (~> 1.0) image_optim (0.31.1) exifr (~> 1.2, >= 1.2.2) @@ -184,9 +184,9 @@ GEM in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) image_size (3.0.1) - in_threads (1.5.4) - ipaddr (1.2.3) - jmespath (1.5.0) + in_threads (1.6.0) + ipaddr (1.2.4) + jmespath (1.6.1) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -194,7 +194,7 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - json_schemer (0.2.18) + json_schemer (0.2.19) ecma-re-validator (~> 0.3) hana (~> 1.3) regexp_parser (~> 2.0) @@ -214,38 +214,36 @@ GEM logstash-event (1.2.02) logstash-logger (0.26.1) logstash-event (~> 1.2) - logster (2.10.1) - loofah (2.13.0) + logster (2.11.0) + loofah (2.15.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) lz4-ruby (0.3.3) maxminddb (0.1.22) memory_profiler (1.0.0) - message_bus (4.0.0) + message_bus (4.2.0) rack (>= 1.1.3) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.6.1) - mini_racer (0.6.1) + mini_portile2 (2.8.0) + mini_racer (0.6.2) libv8-node (~> 16.10.0.0) mini_scheduler (0.13.0) sidekiq (>= 4.2.3) - mini_sql (1.1.3) + mini_sql (1.4.0) mini_suffix (0.3.3) ffi (~> 1.9) minitest (5.15.0) mocha (1.13.0) - mock_redis (0.29.0) - ruby2_keywords - msgpack (1.4.2) + msgpack (1.4.5) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) mustache (1.1.1) nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) oauth (0.5.8) oauth2 (1.4.7) @@ -254,7 +252,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oj (3.13.2) + oj (3.13.11) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -282,12 +280,12 @@ GEM openssl-signature_algorithm (1.1.1) openssl (~> 2.0) optimist (3.0.1) - parallel (1.21.0) + parallel (1.22.0) parallel_tests (3.7.3) parallel - parser (3.1.0.0) + parser (3.1.1.0) ast (~> 2.4.1) - pg (1.2.3) + pg (1.3.4) progress (3.6.0) pry (0.13.1) coderay (~> 1.1) @@ -298,14 +296,14 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) - puma (5.5.2) + puma (5.6.2) nio4r (~> 2.0) r2 (0.2.7) racc (1.6.0) rack (2.2.3) - rack-mini-profiler (2.3.3) + rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-protection (2.1.0) + rack-protection (2.2.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -314,23 +312,23 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails_failover (0.7.3) - activerecord (~> 6.0) + rails_failover (0.8.1) + activerecord (> 6.0, < 7.1) concurrent-ruby - railties (~> 6.0) - rails_multisite (4.0.0) - activerecord (> 5.0, < 7) - railties (> 5.0, < 7) - railties (6.1.4.1) - actionpack (= 6.1.4.1) - activesupport (= 6.1.4.1) + railties (> 6.0, < 7.1) + rails_multisite (4.0.1) + activerecord (> 5.0, < 7.1) + railties (> 5.0, < 7.1) + railties (6.1.4.7) + actionpack (= 6.1.4.7) + activesupport (= 6.1.4.7) method_source rake (>= 0.13) thor (~> 1.0) rainbow (3.1.1) raindrops (0.20.0) rake (13.0.6) - rb-fsevent (0.11.0) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) rbtrace (0.4.14) @@ -339,34 +337,34 @@ GEM optimist (>= 3.0.0) rchardet (1.8.0) redis (4.5.1) - redis-namespace (1.8.1) + redis-namespace (1.8.2) redis (>= 3.0.4) - regexp_parser (2.2.0) - request_store (1.5.0) + regexp_parser (2.2.1) + request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rqrcode (2.1.0) + rqrcode (2.1.1) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.11.0) rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.10.2) + rspec-mocks (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.2) + rspec-support (~> 3.11.0) + rspec-rails (5.1.1) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -374,29 +372,29 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.3) + rspec-support (3.11.0) rss (0.2.9) rexml - rswag-specs (2.4.0) - activesupport (>= 3.1, < 7.0) + rswag-specs (2.5.1) + activesupport (>= 3.1, < 7.1) json-schema (~> 2.2) - railties (>= 3.1, < 7.0) + railties (>= 3.1, < 7.1) rtlit (0.0.5) - rubocop (1.25.0) + rubocop (1.26.0) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.15.1, < 2.0) + rubocop-ast (>= 1.16.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.1) - parser (>= 3.0.1.1) + rubocop-ast (1.16.0) + parser (>= 3.1.1.0) rubocop-discourse (2.5.0) rubocop (>= 1.1.0) rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.7.0) + rubocop-rspec (2.9.0) rubocop (~> 1.19) ruby-prof (1.4.3) ruby-progressbar (1.11.0) @@ -422,7 +420,7 @@ GEM activesupport (>= 3.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.3.1) + sidekiq (6.4.1) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) @@ -431,7 +429,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.3) + simplecov_json_formatter (0.1.4) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -440,7 +438,7 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.17) + stackprof (0.2.19) test-prof (1.0.7) thor (1.2.1) tilt (2.0.10) @@ -450,12 +448,12 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) unicode-display_width (2.1.0) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) - uniform_notifier (1.14.2) + uniform_notifier (1.15.0) uri_template (0.7.0) webmock (3.14.0) addressable (>= 2.8.0) @@ -466,20 +464,20 @@ GEM jwt (~> 2.0) xorcist (1.1.2) yaml-lint (0.0.10) - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS ruby DEPENDENCIES - actionmailer (= 6.1.4.1) - actionpack (= 6.1.4.1) - actionview (= 6.1.4.1) + actionmailer (= 6.1.4.7) + actionpack (= 6.1.4.7) + actionview (= 6.1.4.7) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 6.1.4.1) - activerecord (= 6.1.4.1) - activesupport (= 6.1.4.1) + activemodel (= 6.1.4.7) + activerecord (= 6.1.4.7) + activesupport (= 6.1.4.7) addressable annotate aws-sdk-s3 @@ -537,11 +535,10 @@ DEPENDENCIES mini_suffix minitest mocha - mock_redis multi_json mustache nokogiri - oj (= 3.13.2) + oj omniauth omniauth-facebook omniauth-github @@ -559,7 +556,7 @@ DEPENDENCIES rack-protection rails_failover rails_multisite - railties (= 6.1.4.1) + railties (= 6.1.4.7) rake rb-fsevent rbtrace @@ -601,4 +598,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.3.4 + 2.3.5 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 9b5fbfca4a85..72748dad501b 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00s07l2ac5igch1g2rpa0linmiq7mhgk6v6wxkckg8gbiqijb592"; + sha256 = "0rjm6rx3qbqgxczy2a8l6hff72166hsf878fy2v1ik4pp8rh9cxa"; type = "gem"; }; - version = "6.1.4.1"; + version = "6.1.4.7"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xgysqnibjsy6kdz10x2xb3kwa6lssiqhh0zggrbgs31ypwhlpia"; + sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814"; type = "gem"; }; - version = "6.1.4.1"; + version = "6.1.4.7"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yf4ic5kl324rs0raralpwx24s6hvvdzxfhinafylf8f3x7jj23z"; + sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac"; type = "gem"; }; - version = "6.1.4.1"; + version = "6.1.4.7"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7c0i0kwarxgcbxk71wa9jnlg45grbxmhlrh7dk9bgcv7r7r7hn"; + sha256 = "1g8dpxjzj7k3sjfjhfia21bwzmgc721lafpk2napravmq1qi0rkj"; type = "gem"; }; - version = "6.1.4.1"; + version = "6.1.4.7"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ixam4lni8b5lgx0whnax0imzh1dh10fy5r9pxs52n83yz5nbq3"; + sha256 = "01mzgr5pdxcki023p96bj77by1iblv9bq6pwmbly931bjwhr5irv"; type = "gem"; }; - version = "6.1.4.1"; + version = "6.1.4.7"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccgvlj767ybps3pxlaa4iw77n7wbriw2sr8754id3ngjfap08ja"; + sha256 = "1idirwh7dzhzcjsssnghqyjl87inh84za0cmrf8g323p9qsx879l"; type = "gem"; }; - version = "6.1.4.1"; + version = "6.1.4.7"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; + sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9"; type = "gem"; }; - version = "6.1.4.1"; + version = "6.1.4.7"; }; addressable = { dependencies = ["public_suffix"]; @@ -111,14 +111,14 @@ }; annotate = { dependencies = ["activerecord" "rake"]; - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dxrfppwfg13vqmambbs56xjj8qsdgcy58r2yc44vvy3z1g5yflw"; + sha256 = "1lw0fxb5mirsdp3bp20gjyvs7clvi19jbxnrm2ihm20kzfhvlqcs"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.0"; }; ast = { groups = ["default" "development" "test"]; @@ -252,10 +252,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19i4x2nascd74ahcvmrsnf03cygh1y4c9yf8rcv91fv0mcxpvb9n"; + sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg"; type = "gem"; }; - version = "1.9.4"; + version = "1.11.1"; }; builder = { groups = ["default" "development" "test"]; @@ -382,10 +382,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sslff7yy8jvp4rcn1b6jn9v0d3iibb68i79shgd94rs2yq8k117"; + sha256 = "0ijzvnm5jclyhf6ls30kv7dqy05f3hbha69f59jwbzdid7dndla5"; type = "gem"; }; - version = "0.3.3"; + version = "0.4.2"; }; crack = { dependencies = ["rexml"]; @@ -573,10 +573,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0153rr745g48h48vaplgmx7xkfjbc79acpq5jsl7agdrk4yf75ih"; + sha256 = "12d0xkb2qkydygs4py2z2m7vzx0hygx2dnyk98ja8lkj2k348925"; type = "gem"; }; - version = "0.89.0"; + version = "0.92.1"; }; execjs = { groups = ["assets" "default"]; @@ -603,10 +603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09b6gyqf76iflxh9v69k59xhxmrx1akdp2mbg8k8nb5rxy0sz0v6"; + sha256 = "1zmak7fgis1nk9j157g2rjzxrw9prr3jzlxap9vix3xm0gkihr53"; type = "gem"; }; - version = "2.24.0"; + version = "2.27.0"; }; faker = { dependencies = ["i18n"]; @@ -614,10 +614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hb9wfxyb4ss2vl2mrj1zgdk7dh4yaxghq22gbx62yxj5yb9w4zw"; + sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi"; type = "gem"; }; - version = "2.19.0"; + version = "2.20.0"; }; fakeweb = { groups = ["test"]; @@ -635,10 +635,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; + sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.0"; }; faraday-em_http = { groups = ["default"]; @@ -918,10 +918,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.8.11"; + version = "1.10.0"; }; image_optim = { dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; @@ -949,30 +949,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m71806p1gm4kxiz4gvkyr8qip16hifn2kdf926jz44jj6kc6bbs"; + sha256 = "0j9132d4g8prjafgdh4pw948j527kr09m2lvylrcd797il9yd9wi"; type = "gem"; }; - version = "1.5.4"; + version = "1.6.0"; }; ipaddr = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s2cipiyhm1r8igc1n43py5p5r3rdz8lvagaa61jrm62prn7v5b2"; + sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.4"; }; jmespath = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan"; + sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.1"; }; jquery-rails = { dependencies = ["rails-dom-testing" "railties" "thor"]; @@ -1012,10 +1012,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rkb7gz819g82n3xshb5g8kgv1nvgwg1lm2fk7715pggzcgc4qik"; + sha256 = "03lzdfwpmywxc6l5apnhfjwl8swf9jz2ajwjgq38am0q60ggjrcf"; type = "gem"; }; - version = "0.2.18"; + version = "0.2.19"; }; jwt = { groups = ["default"]; @@ -1111,10 +1111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l4rdq5gsnhr7ma7i5ddg8sagkqn122kz8cb244q4hyk9rwmd2w"; + sha256 = "0mamk8hgdhjcd33jf1w3j2kayvpyyscysvnmbhq3mw5kjji89cam"; type = "gem"; }; - version = "2.10.1"; + version = "2.11.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1122,10 +1122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg"; + sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23"; type = "gem"; }; - version = "2.13.0"; + version = "2.15.0"; }; lru_redux = { groups = ["default"]; @@ -1196,10 +1196,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0589k3ggj6s970mr2jaz8zfcnl5b926birwi6s3b6j3ijf2nh3s3"; + sha256 = "15gazkvbqffh57if68j2p81pm52ww7j9wibbqpq8xp7c3gxqahgq"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.0"; }; method_source = { groups = ["default" "development" "test"]; @@ -1226,10 +1226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.6.1"; + version = "2.8.0"; }; mini_racer = { dependencies = ["libv8-node"]; @@ -1237,10 +1237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j45mg8fs7i0g6ndbzd9qqs3fhq6wpvlp5s95k6mjn1as71l5l55"; + sha256 = "0jf9qjz3r06asz14b6f3z7f2y437a1viqfp52sdi71ipj7dk70bs"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.2"; }; mini_scheduler = { dependencies = ["sidekiq"]; @@ -1258,10 +1258,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvln5wx2jfpd9q2pvjdid96vdz1ynnfk8ip913wpx28wp8ww7jn"; + sha256 = "1dgwyyya821sfj4f92sljsxmmnak2yrzsbckvy82001zgq1n3b41"; type = "gem"; }; - version = "1.1.3"; + version = "1.4.0"; }; mini_suffix = { dependencies = ["ffi"]; @@ -1294,17 +1294,6 @@ }; version = "1.13.0"; }; - mock_redis = { - dependencies = ["ruby2_keywords"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10jj7hralc2hmvvm77w71d4dwq9ij5a1lkqyfw6z32saybzmcs99"; - type = "gem"; - }; - version = "0.29.0"; - }; msgpack = { groups = ["default"]; platforms = [{ @@ -1314,10 +1303,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; + sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.5"; }; multi_json = { groups = ["default"]; @@ -1375,10 +1364,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.3"; }; oauth = { groups = ["default"]; @@ -1406,10 +1395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fh73xl58n696akgarylfdfmv6l93rfwh3csjjbljr6gvhg4qrz9"; + sha256 = "0bm8sdh7vz7ss3y21v961rd8nww23w5g4yhgvnd7jk331kdjyyzl"; type = "gem"; }; - version = "3.13.2"; + version = "3.13.11"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1529,10 +1518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; + sha256 = "1bncdqm62l1q8flw10gl86gcc74zm89s5vrjww73i3094jg64pam"; type = "gem"; }; - version = "1.21.0"; + version = "1.22.0"; }; parallel_tests = { dependencies = ["parallel"]; @@ -1551,20 +1540,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q20ckhn58m49lccf93p0yv7pkc7hymmcz3di762kb658d5fd38"; + sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; type = "gem"; }; - version = "3.1.0.0"; + version = "3.1.1.0"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; progress = { groups = ["default"]; @@ -1625,10 +1614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; + sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; type = "gem"; }; - version = "5.5.2"; + version = "5.6.2"; }; r2 = { groups = ["default"]; @@ -1670,10 +1659,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03hcvjw9nrv0w6yjy2zkv4ivin9xg2wr7xfcvx7rc2msv1gmjb6z"; + sha256 = "121fqk18x1bd52c2bkz8wkvv9nkgpqphj5aycnb7lkf67jkwic0h"; type = "gem"; }; - version = "2.3.3"; + version = "3.0.0"; }; rack-protection = { dependencies = ["rack"]; @@ -1681,10 +1670,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; + sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; rack-test = { dependencies = ["rack"]; @@ -1725,10 +1714,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g3snqmsbdl2jyf2h7q4ds333hizp0j89chca75xv10gv2lq6sa8"; + sha256 = "145m778yylgrjl2q7zfkq35l5sibyynlx6pyp176ifm146gbf9wf"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.1"; }; rails_multisite = { dependencies = ["activerecord" "railties"]; @@ -1736,10 +1725,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j44n1c19gbskzxskdipr5f6lgglpn398x9kcbpw452wwwav8rmf"; + sha256 = "08fa5yq73ws536nhzd55bjx4gfvh6986zvw33rkg6ql6i8rga68y"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -1747,10 +1736,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kwpm068cqys34p2g0j3l1g0cd5f3kxnsay5v7lmbd0sgarac0vy"; + sha256 = "0g6hvhvqdmgabcpmdiby4b77ni3rsgd5p7sd1qkqj34r4an0ldyd"; type = "gem"; }; - version = "6.1.4.1"; + version = "6.1.4.7"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1793,10 +1782,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is"; + sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; rb-inotify = { dependencies = ["ffi"]; @@ -1850,20 +1839,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k65fr7f8ciq7d9nwc5ziw1d32zsxilgmqdlj3359rz5jgb0f5y8"; + sha256 = "0ndj4lcm8rw01078zr0249grsk93zbda8qsibdvlx69b5ijg1rzf"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.2"; }; regexp_parser = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "008yn8j44414qxhn1c0nxp4a70rq0bqhz70hnjpgx8cjh2g0makp"; + sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; request_store = { dependencies = ["rack"]; @@ -1871,10 +1860,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; + sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; rexml = { groups = ["default" "development" "test"]; @@ -1912,10 +1901,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0444sgvx3ahvgr3c9swpy32kcdpciwgcqahp3pb4m7d23xp1qjdc"; + sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; rqrcode_core = { groups = ["default"]; @@ -1933,10 +1922,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dwai7jnwmdmd7ajbi2q0k0lx1dh88knv5wl7c34wjmf94yv8w5q"; + sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9"; type = "gem"; }; - version = "3.10.0"; + version = "3.11.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -1944,10 +1933,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; + sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; type = "gem"; }; - version = "3.10.1"; + version = "3.11.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1955,10 +1944,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qrj2j9jcd3m4aksk4kbv439882yl3z1harv2jrybrgjgdzdz7zs"; + sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53"; type = "gem"; }; - version = "3.10.2"; + version = "3.11.0"; }; rspec-html-matchers = { dependencies = ["nokogiri" "rspec"]; @@ -1977,10 +1966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k"; + sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3"; type = "gem"; }; - version = "3.10.2"; + version = "3.11.0"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -1988,20 +1977,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "152yz205p8zi5nxxhs8z581rjdvvqsfjndklkvn11f2vi50nv7n9"; + sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa"; type = "gem"; }; - version = "5.0.2"; + version = "5.1.1"; }; rspec-support = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pjckrh8q6sqxy38xw7f4ziylq1983k84xh927s6352pps68zj35"; + sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03"; type = "gem"; }; - version = "3.10.3"; + version = "3.11.0"; }; rss = { dependencies = ["rexml"]; @@ -2020,10 +2009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dma3j5vfjhyclg8y0gsp44vs4wn9chf4jgfhc9r6ws018xrbxzd"; + sha256 = "00gm5qbf56shi655hwxzas74avsfv8b91v6i8v06i4jdw8y4qky2"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.1"; }; rtlit = { groups = ["assets"]; @@ -2041,10 +2030,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "141ff5mdqi8an8q00qw8kchzil7ck2dzalkk3vk176l0s6hljcbj"; + sha256 = "03c6v6bfqdw8vnda0if0sx7aff0iq6xnv1adyfs0bi9msgggafcr"; type = "gem"; }; - version = "1.25.0"; + version = "1.26.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2052,10 +2041,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xrij42166a71ixfpfr1pildqdrcmc0cb4906h2s8sk4kqdyngih"; + sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; type = "gem"; }; - version = "1.15.1"; + version = "1.16.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; @@ -2074,10 +2063,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d76haw5gjpxlfanfzicn7sb5gziyizaksm7i999p7p5dmy5vf9q"; + sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6"; type = "gem"; }; - version = "2.7.0"; + version = "2.9.0"; }; ruby-prof = { groups = ["development"]; @@ -2195,10 +2184,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k38cbwhcj9ncfzlgfmvq2zqfdvldln58w8s8v89m0jqlhnhsqhj"; + sha256 = "0fq3nxpj1c9s2bi056p9cldb7zy45bgdkjq8721zypw1pkvllb7f"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.1"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2226,10 +2215,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19r15hyvh52jx7fmsrcflb58xh8l7l0zx4sxkh3hqzhq68y81pjl"; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; @@ -2272,10 +2261,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "06lz70k8c0r7fyxk1nc3idh14x7nvsr21ydm1bsmbj00jyhmfzsn"; + sha256 = "19rnk17rz0lhf7l9awy0s7xxyw91ydcqxlx0576xvwyi79jh6a2m"; type = "gem"; }; - version = "0.2.17"; + version = "0.2.19"; }; test-prof = { groups = ["test"]; @@ -2345,10 +2334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; + sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.8.1"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -2382,10 +2371,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1614dqnky0f9f1znj0lih8i184vfps86md93dw0kxrg3af9gnqb4"; + sha256 = "00dj2vsz9sq5i9wnncbiy4v5vayqbssppazzigd1ibpl60pzfxkq"; type = "gem"; }; - version = "1.14.2"; + version = "1.15.0"; }; uri_template = { groups = ["default"]; @@ -2444,9 +2433,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; } diff --git a/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch b/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch index 2541e7311b0b..88ebc1337487 100644 --- a/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch +++ b/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch @@ -2,7 +2,7 @@ diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb index e69979adfe..68cb04a036 100644 --- a/config/unicorn.conf.rb +++ b/config/unicorn.conf.rb -@@ -27,17 +27,9 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid") +@@ -27,18 +27,10 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid") if ENV["RAILS_ENV"] != "production" logger Logger.new(STDOUT) diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index ebc85c02087a..74b32fc04198 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler nix-update nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log +#! nix-shell -i python3 -p bundix bundler nix-update nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log prefetch-yarn-deps from __future__ import annotations import click @@ -104,10 +104,17 @@ class DiscourseRepo: return self._latest_commit_sha + def get_yarn_lock_hash(self, rev: str): + yarnLockText = self.get_file('app/assets/javascripts/yarn.lock', rev) + with tempfile.NamedTemporaryFile(mode='w') as lockFile: + lockFile.write(yarnLockText) + return subprocess.check_output(['prefetch-yarn-deps', lockFile.name]).decode('utf-8').strip() + def get_file(self, filepath, rev): - """returns file contents at a given rev :param filepath: the path to - the file, relative to the repo root :param rev: the rev to - fetch at :return: + """Return file contents at a given rev. + + :param str filepath: the path to the file, relative to the repo root + :param str rev: the rev to fetch at :return: """ r = requests.get(f'https://raw.githubusercontent.com/{self.owner}/{self.repo}/{rev}/{filepath}') @@ -116,7 +123,7 @@ class DiscourseRepo: def _call_nix_update(pkg, version): - """calls nix-update from nixpkgs root dir""" + """Call nix-update from nixpkgs root dir.""" nixpkgs_path = Path(__file__).parent / '../../../../' return subprocess.check_output(['nix-update', pkg, '--version', version], cwd=nixpkgs_path) @@ -215,7 +222,7 @@ def print_diffs(rev, reverse): def update(rev): """Update gem files and version. - REV should be the git rev to update to ('vX.Y.Z[.betaA]') or + REV: the git rev to update to ('vX.Y.Z[.betaA]') or 'latest'; defaults to 'latest'. """ @@ -241,12 +248,20 @@ def update(rev): _call_nix_update('discourse', version.version) + old_yarn_hash = _nix_eval('discourse.assets.yarnOfflineCache.outputHash') + new_yarn_hash = repo.get_yarn_lock_hash(version.tag) + click.echo(f"Updating yarn lock hash, {old_yarn_hash} -> {new_yarn_hash}") + with open(Path(__file__).parent / "default.nix", 'r+') as f: + content = f.read() + content = content.replace(old_yarn_hash, new_yarn_hash) + f.seek(0) + f.write(content) + f.truncate() + @cli.command() def update_plugins(): - """Update plugins to their latest revision. - - """ + """Update plugins to their latest revision.""" plugins = [ {'name': 'discourse-assign'}, {'name': 'discourse-calendar'}, From 9b891e6f64a7f8275954597d717543dedc3e64d7 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 24 Mar 2022 19:12:36 +0100 Subject: [PATCH 027/385] discourse.plugins: Update all plugins to their latest versions --- .../plugins/discourse-assign/default.nix | 4 ++-- .../discourse/plugins/discourse-calendar/Gemfile | 4 +--- .../plugins/discourse-calendar/Gemfile.lock | 14 +++++++------- .../plugins/discourse-calendar/default.nix | 4 ++-- .../plugins/discourse-calendar/gemset.nix | 16 ++++++++-------- .../plugins/discourse-canned-replies/default.nix | 4 ++-- .../discourse-chat-integration/default.nix | 4 ++-- .../plugins/discourse-checklist/default.nix | 4 ++-- .../plugins/discourse-data-explorer/default.nix | 4 ++-- .../discourse/plugins/discourse-docs/default.nix | 4 ++-- .../discourse/plugins/discourse-github/Gemfile | 4 +--- .../plugins/discourse-github/Gemfile.lock | 8 ++++---- .../plugins/discourse-github/default.nix | 4 ++-- .../plugins/discourse-github/gemset.nix | 8 ++++---- .../plugins/discourse-ldap-auth/Gemfile | 2 -- .../plugins/discourse-ldap-auth/Gemfile.lock | 2 +- .../plugins/discourse-ldap-auth/default.nix | 4 ++-- .../discourse/plugins/discourse-math/default.nix | 4 ++-- .../plugins/discourse-openid-connect/default.nix | 4 ++-- .../plugins/discourse-prometheus/Gemfile | 2 -- .../plugins/discourse-prometheus/Gemfile.lock | 2 +- .../plugins/discourse-prometheus/default.nix | 4 ++-- .../plugins/discourse-saved-searches/default.nix | 4 ++-- .../plugins/discourse-solved/default.nix | 4 ++-- .../plugins/discourse-spoiler-alert/default.nix | 4 ++-- .../plugins/discourse-voting/default.nix | 4 ++-- .../plugins/discourse-yearly-review/default.nix | 4 ++-- 27 files changed, 61 insertions(+), 69 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 2a1970e92dd3..7fa373106f7c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "ffe95da7ed0cf0893a76af37498784ad92041131"; - sha256 = "sha256-FdZATO1Z6XmhForETZ2FC+6wfR437cpRg8QSFzmbsxQ="; + rev = "d8d2dc950a0512cc53885afbd1da26ea38fdf1e1"; + sha256 = "sha256-FRq/zL+Hiu/Pd/8HDOmFW8Uoovw9so1gKbM4by3jSYg="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile index bda8e6ec3cf3..faf4db6ca825 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile @@ -2,7 +2,5 @@ source "https://rubygems.org" -git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } - # gem "rails" -gem 'rrule', '0.4.2', require: false +gem 'rrule', '0.4.4', require: false diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 727fde304953..4a4ff3b0e178 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.1) + activesupport (7.0.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - concurrent-ruby (1.1.9) - i18n (1.9.1) + concurrent-ruby (1.1.10) + i18n (1.10.0) concurrent-ruby (~> 1.0) minitest (5.15.0) - rrule (0.4.2) - activesupport (>= 4.1) + rrule (0.4.4) + activesupport (>= 2.3) tzinfo (2.0.4) concurrent-ruby (~> 1.0) @@ -19,7 +19,7 @@ PLATFORMS ruby DEPENDENCIES - rrule (= 0.4.2) + rrule (= 0.4.4) BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 1d3e2756bb0d..15d7abfec19e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "765d16242ffeb4324c3269393d3fa81e9b751d4f"; - sha256 = "sha256-YYxspW0DX0DUBwPOcvX2pLJYmyK4b56LdjL6avLKzRs="; + rev = "c44d348c7739f08fe026f1d67dbd902cb2f4d590"; + sha256 = "sha256-+876F3/nGhqtwQn2D/v3WzqchemsocnneiYYFmjqGGo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index 48598802c61c..69f2648831ce 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -5,20 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6"; + sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8"; type = "gem"; }; - version = "7.0.1"; + version = "7.0.2.3"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.9.1"; + version = "1.10.0"; }; minitest = { groups = ["default"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w338b7dgvd144fl5b8xy2lfc6zgbcjac7b4z158jc8h070yzc9v"; + sha256 = "04h3q0ws0wswqj3mwjyv44yx59d9ima9a820ay9w5bwnlb73syj2"; type = "gem"; }; - version = "0.4.2"; + version = "0.4.4"; }; tzinfo = { dependencies = ["concurrent-ruby"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 43ef518a9cec..e41574a2ca7e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "8762b8d0fe28ffcacc427e7a683b971bf125a881"; - sha256 = "sha256-ZAm/A45vAofiOiqXS/STt4XO3FJ6XUFyVydsFaI40+k="; + rev = "f9d1d87e352c0d1c41c1a8e4ef26b7766e39d2f1"; + sha256 = "sha256-luFPwcnH6faTJV7Bhx9nnaxkK5PHI9vqhHrFO0m49mg="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 63797d3b89cc..e279c12ce70b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "ddee0c44179c547b2581474c3c4d0da7d8d23fe8"; - sha256 = "sha256-8AUzIu+HRHrcAqpyI/eVrgZLTKXTLgDjXFTGQbMRzxs="; + rev = "0c367e19ca4c06ace067f1268c1a1a64d8da4253"; + sha256 = "sha256-X7bkAjINzKTrWcVd9MPl51Vy6pOWp378ACJJTSihQRc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index 9c61b4bcf67c..c5958589fd19 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "c2bb6b0156e411ef3c1de52aa36b38abeba801cd"; - sha256 = "sha256-p0nOdh0zg891Pe8wYhMzcbunGYJY41iVET4fFRDJt+k="; + rev = "c4f3df0d825082eeaaa3fd9fceba0258080aa6fa"; + sha256 = "sha256-VGKDpu8tohMgSjMoTzhVnPLHMfLsXOejXL3bmQQ3jWM="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 38336973f32a..74c6b3eebb4f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "2a17f49f66feb7a3068cf6f1e4ad08550f875057"; - sha256 = "sha256-LOcJle0S7Z8oGz1XgTEHiz1JNKufxege+joeinwX7xU="; + rev = "e7c19ac107dcd37618c7ac7b98530e99c7fe31db"; + sha256 = "sha256-w7IzniVlSArmR58Xk9U4MLolV61w/7t1C0nMqERM9J4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 3b7d5e96f077..b006f62dc545 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "05678c451caf2ceb192501da91cf0d24ea44c8e8"; - sha256 = "sha256-C+3jaJ09P1PteeHFVfbAXxDgAa6d0RZwLdlp+NKuZJU="; + rev = "e517e69c09479654c197b1d620e6e7a5e69edca7"; + sha256 = "sha256-fbkuFWyY25V3B32a7NYtTcOlBot18JZYRth6ainHDQo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile index 7c0e7f435ae7..ae97d9198459 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile @@ -2,8 +2,6 @@ source "https://rubygems.org" -git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } - # gem "rails" gem 'sawyer', '0.8.2' -gem 'octokit', '4.21.0' +gem 'octokit', '4.22.0' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index 837fd40ee081..a569496b5a89 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - faraday (1.9.3) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -27,7 +27,7 @@ GEM faraday-rack (1.0.0) faraday-retry (1.0.3) multipart-post (2.1.1) - octokit (4.21.0) + octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) public_suffix (4.0.6) @@ -40,8 +40,8 @@ PLATFORMS ruby DEPENDENCIES - octokit (= 4.21.0) + octokit (= 4.22.0) sawyer (= 0.8.2) BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index 9421267d1522..8970f8560516 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "031dc6b512ada263eb3634eae5adfe4cdb008b4b"; - sha256 = "sha256-v69RYgA5k6A3bus+Joc/NFp2DU4bwiaoCSe2xua3DgY="; + rev = "810105186dbe8441852e2df9a9fc2ae8b8516ec6"; + sha256 = "sha256-96sqnvtEmm7sxFPAk6iDiYm7XChaQV+6HXZt/m5BtsI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 29a1e080e83f..62b54dbb0b0c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; + sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.0"; }; faraday-em_http = { groups = ["default"]; @@ -138,10 +138,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27"; + sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj"; type = "gem"; }; - version = "4.21.0"; + version = "4.22.0"; }; public_suffix = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile index a988913a1bf6..2602ef5c72b5 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile @@ -2,8 +2,6 @@ source "https://rubygems.org" -git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } - # gem "rails" gem 'pyu-ruby-sasl', '0.0.3.3', require: false gem 'rubyntlm', '0.3.4', require: false diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock index 83e3cd4cbf47..9ed9dcc8ef91 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock @@ -25,4 +25,4 @@ DEPENDENCIES rubyntlm (= 0.3.4) BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix index 9010ee21a897..0fc71fad2615 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "jonmbake"; repo = "discourse-ldap-auth"; - rev = "fe014176bd635e7df24ee2978d356e1f87d8daed"; - sha256 = "sha256-1Cx+65rJx292sTfPUfbzSfJAU71V1pKWvWdLNCq8M8A="; + rev = "a7a2e35eb5a8f6ee3b90bf48424efcb2a66c9989"; + sha256 = "sha256-Dsb12bZEZlNjFGw1GX7zt2hDVM9Ua+MDWSmBn4HEvs0="; }; meta = with lib; { homepage = "https://github.com/jonmbake/discourse-ldap-auth"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index e3e52ccfea78..85475db73fb1 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "2deef48ab16bc0a15ab5f1fef98e15261251bf32"; - sha256 = "sha256-Crt7ozasZ1DCwAzaH/Y6BQEXwpX6t9qsIrGYMlECylk="; + rev = "447c4811ea44d006da98dcbb6dfde142ada53567"; + sha256 = "sha256-iq3wWhYhOnh+QgChEsSIlRzDmD8kXbjNerVGfuNF7uY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index c5405367ff3b..d6282cd8c62e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "ab26c4eaa858bf35cb6fa6314597a50fff57baf9"; - sha256 = "sha256-Yxw1C0vNcVr+sYvmLvBWFV/XOr7yDBTW17Ohxfkv6W0="; + rev = "dfcdc38d77aab4010cfe032cdd4155b4ae60ed14"; + sha256 = "sha256-I2cuyhA4jhhz+pJ5692/lRj6YRViP//HsoZOZjtu/e4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile index ed57d552593e..63a7cf62749b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile @@ -2,7 +2,5 @@ source "https://rubygems.org" -git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } - # gem "rails" gem 'prometheus_exporter', File.read(File.expand_path("../prometheus_exporter_version", __FILE__)).strip diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock index 7fbd6680db6c..79978e387cb9 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES prometheus_exporter (= 0.5.0) BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 4c23355b301d..a1e540f7fd0d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "1c3e2d75c33a0ed8563977d7c4919e3d06788dcd"; - sha256 = "sha256-tj/IYUjuUs6foV4goIm+HACccmHjAiI1/EAOKibwUMs="; + rev = "834f8683dfae475483c50bdeec979a5fa4a1cf04"; + sha256 = "sha256-M7NnXUib/iKxQT+UTqicmrZONR/Z+oXl46BNgYf1SQM="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 5ba948cf1d13..84d801b12fa9 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "baf1ab94317129d2ff2eb4e5e6d84fa76c40797c"; - sha256 = "sha256-6NP9TK5Wx0LPX0ZFIiaEEYJv3d9WIQ26nvODk0dU2I0="; + rev = "a7eafe288a2f93aa8cc7cf59d8173adc70c8f48a"; + sha256 = "sha256-Zli+tzNxLIwp5sZome+pXqvpsvqM/kXRbe73QtH0rTc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index 8d0c1b07d960..e7b0adbb826b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "922ca15fc92bfab496088b5ee240982bd8404f28"; - sha256 = "sha256-s7XNRLDXnrsoB7FUgGaYIVfd7iO3ittIBoqSo2UaUTY="; + rev = "9aba2bd6b7efbea3e46158fd0b1ce96a975379d7"; + sha256 = "sha256-RmYsDCDuVxXX91haljP6Jbx3s4Nl2RV6UU3PBQ/Xi7Y="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index e97f1bfd06c1..63cdeefd235e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "5afbcb905fa2c8cb8b7156ab5df3af27d6e6b477"; - sha256 = "sha256-/Y5ATVSnJ3hMNiiqqYJzitgkQ/2zbWLaPdII9agTa10="; + rev = "7382d74af57f4476004014598135aec530b0342f"; + sha256 = "sha256-YyCG1bAfjJ9/itHlsZTBQgkRjgPKNKPzJopnP/Z7/NA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index 4efe8aabcdcd..f2a97d9e44d6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "6a4b2a306928191c9ef9f3efdafeb9b4df496bcb"; - sha256 = "sha256-OAn+NS64BcOlhmFYXV0Bq+O1B4a9FKHyN44vbHSax3Y="; + rev = "2de1fe5df1a5c25ad1e0e31e8d28adca315d9092"; + sha256 = "sha256-XxrRPIc9F78wHF6p1qqUZhkPqKWSebqGZn9P5lNTDeo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index a03bf7b8cdd9..62e943537a6c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "5e3674201a32bf9e6c22417395bc2e052d9f217d"; - sha256 = "sha256-gkQGLJegWTSwzpjrHPYK5/Uz4QjLUCLd6OuEIRYeP/I="; + rev = "f2224b38c96c8772ce6cc64514b8a3edaa42ebb9"; + sha256 = "sha256-dJtQXaLsADXcsADzExGPj3L2x4zlNfsQCNBk17W0a5A="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; From 068c5a0c80097af8b419e26297fc4bef48344a54 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 24 Mar 2022 19:32:17 +0100 Subject: [PATCH 028/385] nixos/discourse: Update redis server settings... ...to match the updated redis module. --- nixos/modules/services/web-apps/discourse.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index fa2bb06f7f48..7dbbf4a12fe5 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -656,7 +656,12 @@ in long_polling_interval = null; }; - services.redis.enable = lib.mkDefault (cfg.redis.host == "localhost"); + services.redis.servers.discourse = + lib.mkIf (lib.elem cfg.redis.host [ "localhost" "127.0.0.1" ]) { + enable = true; + bind = cfg.redis.host; + port = cfg.backendSettings.redis_port; + }; services.postgresql = lib.mkIf databaseActuallyCreateLocally { enable = true; @@ -697,12 +702,12 @@ in systemd.services.discourse = { wantedBy = [ "multi-user.target" ]; after = [ - "redis.service" + "redis-discourse.service" "postgresql.service" "discourse-postgresql.service" ]; bindsTo = [ - "redis.service" + "redis-discourse.service" ] ++ lib.optionals (cfg.database.host == null) [ "postgresql.service" "discourse-postgresql.service" From d46598d4f4dbba8eaa5d56786db65bad17010332 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 25 Mar 2022 12:06:14 +0100 Subject: [PATCH 029/385] discourse-mail-receiver: Add update_mail_receiver to update.py --- pkgs/servers/web-apps/discourse/update.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 74b32fc04198..64f374bad703 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -259,6 +259,25 @@ def update(rev): f.truncate() +@cli.command() +@click.argument('rev', default='latest') +def update_mail_receiver(rev): + """Update discourse-mail-receiver. + + REV: the git rev to update to ('vX.Y.Z') or 'latest'; defaults to + 'latest'. + + """ + repo = DiscourseRepo(repo="mail-receiver") + + if rev == 'latest': + version = repo.versions[0] + else: + version = DiscourseVersion(rev) + + _call_nix_update('discourse-mail-receiver', version.version) + + @cli.command() def update_plugins(): """Update plugins to their latest revision.""" From 7ee72e55974beb5a8aaf7ad283f120e0287df0c2 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Tue, 15 Mar 2022 21:52:27 +0200 Subject: [PATCH 030/385] rootlesskit: 0.11.1 -> 1.0.0 --- .../tools/virtualization/rootlesskit/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 61da0d86e33b..d40eb2e07ae4 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -1,15 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "rootlesskit"; - version = "0.11.1"; - goPackagePath = "github.com/rootless-containers/rootlesskit"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - sha256 = "15k0503077ang9ywvmhpr1l7ax0v3wla0x8n6lqpmd71w0j2zm5r"; + hash = "sha256-Tml6zTc9l3O8qB+NSKlClWl5lj1rkiDHwI5exxBL83A="; + }; + + vendorSha256 = "sha256-CpDPa1LAinvXCnVYbn9ZXuEjyHHlDU4bzZ2R+ctoCzQ="; + + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + tests = nixosTests.docker-rootless; }; meta = with lib; { From ffb8c40ad7638ade21f71015c26b448c0033d7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 18:27:44 +0200 Subject: [PATCH 031/385] intel-media-driver: 22.2.2 -> 22.3.0 --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 380f0c1f7e25..d97eac2a93db 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.2.2"; + version = "22.3.0"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-ksh8xx46x9OgXBrhJr3FnBI9g4PHXUDhLPbgpvccffM="; + sha256 = "sha256-TQmXU/Roij6U6NTt3oywhjpPJzaFeR4hhVor11mgaRE="; }; patches = [ From 06e3b4f7a0c92457eae07431b2f09964dd872c08 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 29 Mar 2022 11:04:17 -0400 Subject: [PATCH 032/385] geos39: init at 3.9.2 --- pkgs/development/libraries/geos/3.9.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/geos/3.9.nix diff --git a/pkgs/development/libraries/geos/3.9.nix b/pkgs/development/libraries/geos/3.9.nix new file mode 100644 index 000000000000..fd0531fa747f --- /dev/null +++ b/pkgs/development/libraries/geos/3.9.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "geos"; + version = "3.9.2"; + + src = fetchurl { + url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + sha256 = "sha256-RKWpviHX1HNDa/Yhwt3MPPWou+PHhuEyKWGKO52GEpc="; + }; + + enableParallelBuilding = true; + + # https://trac.osgeo.org/geos/ticket/993 + configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + + meta = with lib; { + description = "C++ port of the Java Topology Suite (JTS)"; + homepage = "https://trac.osgeo.org/geos"; + license = licenses.lgpl21Only; + maintainers = with lib.maintainers; [ + willcohen + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82ac4a6315bd..e747e5c60be0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16976,6 +16976,8 @@ with pkgs; geos = callPackage ../development/libraries/geos { }; + geos39 = callPackage ../development/libraries/geos/3.9.nix { }; + getdata = callPackage ../development/libraries/getdata { }; inherit (callPackages ../development/libraries/getdns { }) From 65e92f70284f282801beb16bdebd74e4eedadfce Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 22 Mar 2022 16:03:34 -0400 Subject: [PATCH 033/385] geos: 3.9.1 -> 3.10.2 --- pkgs/development/libraries/geos/default.nix | 18 ++++++++++++------ .../development/libraries/valhalla/default.nix | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 355e9e5f07ff..fe698d86a85f 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,18 +1,24 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, cmake }: stdenv.mkDerivation rec { pname = "geos"; - version = "3.9.1"; + version = "3.10.2"; src = fetchurl { url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; - sha256 = "sha256-fmMFB9ysncB1ZdJJom8GoVyfWwxS3SkSmg49OB1+OCo="; + sha256 = "sha256-ULvFmaw4a0wrOWLcxBHwBAph8gSq7066ciXs3Qz0VxU="; }; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; - # https://trac.osgeo.org/geos/ticket/993 - configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + postPatch = '' + substituteInPlace tools/geos-config.in \ + --replace "@libdir@" "@prefix@/lib" \ + --replace "@includedir@" "@prefix@/include" + ''; meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix index b3d61e6efd72..dded351d3105 100644 --- a/pkgs/development/libraries/valhalla/default.nix +++ b/pkgs/development/libraries/valhalla/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , zlib, curl, protobuf, prime-server, boost, sqlite, libspatialite -, luajit, geos, python3, zeromq }: +, luajit, geos39, python3, zeromq }: stdenv.mkDerivation rec { pname = "valhalla"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib curl protobuf prime-server boost sqlite libspatialite - luajit geos python3 zeromq + luajit geos39 python3 zeromq ]; cmakeFlags = [ From 6a3cd2f6d718c27aa5dc28917a007633386dd574 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 22 Mar 2022 16:04:48 -0400 Subject: [PATCH 034/385] geos: add willcohen to maintainers --- pkgs/development/libraries/geos/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index fe698d86a85f..c067a705d0bf 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -24,5 +24,8 @@ stdenv.mkDerivation rec { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + maintainers = with lib.maintainers; [ + willcohen + ]; }; } From 46aaabd7dca78e8726f32c9b6aae903b56d2f292 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Mar 2022 16:21:25 +0000 Subject: [PATCH 035/385] python310Packages.sphinxext-opengraph: 0.6.2 -> 0.6.3 --- .../python-modules/sphinxext-opengraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 8b68eea25668..76e5079e9163 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-3bZFFtGW6j/3m/3F4+tapZujzpMZnrIcYTngDCNGylI="; + sha256 = "sha256-YR6TlsmND5IhLdbPbmtVhRN2vSZfx70g2a6Yn6y6L/M="; }; propagatedBuildInputs = [ From 0cd73588690f10c53e1b5e13fda4e0708bf44d9f Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 26 Mar 2022 17:15:17 +0100 Subject: [PATCH 036/385] imagemagick: use libjxl on aarch64-linux, as it builds now for that target Works since f24cab5396085e138ff82d53888af8a9a7d83055 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 7a8cae9bf81a..523903c53ab2 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -64,9 +64,7 @@ stdenv.mkDerivation rec { ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optional (liblqr1 != null) "--with-lqr" - # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, - # let's disable it for now to unbreak the imagemagick build. - ++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl" + ++ lib.optional (libjxl != null ) "--with-jxl" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" @@ -92,11 +90,8 @@ stdenv.mkDerivation rec { libxml2 libheif djvulibre + libjxl ] - # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, - # let's disable it for now to unbreak the imagemagick build. - ++ lib.optionals (!stdenv.isAarch64) - [ libjxl ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optionals stdenv.isDarwin [ From 388d576fd1d0c8c271af82572c132dd13ec8a203 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 12 Mar 2022 11:10:46 +0100 Subject: [PATCH 037/385] imagemagick: 7.1.0-26 -> 7.1.0-29 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 523903c53ab2..13a40cee5edf 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-26"; + version = "7.1.0-29"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-q1CL64cfyb5fN9aVYJfls+v0XRFd4jH+B8n+UJqPE1I="; + hash = "sha256-46fJMOIGnK5aNIcG7+8mJdZDcSFyFmhmkLcuVlnupSU="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From aeef08c9f996b0e50babedd18d2632fb3c603949 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Sat, 26 Mar 2022 22:56:18 +0100 Subject: [PATCH 038/385] joystickwake: autostart --- pkgs/tools/games/joystickwake/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/games/joystickwake/default.nix b/pkgs/tools/games/joystickwake/default.nix index f8f962f6eef7..cd18b8b09df5 100644 --- a/pkgs/tools/games/joystickwake/default.nix +++ b/pkgs/tools/games/joystickwake/default.nix @@ -12,6 +12,11 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pyudev xlib ]; + postInstall = '' + # autostart file + ln -s $out/${python3.sitePackages}/etc $out/etc + ''; + meta = with lib; { description = "A joystick-aware screen waker"; longDescription = '' From 74e85f3b68752e3b607f548c34eac7aefc4194ef Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 31 Mar 2022 17:14:12 +0100 Subject: [PATCH 039/385] infracost: 0.9.20 -> 0.9.21 --- pkgs/tools/misc/infracost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 920d4a19e793..650be8cd480b 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.20"; + version = "0.9.21"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-ujoKnf6f9rrPIxvWlzVnC6q+2BxzhpXgb66clgAuC+8="; + sha256 = "sha256-LoIZbA1K1s3ZLHlRz2SOFxC4nv/Vgpae0qdxIcvAVRQ="; }; vendorSha256 = "sha256-TfO3+pGxR9dPzigkx89a/Ak+tKiBa6Z0a6U4kIdRsSQ="; From e9c6db642f54427036d878043a39197e5bea3cda Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 31 Mar 2022 18:14:43 -0300 Subject: [PATCH 040/385] firebird: 3.0.8 -> 3.0.9 --- pkgs/servers/firebird/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 5348862ed6d5..6f5d22462fb6 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -5,6 +5,7 @@ let base = { meta = with lib; { description = "SQL relational database management system"; + downloadPage = "https://github.com/FirebirdSQL/firebird/"; homepage = "https://firebirdsql.org/"; changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md"; license = [ "IDPL" "Interbase-1.0" ]; @@ -54,13 +55,13 @@ let base = { }); firebird_3 = stdenv.mkDerivation (base // rec { - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; rev = "v${version}"; - sha256 = "sha256-l1V3CGxTybPY8pl6WhsExqdWJLiYsOv5BCrU/iD+I7k="; + sha256 = "0axgw4zzb7f7yszr8s7svnspv3mgyvpbkb0b3w6c70fnj10hw21c"; }; buildInputs = base.buildInputs ++ [ zlib libtommath ]; From 21e312d0f7bb3668fb822d32a389d5fc532dc34f Mon Sep 17 00:00:00 2001 From: Greaka Date: Fri, 1 Apr 2022 22:22:05 +0200 Subject: [PATCH 041/385] oven-media-engine: 0.13.1 -> 0.13.2 --- pkgs/servers/misc/oven-media-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 7cd209f95e3f..e6cb494fc7d0 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-oWZ+o19bNR7/QuYTquRa3l7GfRLMEdyPtBUOwb2p3jA="; + sha256 = "0lkpidx4r890mcdk9m69j4iahm7qr7w34h11w1nmi132v0rqm0h8"; }; sourceRoot = "source/src"; From 5fa538ed8815e0c941de7859c0cfc7d9bf8f6e35 Mon Sep 17 00:00:00 2001 From: Sarunas Valaskevicius Date: Fri, 1 Apr 2022 21:55:43 +0100 Subject: [PATCH 042/385] bloop: fix hashes for the v1.4.13 --- pkgs/development/tools/build-managers/bloop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 11b25bec3816..4cde151ae4c0 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "bf3uHuGfmJukf0Qeudv8ZXz/9Uql/qsmvPS0XBb7oTQ="; + sha256 = "VbvBAz7mXhgQtbrlB6uCSmZXLcdYaROJRSREbazAReo="; }; bloop-bash = fetchurl { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-jqcecAM51qEDmTim2VBNm8IO8wQmwU19R57Zk4pxwSA=" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-AiF/ih15Jd0WuDP/0vU0vdaSo3FGjWXos+hNVBayFz4=" else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-WJytRIbsygi4zoIVfkJmzWyFe2p8mQuT4DDO5KDKopY=" else throw "unsupported platform"; }; From f9b9a473c6120dec27f73c059c753d0b4f8e7270 Mon Sep 17 00:00:00 2001 From: Sarunas Valaskevicius Date: Sat, 2 Apr 2022 15:35:08 +0100 Subject: [PATCH 043/385] bloop: add output hash for Darwin (thanks to @kubukoz) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Kozłowski --- pkgs/development/tools/build-managers/bloop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 4cde151ae4c0..ab8c5856a1aa 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-AiF/ih15Jd0WuDP/0vU0vdaSo3FGjWXos+hNVBayFz4=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-WJytRIbsygi4zoIVfkJmzWyFe2p8mQuT4DDO5KDKopY=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-LD23YpcNhWfioGDMqb1plqLy87ZHzT0zvIyc4O4WP5g=" else throw "unsupported platform"; }; From a3ce1b0a9c4a9ce2488f51ab7c4bd591fbff5958 Mon Sep 17 00:00:00 2001 From: J XD Date: Sun, 3 Apr 2022 19:17:31 +0800 Subject: [PATCH 044/385] sioyek: init at 1.1.0 --- pkgs/applications/misc/sioyek/default.nix | 56 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/misc/sioyek/default.nix diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix new file mode 100644 index 000000000000..8b7bae60587f --- /dev/null +++ b/pkgs/applications/misc/sioyek/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, gumbo +, harfbuzz +, jbig2dec +, mupdf +, openjpeg +, qt3d +, qtbase +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "sioyek"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "ahrm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-UhZuELWfFfqj1jjCgZTD+X44i7jMpeDTbClkZarV2Zw="; + }; + + buildInputs = [ gumbo harfbuzz jbig2dec mupdf openjpeg qt3d qtbase ]; + + nativeBuildInputs = [ wrapQtAppsHook ]; + + buildPhase = '' + # Remove nonexistent lib and insert missing ones + sed -i 's/-lmupdf-threads/-lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg/' pdf_viewer_build_config.pro + qmake pdf_viewer_build_config.pro + make + ''; + + installPhase = '' + install -Dm755 sioyek $out/bin/sioyek + install -Dm644 tutorial.pdf $out/bin/tutorial.pdf + install -Dm644 -t $out/bin/ pdf_viewer/{keys,prefs}.config + cp -r pdf_viewer/shaders $out/bin/ + ''; + + postInstall = '' + install -Dm644 resource/sioyek-icon-linux.png $out/usr/share/icons/sioyek-icon-linux.png + install -Dm644 resource/sioyek.desktop $out/usr/share/applications/sioyek.desktop + installManPage resources/sioyek.1 + ''; + + meta = with lib; { + description = "Sioyek is a PDF viewer designed for reading research papers and technical books."; + homepage = "https://sioyek.info/"; + changelog = "https://github.com/ahrm/sioyek/releases"; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60ae4faa4391..a63ffd08b4fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29101,6 +29101,8 @@ with pkgs; simple-scan = gnome.simple-scan; + sioyek = libsForQt5.callPackage ../applications/misc/sioyek { }; + siproxd = callPackage ../applications/networking/siproxd { }; sish = callPackage ../tools/networking/sish { }; From 4a2a7b74f05ccbc8e003490a776858f1c4c3caf1 Mon Sep 17 00:00:00 2001 From: J XD Date: Sun, 3 Apr 2022 19:23:17 +0800 Subject: [PATCH 045/385] Add myself to maintainers list --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/misc/sioyek/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7cae29a1eefe..e0587d20c5a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9910,6 +9910,12 @@ fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A"; }]; }; + podocarp = { + email = "xdjiaxd@gmail.com"; + github = "podocarp"; + githubId = 10473184; + name = "Jia Xiaodong"; + }; polendri = { email = "paul@ijj.li"; github = "polendri"; diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 8b7bae60587f..fb39f2912333 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/ahrm/sioyek/releases"; license = licenses.gpl3Only; platforms = platforms.linux; + maintainers = [ mainterners.podocarp ]; }; } From 973e3f8b9c29bd661245989f517fd1d74d6af8db Mon Sep 17 00:00:00 2001 From: gruve-p Date: Sun, 3 Apr 2022 14:35:04 +0200 Subject: [PATCH 046/385] electrum-grs: 4.1.5 -> 4.2.0 --- .../misc/electrum-grs/default.nix | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/electrum-grs/default.nix b/pkgs/applications/misc/electrum-grs/default.nix index c8fb9f84ad19..d35941ccfb1b 100644 --- a/pkgs/applications/misc/electrum-grs/default.nix +++ b/pkgs/applications/misc/electrum-grs/default.nix @@ -9,7 +9,7 @@ }: let - version = "4.1.5"; + version = "4.2.0"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -20,19 +20,6 @@ let if stdenv.isLinux then "libzbar.so.0" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; - py = python3.override { - packageOverrides = self: super: { - - aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { - version = "0.18.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; - }; - }); - }; - }; - in python3.pkgs.buildPythonApplication { @@ -43,17 +30,12 @@ python3.pkgs.buildPythonApplication { owner = "Groestlcoin"; repo = "electrum-grs"; rev = "refs/tags/v${version}"; - sha256 = "0wvbjj80r1zxpz24adkicxsdjnv3nciga6rl1wfmky463w03rca2"; + sha256 = "15n6snrs1kgdqkhp4wgs0bxxdz6mzl8dvf8h7s0jzc6r4b74vv3n"; }; - postPatch = '' - substituteInPlace contrib/requirements/requirements.txt \ - --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" - ''; - nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx From 232c7bd19551561c4c41a2b5442a94abca63d593 Mon Sep 17 00:00:00 2001 From: Nazarii Bardiuk Date: Sun, 3 Apr 2022 17:13:54 +0100 Subject: [PATCH 047/385] beekeeper-studio: 3.1.0 -> 3.3.8 --- .../tools/database/beekeeper-studio/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/database/beekeeper-studio/default.nix b/pkgs/development/tools/database/beekeeper-studio/default.nix index c00c2e99a14e..c112fc3f773f 100644 --- a/pkgs/development/tools/database/beekeeper-studio/default.nix +++ b/pkgs/development/tools/database/beekeeper-studio/default.nix @@ -2,19 +2,20 @@ let pname = "beekeeper-studio"; - version = "3.1.0"; + version = "3.3.8"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}.AppImage"; - name="${pname}-${version}.AppImage"; - sha512 = "sha512:1zv4fclac94fzzhgqmjgc5pllxcxajjx6yjf3zblj53cc7m4sp4ydjx3wh4db57j75x8vh7xc3q1xpq6q3sj1dafnap0j0icfi6wznk"; + name = "${pname}-${version}.AppImage"; + sha512 = "sha512-riBKlvOzBovJhXUf7YX6SJKshxwGiQR0jyWHfJRkq9+WMspPkpXg4sJMXziARHaa6durXZtqCfzQ08HrfqA4Qg=="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit name src; multiPkgs = null; # no 32bit needed From 5f5a06877ff40bb176e0db2b181084ce7359cbd3 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sat, 2 Apr 2022 14:31:11 -0500 Subject: [PATCH 048/385] CloudCompare: unstable-2021-10-14 -> 2.12.0, add plugins --- .../graphics/cloudcompare/default.nix | 57 +++++++++++++++---- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index cd3f026dfa09..6a6820240f4a 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,13 +1,16 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake -, dxflib +, boost +, cgal_5 , eigen , flann , gdal +, gmp , LASzip -, libLAS +, mpfr , pdal , pcl , qtbase @@ -15,36 +18,43 @@ , qttools , tbb , xercesc +, wrapGAppsHook }: mkDerivation rec { pname = "cloudcompare"; - # Released version(v2.11.3) doesn't work with packaged PCL. - version = "unstable-2021-10-14"; + version = "2.12.0"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; - rev = "1f65ba63756e23291ae91ff52d04da468ade8249"; - sha256 = "x1bDjFjXIl3r+yo1soWvRB+4KGP50/WBoGlrH013JQo="; - # As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules): - # * libE57Format - # * PoissonRecon - # * CCCoreLib + rev = "v${version}"; + sha256 = "sha256-hu3ckVocExi9lvxelHAwKb/MZacH4CcCE+vIzElgP/A="; fetchSubmodules = true; }; + patches = [ + # fix issues compiling on aarch64. remove once upgraded past 2.12.0 + (fetchpatch { + url = "https://github.com/CloudCompare/CloudCompare/commit/7e71861fdbd6ea704add5ba69343f47d8fc3d5ae.patch"; + sha256 = "sha256-CRUPjxtKUbsqOyYsjKF+dRZ+E3rqrv5mS3ZaOay2wk8="; + }) + ]; + nativeBuildInputs = [ cmake eigen # header-only + wrapGAppsHook ]; buildInputs = [ - dxflib + boost + cgal_5 flann gdal + gmp LASzip - libLAS + mpfr pdal pcl qtbase @@ -72,9 +82,32 @@ mkDerivation rec { "-DPLUGIN_IO_QPHOTOSCAN=ON" "-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs + "-DCCCORELIB_USE_CGAL=ON" # enables Delauney triangulation support "-DPLUGIN_STANDARD_QPCL=ON" # Adds PCD import and export support + "-DPLUGIN_STANDARD_QANIMATION=ON" + "-DPLUGIN_STANDARD_QBROOM=ON" + "-DPLUGIN_STANDARD_QCANUPO=ON" + "-DPLUGIN_STANDARD_QCOMPASS=ON" + "-DPLUGIN_STANDARD_QCSF=ON" + "-DPLUGIN_STANDARD_QFACETS=ON" + "-DPLUGIN_STANDARD_QHOUGH_NORMALS=ON" + "-DEIGEN_ROOT_DIR=${eigen}/include/eigen3" # needed for hough normals + "-DPLUGIN_STANDARD_QHPR=ON" + "-DPLUGIN_STANDARD_QM3C2=ON" + "-DPLUGIN_STANDARD_QMPLANE=ON" + "-DPLUGIN_STANDARD_QPOISSON_RECON=ON" + "-DPLUGIN_STANDARD_QRANSAC_SD=ON" + "-DPLUGIN_STANDARD_QSRA=ON" + "-DPLUGIN_STANDARD_QCLOUDLAYERS=ON" ]; + dontWrapGApps = true; + + # fix file dialogs crashing on non-NixOS (and avoid double wrapping) + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "3D point cloud and mesh processing software"; homepage = "https://cloudcompare.org"; From 3f73270a62a45376d8f3adb32af69b2116701a77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 14:01:01 +0000 Subject: [PATCH 049/385] quick-lint-js: 2.3.0 -> 2.3.1 add testVersion --- pkgs/development/tools/quick-lint-js/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index 82a31ea52b10..b420d62daab5 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -1,19 +1,24 @@ -{ cmake, fetchFromGitHub, lib, ninja, stdenv }: +{ cmake, fetchFromGitHub, lib, ninja, stdenv, testVersion, quick-lint-js }: + stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "1ay59pmprcswip6zzbqfy5g2rdv4lgmps8vrxay4l9w6xn9lg03v"; + sha256 = "sha256-3DiK7c+RuCIy9B2j6ozSaVIRf63o9S8uH27SZZJHjes="; }; nativeBuildInputs = [ cmake ninja ]; doCheck = true; + passthru.tests = { + version = testVersion { package = quick-lint-js; }; + }; + meta = with lib; { description = "Find bugs in Javascript programs"; homepage = "https://quick-lint-js.com"; From 39cda6be9908275bd5daee82818a675547833c3e Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Wed, 30 Mar 2022 14:52:18 +0200 Subject: [PATCH 050/385] jsoncpp: enable static and USING_SECURE_MEMORY --- .../development/libraries/jsoncpp/default.nix | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 9adf509f8aaa..77d49c700030 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, validatePkgConfig, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +, validatePkgConfig +, fetchpatch +, secureMemory ? false +, enableStatic ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -30,6 +39,10 @@ stdenv.mkDerivation rec { export sourceRoot=${src.name} ''; + postPatch = lib.optionalString secureMemory '' + sed -i 's/#define JSONCPP_USING_SECURE_MEMORY 0/#define JSONCPP_USING_SECURE_MEMORY 1/' include/json/version.h + ''; + # Hack to be able to run the test, broken because we use # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install preBuild = if stdenv.isDarwin then '' @@ -42,10 +55,21 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_STATIC_LIBS=OFF" "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" - ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DJSONCPP_WITH_TESTS=OFF"; + ] + # the test's won't compile if secureMemory is used because there is no + # comparison operators and conversion functions between + # std::basic_string<..., Json::SecureAllocator> vs. + # std::basic_string<..., [default allocator]> + ++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF" + ++ lib.optional (!enableStatic) "-DBUILD_STATIC_LIBS=OFF"; + + # this is fixed and no longer necessary in 1.9.5 but there they use + # memset_s without switching to a different c++ standard in the cmake files + postInstall = lib.optionalString enableStatic '' + (cd $out/lib && ln -sf libjsoncpp_static.a libjsoncpp.a) + ''; meta = with lib; { homepage = "https://github.com/open-source-parsers/jsoncpp"; From a167391bc80c48f31d17712d0fdbb32f8854f7ca Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Mon, 4 Apr 2022 11:19:20 +0000 Subject: [PATCH 051/385] lightning-loop: 0.17.0-beta -> 0.18.0-beta --- pkgs/applications/blockchains/lightning-loop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index 2f4caad32553..6e99e8fe4122 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.17.0-beta"; + version = "0.18.0-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "0hjawagn1dfgj67i52bvf3phvm9f9708z3jqs6cvyz0w7vp107py"; + sha256 = "1kg5nlvb4lb3cjn84wcylhq0l73d2n6rg4n1srnxmgs96v41y78f"; }; - vendorSha256 = "1fpc73hwdn3baz5ykrykvqdr5861gj9p6liy8qll5525kdv560f6"; + vendorSha256 = "0q3wbjfaqdj29sjlhx6fhc0p4d12aa31s6ia36jalcvf659ybb0l"; subPackages = [ "cmd/loop" "cmd/loopd" ]; From 06d1798a8f7211197d686928ee824e1118d94156 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Apr 2022 08:42:33 +0000 Subject: [PATCH 052/385] ocenaudio: 3.11.7 -> 3.11.10 --- pkgs/applications/audio/ocenaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 50697c6c81a9..c927d8997ed8 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.11.7"; + version = "3.11.10"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-fTeDRo7gCM1jXTQGm9MsmKu4KvTGDUogF3VSZWk91RM="; + sha256 = "sha256-Ah6Ni5EbFdIQ/wN7uGeMrSP5ybQfI4iy9gI1VT5LztU="; }; nativeBuildInputs = [ From e7c301df52edcf6043ebd56b0da8db94be621d96 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 4 Apr 2022 15:50:02 +0000 Subject: [PATCH 053/385] nixos/mailman: remove obsolete setting This was dropped in mailman 3.2.0. --- nixos/modules/services/mail/mailman.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 0c9b38b44b24..b01760ec4d13 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -192,7 +192,6 @@ in { log_dir = "/var/log/mailman"; lock_dir = "$var_dir/lock"; etc_dir = "/etc"; - ext_dir = "$etc_dir/mailman.d"; pid_file = "/run/mailman/master.pid"; }; From 737cd109e7bf295be12f41dea75708930e36b8ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Apr 2022 13:42:57 +0000 Subject: [PATCH 054/385] otpclient: 2.4.9.1 -> 2.5.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 1f5f3d187290..9f416ff75a3c 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.9.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QcdPyuwbGK12Kul+gGTfRGmXfghr0qugpBEcrgATOT4="; + sha256 = "sha256-VUrLbGaDfPE+Ak20ZCJDmO/sgBzdf4S+SqvyQ7F6SQU="; }; buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; From 8305aa29c2a48b80cc6dfaf087bc80cf98ed84d4 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 5 Apr 2022 20:07:27 -0700 Subject: [PATCH 055/385] binutils: apply debian's patch if isMips64n64 Upstream binutils is missing sensible defaults for a few flags (notably linker personality) when cross-compiling to mips64el-*-*abi64. Most of the time this isn't an issue because packages that invoke the linker directly detect the flags from gcc's behavior (for example, libtool does this) and gcc has good code for detecting the right defaults. However some do not; notably nix, itself lacks this. Presumably Debian is working on upstreaming this, and has more clout than we do. I propose we carry their patch in the meantime. The patch is conditioned on stdenv.targetPlatform.isMips64n64 in order to avoid mass-rebuilds. Closes #164835. --- .../tools/misc/binutils/default.nix | 9 +- .../misc/binutils/mips64-default-n64.patch | 82 +++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/binutils/mips64-default-n64.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 8d759457fa11..ff89f1ad493a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -13,6 +13,7 @@ in , flex , texinfo , perl +, substitute }: # configure silently disables ld.gold if it's unsupported, @@ -95,7 +96,13 @@ stdenv.mkDerivation { # this comment for more information: # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 lib.optional (stdenv.targetPlatform.isAarch32 && stdenv.hostPlatform.system != stdenv.targetPlatform.system) ./R_ARM_COPY.patch - ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch; + ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch + ++ lib.optional stdenv.targetPlatform.isMips64n64 + # this patch is from debian: + # https://sources.debian.org/data/main/b/binutils/2.38-3/debian/patches/mips64-default-n64.diff + (if stdenv.targetPlatform.isMusl + then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; } + else ./mips64-default-n64.patch); outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/mips64-default-n64.patch b/pkgs/development/tools/misc/binutils/mips64-default-n64.patch new file mode 100644 index 000000000000..00581279f85e --- /dev/null +++ b/pkgs/development/tools/misc/binutils/mips64-default-n64.patch @@ -0,0 +1,82 @@ +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -927,11 +927,21 @@ case "${targ}" in + targ_defvec=mips_elf32_be_vec + targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" + ;; +- mips64*el-*-linux*) ++ mips*64*el-*-linux*-gnuabi64) ++ targ_defvec=mips_elf64_trad_le_vec ++ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec" ++ want64=true ++ ;; ++ mips*64*-*-linux*-gnuabi64) ++ targ_defvec=mips_elf64_trad_be_vec ++ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec" ++ want64=true ++ ;; ++ mips*64*el-*-linux*) + targ_defvec=mips_elf32_ntrad_le_vec + targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec" + ;; +- mips64*-*-linux*) ++ mips*64*-*-linux*) + targ_defvec=mips_elf32_ntrad_be_vec + targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" + ;; +--- a/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d ++++ b/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d +@@ -1,4 +1,5 @@ + #PROG: objcopy ++#as: -n32 + #readelf: --notes --wide + #objcopy: --merge-notes + #name: MIPS merge notes section (n32) +--- a/gas/configure ++++ b/gas/configure +@@ -12167,6 +12167,9 @@ _ACEOF + esac + # Decide which ABI to target by default. + case ${target} in ++ mips*64*-linux-gnuabi64) ++ mips_default_abi=N64_ABI ++ ;; + mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \ + | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) + mips_default_abi=N32_ABI +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -384,6 +384,9 @@ changequote([,])dnl + esac + # Decide which ABI to target by default. + case ${target} in ++ mips*64*-linux-gnuabi64) ++ mips_default_abi=N64_ABI ++ ;; + mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \ + | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) + mips_default_abi=N32_ABI +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -543,11 +543,19 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvx + ;; + mips*-*-windiss) targ_emul=elf32mipswindiss + ;; +-mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 ++mips*64*el-*-linux-gnuabi64) targ_emul=elf64ltsmip ++ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" ++ targ_extra_libpath=$targ_extra_emuls ++ ;; ++mips*64*el-*-linux-*) targ_emul=elf32ltsmipn32 + targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" + targ_extra_libpath=$targ_extra_emuls + ;; +-mips64*-*-linux-*) targ_emul=elf32btsmipn32 ++mips*64*-*-linux-gnuabi64) targ_emul=elf64btsmip ++ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" ++ targ_extra_libpath=$targ_extra_emuls ++ ;; ++mips*64*-*-linux-*) targ_emul=elf32btsmipn32 + targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" + targ_extra_libpath=$targ_extra_emuls + ;; From efcf757b645494653d7fe8bc443111dd98e730fc Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 6 Apr 2022 09:42:41 +0200 Subject: [PATCH 056/385] matrix-appservice-slack: 1.10.0 -> 1.11.0 --- .../matrix-appservice-slack/default.nix | 4 ++-- .../generate-dependencies.sh | 6 ++--- .../matrix-appservice-slack/node-packages.nix | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index eb3d82e14d0b..a00d983e91bb 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -3,8 +3,8 @@ let src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-appservice-slack"; - rev = "1.10.0"; - sha256 = "WnonduUhhrxCMuXOgLk8voNnn+f6R5CsJ7VKpEmGwzk="; + rev = "1.11.0"; + sha256 = "U1EHL1ZwcpCXA9sjya6ry/3Q+gwdQWPUDFN+wp1qjrg="; }; nodePackages = import ./node-composition.nix { diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh index 2503d6d7ef35..1fceed1c72c1 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -# Download package.json and package-lock.json from the v1.10.0 release -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.10.0/package.json -o package.json -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.10.0/package-lock.json -o package-lock.json +# Download package.json and package-lock.json from the v1.11.0 release +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0/package.json -o package.json +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0/package-lock.json -o package-lock.json node2nix \ --nodejs-12 \ diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index dc0bd7b052bf..6bc864cd1089 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -762,13 +762,13 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-0.24.0" = { + "axios-0.26.0" = { name = "axios"; packageName = "axios"; - version = "0.24.0"; + version = "0.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz"; + sha512 = "lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og=="; }; }; "balanced-match-1.0.2" = { @@ -1959,13 +1959,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.14.4" = { + "follow-redirects-1.14.8" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.4"; + version = "1.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz"; - sha512 = "zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz"; + sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="; }; }; "forever-agent-0.6.1" = { @@ -4771,7 +4771,7 @@ let args = { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.10.0"; + version = "1.11.0"; src = ./.; dependencies = [ sources."@alloc/quick-lru-5.2.0" @@ -4895,7 +4895,7 @@ let sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.24.0" + sources."axios-0.26.0" sources."balanced-match-1.0.2" sources."base-x-3.0.9" sources."base64-js-1.5.1" @@ -5059,7 +5059,7 @@ let sources."flat-cache-3.0.4" sources."flatted-3.1.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.4" + sources."follow-redirects-1.14.8" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."forwarded-0.1.2" From 4b38deb3aa21317a2f9711fd428a76cdbeb0a63c Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 6 Apr 2022 05:56:28 -0300 Subject: [PATCH 057/385] steampipe: enable tests --- pkgs/tools/misc/steampipe/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index ee97166deb11..fa6818be399a 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -14,9 +14,6 @@ buildGoModule rec { vendorSha256 = "sha256-0jixQcgSXQJAd899EWOUKde5OXZcSZwQfH7LRdQlm7c="; proxyVendor = true; - # tests are failing for no obvious reasons - doCheck = false; - nativeBuildInputs = [ installShellFiles ]; ldflags = [ From 3463cec6cc7c91f9f6ac459f363026d10b6afef5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 18:09:08 -0300 Subject: [PATCH 058/385] goawk: enable tests --- pkgs/tools/text/goawk/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index b665c1823329..19c8e516e969 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -1,4 +1,5 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, stdenv }: + buildGoModule rec { pname = "goawk"; version = "1.16.0"; @@ -12,8 +13,18 @@ buildGoModule rec { vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - # checks do not pass at the moment - doCheck = false; + postPatch = '' + substituteInPlace goawk_test.go \ + --replace "TestCommandLine" "SkipCommandLine" \ + --replace "TestDevStdout" "SkipDevStdout" \ + --replace "TestFILENAME" "SkipFILENAME" \ + --replace "TestWildcards" "SkipWildcards" + + substituteInPlace interp/interp_test.go \ + --replace "TestShellCommand" "SkipShellCommand" + ''; + + doCheck = (stdenv.system != "aarch64-darwin"); meta = with lib; { description = "A POSIX-compliant AWK interpreter written in Go"; From 1d3e73f73a8d02e9bea8746c8872f4f0cc050bcf Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 6 Apr 2022 12:13:22 -0300 Subject: [PATCH 059/385] gopass: enable tests --- pkgs/tools/security/gopass/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index ee70413591d4..6825e6cbba80 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -28,8 +28,6 @@ buildGoModule rec { subPackages = [ "." ]; - doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; wrapperPath = lib.makeBinPath ( From ffa3fa9d763c4cd53b742395fd485fb229a79457 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 17:40:18 +0000 Subject: [PATCH 060/385] vmware-horizon-client: 2111 -> 2203 --- .../networking/remote/vmware-horizon-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index f114f8a3091b..f3461a426586 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -9,7 +9,7 @@ , configText ? "" }: let - version = "2111"; + version = "2203"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" @@ -33,8 +33,8 @@ let name = "vmwareHorizonClientFiles"; inherit version; src = fetchurl { - url = "https://download3.vmware.com/software/view/viewclients/CART22FH2/VMware-Horizon-Client-Linux-2111-8.4.0-18957622.tar.gz"; - sha256 = "2f79d2d8d34e6f85a5d21a3350618c4763d60455e7d68647ea40715eaff486f7"; + url = "https://download3.vmware.com/software/CART23FQ1_LIN_2203_TARBALL/VMware-Horizon-Client-Linux-2203-8.5.0-19586897.tar.gz"; + sha256 = "27429dddaeedfa8b701d7aa7868f60ad58efa42687d7f27e84375fda9f5cd137"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 9b310e61b4585ff719dbe2c37bc641b65e46a927 Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Wed, 6 Apr 2022 21:55:56 +0100 Subject: [PATCH 061/385] gcc10: fix cross-compilation from aarch64-darwin host Without this patch, linking when cross-compiling fails: Undefined symbols for architecture arm64: "_host_hooks", referenced from: gt_pch_save(__sFILE*) in libbackend.a(ggc-common.o) gt_pch_restore(__sFILE*) in libbackend.a(ggc-common.o) toplev::main(int, char**) in libbackend.a(toplev.o) ld: symbol(s) not found for architecture arm64 --- pkgs/development/compilers/gcc/10/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index d00d428a6950..1e8917ef6cf1 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -71,7 +71,12 @@ let majorVersion = "10"; # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch - ++ [ ../libsanitizer-no-cyclades.patch ]; + ++ [ ../libsanitizer-no-cyclades.patch ] + + ++ optional (buildPlatform.system == "aarch64-darwin" && targetPlatform != buildPlatform) (fetchpatch { + url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch"; + sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA="; + }); /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; From 08f4d64b70951c0a3e6bd490b7a180b8e2d073af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 00:17:15 +0000 Subject: [PATCH 062/385] linode-cli: 5.17.2 -> 5.17.2 --- pkgs/tools/virtualization/linode-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 8484762e3896..c80bec0fbdb4 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,8 +13,8 @@ let sha256 = "1f0nrdg8hf650qxz79i3a1d2zyf24niyrcnbnhc9i7hzbnqbp5qg"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.119.0"; - specSha256 = "0q5cqx9w44a85r8h9an4iz4m3s7x3b0nyk188i3hsh3r1wf1nryv"; + specVersion = "4.119.4"; + specSha256 = "057qzpy8da0r0av8wmm640mqqhl4qynqxqalkf3ylsa3xnch5c9m"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; From 5fd49e35ccc4061f37ce3c65a7a0312584044768 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Thu, 7 Apr 2022 03:52:24 -0300 Subject: [PATCH 063/385] atlantis: 0.16.1 -> 0.19.2 Signed-off-by: Bryan A. S --- .../networking/cluster/atlantis/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index dcb6b823667e..55807caa5afb 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,21 +2,24 @@ buildGoModule rec { pname = "atlantis"; - version = "0.16.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-D549pInoK8ispgcn8LYdix19Hp7wO6w2/d2Y1L/9Px8="; + sha256 = "sha256-cd2dhrqJl/VRhOYB1g9OpOnPV92EQm8f3rRGZGVN+IY="; }; - vendorSha256 = null; - - doCheck = false; + vendorSha256 = "sha256-ux+Hw/TjeiY9VYhIQxaltZGk5CkxAab8R7kAsTaMUGc="; subPackages = [ "." ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/atlantis version | grep ${version} > /dev/null + ''; + meta = with lib; { homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; From 7d80a83005c95aff02839dd822b79e72ba7d2673 Mon Sep 17 00:00:00 2001 From: Han Verstraete Date: Thu, 7 Apr 2022 08:55:21 +0200 Subject: [PATCH 064/385] arkade: 0.8.20 -> 0.8.22 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 57a56e20c2e5..e1524270fabd 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.20"; + version = "0.8.22"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-DIXvsYYckNlxFzeJqk3TYRQIAtafAfylyDc/a20kl+0="; + sha256 = "sha256-mn/UX2xNMthCtXYFUXqiiPnMltwO2Hk/qveudEYAOZ0="; }; CGO_ENABLED = 0; From 35e363bf128debbc45e9e6cf91bf847e054ecf01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 08:27:53 +0000 Subject: [PATCH 065/385] cloud-sql-proxy: 1.29.0 -> 1.30.0 --- pkgs/tools/misc/cloud-sql-proxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index a60624a904b8..6f2cf06a433e 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloudsql-proxy"; rev = "v${version}"; - sha256 = "sha256-V/dNS/tbPPkVpgaCkGa5pfH/vj8y7mO9OQDLhgWbRCE="; + sha256 = "sha256-EbUIzAKMqCLsz8rBMWCvw00j6VX2ZYEMtNsMEx30kBU="; }; subPackages = [ "cmd/cloud_sql_proxy" ]; - vendorSha256 = "sha256-6td7rDye0sBUhDn9YARvdCgdfS/8z+VY1wYcEcUzHBs="; + vendorSha256 = "sha256-yxqLGDqdu9vX3ykHq7Kzf8oBH1ydltZkiWNWWM2l0Aw="; checkFlags = [ "-short" ]; From e4ebc8c200adacb7cc07fb6efc93aeae7084191a Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 7 Apr 2022 07:14:48 -0300 Subject: [PATCH 066/385] powerline-go: enable tests --- pkgs/tools/misc/powerline-go/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 85d9ed59ff43..3eb29c874418 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -16,8 +16,6 @@ buildGoModule rec { vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; - doCheck = false; - meta = with lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; homepage = "https://github.com/justjanne/powerline-go"; From 3ed4e07a52697dd12396ee7f8621d9485eef3d32 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Apr 2022 11:22:03 +0100 Subject: [PATCH 067/385] protobuf2_5: remove --- pkgs/development/libraries/protobuf/2.5.nix | 10 --- .../libraries/protobuf/generic.nix | 61 ------------------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 72 deletions(-) delete mode 100644 pkgs/development/libraries/protobuf/2.5.nix delete mode 100644 pkgs/development/libraries/protobuf/generic.nix diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix deleted file mode 100644 index 9d7bb38cf3c9..000000000000 --- a/pkgs/development/libraries/protobuf/2.5.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.5.0"; - # make sure you test also -A pythonPackages.protobuf - src = fetchurl { - url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; - sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; - }; -}) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix deleted file mode 100644 index 7d64df436260..000000000000 --- a/pkgs/development/libraries/protobuf/generic.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, version, src -, autoreconfHook, zlib, gtest -, ... -}: - -stdenv.mkDerivation { - pname = "protobuf"; - inherit version; - - inherit src; - - postPatch = '' - rm -rf gtest - cp -r ${gtest.src}/googletest gtest - chmod -R a+w gtest - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - outputs = [ "out" "lib" ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ zlib ]; - - # The generated C++ code uses static initializers which mutate a global data - # structure. This causes problems for an executable when: - # - # 1) it dynamically links to two libs, both of which contain generated C++ for - # the same proto file, and - # 2) the two aforementioned libs both dynamically link to libprotobuf. - # - # One solution is to statically link libprotobuf, that way the global - # variables are not shared; in fact, this is necessary for the python Mesos - # binding to not crash, as the python lib contains two C extensions which - # both refer to the same proto schema. - # - # See: https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684 - # https://github.com/google/protobuf/issues/1489 - dontDisableStatic = true; - configureFlags = [ - "CFLAGS=-fPIC" - "CXXFLAGS=-fPIC" - ]; - - doCheck = true; - - meta = { - description = "Protocol Buffers - Google's data interchange format"; - longDescription = - '' Protocol Buffers are a way of encoding structured data in an - efficient yet extensible format. Google uses Protocol Buffers for - almost all of its internal RPC protocols and file formats. - ''; - license = "mBSD"; - homepage = "https://developers.google.com/protocol-buffers/"; - platforms = lib.platforms.unix; - }; - - passthru.version = version; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93670a15f35a..6d1eeeefd43f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19753,7 +19753,6 @@ with pkgs; protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; - protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; From 141443e02b5c7038a5247563ed08c520e0063299 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 7 Apr 2022 16:10:37 -0300 Subject: [PATCH 068/385] obfs4: enable tests --- pkgs/tools/networking/obfs4/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index a988a14cd455..64e601c375c6 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -12,8 +12,6 @@ buildGoModule rec { vendorSha256 = "sha256-xGCK8biTYcrmKbsl6ZyCjpRrVP9x5xGrC3VcMsR7ETo="; - doCheck = false; - meta = with lib; { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; From acc99abf6a4a25ec0796cbcb7a9faf487e56cea8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Apr 2022 23:04:45 +0200 Subject: [PATCH 069/385] python3Packages.twisted: Patch HTTP request smuggling issue Fixes HTTP request smuggling in HTTP/1.1 server and proxy implementation caused by insufficient validation of HTTP request headers. Fixes: CVE-20222-24801 --- .../python-modules/twisted/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 4641e4af4046..25a9753400eb 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , buildPythonPackage +, fetchpatch , fetchPypi , python , zope_interface @@ -25,13 +26,25 @@ buildPythonPackage rec { sha256 = "1wml02jxni8k15984pskks7d6yin81w4d2ac026cpyiqd0gjpwsp"; }; + patches = [ + (fetchpatch { + # https://github.com/twisted/twisted/security/advisories/GHSA-c2jg-hw38-jrqq + name = "CVE-2022-24801.patch"; + url = "https://github.com/twisted/twisted/commit/592217e951363d60e9cd99c5bbfd23d4615043ac.patch"; + hash = "sha256-psX5vAM9myuILuTazpebSk8QTT52CB6N7RXAY4MAV8g="; + excludes = [ + "src/twisted/web/newsfragments/10323.bugfix" + ]; + }) + ]; + propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; passthru.extras.tls = [ pyopenssl service-identity idna ]; # Patch t.p._inotify to point to libc. Without this, # twisted.python.runtime.platform.supportsINotify() == False - patchPhase = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/twisted/python/_inotify.py --replace \ "ctypes.util.find_library(\"c\")" "'${stdenv.glibc.out}/lib/libc.so.6'" ''; From d2b225789c9caae1b502478d054e30651532b2e4 Mon Sep 17 00:00:00 2001 From: tu-maurice Date: Thu, 7 Apr 2022 22:16:22 +0200 Subject: [PATCH 070/385] gnomeExtensions: refactor update script The update-extensions.py script downloads extension information once for each shell version, although one extension version might be used for multiple shell versions. To reduce the amount of downloads we first select the appropriate extension version per shell version as done before, then download the corresponding information once for each selected extension version, and finally map each shell version to the downloaded information of the selected extension version. --- .../gnome/extensions/update-extensions.py | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/update-extensions.py b/pkgs/desktops/gnome/extensions/update-extensions.py index d1fdfc1f1a53..581781fb11a8 100755 --- a/pkgs/desktops/gnome/extensions/update-extensions.py +++ b/pkgs/desktops/gnome/extensions/update-extensions.py @@ -77,7 +77,9 @@ def generate_extension_versions( - Filter out versions that only support old GNOME versions - Download the extension and hash it """ - extension_versions: Dict[ShellVersion, Dict[str, str]] = {} + + # Determine extension version per shell version + extension_versions: Dict[ShellVersion, ExtensionVersion] = {} for shell_version, version_prefix in supported_versions.items(): # Newest compatible extension version extension_version: Optional[int] = max( @@ -91,11 +93,24 @@ def generate_extension_versions( # Extension is not compatible with this GNOME version if not extension_version: continue + + extension_versions[shell_version] = extension_version + + # Download information once for all extension versions chosen above + extension_info_cache: Dict[ExtensionVersion, Tuple[str, str]] = {} + for extension_version in sorted(set(extension_versions.values())): logging.debug( - f"[{shell_version}] Downloading '{uuid}' v{extension_version}" + f"[{uuid}] Downloading v{extension_version}" ) - sha256, metadata = fetch_extension_data(uuid, str(extension_version)) - extension_versions[shell_version] = { + extension_info_cache[extension_version] = \ + fetch_extension_data(uuid, str(extension_version)) + + # Fill map + extension_versions_full: Dict[ShellVersion, Dict[str, str]] = {} + for shell_version, extension_version in extension_versions.items(): + sha256, metadata = extension_info_cache[extension_version] + + extension_versions_full[shell_version] = { "version": str(extension_version), "sha256": sha256, # The downloads are impure, their metadata.json may change at any time. @@ -103,7 +118,7 @@ def generate_extension_versions( # Upstream issue: https://gitlab.gnome.org/Infrastructure/extensions-web/-/issues/137 "metadata": metadata, } - return extension_versions + return extension_versions_full def pname_from_url(url: str) -> Tuple[str, str]: From ab27371e2f98ee4681b248d6243b255a4f39347f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 7 Apr 2022 18:20:40 -0300 Subject: [PATCH 071/385] impl: 1.0.0 -> 1.1.0 --- pkgs/development/tools/impl/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix index 15c1361abd22..e5792d3137dd 100644 --- a/pkgs/development/tools/impl/default.nix +++ b/pkgs/development/tools/impl/default.nix @@ -2,25 +2,25 @@ buildGoModule rec { pname = "impl"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "josharian"; repo = "impl"; rev = "v${version}"; - sha256 = "0l21fkcgiaaf6ka91dmz8hx0l3nbp0kqi8p25kij1s5zb796z0dy"; + sha256 = "sha256-OztQR1NusP7/FTm5kmuSSi1AC47DJFki7vVlPQIl6+8="; }; - vendorSha256 = "0xkalwy02w62px01jdwwr3vwwsh50f22dsxf8lrrwmw6k0rq57zv"; + vendorSha256 = "sha256-+5+CM5iGV54zRa7rJoQDBWrO98icNxlAv8JwATynanY="; - # go: cannot find GOROOT directory: go - doCheck = false; + preCheck = '' + export GOROOT="$(go env GOROOT)" + ''; meta = with lib; { description = "Generate method stubs for implementing an interface"; homepage = "https://github.com/josharian/impl"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } From 3eb6b5fc73f8b4db1c2d64fced5ebe4203b129c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 21:23:34 +0000 Subject: [PATCH 072/385] glfw: 3.3.6 -> 3.3.7 --- pkgs/development/libraries/glfw/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 53409ec7f732..660ad1ba607a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "3.3.6"; + version = "3.3.7"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-mYcnucIRudLLySShKSDzsQfuoM2/0guKpeLSGuAWEkQ="; + sha256 = "sha256-aWwt6FRq/ofQmZAeavDa8inrJfrPxb8iyo1XYdQsrKc="; }; # Fix freezing on Wayland (https://github.com/glfw/glfw/pull/1711) From c6adc82943759bbe38759bba3284267045f2bb21 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 7 Apr 2022 18:50:43 -0300 Subject: [PATCH 073/385] charm: 0.10.3 -> 0.11.0 --- pkgs/applications/misc/charm/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 907bc7a53e05..0db2be5151a5 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-7WdSIpmpN8Zz2k5PveYZoCueQo5sLxLLZvZdzxRlkaE="; + sha256 = "sha256-98TUiFy4X7lMUostkgZikk6r6wzBPF0pqWthrS9nU+U="; }; - vendorSha256 = "sha256-5cqZxh2uvmJV7DtAGzQwt//heF3kF9mjyB0KAs8nWZY="; - - doCheck = false; + vendorSha256 = "sha256-enkt7BUAntbB75LR12NB0vW6z9dTPzk0bGdRrn3JHm4="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From 6edc4b20c75519176892559aaedb61d1d88404a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 00:23:46 +0000 Subject: [PATCH 074/385] hyper: 3.2.0 -> 3.2.1 --- pkgs/applications/terminal-emulators/hyper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 485c1dead14c..2266e884454b 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "1ryw3315x0lb60j8nzz78h7zd36r2l1j39hnlfav0p7nq8dhqbpm"; + sha256 = "sha256-nwaJ+lnuHv+Qb/QkKF/9jG8cvq1Z+urz8CPwxSsMmuA="; }; nativeBuildInputs = [ dpkg ]; From bb2018c026d71d8b026c7f02e57762fe4877068a Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 8 Apr 2022 00:34:47 +0000 Subject: [PATCH 075/385] python3Packages.jax: 0.3.4 -> 0.3.5 --- pkgs/development/python-modules/jax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 332cac3133cc..94be46b3aeb2 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -19,7 +19,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.4"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "jax-v${version}"; - sha256 = "sha256-RZqSJP2vtt8U6nmftV2VzfkMGkkk3100QqsjI7PpQbc="; + hash = "sha256-c+5r0Xvd2zrIVF9VG+yve5QDvCcfMiOYp6JqaabowhA="; }; patches = [ From 45bb9217a5026695f10c35e168dbb1102055dc19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 03:51:38 +0000 Subject: [PATCH 076/385] ktlint: 0.45.1 -> 0.45.2 --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index ad41cf6e4af7..0f75662d7076 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.45.1"; + version = "0.45.2"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-fEMLZ8lV1RNFlf5ApfJOG9jI8JumpgP673+XSOWgsKI="; + sha256 = "sha256-iUkeqGXTabOc+sotz2Czitvc10mF9eAXDAu3MDQAATU="; }; nativeBuildInputs = [ makeWrapper ]; From 0c066f0d0e1ce6739a9a2f1e11429ddc22d8c7ba Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Sat, 26 Mar 2022 22:54:02 +0100 Subject: [PATCH 077/385] nixos/openconnect: add module --- .../from_md/release-notes/rl-2205.section.xml | 7 + .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/networking/openconnect.nix | 135 ++++++++++++++++++ 4 files changed, 145 insertions(+) create mode 100644 nixos/modules/services/networking/openconnect.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 4453c907f67a..feb3a8bd2d40 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 @@ -1631,6 +1631,13 @@ true. + + + A module for declarative configuration of openconnect VPN + profiles was added under + networking.openconnect. + + The element-desktop package now has an diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index abc16b8d66e8..9a7ee88e617b 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -569,6 +569,8 @@ In addition to numerous new and upgraded packages, this release has the followin using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` is set to `true`. +- A module for declarative configuration of openconnect VPN profiles was added under `networking.openconnect`. + - The `element-desktop` package now has an `useKeytar` option (defaults to `true`), which allows disabling `keytar` and in turn `libsecret` usage (which binds to native credential managers / keychain libraries). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1ad2592b1dd7..813ac397d7f8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -851,6 +851,7 @@ ./services/networking/ofono.nix ./services/networking/oidentd.nix ./services/networking/onedrive.nix + ./services/networking/openconnect.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix ./services/networking/owamp.nix diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix new file mode 100644 index 000000000000..7b2ef48e1c42 --- /dev/null +++ b/nixos/modules/services/networking/openconnect.nix @@ -0,0 +1,135 @@ +{ config, lib, options, pkgs, ... }: +with lib; +let + cfg = config.networking.openconnect; + openconnect = cfg.package; + pkcs11 = types.strMatching "pkcs11:.+" // { + name = "pkcs11"; + description = "PKCS#11 URI"; + }; + interfaceOptions = { + options = { + gateway = mkOption { + description = "Gateway server to connect to."; + example = "gateway.example.com"; + type = types.str; + }; + + protocol = mkOption { + description = "Protocol to use."; + example = "anyconnect"; + type = + types.enum [ "anyconnect" "array" "nc" "pulse" "gp" "f5" "fortinet" ]; + }; + + user = mkOption { + description = "Username to authenticate with."; + example = "example-user"; + type = types.nullOr types.str; + }; + + # Note: It does not make sense to provide a way to declaratively + # set an authentication cookie, because they have to be requested + # for every new connection and would only work once. + passwordFile = mkOption { + description = '' + File containing the password to authenticate with. This + is passed to openconnect via the + --passwd-on-stdin option. + ''; + default = null; + example = "/var/lib/secrets/openconnect-passwd"; + type = types.nullOr types.path; + }; + + certificate = mkOption { + description = "Certificate to authenticate with."; + default = null; + example = "/var/lib/secrets/openconnect_certificate.pem"; + type = with types; nullOr (either path pkcs11); + }; + + privateKey = mkOption { + description = "Private key to authenticate with."; + example = "/var/lib/secrets/openconnect_private_key.pem"; + default = null; + type = with types; nullOr (either path pkcs11); + }; + + extraOptions = mkOption { + description = '' + Extra config to be appended to the interface config. It should + contain long-format options as would be accepted on the command + line by openconnect + (see https://www.infradead.org/openconnect/manual.html). + Non-key-value options like deflate can be used by + declaring them as booleans, i. e. deflate = true;. + ''; + default = { }; + example = { + compression = "stateless"; + + no-http-keepalive = true; + no-dtls = true; + }; + type = with types; attrsOf (either str bool); + }; + }; + }; + generateExtraConfig = extra_cfg: + strings.concatStringsSep "\n" (attrsets.mapAttrsToList + (name: value: if (value == true) then name else "${name}=${value}") + (attrsets.filterAttrs (_: value: value != false) extra_cfg)); + generateConfig = name: icfg: + pkgs.writeText "config" '' + interface=${name} + ${optionalString (icfg.user != null) "user=${icfg.user}"} + ${optionalString (icfg.passwordFile != null) "passwd-on-stdin"} + ${optionalString (icfg.certificate != null) + "certificate=${icfg.certificate}"} + ${optionalString (icfg.privateKey != null) "sslkey=${icfg.privateKey}"} + + ${generateExtraConfig icfg.extraOptions} + ''; + generateUnit = name: icfg: { + description = "OpenConnect Interface - ${name}"; + requires = [ "network-online.target" ]; + after = [ "network.target" "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${openconnect}/bin/openconnect --config=${ + generateConfig name icfg + } ${icfg.gateway}"; + StandardInput = "file:${icfg.passwordFile}"; + }; + }; +in { + options.networking.openconnect = { + package = mkPackageOption pkgs "openconnect" { }; + + interfaces = mkOption { + description = "OpenConnect interfaces."; + default = { }; + example = { + openconnect0 = { + gateway = "gateway.example.com"; + protocol = "anyconnect"; + user = "example-user"; + passwordFile = "/var/lib/secrets/openconnect-passwd"; + }; + }; + type = with types; attrsOf (submodule interfaceOptions); + }; + }; + + config = { + systemd.services = mapAttrs' (name: value: { + name = "openconnect-${name}"; + value = generateUnit name value; + }) cfg.interfaces; + }; + + meta.maintainers = with maintainers; [ alyaeanyx ]; +} From 771a209a5c37fcceb08b5001381ddf692b45d1ca Mon Sep 17 00:00:00 2001 From: Vo Anh Duy Date: Fri, 8 Apr 2022 17:57:05 +0800 Subject: [PATCH 078/385] =?UTF-8?q?zsh-prezto:=20unstable-2021-11-16=20?= =?UTF-8?q?=E2=86=92=20unstable-2022-04-05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/zsh-prezto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 226b920b8f53..e4bbd7a8b64a 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2021-11-16"; + version = "unstable-2022-04-05"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "ecaed1cfa7591d2304d7eb5d69b42b54961a7145"; - sha256 = "+7KYBHmzXkdMgyj/x7o7Bf8f1DDFJ6nUMWe8vLUxbZo="; + rev = "2c663313168490d28f607738e962aa45ada0e26b"; + sha256 = "05n2801xqdxc5nx0709mak1pr73l7aq5azd9adm0ym7si3vl59sj"; fetchSubmodules = true; }; From 9e63303ba22697e143835960771e461350499389 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 8 Apr 2022 10:27:01 +0200 Subject: [PATCH 079/385] symfony-cli: Rename `symfony-cli` in `symfony`. --- pkgs/development/tools/symfony-cli/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index be288d1e1c74..7444470d890c 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -12,6 +12,10 @@ buildGoModule rec { sha256 = "sha256-xYNq5hnkk6OIsnDHhN/vh1LNuP7isTNgtTY2WUwC8x4="; }; + postInstall = '' + mv $out/bin/symfony-cli $out/bin/symfony + ''; + # Tests requires network access doCheck = false; From 5c0481109c0d7fe2a19dfbdb6bd18f94b1c21a35 Mon Sep 17 00:00:00 2001 From: Jia Xiaodong Date: Fri, 8 Apr 2022 19:42:52 +0800 Subject: [PATCH 080/385] Update pkgs/applications/misc/sioyek/default.nix typo! Co-authored-by: ajs124 --- pkgs/applications/misc/sioyek/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index fb39f2912333..a62478e21e45 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/ahrm/sioyek/releases"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ mainterners.podocarp ]; + maintainers = [ maintainers.podocarp ]; }; } From 3d883a5d9be8dd3b0111d2756746fec7d4bf0066 Mon Sep 17 00:00:00 2001 From: J XD Date: Fri, 8 Apr 2022 20:04:59 +0800 Subject: [PATCH 081/385] fixes --- pkgs/applications/misc/sioyek/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index a62478e21e45..afedf9171038 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, installShellFiles , fetchFromGitHub , gumbo , harfbuzz @@ -24,25 +25,29 @@ stdenv.mkDerivation rec { buildInputs = [ gumbo harfbuzz jbig2dec mupdf openjpeg qt3d qtbase ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ installShellFiles wrapQtAppsHook ]; buildPhase = '' + runHook prebuild # Remove nonexistent lib and insert missing ones sed -i 's/-lmupdf-threads/-lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg/' pdf_viewer_build_config.pro qmake pdf_viewer_build_config.pro make + runHook postBuild ''; installPhase = '' + runHook preInstall install -Dm755 sioyek $out/bin/sioyek install -Dm644 tutorial.pdf $out/bin/tutorial.pdf install -Dm644 -t $out/bin/ pdf_viewer/{keys,prefs}.config cp -r pdf_viewer/shaders $out/bin/ + runHook postInstall ''; postInstall = '' - install -Dm644 resource/sioyek-icon-linux.png $out/usr/share/icons/sioyek-icon-linux.png - install -Dm644 resource/sioyek.desktop $out/usr/share/applications/sioyek.desktop + install -Dm644 resources/sioyek-icon-linux.png $out/share/icons/sioyek-icon-linux.png + install -Dm644 resources/sioyek.desktop $out/share/applications/sioyek.desktop installManPage resources/sioyek.1 ''; From 4dd78c63a17c6fa816eca53222a7d0d25aa1f4b3 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 31 Mar 2022 14:26:45 +0100 Subject: [PATCH 082/385] starboard: 0.14.1 -> 0.15.3 --- .../networking/cluster/starboard/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 30ca2ee1cdee..96c853d21e40 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,36 +2,42 @@ buildGoModule rec { pname = "starboard"; - version = "0.14.1"; + version = "0.15.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sB7C0IKadgpQ2h6HuH4D6ku/GXnFfFS+fGCW/RBSc10="; + sha256 = "sha256-EBjAB0uSMAyiVr6KxqrT/F+GIkntmOKNPHL1D0RBdG0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; postFetch = '' cd "$out" - commit="$(git rev-parse HEAD)" - source_date_epoch=$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad) - substituteInPlace "$out/cmd/starboard/main.go" \ - --replace 'commit = "none"' "commit = \"$commit\"" \ - --replace 'date = "unknown"' "date = \"$source_date_epoch\"" + git rev-parse HEAD > $out/COMMIT + # 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-R7tF724y5WNIByE+9nRoNSZDZzfLtPfK/9tSBkARaN0="; + vendorSha256 = "sha256-BxXH+dJyAQRGAq25CljUImxYIT+nCQpmUPUjHOYF0kc="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/starboard" ]; ldflags = [ - "-s" "-w" "-X main.version=v${version}" + "-s" + "-w" + "-X main.version=v${version}" ]; + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X main.gitCommit=$(cat COMMIT)" + ldflags+=" -X main.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; + preCheck = '' # Remove test that requires networking rm pkg/plugin/aqua/client/client_integration_test.go From 7203cae13b74e6c38fa8993cde084967a0de72a4 Mon Sep 17 00:00:00 2001 From: yuu Date: Thu, 7 Apr 2022 12:32:26 -0300 Subject: [PATCH 083/385] brmodelo: init at 3.31 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sandro Jäckel --- .../science/engineering/brmodelo/default.nix | 109 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 113 insertions(+) create mode 100644 pkgs/applications/science/engineering/brmodelo/default.nix diff --git a/pkgs/applications/science/engineering/brmodelo/default.nix b/pkgs/applications/science/engineering/brmodelo/default.nix new file mode 100644 index 000000000000..c0573ae131d3 --- /dev/null +++ b/pkgs/applications/science/engineering/brmodelo/default.nix @@ -0,0 +1,109 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, openjdk8 +, ant +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "brmodelo"; + version = "3.31"; + + src = fetchFromGitHub { + owner = "chcandido"; + repo = pname; + rev = version; + sha256 = "09qrhqhv264x8phnf3pnb0cwq75l7xdsj9xkwlvhry81nxz0d5v0"; + }; + + nativeBuildInputs = [ ant makeWrapper copyDesktopItems ]; + + buildInputs = [ openjdk8 ]; + + patches = [ + # Fixes for building with Ant. + # https://github.com/chcandido/brModelo/pull/22 + (fetchpatch { + name = "fix-self-closing-element-not-allowed.patch"; + url = "https://github.com/yuuyins/brModelo/commit/0d712b74fd5d29d67be07480ed196da28a77893b.patch"; + sha256 = "sha256-yy03arE6xetotzyvpToi9o9crg3KnMRn1J70jDUvSXE="; + }) + (fetchpatch { + name = "fix-tag-closing.patch"; + url = "https://github.com/yuuyins/brModelo/commit/e8530ff75f024cf6effe0408ed69985405e9709c.patch"; + sha256 = "sha256-MNuh/ORbaAkB5qDSlA/nPrXN+tqzz4oOglVyEtSangI="; + }) + (fetchpatch { + name = "fix-bad-use-greater-than.patch"; + url = "https://github.com/yuuyins/brModelo/commit/498a6ef8129daff5a472b318f93c8f7f2897fc7f.patch"; + sha256 = "sha256-MmAwYUmx38DGRsiSxCWCObtpqxk0ykUQiDSC76bCpFc="; + }) + (fetchpatch { + name = "fix-param-errors.patch"; + url = "https://github.com/yuuyins/brModelo/commit/8a508aaba0bcffe13a3f95cff495230beea36bc4.patch"; + sha256 = "sha256-qME9gZChSMzu1vs9HaosD+snb+jlOrQLY97meNoA8oU="; + }) + + # Add SVG icons. + # https://github.com/chcandido/brModelo/pull/23 + (fetchpatch { + name = "add-brmodelo-logo-icons-svg.patch"; + url = "https://github.com/yuuyins/brModelo/commit/f260b82b664fad3325bbf3ebd7a15488d496946b.patch"; + sha256 = "sha256-UhgcWxsHkNFS1GgaRnmlZohjDR8JwHof2cIb3SBetYs="; + }) + ]; + + buildPhase = '' + ant + ''; + + desktopItems = [ + (makeDesktopItem { + name = "brmodelo"; + desktopName = "brModelo"; + genericName = "Entity-relationship diagramming tool"; + exec = "brmodelo"; + icon = "brmodelo"; + comment = meta.description; + categories = [ "Development" "Education" "Database" "2DGraphics" "ComputerScience" "DataVisualization" "Engineering" "Java" ]; + }) + ]; + + installPhase = '' + install -d $out/bin $out/share/doc/${pname} $out/share/java + + cp -rv ./dist/javadoc $out/share/doc/${pname}/ + + install -Dm755 ./dist/brModelo.jar -t $out/share/java/ + # NOTE: The standard Java GUI toolkit has a + # hard-coded list of "non-reparenting" window managers, + # which cause issues while running brModelo + # in WMs that are not in that list (e.g. XMonad). + # Solution/Workaround: set the environment variable + # _JAVA_AWT_WM_NONREPARENTING=1. + makeWrapper ${openjdk8}/bin/java $out/bin/brmodelo \ + --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ + --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-jar $out/share/java/brModelo.jar" + + runHook postInstall + ''; + + postInstall = '' + for size in 16 24 32 48 64 128 256; do + install -Dm644 ./src/imagens/icone_"$size"x"$size".svg \ + $out/share/icons/hicolor/"$size"x"$size"/apps/brmodelo.svg + done + ''; + + meta = with lib; { + description = "Entity-relationship diagram tool for making conceptual and logical database models"; + homepage = "https://github.com/chcandido/brModelo"; + license = licenses.gpl3; + maintainers = with maintainers; [ yuu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5677de306b10..93e8c32469de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32836,6 +32836,10 @@ with pkgs; lingeling = callPackage ../applications/science/logic/lingeling {}; + ### SCIENCE / ENGINEERING + + brmodelo = callPackage ../applications/science/engineering/brmodelo { }; + ### SCIENCE / ELECTRONICS adms = callPackage ../applications/science/electronics/adms { }; From dbc24adde7f6631c1f17804cd32487c47075d3ba Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Fri, 8 Apr 2022 23:44:27 +0200 Subject: [PATCH 084/385] claws-mail: add keyword_warner-plugin This plugin was newly introduced after Claws-Mail's release 4.1.0. https://git.claws-mail.org/?p=claws.git;a=blob_plain;f=RELEASE_NOTES;hb=4.1.0 --- pkgs/applications/networking/mailreaders/claws-mail/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index af1099cbcf3e..93160a6e7b5e 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -33,6 +33,7 @@ , enablePluginDillo ? true , enablePluginFancy ? true, libsoup, webkitgtk , enablePluginFetchInfo ? true +, enablePluginKeywordWarner ? true , enablePluginLibravatar ? enablePluginRavatar , enablePluginLitehtmlViewer ? true, gumbo , enablePluginMailmbox ? true @@ -70,6 +71,7 @@ let { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ libsoup webkitgtk ]; } { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; } + { flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; } { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } { flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; } { flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; } From 6175188591f13d8bbcfab928acb5958b0504f59d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 7 Apr 2022 18:41:08 -0300 Subject: [PATCH 085/385] nixos/shellhub-agent: reformat code using nixpkgs-fmt Signed-off-by: Otavio Salvador --- nixos/modules/services/networking/shellhub-agent.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix index a45ef148544f..c7f3f9184c4f 100644 --- a/nixos/modules/services/networking/shellhub-agent.nix +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -1,10 +1,11 @@ { config, lib, pkgs, ... }: with lib; + let cfg = config.services.shellhub-agent; -in { - +in +{ ###### interface options = { @@ -89,3 +90,4 @@ in { environment.systemPackages = [ cfg.package ]; }; } + From b71479ac8d8c154186f675ce363a527c2e1877d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 10:57:13 +0000 Subject: [PATCH 086/385] openai: 0.16.0 -> 0.18.0 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index a8b65ea58944..ff0f47965875 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.16.0"; + version = "0.18.0"; disabled = pythonOlder "3.7.1"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-9BxFOiGIf3Cy7OU0as6onV5ltECInM9wwCr+qCMuPbU="; + sha256 = "sha256-MC3xTiQJrUyfRbnv7jigIal3/paK08bzy+mJI/j7fxo="; }; propagatedBuildInputs = [ From 5e334e3296d9e317c778787cc4ef757cd364455d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 18:53:16 +0000 Subject: [PATCH 087/385] cudatext: 1.160.0 -> 1.160.2 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index c94ee471c28a..39984f93c586 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.160.0"; + version = "1.160.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-42V6RFa+mAXyaUuKeDQa9Voi1MjnzcVl+cOA65VabxM="; + sha256 = "sha256-moKuiW5kd0jdAk0lBLX8ZWeT/locxGAvM4oOqvMGsr4="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index efb179333bf2..ab490ebd7a40 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -26,8 +26,8 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.03.28", - "sha256": "sha256-jh3lqisiPNMxCapP6O5oJdUL3PLQ3JyomtgWix+bML0=" + "rev": "2022.04.08", + "sha256": "sha256-pPlb8rr5loYVzKw/7R2kogSAosmViwGM3cehVwf4EYY=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", From cdef7bcb5b5f13fc8d21bb26330631b69b9962bc Mon Sep 17 00:00:00 2001 From: Sam Hug Date: Sat, 9 Apr 2022 11:51:07 -0700 Subject: [PATCH 088/385] nixos/qemu-vm: sanitize generated environment variable name --- nixos/modules/virtualisation/qemu-vm.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 20ce129c5a0a..b1c5a7a6c95f 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -853,8 +853,12 @@ in (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) - (mkIf (!cfg.useBootLoader) [ - "-kernel \${NIXPKGS_QEMU_KERNEL_${config.system.name}:-${config.system.build.toplevel}/kernel}" + (let + alphaNumericChars = lowerChars ++ upperChars ++ (map toString (range 0 9)); + # Replace all non-alphanumeric characters with underscores + sanitizeShellIdent = s: concatMapStrings (c: if builtins.elem c alphaNumericChars then c else "_") (stringToCharacters s); + in mkIf (!cfg.useBootLoader) [ + "-kernel \${NIXPKGS_QEMU_KERNEL_${sanitizeShellIdent config.system.name}:-${config.system.build.toplevel}/kernel}" "-initrd ${config.system.build.toplevel}/initrd" ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"'' ]) From 4c1dfa7b27b1944607c51b543b43dc36256c9fbb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 8 Apr 2022 17:08:59 +0200 Subject: [PATCH 089/385] pypy2Packages.nose, pypy37Packages.nose: fix build by not trying to use 2to3 --- pkgs/development/python-modules/nose/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 451c71897da9..586af7a90423 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -23,7 +23,9 @@ buildPythonPackage rec { --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" ''; - preBuild = '' + preBuild = lib.optionalString + ((python.isPy3k or false) && (python.pname != "pypy3")) + '' 2to3 -wn nose functional_tests unit_tests ''; From 9de6fad194b06f0ab17f975f1be1f97eac90aab4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 19:33:52 +0000 Subject: [PATCH 090/385] fheroes2: 0.9.13 -> 0.9.14 --- pkgs/games/fheroes2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 10d7a23aca4e..ff3537cfae99 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.13"; + version = "0.9.14"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-+VAgS7NR/D0HD/Fy7idSUTMJPp2ctpirMpcFooo+bEg="; + sha256 = "sha256-M5sUEOKU7KSenAAE7dUI8algB5XsbQQ1s3sDflZLsiA="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; From 7a6e487964192a1dde99ca51ba7b6f7297ea30d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 21:14:33 +0000 Subject: [PATCH 091/385] telepresence2: 2.4.10 -> 2.5.4 --- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 06a36473ec14..e623e75e9bd3 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.4.10"; + version = "2.5.4"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "sha256-OM0kMQYYHjk17x4VmrIXyTq/DxXnTrt6oRHEdV+1+Ns="; + sha256 = "sha256-v6E1v89cVL4N8eKJ5pKU6BwQWZF5lLs4VLGhUS5J1rA="; }; # The Helm chart is go:embed'ed as a tarball in the binary. @@ -21,7 +21,7 @@ buildGoModule rec { go run ./build-aux/package_embedded_chart/main.go ${src.rev} ''; - vendorSha256 = "sha256-J7Qj0g479K6k0pXmZzQ3T4VG4Vdj7Sc9Xhuy4Ke/xkU="; + vendorSha256 = "sha256-RDXP7faijMujAV19l9NmI4xk0Js6DE5YZoHRo2GHyoU="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" From d8b3d0fe46a2a26f8e8aa246e77326a7836b2b98 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sat, 9 Apr 2022 21:38:01 +0000 Subject: [PATCH 092/385] python3Packages.apache-beam: 2.36.0 -> 2.37.0 --- .../python-modules/apache-beam/default.nix | 35 ++++++++-------- .../apache-beam/fix-cython.patch | 41 ------------------- .../apache-beam/relax-deps.patch | 20 --------- 3 files changed, 16 insertions(+), 80 deletions(-) delete mode 100644 pkgs/development/python-modules/apache-beam/fix-cython.patch delete mode 100644 pkgs/development/python-modules/apache-beam/relax-deps.patch diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index b8d1a94eeff0..8d774410ca35 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -25,8 +25,6 @@ , pydot , pyhamcrest , pymongo -, pytest-timeout -, pytest-xdist , pytestCheckHook , python , pythonAtLeast @@ -43,26 +41,21 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.36.0"; + version = "2.37.0"; disabled = pythonAtLeast "3.10"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "v${version}"; - sha256 = "sha256-f+ICbKSwNjkhrTCCZwxbmqZlQ1+dQSTRag1IflWsqYg="; + sha256 = "sha256-FmfTxRLqXUHhhAZIxCRx2+phX0bmU5rIHaftBU4yBJY="; }; - patches = [ - ./relax-deps.patch - # Fixes https://issues.apache.org/jira/browse/BEAM-9324 - ./fix-cython.patch - ]; - # See https://github.com/NixOS/nixpkgs/issues/156957. postPatch = '' substituteInPlace setup.py \ - --replace "typing-extensions>=3.7.0,<4" "typing-extensions" \ + --replace "dill>=0.3.1.1,<0.3.2" "dill" \ + --replace "httplib2>=0.8,<0.20.0" "httplib2" \ --replace "pyarrow>=0.15.1,<7.0.0" "pyarrow" ''; @@ -109,8 +102,6 @@ buildPythonPackage rec { parameterized psycopg2 pyhamcrest - pytest-timeout - pytest-xdist pytestCheckHook pyyaml requests-mock @@ -123,6 +114,18 @@ buildPythonPackage rec { preCheck = "cd $out/lib/${python.libPrefix}/site-packages"; disabledTestPaths = [ + # Fails with + # _______ ERROR collecting apache_beam/io/external/xlang_jdbcio_it_test.py _______ + # apache_beam/io/external/xlang_jdbcio_it_test.py:80: in + # class CrossLanguageJdbcIOTest(unittest.TestCase): + # apache_beam/io/external/xlang_jdbcio_it_test.py:99: in CrossLanguageJdbcIOTest + # container_init: Callable[[], Union[PostgresContainer, MySqlContainer]], + # E NameError: name 'MySqlContainer' is not defined + # + # Test relies on the testcontainers package, which is not currently (as of + # 2022-04-08) available in nixpkgs. + "apache_beam/io/external/xlang_jdbcio_it_test.py" + # These tests depend on the availability of specific servers backends. "apache_beam/runners/portability/flink_runner_test.py" "apache_beam/runners/portability/samza_runner_test.py" @@ -136,12 +139,6 @@ buildPythonPackage rec { # quite elaborate testing infra with containers and multiple # different runners - I don't expect them to help debugging these # when running via our (= custom from their PoV) testing infra. - "testBuildListUnpack" - "testBuildTupleUnpack" - "testBuildTupleUnpackWithCall" - "test_convert_bare_types" - "test_incomparable_default" - "test_pardo_type_inference" "test_with_main_session" ]; diff --git a/pkgs/development/python-modules/apache-beam/fix-cython.patch b/pkgs/development/python-modules/apache-beam/fix-cython.patch deleted file mode 100644 index f73d75b4b84a..000000000000 --- a/pkgs/development/python-modules/apache-beam/fix-cython.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/apache_beam/runners/worker/operations.py b/apache_beam/runners/worker/operations.py -index 3464c5750c..5921c72b90 100644 ---- a/apache_beam/runners/worker/operations.py -+++ b/apache_beam/runners/worker/operations.py -@@ -69,18 +69,6 @@ if TYPE_CHECKING: - from apache_beam.runners.worker.statesampler import StateSampler - from apache_beam.transforms.userstate import TimerSpec - --# Allow some "pure mode" declarations. --try: -- import cython --except ImportError: -- -- class FakeCython(object): -- @staticmethod -- def cast(type, value): -- return value -- -- globals()['cython'] = FakeCython() -- - _globally_windowed_value = GlobalWindows.windowed_value(None) - _global_window_type = type(_globally_windowed_value.windows[0]) - -@@ -149,7 +137,7 @@ class ConsumerSet(Receiver): - # type: (WindowedValue) -> None - self.update_counters_start(windowed_value) - for consumer in self.consumers: -- cython.cast(Operation, consumer).process(windowed_value) -+ consumer.process(windowed_value) - self.update_counters_finish() - - def try_split(self, fraction_of_remainder): -@@ -345,7 +333,7 @@ class Operation(object): - - def output(self, windowed_value, output_index=0): - # type: (WindowedValue, int) -> None -- cython.cast(Receiver, self.receivers[output_index]).receive(windowed_value) -+ self.receivers[output_index].receive(windowed_value) - - def add_receiver(self, operation, output_index=0): - # type: (Operation, int) -> None diff --git a/pkgs/development/python-modules/apache-beam/relax-deps.patch b/pkgs/development/python-modules/apache-beam/relax-deps.patch deleted file mode 100644 index 67bd38f5e7cc..000000000000 --- a/pkgs/development/python-modules/apache-beam/relax-deps.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/setup.py b/setup.py -index 9429459622..2727b3becb 100644 ---- a/setup.py -+++ b/setup.py -@@ -136,12 +136,12 @@ REQUIRED_PACKAGES = [ - # version of dill. It is best to use the same version of dill on client and - # server, therefore list of allowed versions is very narrow. - # See: https://github.com/uqfoundation/dill/issues/341. -- 'dill>=0.3.1.1,<0.3.2', -+ 'dill>=0.3.1.1', - 'fastavro>=0.21.4,<2', - 'grpcio>=1.29.0,<2', - 'hdfs>=2.1.0,<3.0.0', -- 'httplib2>=0.8,<0.20.0', -- 'numpy>=1.14.3,<1.21.0', -+ 'httplib2>=0.8', -+ 'numpy>=1.14.3', - 'pymongo>=3.8.0,<4.0.0', - 'oauth2client>=2.0.1,<5', - 'protobuf>=3.12.2,<4', From dce286b69a299b718c1f5121d5f35ca2657a5f0a Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 10 Apr 2022 00:21:22 +0200 Subject: [PATCH 093/385] nix-direnv: 1.6.1 -> 2.0.0 --- pkgs/tools/misc/nix-direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 731278cafe0e..7323a5fdf17d 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.6.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-WgNfo9GRqIrXsIgNRhoNPU2/uwyPd8xG8xEEImEy4KY="; + sha256 = "sha256-0gBb/U7tNNSjazJE/Z2qAxHPX53wRSPMJ8rHc7HtCNg="; }; # Substitute instead of wrapping because the resulting file is From 9ec60f810df8c4b6e0851e00f4a4d86be3340e69 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sat, 9 Apr 2022 22:41:35 +0000 Subject: [PATCH 094/385] python3Packages.servefile: init at 0.5.3 --- .../python-modules/servefile/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/servefile/default.nix diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix new file mode 100644 index 000000000000..e9d87ca91273 --- /dev/null +++ b/pkgs/development/python-modules/servefile/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pyopenssl +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "servefile"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "sebageek"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/ZEMZIH/ImuZ2gh5bwB0FlaWnG/ELxfBGEJ2SuNSEb8="; + }; + + propagatedBuildInputs = [ pyopenssl ]; + + checkInputs = [ pytestCheckHook requests ]; + # Test attempts to connect to a port on localhost which fails in nix build + # environment. + disabledTests = [ + "test_abort_download" + "test_big_download" + "test_https_big_download" + "test_https" + "test_redirect_and_download" + "test_specify_port" + "test_upload_size_limit" + "test_upload" + ]; + pythonImportsCheck = [ "servefile" ]; + + meta = with lib; { + description = "Serve files from shell via a small HTTP server"; + homepage = "https://github.com/sebageek/servefile"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1cab3948c617..891c18086145 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9180,6 +9180,8 @@ in { serpy = callPackage ../development/python-modules/serpy { }; + servefile = callPackage ../development/python-modules/servefile { }; + serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; service-identity = callPackage ../development/python-modules/service_identity { }; From a62471fc65888bb0ba7b6d8b79352a560cb1629f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 7 Apr 2022 18:35:43 -0300 Subject: [PATCH 095/385] nixos/shellhub-agent: use mkEnableOption to simplify code Signed-off-by: Otavio Salvador --- nixos/modules/services/networking/shellhub-agent.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix index c7f3f9184c4f..7a92636b5e37 100644 --- a/nixos/modules/services/networking/shellhub-agent.nix +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -12,14 +12,7 @@ in services.shellhub-agent = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the ShellHub Agent daemon, which allows - secure remote logins. - ''; - }; + enable = mkEnableOption "ShellHub Agent daemon"; package = mkOption { type = types.package; From 60158bfc22a50d90919ee647b3a36e4f5f255428 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 7 Apr 2022 18:36:38 -0300 Subject: [PATCH 096/385] nixos/shellhub-agent: use new configuration variables The old variables still work but will eventually stop to be supported so move to the new ones. Signed-off-by: Otavio Salvador --- nixos/modules/services/networking/shellhub-agent.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix index 7a92636b5e37..d4344272988a 100644 --- a/nixos/modules/services/networking/shellhub-agent.nix +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -68,9 +68,9 @@ in "time-sync.target" ]; - environment.SERVER_ADDRESS = cfg.server; - environment.PRIVATE_KEY = cfg.privateKey; - environment.TENANT_ID = cfg.tenantId; + environment.SHELLHUB_SERVER_ADDRESS = cfg.server; + environment.SHELLHUB_PRIVATE_KEY = cfg.privateKey; + environment.SHELLHUB_TENANT_ID = cfg.tenantId; serviceConfig = { # The service starts sessions for different users. From 6729653309e636401ea880acffa17866f18f320d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 7 Apr 2022 18:39:48 -0300 Subject: [PATCH 097/385] nixos/shellhub-agent: allow setting the keepAliveInterval Signed-off-by: Otavio Salvador --- nixos/modules/services/networking/shellhub-agent.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix index d4344272988a..fa237a44d69f 100644 --- a/nixos/modules/services/networking/shellhub-agent.nix +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -23,6 +23,16 @@ in ''; }; + keepAliveInterval = mkOption { + type = types.int; + default = 30; + description = '' + Determine the interval to send the keep alive message to + the server. This has a direct impact of the bandwidth + used by the device. + ''; + }; + tenantId = mkOption { type = types.str; example = "ba0a880c-2ada-11eb-a35e-17266ef329d6"; @@ -71,6 +81,7 @@ in environment.SHELLHUB_SERVER_ADDRESS = cfg.server; environment.SHELLHUB_PRIVATE_KEY = cfg.privateKey; environment.SHELLHUB_TENANT_ID = cfg.tenantId; + environment.SHELLHUB_KEEPALIVE_INTERVAL = toString cfg.keepAliveInterval; serviceConfig = { # The service starts sessions for different users. From 68c4492a0323fb0867a2f1c70bd4ca583ee6e891 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Sun, 10 Apr 2022 00:11:38 +0000 Subject: [PATCH 098/385] plexamp: 4.1.0 -> 4.2.0 --- pkgs/applications/audio/plexamp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index d86223dcdcb1..fa76b50f8ae6 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "N+WkH6n7MWfRd2rsk/2b/rABL6pcjpKa1iBZSHslIOEc5fYWjGAxjwwTU0RgSaqptS1DyPeCUeWuphWPZJsQgw=="; + sha512 = "yIdZoKTJJEpUzEqvixQ7JJBxzrtCRov31dGBDOjMiK/oA2q00Xo6XVDvAhYuIn6ocZqK+I5jHfmf4qYaRePDvg=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/42"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/43"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; From 5182ce10fe38cabb8071659ab076bf2ecf138b01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 00:56:59 +0000 Subject: [PATCH 099/385] python310Packages.aioairzone: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index acb49627d58f..fc62525915e9 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mInpqQsH6GUyakA+74c3xvGRQvIFJ1rBa4bqWlJ9ea0="; + hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk="; }; propagatedBuildInputs = [ From 2ba10610273a4163dbc506eceb4b60c3045f71ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 02:11:39 +0000 Subject: [PATCH 100/385] python310Packages.astroquery: 0.4.5 -> 0.4.6 --- pkgs/development/python-modules/astroquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index a022c80b16b9..6c1d39a82b01 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.4.5"; + version = "0.4.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "20002f84b61fb11ceeae408a4cd23b379490e174054ec777f946df8a3f06be1b"; + sha256 = "sha256-MHylVMtzSgypoi+G9e/+fkE6+ROuZeFXiXLYR7H+E+4="; }; disabled = !isPy3k; From 39050c8c66cd6dac8a39d20ef2bc902f12fef924 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 05:11:17 +0000 Subject: [PATCH 101/385] wordpress: 5.9.2 -> 5.9.3 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 1e6b40865ee3..f1c43bde3ce0 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.9.2"; + version = "5.9.3"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-d2Xy3SpWzpIHmXh8x5BKWF9jNlvKK6D3uwbqIGDGn4s="; + sha256 = "sha256-cMvqXXLez7Ep9MyObD0BdepkvsaOl5YbbbA3cnilKlY="; }; installPhase = '' From 3a999186fd5ecfaf2b0da7481ab3cfe966eb663d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 05:19:21 +0000 Subject: [PATCH 102/385] python310Packages.cupy: 10.2.0 -> 10.3.1 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index beba7d21e0c6..cdd11e5010be 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -9,12 +9,12 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "10.2.0"; + version = "10.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-5ovvA76QGOsOnVztMfDgLerks5nJrKR08rLc+ArmWA8="; + sha256 = "sha256-c8BOKI1AWU+zN8lhliRus55PUAgvFm+TlxKToYn7jWc="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both From 1c5ef46be7e24e471f0963822807846e9ef4e0ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 05:20:25 +0000 Subject: [PATCH 103/385] x42-plugins: 20220107 -> 20220327 --- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 0a6ad4bdc4cd..4e2bb5600d3b 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20220107"; + version = "20220327"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-+lzgkRQHe6moid3h6az/iqt2XL5vbyM0BjSTwMBvd3I="; + sha256 = "sha256-IhuPqTlCbCxExT5B9Au42RQQl4sDEvz6+HhsuT02KVs="; }; nativeBuildInputs = [ pkg-config ]; From f1e1a11ae3e28b4da4bd253e8c9d857a01fb987c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 06:13:47 +0000 Subject: [PATCH 104/385] pyinfra: 1.7.2 -> 2.0 --- pkgs/development/python-modules/pyinfra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index fed8628ea2da..dc25d162445f 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "1.7.2"; + version = "2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qA65l0+E5jVdPghjcX2YiVtdhHRxt4ey28xOedgwHaM="; + sha256 = "sha256-rzVirU697wGehCIc/WwE6Rg9AaYYELXfoe10GMRFHgw="; }; propagatedBuildInputs = [ From a37726b71f552898e87d47462f04acb057a43a77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 08:21:00 +0000 Subject: [PATCH 105/385] python310Packages.graphql-subscription-manager: 0.5.6 -> 0.6.0 --- .../python-modules/graphql-subscription-manager/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix index ab12d3500886..40b7b0be6879 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.6"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; - rev = version; - hash = "sha256-nieKl25yDc3FHnMqwn6FNzWKd8sas3rTlBonYbJc1tg="; + rev = "refs/tags/${version}"; + hash = "sha256-5+KHPm/JuazObvuC2ip6hwQxvjJH/lDgukJMH49cuwg="; }; propagatedBuildInputs = [ From f4a3848a68841f3497e77ff5da64075dfaed6edd Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:40:58 +0000 Subject: [PATCH 106/385] linux: 4.14.274 -> 4.14.275 --- 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 0683e7d6ad4d..edf274aa85cb 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.274"; + version = "4.14.275"; # 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 = "1bbz1w5l7im7dspq6g6iy5vahsxcaa1b2ykrw49m3pw8rf7m6hib"; + sha256 = "1yaq5qhl694ygx17x998syg79yx72l3n9vzfkyf0g3idzdh9j2hh"; }; } // (args.argsOverride or {})) From 46e8fed971b33b0e8cd08d200a23a709fe4a8b71 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:06 +0000 Subject: [PATCH 107/385] linux: 5.10.109 -> 5.10.110 --- 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 7b5c9cba1444..be92811a34c2 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.109"; + version = "5.10.110"; # 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 = "1p0k46isy2wzzms801lrnb59f1nb9mhywjj7fnkrwrj9nbn25yqq"; + sha256 = "14sn906f1bd87ngq1g2hx458v42d4nlzr36ba4alhcsl6836mvyv"; }; } // (args.argsOverride or {})) From 2827192c14f0be6bb01dded023e44c80a775208e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:12 +0000 Subject: [PATCH 108/385] linux: 5.15.32 -> 5.15.33 --- 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 dab27c119aa5..4cf4fbf8e78b 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.32"; + version = "5.15.33"; # 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 = "11nz2w6hgwy6va6sxf4ic1s4kv24zbpssgjxsq6n321h4bxcsqql"; + sha256 = "1i590npi00w5d1znmamkm3sb293k5k4xd37miwnvz7hg17k1f2n3"; }; } // (args.argsOverride or { })) From 89e6f752db1f3d6d99bcf8d32996652e725f25b7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:19 +0000 Subject: [PATCH 109/385] linux: 5.16.18 -> 5.16.19 --- 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 4dcb71c4f5cd..dc0f4b14156a 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.18"; + version = "5.16.19"; # 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 = "096f80m2czj8khvil7s037pqdf1s6pklqn5d9419jqkz7v70piry"; + sha256 = "0zlvsnbmcx4l8a5cqciwaabm1267q5zn4ah3gfhxi0jvigx2qvfs"; }; } // (args.argsOverride or { })) From cc0d60827924b30fe30572201adafa66d847e044 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:26 +0000 Subject: [PATCH 110/385] linux: 5.17.1 -> 5.17.2 --- pkgs/os-specific/linux/kernel/linux-5.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix index edd5339e103d..c1a037283ace 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.17.1"; + version = "5.17.2"; # 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 = "092cx18va108lb27kxx2b00ma3l9g22nmkk81034apx26bacbmbw"; + sha256 = "168b7zzw72k6hxbw0q402vvfir79qki9bjvxxvfi7s6g6y20z8id"; }; } // (args.argsOverride or { })) From 83fdd68cba423b30c64834587ee75d1888ff5040 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:59 +0000 Subject: [PATCH 111/385] linux-rt_5_10: 5.10.106-rt64 -> 5.10.109-rt65 --- 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 cf0744bce681..7162fe8ac198 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.106-rt64"; # updated by ./update-rt.sh + version = "5.10.109-rt65"; # 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 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6"; + sha256 = "1p0k46isy2wzzms801lrnb59f1nb9mhywjj7fnkrwrj9nbn25yqq"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0z5gyi1vyjyd05vyccmk9yfgvm5v1lc8vbfywahx495xzpp9i8xb"; + sha256 = "0w7bs5kmwvbyfy5js218ys42s8i51m8v0mbkfhiynlpm3iph357q"; }; }; in [ rt-patch ] ++ kernelPatches; From 3a47fa6f0a17b9c85072a2902fe64c24ac6b17d7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:42:32 +0000 Subject: [PATCH 112/385] linux-rt_5_4: 5.4.182-rt71 -> 5.4.182-rt72 --- 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 747563e3c01f..a7135d83bbd3 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-rt71"; # updated by ./update-rt.sh + version = "5.4.182-rt72"; # 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 = "1lxj63v37bhdgynr8ffyd5g8vp5a79dnzi6fng7jsjapfriywzqh"; + sha256 = "175ls411yr6c8gvmpfpyl00l0saaz9bdshjdf6ybxbpi9fmamypk"; }; }; in [ rt-patch ] ++ kernelPatches; From 0342af6d1655bb8cd3fd8438ba2f9e82823230ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 10:08:42 +0000 Subject: [PATCH 113/385] appgate-sdp: 5.5.3 -> 5.5.4 --- pkgs/applications/networking/appgate-sdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 987f6e0c1ca2..7e4c5cfac888 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -87,11 +87,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.5.3"; + version = "5.5.4"; src = fetchurl { url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-qSo4JX/Jj+JkeetZIMw88MK7SzOgT8aNbQby2kJ91oo="; + sha256 = "sha256-7qfgUYD7uPb+ZEierREVfnHoGz0/b/J+hcsX/duDFWU="; }; # just patch interpreter From a7849020612b3e1cab94cc59f0480c3c0d9655ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 10:21:13 +0000 Subject: [PATCH 114/385] python310Packages.jsbeautifier: 1.14.2 -> 1.14.3 --- pkgs/development/python-modules/jsbeautifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index bdd0897acbe6..5109f8ffe27b 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.14.2"; + version = "1.14.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PskybkfTilQ5W97/h2lWakcnWOcLnhG6fMVs/spqm/Y="; + hash = "sha256-1tV2J8+ezYzZAbnsetSogSeo3t6RAXf6SyGedtAvm9c="; }; propagatedBuildInputs = [ From 53b1013f991c0ded64de1396cd5ae56343ec111e Mon Sep 17 00:00:00 2001 From: Van Tuan Vo Date: Thu, 17 Mar 2022 10:56:01 +0100 Subject: [PATCH 115/385] kotlin-language-server: fix missing JDK in PATH --- .../development/tools/kotlin-language-server/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix index d48c5ace3e36..ded948d83434 100644 --- a/pkgs/development/tools/kotlin-language-server/default.nix +++ b/pkgs/development/tools/kotlin-language-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, openjdk11, gradle }: +{ lib, stdenv, fetchurl, unzip, openjdk11, gradle, makeWrapper, maven }: stdenv.mkDerivation rec { pname = "kotlin-language-server"; @@ -17,14 +17,19 @@ stdenv.mkDerivation rec { cp -r bin/* $out/bin ''; - nativeBuildInputs = [ unzip gradle ]; + nativeBuildInputs = [ unzip gradle makeWrapper ]; buildInputs = [ openjdk11 gradle ]; + postFixup = '' + wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk11} --prefix PATH : ${lib.strings.makeBinPath [ openjdk11 maven ] } + ''; + meta = { description = "kotlin language server"; longDescription = '' About Kotlin code completion, linting and more for any editor/IDE using the Language Server Protocol Topics''; + maintainers = with lib.maintainers; [ vtuan10 ]; homepage = "https://github.com/fwcd/kotlin-language-server"; license = lib.licenses.mit; platforms = lib.platforms.unix; From bc6912323b4125bb2715b68fef4ee969c1c087aa Mon Sep 17 00:00:00 2001 From: Van Tuan Vo Date: Mon, 21 Mar 2022 11:33:13 +0100 Subject: [PATCH 116/385] kotlin-language-server: use fetchzip --- pkgs/development/tools/kotlin-language-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix index ded948d83434..802763fc67ab 100644 --- a/pkgs/development/tools/kotlin-language-server/default.nix +++ b/pkgs/development/tools/kotlin-language-server/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, unzip, openjdk11, gradle, makeWrapper, maven }: +{ lib, stdenv, fetchzip, openjdk11, gradle, makeWrapper, maven }: stdenv.mkDerivation rec { pname = "kotlin-language-server"; version = "1.3.0"; - src = fetchurl { + src = fetchzip { url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; - sha256 = "sha256-yyqI+87vtggSeAfb3OEftalknqbTDEQ5gTJwB/EMIlY="; + hash = "sha256-nqrZoSntomNLUMTni/yoiVhDOJFSFmZeGze8IJhITu0="; }; dontBuild = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp -r bin/* $out/bin ''; - nativeBuildInputs = [ unzip gradle makeWrapper ]; + nativeBuildInputs = [ gradle makeWrapper ]; buildInputs = [ openjdk11 gradle ]; postFixup = '' From f0c8e6bf7f2b6856f9a85e85b3f216e2036b3ad7 Mon Sep 17 00:00:00 2001 From: J XD Date: Sun, 10 Apr 2022 18:48:12 +0800 Subject: [PATCH 117/385] patch paths --- pkgs/applications/misc/sioyek/default.nix | 30 +++++++++-------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index afedf9171038..a67a3afa3d97 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -9,6 +9,7 @@ , openjpeg , qt3d , qtbase +, qmake , wrapQtAppsHook }: @@ -25,29 +26,22 @@ stdenv.mkDerivation rec { buildInputs = [ gumbo harfbuzz jbig2dec mupdf openjpeg qt3d qtbase ]; - nativeBuildInputs = [ installShellFiles wrapQtAppsHook ]; + nativeBuildInputs = [ installShellFiles wrapQtAppsHook qmake ]; - buildPhase = '' - runHook prebuild - # Remove nonexistent lib and insert missing ones - sed -i 's/-lmupdf-threads/-lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg/' pdf_viewer_build_config.pro - qmake pdf_viewer_build_config.pro - make - runHook postBuild + postPatch = '' + substituteInPlace pdf_viewer_build_config.pro \ + --replace "-lmupdf-threads" "-lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg" + substituteInPlace pdf_viewer/main.cpp \ + --replace "/usr/share/sioyek" "$out/share" \ + --replace "/etc/sioyek" "$out/etc" ''; - installPhase = '' - runHook preInstall - install -Dm755 sioyek $out/bin/sioyek - install -Dm644 tutorial.pdf $out/bin/tutorial.pdf - install -Dm644 -t $out/bin/ pdf_viewer/{keys,prefs}.config - cp -r pdf_viewer/shaders $out/bin/ - runHook postInstall - ''; + qmakeFlags = "DEFINES+=\"LINUX_STANDARD_PATHS\" pdf_viewer_build_config.pro"; postInstall = '' - install -Dm644 resources/sioyek-icon-linux.png $out/share/icons/sioyek-icon-linux.png - install -Dm644 resources/sioyek.desktop $out/share/applications/sioyek.desktop + install -Dm644 tutorial.pdf $out/share/tutorial.pdf + cp -r pdf_viewer/shaders $out/share/ + install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config installManPage resources/sioyek.1 ''; From 1c828908a57564c3b0fdf680527bddc05a20d5ae Mon Sep 17 00:00:00 2001 From: J XD Date: Sun, 10 Apr 2022 18:52:57 +0800 Subject: [PATCH 118/385] bump version --- pkgs/applications/misc/sioyek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index a67a3afa3d97..76ef7bebbd56 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "sioyek"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ahrm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UhZuELWfFfqj1jjCgZTD+X44i7jMpeDTbClkZarV2Zw="; + sha256 = "sha256-G4iZi6xTJjWZN0T3lO0jPquxJ3p8Mc0ewmjJEKcGJ34="; }; buildInputs = [ gumbo harfbuzz jbig2dec mupdf openjpeg qt3d qtbase ]; From 33823d491d7e9861968bcd8a4df819c0aa4824f5 Mon Sep 17 00:00:00 2001 From: Van Tuan Vo Date: Sun, 10 Apr 2022 12:58:45 +0200 Subject: [PATCH 119/385] klipper: add numpy dependency Numpy is required in klipper to measure resonances via hardware like the adxl345 board. --- pkgs/servers/klipper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 490bb9c9e094..7b2bb8d4df95 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # NB: This is needed for the postBuild step nativeBuildInputs = [ (python2.withPackages ( p: with p; [ cffi ] )) ]; - buildInputs = [ (python2.withPackages (p: with p; [ cffi pyserial greenlet jinja2 ])) ]; + buildInputs = [ (python2.withPackages (p: with p; [ cffi pyserial greenlet jinja2 numpy ])) ]; # we need to run this to prebuild the chelper. postBuild = "python2 ./chelper/__init__.py"; From e420804ed7e2328806a672edfdf44e1d7bb4a240 Mon Sep 17 00:00:00 2001 From: J XD Date: Sun, 10 Apr 2022 18:58:57 +0800 Subject: [PATCH 120/385] remove whitespace --- pkgs/applications/misc/sioyek/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 76ef7bebbd56..7ffb24cb4193 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace "-lmupdf-threads" "-lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg" substituteInPlace pdf_viewer/main.cpp \ --replace "/usr/share/sioyek" "$out/share" \ - --replace "/etc/sioyek" "$out/etc" + --replace "/etc/sioyek" "$out/etc" ''; qmakeFlags = "DEFINES+=\"LINUX_STANDARD_PATHS\" pdf_viewer_build_config.pro"; From 6da2a24cc3cc4f0e71b0ee652865503fd9994950 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 11:42:08 +0000 Subject: [PATCH 121/385] checkSSLCert: 2.23.0 -> 2.24.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 b55b47cd7afd..dc0aa891bdf7 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.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-RGl6Fgm9FVaZQMWHl93RwHvrScz69VgbIyDBqMh3PVo="; + sha256 = "sha256-TZT37W4A09t7okPFfcOJOQEAKAchH1FJ+LRftdHZQsM="; }; nativeBuildInputs = [ From e3f8ca40e91c962e63866a9b3626b2dfd3d1de52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 11:46:40 +0000 Subject: [PATCH 122/385] chamber: 2.10.8 -> 2.10.9 --- pkgs/tools/admin/chamber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index f0d90cde98a1..56d4213481c0 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.8"; + version = "2.10.9"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rU9xywEa9E1VG1CaRGHzjXTL+0erlgP1thDTYBz+oLM="; + sha256 = "sha256-rOOpwLoEiTS41VIPvqoq8yGP4GOOCOJNFfLLxt9mfvM="; }; CGO_ENABLED = 0; From 3db257c3e361ebf75cc3862745d5f09c0c02f656 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 11:49:57 +0000 Subject: [PATCH 123/385] python310Packages.plugwise: 0.17.3 -> 0.17.6 --- pkgs/development/python-modules/plugwise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index d5e10f32a192..28efe63eb3cc 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.17.3"; + version = "0.17.6"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; - rev = "v${version}"; - sha256 = "sha256-1wSVmH7woTR2ebHS5FfWHLqwbY04rxtPx/0A/HY+N8s="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Znhtw4VQ7r26rluLa5I+b3TMJ+Wyog7uaUReHORHOgU="; }; postPatch = '' From e4c93fb04c24119c40676de01ab08c9346e08a8f Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Sun, 10 Apr 2022 14:19:22 +0200 Subject: [PATCH 124/385] nixos/openconnect: add hardening flags --- nixos/modules/services/networking/openconnect.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix index 7b2ef48e1c42..de4b505130eb 100644 --- a/nixos/modules/services/networking/openconnect.nix +++ b/nixos/modules/services/networking/openconnect.nix @@ -103,6 +103,8 @@ let generateConfig name icfg } ${icfg.gateway}"; StandardInput = "file:${icfg.passwordFile}"; + + ProtectHome = true; }; }; in { From 5a90f2abf72c72124c0b76bec2ebbd1de654d1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Fri, 8 Apr 2022 21:01:16 -0300 Subject: [PATCH 125/385] linux_zen: 5.17.0-zen1 -> 5.17.2-zen3 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 0e6cc394a549..0d9d34588a9e 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.17.0-zen1"; + modDirVersion = "5.17.2-zen3"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -20,7 +20,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; inherit rev; - sha256 = "sha256-8DCcO2oPnwXjjm3PW7vNZKbB3S7XsEB/svAMhbPRJIo="; + sha256 = "sha256-q6Cc3wQHDXzyt2hx3+CS8N74myC6ra/Y+8IHQxTkoLo="; }; structuredExtraConfig = with lib.kernel; { From 6ebcd043e2780ac1a7e87c54304d68d4b2fd24b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 12:33:50 +0000 Subject: [PATCH 126/385] calc: 2.14.0.14 -> 2.14.1.0 --- pkgs/applications/science/math/calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index f9931c7d4c96..41adb1cfbe6c 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.0.14"; + version = "2.14.1.0"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-93J4NaED2XEsVxlY6STpwlS9FI8I60NIAZvDT45xxV0="; + sha256 = "sha256-C1YWZS4x7htUWF3MhRLQIYChL4rdwJxASdPQjttUr0A="; }; postPatch = '' From 5d64003e017ca3734249e01f422c49e0e18f272c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 13:58:27 +0000 Subject: [PATCH 127/385] difftastic: 0.25.0 -> 0.26.0 --- pkgs/tools/text/difftastic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 17c1a33d8c89..1bc18749c652 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-TJMMy1fMwqUMVhztMOlN4yQhW5IF36yahOhDTJ9kadA="; + sha256 = "sha256-bluiRWueb9+UG+8jCwm+Xc483dSvoxwu+HP02I0DZBs="; }; - cargoSha256 = "sha256-crH2SodT+Wy3auk3uli253rIrHyKsibQcYGtpxwbJJQ="; + cargoSha256 = "sha256-nVYPvYt3Sr1VxoXiaFhpiAh+vngklsr6vn1jfBUg4C4="; meta = with lib; { description = "A syntax-aware diff"; From cc067725453ea09bf6437896513be1692f352b98 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 10 Apr 2022 17:17:07 +0300 Subject: [PATCH 128/385] gnuradio: 3.10.1.1 -> 3.10.2.0 --- pkgs/applications/radio/gnuradio/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index eef1960ae1f4..14a4763259fa 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "1"; - patch = "1"; + minor = "2"; + patch = "0"; } }: let - sourceSha256 = "sha256-vsAK+GQzcpA9Vsa6q4RFEzVpbF7/+yZkMsemKn6VhIg="; + sourceSha256 = "sha256-WcfmW39wHhFdpbdBSjOfuDkxL8/fuMjjJoLUyCUud/o="; featuresInfo = { # Needed always basic = { @@ -136,6 +136,12 @@ let ]; cmakeEnableFlag = "GRC"; }; + jsonyaml_blocks = { + pythonRuntime = [ + python.pkgs.jsonschema + ]; + cmakeEnableFlag = "JSONYAML_BLOCKS"; + }; gr-blocks = { cmakeEnableFlag = "GR_BLOCKS"; }; @@ -221,6 +227,7 @@ let setuptools click click-plugins + pygccxml ]; cmakeEnableFlag = "GR_MODTOOL"; }; From 2b745e7ae8f96ecbd6bd8185530a651d4cf003da Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 10 Apr 2022 17:21:49 +0300 Subject: [PATCH 129/385] gnuradio3_9: 3.9.5.0 -> 3.9.6.0 --- pkgs/applications/radio/gnuradio/3.9.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 638064bbd072..989722fdc3ec 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "5"; + minor = "6"; patch = "0"; } }: let - sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY="; + sourceSha256 = "sha256-0JODgv9MNOkHDQYTVCZMzjr/G542+NvGP9wlH9iwLeg="; featuresInfo = { # Needed always basic = { @@ -134,6 +134,12 @@ let ]; cmakeEnableFlag = "GRC"; }; + jsonyaml_blocks = { + pythonRuntime = [ + python.pkgs.jsonschema + ]; + cmakeEnableFlag = "JSONYAML_BLOCKS"; + }; gr-blocks = { cmakeEnableFlag = "GR_BLOCKS"; }; From 085d0eebb71f4d8d3c371185f0c7e091adb37437 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 14:50:41 +0000 Subject: [PATCH 130/385] python310Packages.pyathena: 2.5.1 -> 2.5.2 --- 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 fe9d3276e1be..7a44cf995e3f 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.1"; + version = "2.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAthena"; inherit version; - sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA="; + sha256 = "sha256-vjoK6lEitvd5vqSEE/ael8q00O05lquKIviFK/bPlVQ="; }; propagatedBuildInputs = [ From 81ab3418dcb594f02864120c21af804ba0443999 Mon Sep 17 00:00:00 2001 From: Frido Friedemann Date: Sun, 10 Apr 2022 17:01:03 +0200 Subject: [PATCH 131/385] python3Packages.ipympl: add mpl to buildinputs --- pkgs/development/python-modules/ipympl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 08b41e629787..922a619a4063 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -3,6 +3,7 @@ , fetchPypi , ipykernel , ipywidgets +, matplotlib }: buildPythonPackage rec { @@ -16,7 +17,7 @@ buildPythonPackage rec { }; - propagatedBuildInputs = [ ipykernel ipywidgets ]; + propagatedBuildInputs = [ ipykernel ipywidgets matplotlib ]; # There are no unit tests in repository doCheck = false; From 7f8c513362f84e1763b386f005e6c1f59f3f0679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 01:17:35 +0200 Subject: [PATCH 132/385] python39Packages.pycurl: disable failing tests, add SuperSandro2000 as maintainer (cherry picked from commit c270defab79e46b4c98039b09ab6209d1a69ffb3) --- pkgs/development/python-modules/pycurl/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 5b62b3bb016b..3b23d8b95b2b 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -71,12 +71,17 @@ buildPythonPackage rec { "test_libcurl_ssl_gnutls" # AssertionError: assert 'crypto' in ['curl'] "test_ssl_in_static_libs" + # pycurl.error: (27, '') + "test_getinfo_raw_certinfo" + "test_request_with_certinfo" + "test_request_with_verifypeer" + "test_request_without_certinfo" ]; meta = with lib; { homepage = "http://pycurl.io/"; description = "Python Interface To The cURL library"; license = with licenses; [ lgpl2Only mit ]; - maintainers = with maintainers; []; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 65c02f8b4cf2a21b264b387cc65a31137d4259bb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 10 Apr 2022 08:58:49 +0100 Subject: [PATCH 133/385] binutils-unwrapped-all-targets: init at 2.38 It's not exactly a new package: binutils has been exposing `withAllTargets = true;` knob for a while. To give it more official status let's expose it as an `binutils-unwrapped-all-targets` attribute. Note that `binutils-unwrapped.override { withAllTargets = true; }` does not work due to recursive definition of binutils. Closes: https://github.com/NixOS/nixpkgs/issues/82792 --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a1aa43d99f..a071c7d3c910 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14561,6 +14561,12 @@ with pkgs; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; + binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { + autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; + # FHS sys dirs presumably only have stuff for the build platform + noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; + withAllTargets = true; + }; binutils = wrapBintoolsWith { bintools = binutils-unwrapped; }; From d49da6386a00c8038cfc9f4258b07781415e6df7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 16:11:31 +0000 Subject: [PATCH 134/385] python310Packages.pynina: 0.1.7 -> 0.1.8 --- pkgs/development/python-modules/pynina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix index 8227e01edc24..be81bd6e6557 100644 --- a/pkgs/development/python-modules/pynina/default.nix +++ b/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - sha256 = "sha256-7sceYmzOmXJMKaIdGmXMuCAum0aJeVTxx1w/jZy5Eig="; + sha256 = "sha256-U8/SzkkZJLRBpTQx8NRpFWUlckn4Jr0n9cHR4/plyb0="; }; propagatedBuildInputs = [ From f1521ea573e6a52f6d360b01e446428b957839f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 16:26:36 +0000 Subject: [PATCH 135/385] flycast: 1.2 -> 1.3 --- pkgs/applications/emulators/flycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index 67ba4590db62..fd5123d05fa2 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "flycast"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; rev = "v${version}"; - sha256 = "sha256-MzHAGK++oukIs84OR/l6gBwCJssdi8Iyte5Rtro2+Q0="; + sha256 = "sha256-FAHm8Fu/yv2rJvWCY+g50TYH4zOT6rO7F+jTL2T6EOU="; fetchSubmodules = true; }; From 510dfffd7567875aed4ab017373895ffeb5c9853 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 7 Apr 2022 11:29:58 +0000 Subject: [PATCH 136/385] yaru-theme: 22.04.3.1 -> unstable-2022-04-07 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: José Romildo Malaquias --- pkgs/data/themes/yaru/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index a27370b96368..e2bc278299dd 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,21 +16,18 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "22.04.3.1"; + version = "unstable-2022-04-07"; # 22.04.3.1 is broken src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; - rev = version; - sha256 = "sha256-nNI6Nm3ZpIJRTbIbe/P9cKofcthb6qWKjn81/ZpPo2g="; + rev = "9bdbf66bf3718c6595c7a15ef4698ba471a36526"; + sha256 = "02f6m0jxnsczw3y7v7bqdihxa33sx2z93yn3j8w4z9r9fv2pn06b"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome.gnome-themes-extra ]; - propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontDropIconThemeCache = true; From 8c4bc7f62c912d7828568492b8715a3006133907 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 7 Apr 2022 18:40:16 -0300 Subject: [PATCH 137/385] nixos/shellhub-agent: allow setting the preferredHostname Signed-off-by: Otavio Salvador --- nixos/modules/services/networking/shellhub-agent.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix index fa237a44d69f..ffab9fb69d23 100644 --- a/nixos/modules/services/networking/shellhub-agent.nix +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -23,6 +23,15 @@ in ''; }; + preferredHostname = mkOption { + type = types.str; + default = ""; + description = '' + Set the device preferred hostname. This provides a hint to + the server to use this as hostname if it is available. + ''; + }; + keepAliveInterval = mkOption { type = types.int; default = 30; @@ -81,6 +90,7 @@ in environment.SHELLHUB_SERVER_ADDRESS = cfg.server; environment.SHELLHUB_PRIVATE_KEY = cfg.privateKey; environment.SHELLHUB_TENANT_ID = cfg.tenantId; + environment.SHELLHUB_PREFERRED_HOSTNAME = cfg.preferredHostname; environment.SHELLHUB_KEEPALIVE_INTERVAL = toString cfg.keepAliveInterval; serviceConfig = { From bd3b046ac85758208b362e0b4234fb0466cd5cbd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 8 Apr 2022 09:32:33 -0300 Subject: [PATCH 138/385] nixos/shellhub-agent: use mkPackageOption to simplify code Signed-off-by: Otavio Salvador --- nixos/modules/services/networking/shellhub-agent.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix index ffab9fb69d23..ce0a6d99927c 100644 --- a/nixos/modules/services/networking/shellhub-agent.nix +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -14,14 +14,7 @@ in enable = mkEnableOption "ShellHub Agent daemon"; - package = mkOption { - type = types.package; - default = pkgs.shellhub-agent; - defaultText = literalExpression "pkgs.shellhub-agent"; - description = '' - Which ShellHub Agent package to use. - ''; - }; + package = mkPackageOption pkgs "shellhub-agent" { }; preferredHostname = mkOption { type = types.str; From d7a0f56c6a2a19c9e6a61716ce5315412b61c2f6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 8 Apr 2022 09:33:02 -0300 Subject: [PATCH 139/385] nixos/shellhub-agent: avoid code duplication for environment Signed-off-by: Otavio Salvador --- nixos/modules/services/networking/shellhub-agent.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix index ce0a6d99927c..4ec59754bfb4 100644 --- a/nixos/modules/services/networking/shellhub-agent.nix +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -80,11 +80,13 @@ in "time-sync.target" ]; - environment.SHELLHUB_SERVER_ADDRESS = cfg.server; - environment.SHELLHUB_PRIVATE_KEY = cfg.privateKey; - environment.SHELLHUB_TENANT_ID = cfg.tenantId; - environment.SHELLHUB_PREFERRED_HOSTNAME = cfg.preferredHostname; - environment.SHELLHUB_KEEPALIVE_INTERVAL = toString cfg.keepAliveInterval; + environment = { + SHELLHUB_SERVER_ADDRESS = cfg.server; + SHELLHUB_PRIVATE_KEY = cfg.privateKey; + SHELLHUB_TENANT_ID = cfg.tenantId; + SHELLHUB_KEEPALIVE_INTERVAL = toString cfg.keepAliveInterval; + SHELLHUB_PREFERRED_HOSTNAME = cfg.preferredHostname; + }; serviceConfig = { # The service starts sessions for different users. From fcb69a858359f7b7fe453c06697f6e4200a4d2d4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 8 Apr 2022 09:33:52 -0300 Subject: [PATCH 140/385] nixos/shellhub-agent: use package internally, avoiding it in PATH Signed-off-by: Otavio Salvador --- nixos/modules/services/networking/shellhub-agent.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix index 4ec59754bfb4..57825945d9f7 100644 --- a/nixos/modules/services/networking/shellhub-agent.nix +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -95,8 +95,6 @@ in ExecStart = "${cfg.package}/bin/agent"; }; }; - - environment.systemPackages = [ cfg.package ]; }; } From 83c9b7483430d7e361d0c7676a8cc31008f400c3 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 30 Oct 2021 20:02:13 +0300 Subject: [PATCH 141/385] nifi: init at 1.16.0 --- pkgs/servers/web-apps/nifi/default.nix | 41 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/servers/web-apps/nifi/default.nix diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix new file mode 100644 index 000000000000..43662321f802 --- /dev/null +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, makeWrapper, jre8 }: + +stdenv.mkDerivation rec { + pname = "nifi"; + version = "1.16.0"; + + src = fetchurl { + url = "https://dlcdn.apache.org/nifi/${version}/nifi-${version}-bin.tar.gz"; + sha256 = "sha256-BE990mVSocO+UuMa9kULJcbXbqiX8oquZQTQKSRPe4g="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre8 ]; + + installPhase = '' + mv ../$sourceRoot $out + rm -f $out/bin/*bat + rm -rf $out/extensions + mkdir -p $out/share/nifi + mv $out/conf $out/share/nifi + mv $out/docs $out/share/nifi + mv $out/{LICENSE,NOTICE,README} $out/share/nifi + + substituteInPlace $out/bin/nifi.sh \ + --replace "/bin/sh" "${stdenv.shell}" + substituteInPlace $out/bin/nifi-env.sh \ + --replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jre8}" + ''; + + meta = with lib; { + description = "Easy to use, powerful, and reliable system to process and distribute data"; + longDescription = '' + Apache NiFi supports powerful and scalable directed graphs of data routing, + transformation, and system mediation logic. + ''; + license = licenses.asl20; + homepage = "https://nifi.apache.org"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 986ff6589c82..caad752c094c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8283,6 +8283,8 @@ with pkgs; ngrok-1 = callPackage ../tools/networking/ngrok-1 { }; + nifi = callPackage ../servers/web-apps/nifi { }; + nitter = callPackage ../servers/nitter { }; noice = callPackage ../applications/misc/noice { }; From d706301b0cb45bb7451a3bfb685b3bf2795baa8f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 30 Oct 2021 20:04:55 +0300 Subject: [PATCH 142/385] nixos/nifi: init service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/nifi.nix | 318 +++++++++++++++++++++++ 2 files changed, 319 insertions(+) create mode 100644 nixos/modules/services/web-apps/nifi.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 329c8685c36d..ae6b1dd0773b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1054,6 +1054,7 @@ ./services/web-apps/netbox.nix ./services/web-apps/nextcloud.nix ./services/web-apps/nexus.nix + ./services/web-apps/nifi.nix ./services/web-apps/node-red.nix ./services/web-apps/pict-rs.nix ./services/web-apps/peertube.nix diff --git a/nixos/modules/services/web-apps/nifi.nix b/nixos/modules/services/web-apps/nifi.nix new file mode 100644 index 000000000000..21a631272641 --- /dev/null +++ b/nixos/modules/services/web-apps/nifi.nix @@ -0,0 +1,318 @@ +{ lib, pkgs, config, options, ... }: + +let + cfg = config.services.nifi; + opt = options.services.nifi; + + env = { + NIFI_OVERRIDE_NIFIENV = "true"; + NIFI_HOME = "/var/lib/nifi"; + NIFI_PID_DIR = "/run/nifi"; + NIFI_LOG_DIR = "/var/log/nifi"; + }; + + envFile = pkgs.writeText "nifi.env" (lib.concatMapStrings (s: s + "\n") ( + (lib.concatLists (lib.mapAttrsToList (name: value: + if value != null then [ + "${name}=\"${toString value}\"" + ] else [] + ) env)))); + + nifiEnv = pkgs.writeShellScriptBin "nifi-env" '' + set -a + source "${envFile}" + eval -- "\$@" + ''; + +in { + options = { + services.nifi = { + enable = lib.mkEnableOption "Apache NiFi"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.nifi; + defaultText = lib.literalExpression "pkgs.nifi"; + description = "Apache NiFi package to use."; + }; + + user = lib.mkOption { + type = lib.types.str; + default = "nifi"; + description = "User account where Apache NiFi runs."; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "nifi"; + description = "Group account where Apache NiFi runs."; + }; + + enableHTTPS = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable HTTPS protocol. Don`t use in production."; + }; + + listenHost = lib.mkOption { + type = lib.types.str; + default = if cfg.enableHTTPS then "0.0.0.0" else "127.0.0.1"; + defaultText = lib.literalExpression '' + if config.${opt.enableHTTPS} + then "0.0.0.0" + else "127.0.0.1" + ''; + description = "Bind to an ip for Apache NiFi web-ui."; + }; + + listenPort = lib.mkOption { + type = lib.types.int; + default = if cfg.enableHTTPS then 8443 else 8080; + defaultText = lib.literalExpression '' + if config.${opt.enableHTTPS} + then "8443" + else "8000" + ''; + description = "Bind to a port for Apache NiFi web-ui."; + }; + + proxyHost = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = if cfg.enableHTTPS then "0.0.0.0" else null; + defaultText = lib.literalExpression '' + if config.${opt.enableHTTPS} + then "0.0.0.0" + else null + ''; + description = "Allow requests from a specific host."; + }; + + proxyPort = lib.mkOption { + type = lib.types.nullOr lib.types.int; + default = if cfg.enableHTTPS then 8443 else null; + defaultText = lib.literalExpression '' + if config.${opt.enableHTTPS} + then "8443" + else null + ''; + description = "Allow requests from a specific port."; + }; + + initUser = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "Initial user account for Apache NiFi. Username must be at least 4 characters."; + }; + + initPasswordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/nifi/password-nifi"; + description = "nitial password for Apache NiFi. Password must be at least 12 characters."; + }; + + initJavaHeapSize = lib.mkOption { + type = lib.types.nullOr lib.types.int; + default = null; + example = 1024; + description = "Set the initial heap size for the JVM in MB."; + }; + + maxJavaHeapSize = lib.mkOption { + type = lib.types.nullOr lib.types.int; + default = null; + example = 2048; + description = "Set the initial heap size for the JVM in MB."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { assertion = cfg.initUser!=null || cfg.initPasswordFile==null; + message = '' + needs to be set if enabled. + ''; + } + { assertion = cfg.initUser==null || cfg.initPasswordFile!=null; + message = '' + needs to be set if enabled. + ''; + } + { assertion = cfg.proxyHost==null || cfg.proxyPort!=null; + message = '' + needs to be set if value specified. + ''; + } + { assertion = cfg.proxyHost!=null || cfg.proxyPort==null; + message = '' + needs to be set if value specified. + ''; + } + { assertion = cfg.initJavaHeapSize==null || cfg.maxJavaHeapSize!=null; + message = '' + needs to be set if value specified. + ''; + } + { assertion = cfg.initJavaHeapSize!=null || cfg.maxJavaHeapSize==null; + message = '' + needs to be set if value specified. + ''; + } + ]; + + warnings = lib.optional (cfg.enableHTTPS==false) '' + Please do not disable HTTPS mode in production. In this mode, access to the nifi is opened without authentication. + ''; + + systemd.tmpfiles.rules = [ + "d '/var/lib/nifi/conf' 0750 ${cfg.user} ${cfg.group}" + "L+ '/var/lib/nifi/lib' - - - - ${cfg.package}/lib" + ]; + + + systemd.services.nifi = { + description = "Apache NiFi"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = env; + path = [ pkgs.gawk ]; + + serviceConfig = { + Type = "forking"; + PIDFile = "/run/nifi/nifi.pid"; + ExecStartPre = pkgs.writeScript "nifi-pre-start.sh" '' + #!/bin/sh + umask 077 + test -f '/var/lib/nifi/conf/authorizers.xml' || (cp '${cfg.package}/share/nifi/conf/authorizers.xml' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/authorizers.xml') + test -f '/var/lib/nifi/conf/bootstrap.conf' || (cp '${cfg.package}/share/nifi/conf/bootstrap.conf' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/bootstrap.conf') + test -f '/var/lib/nifi/conf/bootstrap-hashicorp-vault.conf' || (cp '${cfg.package}/share/nifi/conf/bootstrap-hashicorp-vault.conf' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/bootstrap-hashicorp-vault.conf') + test -f '/var/lib/nifi/conf/bootstrap-notification-services.xml' || (cp '${cfg.package}/share/nifi/conf/bootstrap-notification-services.xml' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/bootstrap-notification-services.xml') + test -f '/var/lib/nifi/conf/logback.xml' || (cp '${cfg.package}/share/nifi/conf/logback.xml' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/logback.xml') + test -f '/var/lib/nifi/conf/login-identity-providers.xml' || (cp '${cfg.package}/share/nifi/conf/login-identity-providers.xml' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/login-identity-providers.xml') + test -f '/var/lib/nifi/conf/nifi.properties' || (cp '${cfg.package}/share/nifi/conf/nifi.properties' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/nifi.properties') + test -f '/var/lib/nifi/conf/stateless-logback.xml' || (cp '${cfg.package}/share/nifi/conf/stateless-logback.xml' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/stateless-logback.xml') + test -f '/var/lib/nifi/conf/stateless.properties' || (cp '${cfg.package}/share/nifi/conf/stateless.properties' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/stateless.properties') + test -f '/var/lib/nifi/conf/state-management.xml' || (cp '${cfg.package}/share/nifi/conf/state-management.xml' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/state-management.xml') + test -f '/var/lib/nifi/conf/zookeeper.properties' || (cp '${cfg.package}/share/nifi/conf/zookeeper.properties' '/var/lib/nifi/conf/' && chmod 0640 '/var/lib/nifi/conf/zookeeper.properties') + test -d '/var/lib/nifi/docs/html' || (mkdir -p /var/lib/nifi/docs && cp -r '${cfg.package}/share/nifi/docs/html' '/var/lib/nifi/docs/html') + ${lib.optionalString ((cfg.initUser != null) && (cfg.initPasswordFile != null)) '' + awk -F'[<|>]' '/property name="Username"/ {if ($3!="") f=1} END{exit !f}' /var/lib/nifi/conf/login-identity-providers.xml || ${cfg.package}/bin/nifi.sh set-single-user-credentials ${cfg.initUser} $(cat ${cfg.initPasswordFile}) + ''} + ${lib.optionalString (cfg.enableHTTPS == false) '' + sed -i /var/lib/nifi/conf/nifi.properties \ + -e 's|nifi.remote.input.secure=.*|nifi.remote.input.secure=false|g' \ + -e 's|nifi.web.http.host=.*|nifi.web.http.host=${cfg.listenHost}|g' \ + -e 's|nifi.web.http.port=.*|nifi.web.http.port=${(toString cfg.listenPort)}|g' \ + -e 's|nifi.web.https.host=.*|nifi.web.https.host=|g' \ + -e 's|nifi.web.https.port=.*|nifi.web.https.port=|g' \ + -e 's|nifi.security.keystore=.*|nifi.security.keystore=|g' \ + -e 's|nifi.security.keystoreType=.*|nifi.security.keystoreType=|g' \ + -e 's|nifi.security.truststore=.*|nifi.security.truststore=|g' \ + -e 's|nifi.security.truststoreType=.*|nifi.security.truststoreType=|g' \ + -e '/nifi.security.keystorePasswd/s|^|#|' \ + -e '/nifi.security.keyPasswd/s|^|#|' \ + -e '/nifi.security.truststorePasswd/s|^|#|' + ''} + ${lib.optionalString (cfg.enableHTTPS == true) '' + sed -i /var/lib/nifi/conf/nifi.properties \ + -e 's|nifi.remote.input.secure=.*|nifi.remote.input.secure=true|g' \ + -e 's|nifi.web.http.host=.*|nifi.web.http.host=|g' \ + -e 's|nifi.web.http.port=.*|nifi.web.http.port=|g' \ + -e 's|nifi.web.https.host=.*|nifi.web.https.host=${cfg.listenHost}|g' \ + -e 's|nifi.web.https.port=.*|nifi.web.https.port=${(toString cfg.listenPort)}|g' \ + -e 's|nifi.security.keystore=.*|nifi.security.keystore=./conf/keystore.p12|g' \ + -e 's|nifi.security.keystoreType=.*|nifi.security.keystoreType=PKCS12|g' \ + -e 's|nifi.security.truststore=.*|nifi.security.truststore=./conf/truststore.p12|g' \ + -e 's|nifi.security.truststoreType=.*|nifi.security.truststoreType=PKCS12|g' \ + -e '/nifi.security.keystorePasswd/s|^#\+||' \ + -e '/nifi.security.keyPasswd/s|^#\+||' \ + -e '/nifi.security.truststorePasswd/s|^#\+||' + ''} + ${lib.optionalString ((cfg.enableHTTPS == true) && (cfg.proxyHost != null) && (cfg.proxyPort != null)) '' + sed -i /var/lib/nifi/conf/nifi.properties \ + -e 's|nifi.web.proxy.host=.*|nifi.web.proxy.host=${cfg.proxyHost}:${(toString cfg.proxyPort)}|g' + ''} + ${lib.optionalString ((cfg.enableHTTPS == false) || (cfg.proxyHost == null) && (cfg.proxyPort == null)) '' + sed -i /var/lib/nifi/conf/nifi.properties \ + -e 's|nifi.web.proxy.host=.*|nifi.web.proxy.host=|g' + ''} + ${lib.optionalString ((cfg.initJavaHeapSize != null) && (cfg.maxJavaHeapSize != null))'' + sed -i /var/lib/nifi/conf/bootstrap.conf \ + -e 's|java.arg.2=.*|java.arg.2=-Xms${(toString cfg.initJavaHeapSize)}m|g' \ + -e 's|java.arg.3=.*|java.arg.3=-Xmx${(toString cfg.maxJavaHeapSize)}m|g' + ''} + ${lib.optionalString ((cfg.initJavaHeapSize == null) && (cfg.maxJavaHeapSize == null))'' + sed -i /var/lib/nifi/conf/bootstrap.conf \ + -e 's|java.arg.2=.*|java.arg.2=-Xms512m|g' \ + -e 's|java.arg.3=.*|java.arg.3=-Xmx512m|g' + ''} + ''; + ExecStart = "${cfg.package}/bin/nifi.sh start"; + ExecStop = "${cfg.package}/bin/nifi.sh stop"; + # User and group + User = cfg.user; + Group = cfg.group; + # Runtime directory and mode + RuntimeDirectory = "nifi"; + RuntimeDirectoryMode = "0750"; + # State directory and mode + StateDirectory = "nifi"; + StateDirectoryMode = "0750"; + # Logs directory and mode + LogsDirectory = "nifi"; + LogsDirectoryMode = "0750"; + # Proc filesystem + ProcSubset = "pid"; + ProtectProc = "invisible"; + # Access write directories + ReadWritePaths = [ cfg.initPasswordFile ]; + UMask = "0027"; + # Capabilities + CapabilityBoundingSet = ""; + # Security + NoNewPrivileges = true; + # Sandboxing + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + PrivateUsers = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_INET AF_INET6" ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = false; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + # System Call Filtering + SystemCallArchitectures = "native"; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @memlock @mount @obsolete @resources @privileged @setuid" "@chown" ]; + }; + }; + + users.users = lib.mkMerge [ + (lib.mkIf (cfg.user == "nifi") { + nifi = { + group = cfg.group; + isSystemUser = true; + home = cfg.package; + }; + }) + (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package nifiEnv ]) + ]; + + users.groups = lib.optionalAttrs (cfg.group == "nifi") { + nifi = { }; + }; + }; +} From 07962ac6f132a12e133c1a057ddb2507d96386d2 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 10 Apr 2022 15:55:20 +0300 Subject: [PATCH 143/385] nixos/nifi: add release notes --- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 10 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 7bcfcebe21b2..ddf4d58ef299 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 @@ -381,6 +381,14 @@ cluster resource manager + + + nifi, an + easy to use, powerful, and reliable system to process and + distribute data. Available as + services.nifi. + +
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a086751a2f37..aca54718c572 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -109,6 +109,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [pacemaker](https://clusterlabs.org/pacemaker/) cluster resource manager +- [nifi](https://nifi.apache.org), an easy to use, powerful, and reliable system to process and distribute data. Available as [services.nifi](options.html#opt-services.nifi.enable). + ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} From 63ef6aebef14c23276532a3abdff01fc14b618ee Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 10 Apr 2022 20:41:30 +0300 Subject: [PATCH 144/385] nixos/tests: add nifi test --- nixos/tests/all-tests.nix | 1 + nixos/tests/web-apps/nifi.nix | 30 ++++++++++++++++++++++++++ pkgs/servers/web-apps/nifi/default.nix | 6 +++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/web-apps/nifi.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d9429920f13b..488485064206 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -362,6 +362,7 @@ in nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; + nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {}; nitter = handleTest ./nitter.nix {}; nix-ld = handleTest ./nix-ld {}; nix-serve = handleTest ./nix-serve.nix {}; diff --git a/nixos/tests/web-apps/nifi.nix b/nixos/tests/web-apps/nifi.nix new file mode 100644 index 000000000000..92f7fa231df3 --- /dev/null +++ b/nixos/tests/web-apps/nifi.nix @@ -0,0 +1,30 @@ +import ../make-test-python.nix ({pkgs, ...}: +{ + name = "nifi"; + meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; + + nodes = { + nifi = { pkgs, ... }: { + virtualisation = { + memorySize = 2048; + diskSize = 4096; + }; + services.nifi = { + enable = true; + enableHTTPS = false; + }; + }; + }; + + testScript = '' + nifi.start() + + nifi.wait_for_unit("nifi.service") + nifi.wait_for_open_port(8080) + + # Check if NiFi is running + nifi.succeed("curl --fail http://127.0.0.1:8080/nifi/login 2> /dev/null | grep 'NiFi Login'") + + nifi.shutdown() + ''; +}) diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 43662321f802..f25c1931501e 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre8 }: +{ lib, stdenv, fetchurl, makeWrapper, jre8, nixosTests }: stdenv.mkDerivation rec { pname = "nifi"; @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { --replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jre8}" ''; + passthru = { + tests.nifi = nixosTests.nifi; + }; + meta = with lib; { description = "Easy to use, powerful, and reliable system to process and distribute data"; longDescription = '' From 12f66be9deb220ea6439aa41605ddfee91a0e4dc Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 10 Apr 2022 18:48:43 +0100 Subject: [PATCH 145/385] libsForQt5.qca-qt5: 2.3.1 -> 2.3.4 --- pkgs/development/libraries/qca-qt5/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 9bd57e7ae97b..d10ebbdd4b77 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -2,21 +2,13 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.3.1"; + version = "2.3.4"; src = fetchurl { url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks="; + sha256 = "sha256-a2lYgafj/ZX3Oq7m6uq5b2rRflFenCs9SzJy14Yv9cQ="; }; - patches = [ - # Pull upstream fix for gcc-11 - (fetchurl { - url = "https://github.com/KDE/qca/commit/32275f1a74c161d2fed8c056b2dd9555687a22f2.patch"; - sha256 = "sha256-SUH2eyzP2vH/ZjYcX8ybwiqhoTm/QjuEpTKjb2iH1No="; - }) - ]; - buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkg-config ]; From 2eb82298de3bfb1052106b482904743e5e474c4e Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 10 Apr 2022 13:51:28 -0400 Subject: [PATCH 146/385] argocd-autopilot: 0.3.1 -> 0.3.2 --- .../networking/cluster/argocd-autopilot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 58f5dfed8518..4bc1d2d1c20c 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-L8+sb0lGPuc6smOFwijRGFS+oSCxEqB5c1tG55MPlgE="; + sha256 = "sha256-9si2zqYhmAqzhdUWMkfQ/yLeyNcZSAWypvZTbDDrPvA="; }; - vendorSha256 = "sha256-sxPTOao3scTmiVKFyGeWPMzXQz/d0HSVmUYocNGm1vA="; + vendorSha256 = "sha256-UfZCGG24JjPoc5nbX9vPeFCP8YGMNF5oUrdwTC6RpKI="; proxyVendor = true; From 7abd221433749f27b67a9ed31c4d92521c8c86cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 17:51:47 +0000 Subject: [PATCH 147/385] fio: 3.29 -> 3.30 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 859fbe72d631..42ece88147ba 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.29"; + version = "3.30"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-SSQFZK8oVarenp/I37QX/N4F4Es2r2bVyWw6U2OcCHw="; + sha256 = "sha256-X2B8xlCLSHDgTaH55TUJq4WcaObZy/fvfkQ0j3J9Kzo="; }; buildInputs = [ python3 zlib ] From f44598b8e0b5970239e791e3f3f1c93722f57986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 10 Apr 2022 17:12:03 +0200 Subject: [PATCH 148/385] Revert "python39Packages.pycurl: disable failing tests" This partially reverts commit 7f8c513362f84e from PR #168154, and it's also the same as commit 32f42705ff707. The tests worked after curl fix (commit 0fad2b34c4e from PR #167993). --- pkgs/development/python-modules/pycurl/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 3b23d8b95b2b..9d3319001d34 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -71,11 +71,6 @@ buildPythonPackage rec { "test_libcurl_ssl_gnutls" # AssertionError: assert 'crypto' in ['curl'] "test_ssl_in_static_libs" - # pycurl.error: (27, '') - "test_getinfo_raw_certinfo" - "test_request_with_certinfo" - "test_request_with_verifypeer" - "test_request_without_certinfo" ]; meta = with lib; { From e7dd2d60d6d8aab3860ae7630974ee95ee28d87c Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 7 Apr 2022 02:50:06 +0200 Subject: [PATCH 149/385] kvmtool: init at 2021-12-14 --- .../virtualization/kvmtool/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/virtualization/kvmtool/default.nix diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix new file mode 100644 index 000000000000..a99a9f64d861 --- /dev/null +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, lib }: + +stdenv.mkDerivation { + pname = "kvmtool"; + version = "unstable-2022-04-04"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git"; + rev = "5657dd3e48b41bc6db38fa657994bc0e030fd31f"; + sha256 = "1y1j44lk9957f2dmyrscbxl4zncp4ibvvcdj6bwylb8jsvmd5fs2"; + }; + + enableParallelBuilding = true; + makeFlags = [ "prefix=${placeholder "out"}" ]; + + meta = with lib; { + description = "A lightweight tool for hosting KVM guests"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ astro ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 986ff6589c82..f8d01b0fc90e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25596,6 +25596,8 @@ with pkgs; kerbrute = callPackage ../tools/security/kerbrute { }; + kvmtool = callPackage ../applications/virtualization/kvmtool { }; + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrtools = callPackage ../applications/graphics/exrtools { }; From 4a8f46f7ce3ba5ba23b12823658afe74d6a5223e Mon Sep 17 00:00:00 2001 From: Doro Rose Date: Sun, 10 Apr 2022 20:51:12 +0200 Subject: [PATCH 150/385] boost: make boost work for static darwin builds Prior needsUserConfig setting is unconditionally applied for darwin. This is not valid for static builds and should only be set for dynamically linked darwin builds. --- pkgs/development/libraries/boost/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index c0fce3ae5760..17698216b8d9 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -68,7 +68,7 @@ let else "$NIX_BUILD_CORES"; - needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || stdenv.isDarwin; + needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared); b2Args = concatStringsSep " " ([ "--includedir=$dev/include" From f1f1c062e7448049004342266a709e983977b72f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Apr 2022 21:05:45 +0200 Subject: [PATCH 151/385] feroxbuster: 2.6.2 -> 2.6.4 --- pkgs/tools/security/feroxbuster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 8c006020f644..bc1df5eb5692 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.6.2"; + version = "2.6.4"; src = fetchFromGitHub { owner = "epi052"; repo = pname; rev = "v${version}"; - hash = "sha256-SRVCtyl0+GRQ6MUHDY3gi7eg0l42d74c+Ct7G70MJfw="; + hash = "sha256-aTyjZc+bsA4rvbcFTLArK+zbfF6thHEYyPbMx9vLcMo="; }; - cargoSha256 = "sha256-5SCJqVA5CEyILc5Ojr5ZsFiK8y6qfgggXyp9e8i5pdo="; + cargoSha256 = "sha256-PLrIMgn0o+fFB6Zv9sf7X4gZyHwVSd6BOM1/KUo3TAg="; OPENSSL_NO_VENDOR = true; From 13587bb649b323a0e9bae51ac2e9e6ede084070d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 10 Apr 2022 21:26:02 +0200 Subject: [PATCH 152/385] jmusicbot: 0.3.6 -> 0.3.8 --- pkgs/applications/audio/jmusicbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 60df749a1426..94290ada7b35 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JMusicBot"; - version = "0.3.6"; + version = "0.3.8"; src = fetchurl { url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; - sha256 = "sha256-Hc3dsOADC+jVZScY19OYDkHimntMjdw/BoB3EUS/d0k="; + sha256 = "sha256-wzmrh9moY6oo3RqOy9Zl1X70BZlvbJkQmz8BaBIFtIM="; }; dontUnpack = true; From 9cd12eecb5087e058c6509642525dae9968a16bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 10 Apr 2022 19:27:36 +0000 Subject: [PATCH 153/385] python3Packages.pytibber: 0.22.1 -> 0.22.3 https://github.com/Danielhiversen/pyTibber/releases/tag/0.22.3 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index e2c788f1b3eb..3b2d924695ac 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.22.1"; + version = "0.22.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - hash = "sha256-kzKY9ixsAkfee5En0IzYl5izeXq3xY/8bc5Kz/qkE7U="; + hash = "sha256-tM8Uu/TpP5a7y+ePFko0bMoZJWG2efYA861Ez8dPeFY="; }; propagatedBuildInputs = [ From e0617066bc4d85a326f3c46a2ae9d11f205a0d7a Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 10 Apr 2022 22:32:13 +0300 Subject: [PATCH 154/385] werf: 1.2.78 -> 1.2.87 --- .../networking/cluster/werf/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 9a9f454ac003..9d6e91fd0a6b 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, installShellFiles , pkg-config , gpgme , glibc @@ -11,18 +12,18 @@ buildGoModule rec { pname = "werf"; - version = "1.2.78"; + version = "1.2.87"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-ehrzb7WvkYL8oj2RSzKc1KDagV0zg6vMzgpT2sPyhcI="; + sha256 = "sha256-DMP//gh79WuQ8VY4sV6lQlwR+k+rwqODf/pagOBP+4U="; }; - vendorSha256 = "sha256-w8ZeAQbZIVOBoRa9fJhXgTeYRCYpkh/U4pwb5u6A9mQ="; + vendorSha256 = "sha256-OrvGDNj48W1tVAs3tdtAuesHnh8fHRsGd6KL0Uaf9Zg="; proxyVendor = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ glibc.static lvm2 btrfs-progs ]; @@ -44,6 +45,12 @@ buildGoModule rec { subPackages = [ "cmd/werf" ]; + postInstall = '' + installShellCompletion --cmd werf \ + --bash <($out/bin/werf completion --shell=bash) \ + --zsh <($out/bin/werf completion --shell=zsh) + ''; + meta = with lib; { homepage = "https://github.com/werf/werf"; description = "GitOps delivery tool"; From 688d6d243589cc57e326e2b2eca52329db7997aa Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 21 Mar 2022 20:29:10 +0100 Subject: [PATCH 155/385] chromium: get-commit-message.py: Support releases with 0 security fixes Wow, a Chrome release without any (known!) security fixes: https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_20.html --- .../networking/browsers/chromium/get-commit-message.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 85ebb8a7b935..833b6b8283d0 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -38,9 +38,9 @@ for entry in feed.entries: else: print('chromium: TODO -> ' + version + '\n') print(url) - if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): - zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content) - if zero_days: + if fixes := re.search(r'This update includes .+ security fixes\.', content): + fixes = fixes.group(0) + if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content): fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) if cve_list := re.findall(r'CVE-[^: ]+', content): From 073c33c3a6f9283e47f59758ac9155b71ed34f71 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 10 Apr 2022 21:44:08 +0200 Subject: [PATCH 156/385] chromiumBeta: 101.0.4951.15 -> 101.0.4951.26 --- .../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 b83aae6c34be..a27752bda8a6 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": "101.0.4951.15", - "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y", - "sha256bin64": "0z2rx7mw9wg5ly8wmxkflk8f9gifq4cxqvi224v9dr11qqj8gwm2", + "version": "101.0.4951.26", + "sha256": "1wpdi5l0bic0z9ydvx5vj35z6fh21b3n8dsxyvcbm0rq4fca5zcg", + "sha256bin64": "13mx2jxq5pjzp6dxvnzkfs83krhvpbw0pim7z4c7hhyphjc4fhzr", "deps": { "gn": { "version": "2022-03-14", From 0c0e9ceb8ac8faefe1d4dfdad23abc6dec541719 Mon Sep 17 00:00:00 2001 From: Julien Debon Date: Sun, 10 Apr 2022 21:53:02 +0200 Subject: [PATCH 157/385] Add sir4ur0n to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 22a4310eee23..0ee545962645 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11528,6 +11528,12 @@ githubId = 2770647; name = "Simon Vandel Sillesen"; }; + sir4ur0n = { + email = "sir4ur0n@users.noreply.github.com"; + github = "sir4ur0n"; + githubId = 1204125; + name = "sir4ur0n"; + }; siraben = { email = "bensiraphob@gmail.com"; matrix = "@siraben:matrix.org"; From e728cfe252ad1b1a9e4c03f8a33338a3a9fd3c3d Mon Sep 17 00:00:00 2001 From: Ferdinand Bachmann Date: Sun, 10 Apr 2022 21:53:54 +0200 Subject: [PATCH 158/385] wl-mirror: 0.9.2 -> 0.10.0 --- pkgs/tools/wayland/wl-mirror/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 02c63c55a764..c1d674898297 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -26,13 +26,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-W/8DApyd7KtrOrP7Qj6oPKXxLrVzHDuIMOdg+k5ngr4="; + hash = "sha256-ygzSLbzn4P/BdYbqUDduUGwSbRHeU/OBYOX2uznVy1g="; }; patchPhase = '' From c5b017c5d40589f1fbc87fcaaed5960a45f2ff78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 19:54:19 +0000 Subject: [PATCH 159/385] f1viewer: 2.6.2 -> 2.7.0 --- pkgs/applications/video/f1viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/f1viewer/default.nix b/pkgs/applications/video/f1viewer/default.nix index c241dd8a7458..2620142fb11e 100644 --- a/pkgs/applications/video/f1viewer/default.nix +++ b/pkgs/applications/video/f1viewer/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "f1viewer"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "SoMuchForSubtlety"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z6rnkHypk7r9NnYwqZpWQOuGPbWn/EppS+46PQHIdDM="; + sha256 = "sha256-jXC2dENXuqicNQqTHyZKsjibDvjta/npQmf3+uivjX0="; }; vendorSha256 = "sha256-UNeH3zxgssXxFpJws6nAL8EgXt0DRyAQfmlJWz/qyDg="; From 507dc6bae6d1893f7c07782e86c6f3814ca15674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 10 Apr 2022 22:25:03 +0200 Subject: [PATCH 160/385] pngcheck: fix meta.platforms not being flattened, remove zlib overwrite zlib is build with static by default --- pkgs/tools/graphics/pngcheck/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index a4680dff6f64..cb415a2c53ef 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "http://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; license = licenses.free; - platforms = with platforms; [ unix ]; + platforms = platforms.unix; maintainers = with maintainers; [ starcraft66 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 010848c81c37..e932da6790ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9060,11 +9060,7 @@ with pkgs; pm2 = nodePackages.pm2; - pngcheck = callPackage ../tools/graphics/pngcheck { - zlib = zlib.override { - static = true; - }; - }; + pngcheck = callPackage ../tools/graphics/pngcheck { }; pngcrush = callPackage ../tools/graphics/pngcrush { }; From 47a88c845ac6cd40beb84119d7c7a06ce685a075 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 20:26:52 +0000 Subject: [PATCH 161/385] exploitdb: 2022-03-31 -> 2022-04-08 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index cfb1490e3c7f..2a39c61121a0 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-03-31"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-T7vPDbB330Uv276+oGnEYK1xGpJCMzzZiQXx4uW1kc4="; + sha256 = "sha256-yZ/4ULiNekedF0wUwowq5wcen52NbIsbSzINhKuStzo="; }; nativeBuildInputs = [ makeWrapper ]; From 8603836e479be00f6a4d6e0c42d7c529ca747a74 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Sun, 10 Apr 2022 22:37:13 +0200 Subject: [PATCH 162/385] hugo: 0.92.2 -> 0.96.0 https://github.com/gohugoio/hugo/releases/tag/v0.96.0 As of 0.95.0 Hugo requires Go 1.18 to build. `gen autocomplete` is now deprecated in favor of `completion`: https://github.com/gohugoio/hugo/issues/8862 --- pkgs/applications/misc/hugo/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 81ee786aec6f..8be9c83e50ad 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.92.2"; + version = "0.96.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kwqN/9H/ZI2eL09K/9bOMBWW9bow8LtKpbfxyfxIucA="; + sha256 = "sha256-3O+ZdOloh5gILPQssztt7s/MwRgDOnpJItwLn7FXnPU="; }; - vendorSha256 = "sha256-7dJUl0IxsLj0ds2jqtChNCQEBiK9PahG159IhyFxwdM="; + vendorSha256 = "sha256-TgE/ToHBg2QBgtk0gPZTV/icIbQN14RpVAbL/8b+W0U="; doCheck = false; @@ -27,9 +27,9 @@ buildGoModule rec { $out/bin/hugo gen man installManPage man/* installShellCompletion --cmd hugo \ - --bash <($out/bin/hugo gen autocomplete --type=bash) \ - --fish <($out/bin/hugo gen autocomplete --type=fish) \ - --zsh <($out/bin/hugo gen autocomplete --type=zsh) + --bash <($out/bin/hugo completion bash) \ + --fish <($out/bin/hugo completion fish) \ + --zsh <($out/bin/hugo completion zsh) ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fc89d49faa0..ddae21ba24a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26509,7 +26509,7 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; - hugo = callPackage ../applications/misc/hugo { }; + hugo = callPackage ../applications/misc/hugo { buildGoModule = buildGo118Module; }; go-org = callPackage ../applications/misc/go-org { }; From 92559b7330a56778dde383225bae47e225de4861 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Mar 2022 21:15:36 +0200 Subject: [PATCH 163/385] chromium: get-commit-message.py: Support releases with 1 security fix There was an out-of-band security release with only a single security fix: https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_25.html --- .../networking/browsers/chromium/get-commit-message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 833b6b8283d0..45f4282582f5 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -38,7 +38,7 @@ for entry in feed.entries: else: print('chromium: TODO -> ' + version + '\n') print(url) - if fixes := re.search(r'This update includes .+ security fixes\.', content): + if fixes := re.search(r'This update includes .+ security fix(es)?\.', content): fixes = fixes.group(0) if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content): fixes += " " + zero_days.group(0) From dbf02e3a52d3e37759328e2c90b38ee8ba95b2f2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 10 Apr 2022 21:44:08 +0200 Subject: [PATCH 164/385] chromiumDev: 102.0.4972.0 -> 102.0.4987.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a27752bda8a6..c26edc50b24b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "102.0.4972.0", - "sha256": "1aihdym7h8sd52wiybnrgjrd618f3yby4bpbkc26xyrl8gviz31d", - "sha256bin64": "0mb67cfr397aclkiy0v9xqga07c166qdylq257k2kmhj7df1gcvn", + "version": "102.0.4987.0", + "sha256": "0rs6smmda0wlhwbvmhmyz0vi43rkb9gyfbm49bn2084bd1x3qpzy", + "sha256bin64": "1knrnjhn98bln81qf3646gz9znn848kgjayyjl5ik0x0fimx524x", "deps": { "gn": { - "version": "2022-03-29", + "version": "2022-04-05", "url": "https://gn.googlesource.com/gn", - "rev": "e39d5251c25155b9dfdb96adeab31b795095fd3b", - "sha256": "1clr0f847rmwwpmsl9zv4q6rw1shn09my775666v480szpahj9pk" + "rev": "5eb3845ec2d8296b4f41da4eca85302eb111fe69", + "sha256": "04yy4d77bw3bhb32q1szlqn6lmif6qaah2c0ns6by0cbnkliyaza" } } }, From 711bd6955c5c68b4c58e874f92e78652e81ba37f Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 11 Apr 2022 00:33:56 +0300 Subject: [PATCH 165/385] cudaPackages: fix hash mismatch ... for cuda=10.1 cudnn=7.6.5 --- pkgs/development/libraries/science/math/cudnn/extension.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index 263310f3d7c4..172935fc9794 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -49,7 +49,7 @@ final: prev: let rec { fileVersion = "10.1"; fullVersion = "7.6.5.32"; - hash = "sha256-YAJn8squ0v1Y6yFLpmnY6jXzlqfRm5SCLms2+fcIjCA="; + hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz"; supportedCudaVersions = [ "10.1" ]; } From 7c36b7246b1f429c67f2bac6e3c0dd212d14dea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Apr 2022 02:22:58 +0000 Subject: [PATCH 166/385] kdeltachat: unstable-2022-01-02 -> unstable-2022-03-20 --- .../networking/instant-messengers/kdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 5fe90d50a31a..baa4613b1731 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2022-01-02"; + version = "unstable-2022-03-20"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "ec545c8208c870c44312558f91c79e6ffce4444e"; - hash = "sha256-s/dJ2ahdUK7ODKsna+tl81e+VQLkCAELb/iEXf9WlIM="; + rev = "8cce6d20b49e917929521a13caed30e81037c868"; + hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU="; }; nativeBuildInputs = [ From 8a17c5dba612fdc4d5445d83156e3975ec57ca93 Mon Sep 17 00:00:00 2001 From: Korriee Date: Sun, 10 Apr 2022 18:50:41 -0400 Subject: [PATCH 167/385] gnomeExtensions.arcmenu: 27 -> 30 --- pkgs/desktops/gnome/extensions/arcmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 6e6085485306..be4738286794 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "27"; + version = "30"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-X5oA475Wl3SKVLLcg47Hv91VV8HGeNHhaQLfNi3xt8k="; + sha256 = "sha256-BKV1x/MBqVeiqFzpXYt3y8zwK4f5rcGBwFZWqSSUarg="; }; patches = [ From 28e936ba64c015caa1ce1be21ea7c790898ce336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 11 Apr 2022 01:09:36 +0200 Subject: [PATCH 168/385] nixos/xserver: add excludePackages option to remove packages environment.systemPackages --- nixos/modules/services/x11/xserver.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 0c50d82b23be..2e760e2773d0 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -181,6 +181,13 @@ in ''; }; + excludePackages = mkOption { + default = []; + example = literalExpression "[ pkgs.xterm ]"; + type = types.listOf types.package; + description = "Which X11 packages to exclude from the default environment"; + }; + exportConfiguration = mkOption { type = types.bool; default = false; @@ -655,7 +662,7 @@ in ${cfgPath}.source = xorg.xf86inputevdev.out + "/share" + cfgPath; }); - environment.systemPackages = + environment.systemPackages = pkgs.gnome.removePackagesByName [ xorg.xorgserver.out xorg.xrandr xorg.xrdb @@ -671,7 +678,7 @@ in pkgs.xdg-utils xorg.xf86inputevdev.out # get evdev.4 man page pkgs.nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more - ] + ] config.services.xserver.excludePackages ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; environment.pathsToLink = [ "/share/X11" ]; From f47caf769b0741479b35a37c3473ff947c5ec291 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Mar 2022 04:30:49 +0000 Subject: [PATCH 169/385] nixos/networkd: configure /etc/systemd/networkd.conf The networkd.conf file controls a variety of interesting settings which don't seem to be configurable at the moment, including adding names to route tables (for networkd only, although this commit also exports them into iproute2 for convenience's sake), and the speed metering functionality built into networkd. Importantly, however, this also allows disabling the systemd functionality where it likes to delete all the routes and routing rules that haven't been configured through networkd whenever something causes it to perform a reconfiguration. --- nixos/modules/system/boot/networkd.nix | 136 ++++++++++++++++++++++++- nixos/tests/systemd-networkd.nix | 10 ++ 2 files changed, 145 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index ac1e4ef34b46..3efdd32c4133 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -10,6 +10,36 @@ let check = { + global = { + sectionNetwork = checkUnitConfig "Network" [ + (assertOnlyFields [ + "SpeedMeter" + "SpeedMeterIntervalSec" + "ManageForeignRoutingPolicyRules" + "ManageForeignRoutes" + "RouteTable" + ]) + (assertValueOneOf "SpeedMeter" boolValues) + (assertInt "SpeedMeterIntervalSec") + (assertValueOneOf "ManageForeignRoutingPolicyRules" boolValues) + (assertValueOneOf "ManageForeignRoutes" boolValues) + ]; + + sectionDHCPv4 = checkUnitConfig "DHCPv4" [ + (assertOnlyFields [ + "DUIDType" + "DUIDRawData" + ]) + ]; + + sectionDHCPv6 = checkUnitConfig "DHCPv6" [ + (assertOnlyFields [ + "DUIDType" + "DUIDRawData" + ]) + ]; + }; + link = { sectionLink = checkUnitConfig "Link" [ @@ -867,6 +897,44 @@ let }; }; + networkdOptions = { + networkConfig = mkOption { + default = {}; + example = { SpeedMeter = true; ManageForeignRoutingPolicyRules = false; }; + type = types.addCheck (types.attrsOf unitOption) check.global.sectionNetwork; + description = '' + Each attribute in this set specifies an option in the + [Network] section of the networkd config. + See networkd.conf + 5 for details. + ''; + }; + + dhcpV4Config = mkOption { + default = {}; + example = { DUIDType = "vendor"; }; + type = types.addCheck (types.attrsOf unitOption) check.global.sectionDHCPv4; + description = '' + Each attribute in this set specifies an option in the + [DHCPv4] section of the networkd config. + See networkd.conf + 5 for details. + ''; + }; + + dhcpV6Config = mkOption { + default = {}; + example = { DUIDType = "vendor"; }; + type = types.addCheck (types.attrsOf unitOption) check.global.sectionDHCPv6; + description = '' + Each attribute in this set specifies an option in the + [DHCPv6] section of the networkd config. + See networkd.conf + 5 for details. + ''; + }; + }; + linkOptions = commonNetworkOptions // { # overwrite enable option from above enable = mkOption { @@ -1515,6 +1583,39 @@ let }; }; + networkdConfig = { config, ... }: { + options = { + routeTables = mkOption { + default = {}; + example = { foo = 27; }; + type = with types; attrsOf int; + description = '' + Defines route table names as an attrset of name to number. + See networkd.conf + 5 for details. + ''; + }; + + addRouteTablesToIPRoute2 = mkOption { + default = true; + example = false; + type = types.bool; + description = '' + If true and routeTables are set, then the specified route tables + will also be installed into /etc/iproute2/rt_tables. + ''; + }; + }; + + config = { + networkConfig = optionalAttrs (config.routeTables != { }) { + RouteTable = mapAttrsToList + (name: number: "${name}:${toString number}") + config.routeTables; + }; + }; + }; + commonMatchText = def: optionalString (def.matchConfig != { }) '' [Match] ${attrsToSection def.matchConfig} @@ -1596,6 +1697,20 @@ let + def.extraConfig; }; + renderConfig = def: + { text = '' + [Network] + ${attrsToSection def.networkConfig} + '' + + optionalString (def.dhcpV4Config != { }) '' + [DHCPv4] + ${attrsToSection def.dhcpV4Config} + '' + + optionalString (def.dhcpV6Config != { }) '' + [DHCPv6] + ${attrsToSection def.dhcpV6Config} + ''; }; + networkToUnit = name: def: { inherit (def) enable; text = commonMatchText def @@ -1728,6 +1843,12 @@ in description = "Definition of systemd networks."; }; + systemd.network.config = mkOption { + default = {}; + type = with types; submodule [ { options = networkdOptions; } networkdConfig ]; + description = "Definition of global systemd network config."; + }; + systemd.network.units = mkOption { description = "Definition of networkd units."; default = {}; @@ -1772,7 +1893,9 @@ in systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; aliases = [ "dbus-org.freedesktop.network1.service" ]; - restartTriggers = map (x: x.source) (attrValues unitFiles); + restartTriggers = map (x: x.source) (attrValues unitFiles) ++ [ + config.environment.etc."systemd/networkd.conf".source + ]; }; systemd.services.systemd-networkd-wait-online = { @@ -1791,6 +1914,17 @@ in }; }; + environment.etc."systemd/networkd.conf" = renderConfig cfg.config; + + networking.iproute2 = mkIf (cfg.config.addRouteTablesToIPRoute2 && cfg.config.routeTables != { }) { + enable = mkDefault true; + rttablesExtraConfig = '' + + # Extra tables defined in NixOS systemd.networkd.config.routeTables. + ${concatStringsSep "\n" (mapAttrsToList (name: number: "${toString number} ${name}") cfg.config.routeTables)} + ''; + }; + services.resolved.enable = mkDefault true; }) ]; diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index 7faeae3704ec..6c423f4140b1 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -8,6 +8,9 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { environment.systemPackages = with pkgs; [ wireguard-tools ]; systemd.network = { enable = true; + config = { + routeTables.custom = 23; + }; netdevs = { "90-wg0" = { netdevConfig = { Kind = "wireguard"; Name = "wg0"; }; @@ -39,6 +42,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { address = [ "10.0.0.${nodeId}/32" ]; routes = [ { routeConfig = { Gateway = "10.0.0.${nodeId}"; Destination = "10.0.0.0/24"; }; } + { routeConfig = { Gateway = "10.0.0.${nodeId}"; Destination = "10.0.0.0/24"; Table = "custom"; }; } ]; }; "30-eth1" = { @@ -87,6 +91,12 @@ testScript = '' node1.wait_for_unit("systemd-networkd-wait-online.service") node2.wait_for_unit("systemd-networkd-wait-online.service") + # ================================ + # Networkd Config + # ================================ + node1.succeed("grep RouteTable=custom:23 /etc/systemd/networkd.conf") + node1.succeed("sudo ip route show table custom | grep '10.0.0.0/24 via 10.0.0.1 dev wg0 proto static'") + # ================================ # Wireguard # ================================ From 05d0116368067c29b1866606618839591a182d02 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 10 Apr 2022 21:50:16 -0300 Subject: [PATCH 170/385] acr: init at 2.0.0 --- pkgs/development/tools/misc/acr/default.nix | 33 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/misc/acr/default.nix diff --git a/pkgs/development/tools/misc/acr/default.nix b/pkgs/development/tools/misc/acr/default.nix new file mode 100644 index 000000000000..47a980caddfb --- /dev/null +++ b/pkgs/development/tools/misc/acr/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "acr"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "radareorg"; + repo = "acr"; + rev = version; + hash = "sha256-ma4KhwGFlLCfRQvQ11OdyovgGbKQUBo6qVRrE7V2pNo="; + }; + + preConfigure = '' + chmod +x ./autogen.sh && ./autogen.sh + ''; + + meta = with lib; { + homepage = "https://github.com/radareorg/acr/"; + description = "Pure shell autoconf replacement"; + longDescription = '' + ACR tries to replace autoconf functionality generating a full-compatible + 'configure' script (runtime flags). But using shell-script instead of + m4. This means that ACR is faster, smaller and easy to use. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f596c047184..a72406d6f1a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14441,6 +14441,8 @@ with pkgs; autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { }; autoconf271 = callPackage ../development/tools/misc/autoconf { }; + acr = callPackage ../development/tools/misc/acr { }; + autocutsel = callPackage ../tools/X11/autocutsel{ }; automake = automake116x; From 5980cad677a8d86220f70057a4f2a5b3fe056993 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 01:06:49 +0000 Subject: [PATCH 171/385] python310Packages.sumo: 2.2.5 -> 2.3.0 --- pkgs/development/python-modules/sumo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index 68f298de1080..86ab922c1bfb 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sumo"; - version = "2.2.5"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SMTG-UCL"; repo = "sumo"; - rev = "v${version}"; - sha256 = "1vwqyv215yf51j1278cn7l8mpqmy1grm9j7z3hxjlz4w65cff324"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-apI5Qt7Wrr4FXKL48iqqIQJDX2BIf3PPz/qIgSO7nuo="; }; nativeBuildInputs = [ From 60dc89be41bce80a086872492510a2312f920657 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 01:20:18 +0000 Subject: [PATCH 172/385] alejandra: 1.1.0 -> 1.2.0 --- pkgs/tools/nix/alejandra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index 15d232dbfbba..43b6200972dd 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-vkFKYnSmhPPXtc3AH7iRtqRRqxhj0o5WySqPT+klDWU="; + sha256 = "sha256-35hEJuMvRswOPKb9lbB9ZuHVe0eJN6WJc4T8Frn0hYQ="; }; - cargoSha256 = "sha256-MsXaanznE4UtZMj54EDq86aJ2t4xT8O5ziTpa/KCwBw="; + cargoSha256 = "sha256-SsIpggbRQPjpCYgCG4sSJ022MmMV4bJJ8UAHcJR74O8="; passthru.tests = { version = testVersion { package = alejandra; }; From a7fc2f6392be849f811c0a3f29f559311dc695df Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 11 Apr 2022 01:28:55 +0000 Subject: [PATCH 173/385] autoPatchelfHook: more precise dependency ignorance --- doc/stdenv/stdenv.chapter.md | 2 +- .../setup-hooks/auto-patchelf.py | 40 +++++++++++-------- .../setup-hooks/auto-patchelf.sh | 9 ++++- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 7019ae89db74..40f295b178bb 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1043,7 +1043,7 @@ You can also specify a `runtimeDependencies` variable which lists dependencies t In certain situations you may want to run the main command (`autoPatchelf`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchelf` environment variable to a non-empty value. -By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. +By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchelfIgnoreMissingDeps` can be set to a list like `autoPatchelfIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to simply `[ "*" ]` to ignore all missing dependencies. The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/build-support/setup-hooks/auto-patchelf.py index 26fd623e3da0..861d772698d0 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.py +++ b/pkgs/build-support/setup-hooks/auto-patchelf.py @@ -1,23 +1,21 @@ #!/usr/bin/env python3 -from collections import defaultdict -from contextlib import contextmanager -from dataclasses import dataclass -from elftools.common.exceptions import ELFError # type: ignore -from elftools.elf.dynamic import DynamicSection # type: ignore -from elftools.elf.elffile import ELFFile # type: ignore -from elftools.elf.enums import ENUM_E_TYPE, ENUM_EI_OSABI # type: ignore -from itertools import chain -from pathlib import Path, PurePath - -from typing import Tuple, Optional, Iterator, List, DefaultDict, Set - import argparse import os import pprint import subprocess import sys +from collections import defaultdict +from contextlib import contextmanager +from dataclasses import dataclass +from itertools import chain +from pathlib import Path, PurePath +from typing import DefaultDict, Iterator, List, Optional, Set, Tuple +from elftools.common.exceptions import ELFError # type: ignore +from elftools.elf.dynamic import DynamicSection # type: ignore +from elftools.elf.elffile import ELFFile # type: ignore +from elftools.elf.enums import ENUM_E_TYPE, ENUM_EI_OSABI # type: ignore @contextmanager @@ -246,7 +244,7 @@ def auto_patchelf( lib_dirs: List[Path], runtime_deps: List[Path], recursive: bool =True, - ignore_missing: bool =False) -> None: + ignore_missing: List[str] = []) -> None: if not paths_to_patch: sys.exit("No paths to patch, stopping.") @@ -264,12 +262,19 @@ def auto_patchelf( missing = [dep for dep in dependencies if not dep.found] # Print a summary of the missing dependencies at the end + print(f"auto-patchelf: {len(missing)} dependencies could not be satisfied") + failure = False for dep in missing: - print(f"auto-patchelf could not satisfy dependency {dep.name} wanted by {dep.file}") + if dep.name.name in ignore_missing or "*" in ignore_missing: + print(f"warn: auto-patchelf ignoring missing {dep.name} wanted by {dep.file}") + else: + print(f"error: auto-patchelf could not satisfy dependency {dep.name} wanted by {dep.file}") + failure = True - if missing and not ignore_missing: + if failure: sys.exit('auto-patchelf failed to find all the required dependencies.\n' - 'Add the missing dependencies to --libs or use --ignore-missing.') + 'Add the missing dependencies to --libs or use ' + '`--ignore-missing="foo.so.1 bar.so etc.so"`.') def main() -> None: @@ -280,7 +285,8 @@ def main() -> None: 'libraries in the provided paths.') parser.add_argument( "--ignore-missing", - action="store_true", + nargs="*", + type=str, help="Do not fail when some dependencies are not found.") parser.add_argument( "--no-recurse", diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 9822674196ae..661b8597efea 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -53,10 +53,17 @@ autoPatchelf() { esac done + if [ "${autoPatchelfIgnoreMissingDeps[*]}" == "1" ]; then + echo "autoPatchelf: WARNING: setting 'autoPatchelfIgnoreMissingDeps" \ + "= true;' is deprecated and will be removed in a future release." \ + "Use 'autoPatchelfIgnoreMissingDeps = [ \"*\" ];' instead." >&2 + autoPatchelfIgnoreMissingDeps=( "*" ) + fi + local runtimeDependenciesArray=($runtimeDependencies) @pythonInterpreter@ @autoPatchelfScript@ \ ${norecurse:+--no-recurse} \ - ${autoPatchelfIgnoreMissingDeps:+--ignore-missing} \ + --ignore-missing "${autoPatchelfIgnoreMissingDeps[@]}" \ --paths "$@" \ --libs "${autoPatchelfLibs[@]}" \ "${extraAutoPatchelfLibs[@]}" \ From 3d558785a1c5a173b5d23e606ed998610582ef7e Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 11 Apr 2022 01:29:01 +0000 Subject: [PATCH 174/385] openvino: autoPatchelfIgnoreMissingDeps is now a list --- pkgs/development/libraries/openvino/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 86bc3b0d009c..6e253b973180 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { cd ../build ''; - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = [ "libngraph_backend.so" ]; nativeBuildInputs = [ cmake From 3a84954a8983e6bb23d9ce2710df3fe393dd89d7 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 11 Apr 2022 01:29:06 +0000 Subject: [PATCH 175/385] alttpr-opentracker: autoPatchelfIgnoreMissingDeps is now a list --- pkgs/tools/games/opentracker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index 6386d5daaf0e..c6e3987b81c8 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -52,7 +52,7 @@ buildDotnetModule rec { xinput ]; - autoPatchelfIgnoreMissingDeps = true; # Attempts to patchelf unneeded SOs + autoPatchelfIgnoreMissingDeps = [ "libc.musl-x86_64.so.1" ]; # Attempts to patchelf unneeded SOs meta = with lib; { description = "A tracking application for A Link to the Past Randomizer"; From a2c44cba88f13909fdf39c5678bd96962144d705 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 01:30:15 +0000 Subject: [PATCH 176/385] discordchatexporter-cli: 2.33.2 -> 2.34 --- pkgs/tools/backup/discordchatexporter-cli/default.nix | 4 ++-- pkgs/tools/backup/discordchatexporter-cli/deps.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index d2a9bd2563ef..8e98ea3c7c28 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.33.2"; + version = "2.34"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "wOSa6O3O4QlGL5ecnR14ldXPYV5mDoPDlJjcwN5Lrek="; + sha256 = "EHpnLUFHR+FC1qlwW0TuLas9aA/CMELHkzbLlNyiwgE="; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index 92bf39b58ef5..ecc872877763 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -2,9 +2,9 @@ (fetchNuGet { pname = "CliFx"; version = "2.2.2"; sha256 = "13g5xlrbyhnbwkyzic5jlhxl0kpvkfrdmb5h2rdf9yp4gp5p9mwg"; }) (fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) - (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.0"; sha256 = "1rbgkm1hsamqhviw2c62g6iafiwkxcnz66qbybpd32qgz1124cx4"; }) - (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.0"; sha256 = "0zm0l97jfbfy90zj0cbi7v3qbhxhfay1g8f2cw0gp829xz4yk9jr"; }) + (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.1"; sha256 = "1mrjw3vq59pbiqvayilazjgv6l87j20j8hmhcpbacz9p5bl1hvvr"; }) + (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.1"; sha256 = "18qx0rzp4xz4ng9yc0c2bcpa4ky6sfiz10828y4j9ymywas7yzxw"; }) (fetchNuGet { pname = "Polly"; version = "7.2.3"; sha256 = "1iws4jd5iqj5nlfp16fg9p5vfqqas1si0cgh8xcj64y433a933cv"; }) - (fetchNuGet { pname = "Spectre.Console"; version = "0.43.0"; sha256 = "17yh20s17fkcs3iyb5yylqh90jvb36gdn0aaglq3d67rpmcrl5gc"; }) + (fetchNuGet { pname = "Spectre.Console"; version = "0.44.0"; sha256 = "0f4q52rmib0q3vg7ij6z73mnymyas7c7wrm8dfdhrkdzn53zwl6p"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) ] From 4093d69e477c08788e9f09c7368650ec9da1d6a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 01:42:43 +0000 Subject: [PATCH 177/385] dsq: 0.12.0 -> 0.13.0 --- pkgs/tools/misc/dsq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 72a38cf1eaf3..f1e9d53e3fad 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "dsq"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-AxYqSCdCrhHrN21WGJtg0KIde8VAjj6bF7DzELZptj8="; + hash = "sha256-6Rdw/bXIcIoQ/PsVtJKSlwIhCxSlISPmmb2lGbp8vVM="; }; - vendorSha256 = "sha256-aER7j/DG1WB5DZhvgXYrl19UwQ/lZLPRAptINVJ3rdI="; + vendorSha256 = "sha256-hZeI1XqW1lk9F66TVirkpvCZrJb9MO8aS1Sx/R92ddc="; nativeBuildInputs = [ diffutils ]; From 8f07a30e7df58088f6b7837904ad97a47952bcbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 02:00:21 +0000 Subject: [PATCH 178/385] astc-encoder: 3.5 -> 3.6 --- pkgs/tools/graphics/astc-encoder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 2b55113b4f95..8e7f71e68a47 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { gccStdenv.mkDerivation rec { pname = "astc-encoder"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-vsnU592UDQfBuh9XWzw12wANkQBoUxznpOD9efCUKA0="; + sha256 = "sha256-TzVO2xQOuE87h8j4UwkpnAaFwkvy5dZge8zDNR/mVf0="; }; nativeBuildInputs = [ cmake ]; From e2e68e29f9647a19a0c62809f1bc259f1a6d0ddf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 10 Apr 2022 21:15:31 -0500 Subject: [PATCH 179/385] libsForQt5.bismuth: 3.0.0 -> 3.1.0 https://github.com/Bismuth-Forge/bismuth/releases/tag/v3.1.0 --- pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index cfa58c0078ea..997e9d873d72 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "bismuth"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Bismuth-Forge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6kSqZtJijQBqvYcyAoSRLl/RxgUubst2SJw/adiBIj4="; + sha256 = "sha256-kvWrhDbC7nqz810dE42xbd430OSkTN42Hkl6fXR90as="; }; cmakeFlags = [ From d4071bd1fcd27d62f7cd1eafe026511008aebc0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 03:49:04 +0000 Subject: [PATCH 180/385] python310Packages.env-canada: 0.5.22 -> 0.5.23 --- pkgs/development/python-modules/env-canada/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 9ec0dda4bc51..216168b51131 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.22"; + version = "0.5.23"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; - rev = "v${version}"; - sha256 = "sha256-3dqG3wlFlGCI3Ymq5rpoNpmeU36WCQ4Iya5m5mCAVFI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ksQQ3jujfu2XR0ZaR5fc8GNYDL8Tos+8U4OHS1mMyRY="; }; propagatedBuildInputs = [ From cc90d526933904f7fe8e39236a98b31154dcc581 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 03:37:46 +0000 Subject: [PATCH 181/385] terraform-providers: update 2022-04-11 --- .../terraform-providers/providers.json | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0df988b9f98a..f78fd4fc20b9 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.162.0", - "sha256": "sha256-xqZv15Tst+7o9HhNu6/bW+a4z7FTkra+MfS8jKrfeNs=", - "vendorSha256": "sha256-RbOf/S0rkbhW0s+/YOqu+BQuE0V4aS2x36Xf+hgBkqY=", - "version": "1.162.0" + "rev": "v1.163.0", + "sha256": "sha256-lSg8jAzQfRc++U6zAhkfbVf/+hIW/1Nov35o6M8mRrw=", + "vendorSha256": "sha256-8dAk23ISxYuYKj5s0W6g93RBW1++NuZEPva5MaNBSyw=", + "version": "1.163.0" }, "ansible": { "owner": "nbering", @@ -76,10 +76,10 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/avi", "repo": "terraform-provider-avi", - "rev": "v21.1.3", - "sha256": "160l9864p73283hc27qaabd3lrh7lm8fyh6k9xlal5isfd9vrm5p", - "vendorSha256": "1hw1xp20nhs4p1q9l887m82456fg5977pm66165gdkczwrq2zr6v", - "version": "21.1.3" + "rev": "v21.1.4", + "sha256": "sha256-6H56TRA3I0CQ9/d8JdP5JNL0u3lpS8YhCvdSM5bxYp8=", + "vendorSha256": "sha256-b0MwGmgugZdmVk7ZVBSCivDQ4n+tLABymH/igo/S1Wc=", + "version": "21.1.4" }, "aviatrix": { "owner": "AviatrixSystems", @@ -148,10 +148,10 @@ "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.13.1", - "sha256": "sha256-P/6scAuRMRrACHmEdWjn+W37ptVmVgtj+iTXQDrG+WM=", - "vendorSha256": "sha256-o1CZ4VuGCPALqSIz8KSm1zCwd3r9bR13CRvP7XpVBAM=", - "version": "2.13.1" + "rev": "v2.14.0", + "sha256": "sha256-tF1Q55mxwPU6dziiNzdacNtHvemd9ciQHE2E6een1WY=", + "vendorSha256": "sha256-L8QYz1xgw8ZQjrU33uP18XxNUjImPYATZ02h46G4aXs=", + "version": "2.14.0" }, "brightbox": { "owner": "brightbox", @@ -194,10 +194,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.12.0", - "sha256": "sha256-y2qq0asEnhnOjthLBFxyQjf1N5KNlXXK0eXjT1/vCXg=", + "rev": "v3.12.1", + "sha256": "sha256-8l6+hyjW+N3N5OGj/cviH97EFqouSrnJULk/SXrYCTk=", "vendorSha256": "sha256-v6fUzYwrYt4rk5LT0LyNd8e9X79r3dwtd3s1QIV/w/s=", - "version": "3.12.0" + "version": "3.12.1" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -754,10 +754,10 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/nsxt", "repo": "terraform-provider-nsxt", - "rev": "v3.2.5", - "sha256": "0j5kspfmqxdnvk3sfb476rckkn9fdgpw5haf495901a114wynr2l", + "rev": "v3.2.6", + "sha256": "sha256-1uQMjzqMJ1NQVVCXy5aHrrZ4vDK5s1JqUnLyYf1qLVw=", "vendorSha256": null, - "version": "3.2.5" + "version": "3.2.6" }, "null": { "owner": "hashicorp", @@ -791,10 +791,10 @@ "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.22.1", - "sha256": "sha256-G1KJJSxJmzFlIUWOs+7htcgp61oWCu+ryCKaIHzxhzw=", - "vendorSha256": "sha256-n7ih8QtapA+xno1twlM2b2XGEesdJdJIPD+QWpmJDVA=", - "version": "3.22.1" + "rev": "v3.23.0", + "sha256": "sha256-azqWTQA4FW79U+GrdCBO4BWA5c+Cce3ELANS2Os5bSs=", + "vendorSha256": "sha256-S4HVfl/PbgpgWFedkWM+EGyYAL5P0cdkLMYL+y+aX8w=", + "version": "3.23.0" }, "oktaasa": { "owner": "oktadeveloper", From aa58c15998c62722e8a77b5f1eaa47af76f38d5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 04:15:26 +0000 Subject: [PATCH 182/385] checkip: 0.19.0 -> 0.24.5 --- 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 fb30ad59dff3..7959bdaa83ea 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.19.0"; + version = "0.24.5"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h8YZGTjEEQb68TrwMDnAqCJWkNPSuWSAJKcOMLXwXio="; + sha256 = "sha256-/sTagdlWU6hU3TTeJcZ8WK4TqmvxgUbC5eLBz2FH6Jo="; }; vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc="; From 0caca7c40f4c44f065d7bd4156d0ada550ce77e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 04:25:08 +0000 Subject: [PATCH 183/385] chezmoi: 2.15.0 -> 2.15.1 --- pkgs/tools/misc/chezmoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 35e3032f6131..00d0ef3361f8 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.15.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-P4ELrDcN6kIpIsKgZJppJv+y+ofnEz7McmGvCijnfQA="; + sha256 = "sha256-spIdY28ZC/+6bwWWwKW7Iu2E2eKD7MeRuxEAMN2e3H8="; }; vendorSha256 = "sha256-D27a107gjHK4NYkJhZDd0SvhUmmRSl3DX519nglAoPo="; From 4ac8a78cbb9a03caba9675ad474cd55e6eba2168 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 6 Apr 2022 01:49:49 -0500 Subject: [PATCH 184/385] netcdf: disable tests on aarch64-darwin --- pkgs/development/libraries/netcdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 27af3be4f2df..fe51d4b524a5 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { remove-references-to -t ${stdenv.cc} "$(readlink -f $out/lib/libnetcdf.settings)" ''; - doCheck = !mpiSupport; + doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64)); meta = { description = "Libraries for the Unidata network Common Data Format"; From e321a614e2707dbec7fa7d876d9d869d426a45ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 03:20:40 +0000 Subject: [PATCH 185/385] bullet: 3.22a -> 3.22b --- pkgs/development/libraries/bullet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 6a33d2ce2043..e37da386cd6d 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "bullet"; - version = "3.22a"; + version = "3.22b"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "sha256-Ng+kg720y69aE0FgTnD60F05zwUX/LzLlImnrODzOuo="; + sha256 = "sha256-hf2b7enh9mziPKFcdU8NwLdhcxhV7Ididf9Bwwa+5/M="; }; nativeBuildInputs = [ cmake ]; From 8505845d24e6976a0f653c1ae490c21f6653845b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 04:46:37 +0000 Subject: [PATCH 186/385] cmctl: 1.7.2 -> 1.8.0 --- pkgs/applications/networking/cluster/cmctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index df34db0e1476..86c7eddd7ab0 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cmctl"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - sha256 = "sha256-Hx6MG5GCZyOX0tfpg1bfUT0BOI3p7Mws1VCz2PuUuw8="; + sha256 = "sha256-h7GyzjVrfyMHY7yuNmmsym6KGKCQr5R71gjPBTUeMCg="; }; - vendorSha256 = "sha256-4zhdpedOmLl/i1G0QCto4ACxguWRZLzOm5HfMBMtvPY="; + vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI="; subPackages = [ "cmd/ctl" ]; From fa4f79ef636870ef01b1d12ee0645ab9d1b99413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Apr 2022 03:17:17 +0000 Subject: [PATCH 187/385] abcmidi: 2022.02.21 -> 2022.03.20 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 17f4d8848481..88fc66602459 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.02.21"; + version = "2022.03.20"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-oGGtJhVugqTvXD34Q2f8L5qoYoyyT5JjuBhqh4VYAAo="; + hash = "sha256-4PN4XL9Jx+vcT2QCA6GwomIqP7lRXkyBkRz641tephw="; }; meta = with lib; { From 6bfb28f90db9e022491f05fc9f6c6457d5468b38 Mon Sep 17 00:00:00 2001 From: Julien Debon Date: Wed, 26 Jan 2022 11:31:17 +0100 Subject: [PATCH 188/385] unixODBCDrivers.redshift: init at 1.4.49.1000 Add Amazon Redshift ODBC driver. As Amazon does not provide sources, we extract the Debian package and manually patchelf. --- .../libraries/unixODBCDrivers/default.nix | 49 +++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 9b4173a6da13..40ce63965938 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -21,7 +21,7 @@ meta = with lib; { description = "Official PostgreSQL ODBC Driver"; - homepage = "https://odbc.postgresql.org/"; + homepage = "https://odbc.postgresql.org/"; license = licenses.lgpl2; platforms = platforms.linux; }; @@ -62,7 +62,7 @@ meta = with lib; { description = "MariaDB ODBC database driver"; - homepage = "https://downloads.mariadb.org/connector-odbc/"; + homepage = "https://downloads.mariadb.org/connector-odbc/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; @@ -89,7 +89,7 @@ }; meta = with lib; { - description = "MariaDB ODBC database driver"; + description = "MySQL ODBC database driver"; homepage = "https://dev.mysql.com/downloads/connector/odbc/"; license = licenses.gpl2; platforms = platforms.linux; @@ -174,4 +174,47 @@ maintainers = with maintainers; [ spencerjanssen ]; }; }; + + redshift = stdenv.mkDerivation rec { + pname = "redshift-odbc"; + version = "1.4.49.1000"; + + src = fetchurl { + url = "https://s3.amazonaws.com/redshift-downloads/drivers/odbc/${version}/AmazonRedshiftODBC-64-bit-${version}-1.x86_64.deb"; + sha256 = "sha256-r5HvsZjB7+x+ClxtWoONkE1/NAbz90NbHfzxC6tf7jA="; + }; + + nativeBuildInputs = [ dpkg ]; + + unpackPhase = '' + dpkg -x $src src + cd src + ''; + + # `unixODBC` is loaded with `dlopen`, so `autoPatchElfHook` cannot see it, and `patchELF` phase would strip the manual patchelf. Thus: + # - Manually patchelf with `unixODCB` libraries + # - Disable automatic `patchELF` phase + installPhase = '' + mkdir -p $out/lib + cp opt/amazon/redshiftodbc/lib/64/* $out/lib + patchelf --set-rpath ${unixODBC}/lib/ $out/lib/libamazonredshiftodbc64.so + ''; + + dontPatchELF = true; + + buildInputs = [ unixODBC ]; + + passthru = { + fancyName = "Amazon Redshift (x64)"; + driver = "lib/libamazonredshiftodbc64.so"; + }; + + meta = with lib; { + description = "Amazon Redshift ODBC driver"; + homepage = "https://docs.aws.amazon.com/redshift/latest/mgmt/configure-odbc-connection.html"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ sir4ur0n ]; + }; + }; } From e37855ba15f544eded14129d1759f789c69069ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 06:22:43 +0000 Subject: [PATCH 189/385] dnsproxy: 0.42.0 -> 0.42.1 --- 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 2800496aae9a..c9044cb92ac4 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.42.0"; + version = "0.42.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UXFDFS2TFzo7DcExazt4h0TTnGeMf6d3FAiPXZWB7Ys="; + sha256 = "sha256-m4Xc5ZorsO6WcbHmJGROJ8SsPCm/KmFapQRQZTZIQKw="; }; vendorSha256 = null; From 17867e6fbccdfc8f8200490785e0151da61067b9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 11 Apr 2022 09:29:25 +0300 Subject: [PATCH 190/385] lapce: 0.0.10 -> 0.0.12 --- pkgs/applications/editors/lapce/default.nix | 8 ++--- .../editors/lapce/fix-version.patch | 31 ------------------- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 pkgs/applications/editors/lapce/fix-version.patch diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 2653806a14f3..2da2a1f46773 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -21,18 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.0.10"; + version = "0.0.12"; src = fetchFromGitHub { owner = "lapce"; repo = pname; rev = "v${version}"; - sha256 = "tOVFm4DFQurFU4DtpPwxXQLbTGCZnrV1FfYKtvkRxRE="; + sha256 = "sha256-ZFQjQ5+G0b0Fgg3+du/drt+62rC/TCNR5MIdJXAkTrE="; }; - cargoPatches = [ ./fix-version.patch ]; - - cargoSha256 = "BwB3KgmI5XnZ5uHv6f+kGKBzpyxPWcoKvF7qw90eorI="; + cargoSha256 = "sha256-sMTootPsenaWzLLFImo6HWC1pcm2uFupPhVWsUJp1Ak="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/editors/lapce/fix-version.patch b/pkgs/applications/editors/lapce/fix-version.patch deleted file mode 100644 index 2a8d96be1696..000000000000 --- a/pkgs/applications/editors/lapce/fix-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index bc9a0f8..45a74ad 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2165,7 +2165,7 @@ dependencies = [ - - [[package]] - name = "lapce" --version = "0.0.9" -+version = "0.0.10" - dependencies = [ - "lapce-core", - "lapce-proxy", -@@ -2173,7 +2173,7 @@ dependencies = [ - - [[package]] - name = "lapce-core" --version = "0.0.9" -+version = "0.0.10" - dependencies = [ - "Inflector", - "alacritty_terminal 0.15.0", -@@ -2233,7 +2233,7 @@ dependencies = [ - - [[package]] - name = "lapce-proxy" --version = "0.0.9" -+version = "0.0.10" - dependencies = [ - "alacritty_terminal 0.16.0-rc2", - "anyhow", From e5ca3bbc0a2116528f2a58c2bffb8bbb151aa1cf Mon Sep 17 00:00:00 2001 From: barinov274 Date: Fri, 8 Apr 2022 20:38:05 +1000 Subject: [PATCH 191/385] unigine-tropics: init at 1.3 --- .../graphics/unigine-tropics/default.nix | 95 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 97 insertions(+) create mode 100644 pkgs/applications/graphics/unigine-tropics/default.nix diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix new file mode 100644 index 000000000000..1057c2fa6cad --- /dev/null +++ b/pkgs/applications/graphics/unigine-tropics/default.nix @@ -0,0 +1,95 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, libX11 +, libXext +, libXrandr +, libXinerama +, libglvnd +, openal +, glibc +, makeDesktopItem +, copyDesktopItems +, imagemagick +}: +let + version = "1.3"; +in +stdenv.mkDerivation { + pname = "unigine-tropics"; + inherit version; + + src = fetchurl { + url = "http://m12-assets.unigine.com/d/Unigine_Tropics-${version}.run"; + sha256 = "0icasdp46fjnic7gk83pknjx0gpap9j202dm0llcfg5zin5kbq7x"; + }; + + libPath = lib.makeLibraryPath [ + libglvnd + openal + glibc + ]; + + installPhase = '' + bash $src --target $name + + install -D -m 0755 $name/bin/libUnigine_x86.so $out/lib/unigine/tropics/bin/libUnigine_x86.so + install -D -m 0755 $name/bin/Tropics $out/lib/unigine/tropics/bin/Tropics + install -D -m 0755 $name/1024x768_windowed.sh $out/bin/Tropics + + cp -R $name/data $out/lib/unigine/tropics + + wrapProgram $out/bin/Tropics \ + --prefix LD_LIBRARY_PATH : $libPath:$out/lib/unigine/tropics/bin \ + --run "cd $out/lib/unigine/tropics" + + convert -size 256x256 xc:Transparent -fill gradient:'dodgerblue-white' -stroke Transparent -draw "roundrectangle 0,0 256,256 50,50" $name/icon.png + convert $name/icon.png -fill white -stroke white -draw "polygon 69.2564,84.1261 117.9,84.1261 117.9,206.56 138.1,206.56 138.1,84.1261 186.744,84.1261 186.744,65.9877 69.2564,65.9877 69.2564,84.1261" $name/icon.png + + for RES in 16 24 32 48 64 128 256 + do + mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps + convert $name/icon.png -resize "$RES"x"$RES" $out/share/icons/hicolor/"$RES"x"$RES"/apps/Tropics.png + done + convert $name/icon.png -resize 128x128 $out/share/icons/Tropics.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Tropics"; + exec = "Tropics"; + genericName = "A GPU Stress test tool from the UNIGINE"; + icon = "Tropics"; + desktopName = "Tropics Benchmark"; + }) + ]; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + imagemagick + copyDesktopItems + ]; + + buildInputs = [ + stdenv.cc.cc + libX11 + libXext + libXrandr + libXinerama + ]; + + dontUnpack = true; + + meta = { + description = "The Unigine Heaven GPU benchmarking tool"; + homepage = "https://benchmark.unigine.com/tropics"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.BarinovMaxim ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93670a15f35a..7062b1f09d0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29677,6 +29677,8 @@ with pkgs; unigine-heaven = callPackage ../applications/graphics/unigine-heaven { }; + unigine-tropics = pkgsi686Linux.callPackage ../applications/graphics/unigine-tropics { }; + unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { }; unipicker = callPackage ../applications/misc/unipicker { }; From a59b03b38a8139dbc70ddf4198e018253ca0ecf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 06:57:05 +0000 Subject: [PATCH 192/385] ejson2env: 2.0.2 -> 2.0.4 --- pkgs/tools/admin/ejson2env/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix index cb82a689e943..9e873d467e1f 100644 --- a/pkgs/tools/admin/ejson2env/default.nix +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ejson2env"; - version = "2.0.2"; + version = "2.0.4"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1nfMmjYKRo5vjOwLb3fX9SQ0CDHme1DAz0AGGpV4piI="; + sha256 = "sha256-Oc0fWihOUafYN5t9SxHxaYJEv5e46CCDNe4xo+Dcjrs="; }; - vendorSha256 = "sha256-lais54Gm4UGJN8D+iFbP8utTfDr+v8qXZKLdpNKzJi8="; + vendorSha256 = "sha256-BY45WirK9AVhvFGB5uqI4dLxzO2WuNNhhJbQ6nsRXao="; meta = with lib; { description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo."; From adc727d6f8367a1e84326007d2ef1a724575252e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 07:32:30 +0000 Subject: [PATCH 193/385] python310Packages.editables: 0.2 -> 0.3 --- pkgs/development/python-modules/editables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix index ee902d772c99..e5deb02af52f 100644 --- a/pkgs/development/python-modules/editables/default.nix +++ b/pkgs/development/python-modules/editables/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "editables"; - version = "0.2"; + version = "0.3"; src = fetchPypi { inherit pname version; - sha256 = "6918f16225258f24ef9800c2327e14eded42ddac344e77982380749464024f35"; + sha256 = "sha256-FnUk43c1jtHxN05hwmjw16S/fb0EbGVve0EM3hYWGxo="; }; checkInputs = [ From 68a880ecb172c3f94acdc344da2124ca5e44eea0 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 11 Apr 2022 09:37:15 +0200 Subject: [PATCH 194/385] difftastic: 0.26.0 -> 0.26.3 --- pkgs/tools/text/difftastic/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 1bc18749c652..12ad1a764fb2 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -1,17 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform, tree-sitter }: +{ lib, fetchFromGitHub, rustPlatform, tree-sitter, difftastic, testVersion }: rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.26.0"; + version = "0.26.3"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-bluiRWueb9+UG+8jCwm+Xc483dSvoxwu+HP02I0DZBs="; + sha256 = "11qvl78dskhawmzjbff2cd4icwvlfhg8hzf1law5w5cr768zv7yn"; }; - cargoSha256 = "sha256-nVYPvYt3Sr1VxoXiaFhpiAh+vngklsr6vn1jfBUg4C4="; + cargoSha256 = "1kmwd9m94kl3j6ajfndr7rjx66fsqvnn2jh0m54ac5qd5r9hhdc8"; + + passthru.tests.version = testVersion { package = difftastic; }; meta = with lib; { description = "A syntax-aware diff"; From af0e1375e412cd1dd063443ddf99ade6a661fe62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 08:16:16 +0000 Subject: [PATCH 195/385] faustPhysicalModeling: 2.37.3 -> 2.40.0 --- pkgs/applications/audio/faustPhysicalModeling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index f9dbd3f80f0c..bea08b0bfc9f 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.37.3"; + version = "2.40.0"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-h6L+qRkN2chnI4821WrjD3uRFw3J0sUYVLL8w57vR1U="; + sha256 = "sha256-t3I3j5s2ACHfub+fxxaTwu+5ptEwH0JQpVdmHYOzbCA="; }; buildInputs = [ faust2jaqt faust2lv2 ]; From 7fbeeb5382b061cc384b0ba763fdf8926ea8ee00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 08:23:49 +0000 Subject: [PATCH 196/385] fennel: 1.0.0 -> 1.1.0 --- pkgs/development/compilers/fennel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fennel/default.nix b/pkgs/development/compilers/fennel/default.nix index ec6b3d619e1c..e449b4ef098e 100644 --- a/pkgs/development/compilers/fennel/default.nix +++ b/pkgs/development/compilers/fennel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fennel"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromSourcehut { owner = "~technomancy"; repo = pname; rev = version; - sha256 = "sha256-HhxFTWC1gBY76pQzhn6EdgYHpYQr9zkUox0r4YC7mTQ="; + sha256 = "sha256-3Pfl/KNwuGCkZjG/FlF6K2IQHwJQbWsCBmJpLizr1ng="; }; nativeBuildInputs = [ installShellFiles ]; From 7f67b9d301d443383f961e4597eec41a3e32850a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 08:28:58 +0000 Subject: [PATCH 197/385] fits-cloudctl: 0.10.12 -> 0.10.13 --- pkgs/tools/admin/fits-cloudctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index f53315613e7c..fe0670f36aa0 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.12"; + version = "0.10.13"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-nFxudeJJ5BkfZxSnRquyATHyHwI+7xwfQxiY8cedtis="; + sha256 = "sha256-8MSX8A/3FY95rrWuYfGYFynSi76JPcHX+N8VF9BWktM="; }; - vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o="; + vendorSha256 = "sha256-K6HI7aSDbrhqm2XVor7sRwHnqQPQlpZYGLgaf3SFNrU="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; From a82378a76a28e0da67572cda4dc1f04eed0af9d9 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 11 Apr 2022 10:38:44 +0200 Subject: [PATCH 198/385] pcmsolver: fix glibc >= 2.34 compatibility related to https://github.com/PCMSolver/pcmsolver/issues/197. This is a temporary workaround until we have a proper fix from upstream --- pkgs/development/libraries/pcmsolver/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/development/libraries/pcmsolver/default.nix index dd94a4a088cb..2b04274d43ba 100644 --- a/pkgs/development/libraries/pcmsolver/default.nix +++ b/pkgs/development/libraries/pcmsolver/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { sha256= "0jrxr8z21hjy7ik999hna9rdqy221kbkl3qkb06xw7g80rc9x9yr"; }; + # Glibc 2.34 changed SIGSTKSZ to a dynamic value, which breaks + # PCMsolver. Replace SIGSTKZ by the backward-compatible _SC_SIGSTKSZ. + postPatch = '' + substituteInPlace external/Catch/catch.hpp \ + --replace SIGSTKSZ _SC_SIGSTKSZ + ''; + nativeBuildInputs = [ cmake gfortran From 2c1e621741d74d88b8983cfb186713f6b5925c43 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 11 Apr 2022 10:39:41 +0200 Subject: [PATCH 199/385] pcmsolver: replace python2 by python3 as build dependency --- pkgs/development/libraries/pcmsolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/development/libraries/pcmsolver/default.nix index 2b04274d43ba..a957d517bf7a 100644 --- a/pkgs/development/libraries/pcmsolver/default.nix +++ b/pkgs/development/libraries/pcmsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python2 +{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python3 , boost, eigen, zlib } : @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmake gfortran perl - python2 + python3 ]; buildInputs = [ From 0fc325059423e2e38fda7373ea3448a30fca1484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 11 Apr 2022 10:49:00 +0200 Subject: [PATCH 200/385] wezterm: 20220319-142410-0fcdea07 -> 20220408-101518-b908e2dd --- pkgs/applications/terminal-emulators/wezterm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 6d1276035c13..17ee157a4406 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220319-142410-0fcdea07"; + version = "20220408-101518-b908e2dd"; outputs = [ "out" "terminfo" ]; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-KmIlfzSbVY003WesodN5srJ7qEQaU93izmrZW1MobCo="; + sha256 = "sha256-kuuoD+hqgj7QXFRIxa112oc4idtcK0ptFACDpI0bzGY="; }; postPatch = '' @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-+Iu6/pd14O1QIsLkHe7fTP30XyI+8J0GiRY8cnRPS5I="; + cargoSha256 = "sha256-iIb2zLUZpn23ooEiOP+yQMYUUmvef/KqvjzgLOFmjs0="; nativeBuildInputs = [ pkg-config From 2055f85304933814a367e816d010d769d6c4cb16 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Sun, 30 Jan 2022 18:37:55 +0100 Subject: [PATCH 201/385] wolfram-engine: init at 13.0.1 Co-authored-by: Sandro --- .../science/math/wolfram-engine/default.nix | 143 ++++++++++++++++++ .../science/math/wolfram-engine/l10ns.nix | 51 +++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 196 insertions(+) create mode 100644 pkgs/applications/science/math/wolfram-engine/default.nix create mode 100644 pkgs/applications/science/math/wolfram-engine/l10ns.nix diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix new file mode 100644 index 000000000000..df9e2f88dfca --- /dev/null +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -0,0 +1,143 @@ +{ lib +, stdenv +, autoPatchelfHook +, requireFile +, callPackage +, makeWrapper +, alsa-lib +, dbus +, fontconfig +, freetype +, gcc +, glib +, installShellFiles +, libssh2 +, ncurses +, opencv4 +, openssl +, unixODBC +, xkeyboard_config +, xorg +, zlib +, libxml2 +, libuuid +, lang ? "en" +, libGL +, libGLU +}: + +let + l10n = import ./l10ns.nix { + lib = lib; + inherit requireFile lang; + }; + dirName = "WolframEngine"; +in +stdenv.mkDerivation rec { + inherit (l10n) version name src; + + nativeBuildInputs = [ + autoPatchelfHook + installShellFiles + makeWrapper + ]; + + buildInputs = [ + alsa-lib + dbus + fontconfig + freetype + gcc.cc + gcc.libc + glib + libssh2 + ncurses + opencv4 + openssl + stdenv.cc.cc.lib + unixODBC + xkeyboard_config + libxml2 + libuuid + zlib + libGL + libGLU + ] ++ (with xorg; [ + libX11 + libXext + libXtst + libXi + libXmu + libXrender + libxcb + libXcursor + libXfixes + libXrandr + libICE + libSM + ]); + + # some bundled libs are found through LD_LIBRARY_PATH + autoPatchelfIgnoreMissingDeps = true; + + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); + + unpackPhase = '' + # find offset from file + offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) + dd if="$src" ibs=$offset skip=1 | tar -xf - + cd Unix + ''; + + installPhase = '' + cd Installer + sed -i -e 's/^PATH=/# PATH=/' -e 's/=`id -[ug]`/=0/' MathInstaller + + # Installer wants to write default config in HOME + export HOME=$(mktemp -d) + + # Fix the installation script + patchShebangs MathInstaller + substituteInPlace MathInstaller \ + --replace "`hostname`" "" \ + --replace "chgrp" "# chgrp" \ + --replace "chown" ": # chown" + + # Install the desktop items + export XDG_DATA_HOME="$out/share" + + ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/${dirName} -silent + + # Fix library paths + cd $out/libexec/${dirName}/Executables + for path in MathKernel WolframKernel math mcc wolfram; do + makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + done + + # ... and xkeyboard config path for Qt + for path in WolframPlayer wolframplayer; do + makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path \ + --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" + done + + # Install man pages + installManPage $out/libexec/${dirName}/SystemFiles/SystemDocumentation/Unix/* + ''; + + # This is primarily an IO bound build; there's little benefit to building remotely. + preferLocalBuild = true; + + # Stripping causes the program to core dump. + dontStrip = true; + + meta = with lib; { + description = "Wolfram Engine computational software system"; + homepage = "https://www.wolfram.com/engine/"; + license = licenses.unfree; + maintainers = with maintainers; [ fbeffa ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/applications/science/math/wolfram-engine/l10ns.nix new file mode 100644 index 000000000000..9bee8052c6e3 --- /dev/null +++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -0,0 +1,51 @@ +{ lib +, requireFile +, lang +, majorVersion ? null +}: + +let allVersions = with lib; flip map + # N.B. Versions in this list should be ordered from newest to oldest. + [ + { + version = "13.0.1"; + lang = "en"; + language = "English"; + sha256 = "1rrxi7d51m02407k719fq829jzanh550wr810i22n3irhk8axqga"; + installer = "WolframEngine_13.0.1_LINUX.sh"; + } + { + version = "13.0.0"; + lang = "en"; + language = "English"; + sha256 = "10cpwllz9plxz22iqdh6xgkxqphl9s9nq8ax16pafjll6j9kqy1q"; + installer = "WolframEngine_13.0.0_LINUX.sh"; + } + ] + ({ version, lang, language, sha256, installer }: { + inherit version lang; + name = "wolfram-engine-${version}" + optionalString (lang != "en") "-${lang}"; + src = requireFile { + name = installer; + message = '' + This nix expression requires that ${installer} is + already part of the store. Download the file from + https://www.wolfram.com/engine/ and add it to the nix store + with nix-store --add-fixed sha256 . + ''; + inherit sha256; + }; + }); +minVersion = + with lib; + if majorVersion == null + then elemAt (builtins.splitVersion (elemAt allVersions 0).version) 0 + else majorVersion; +maxVersion = toString (1 + builtins.fromJSON minVersion); +in +with lib; +findFirst (l: (l.lang == lang + && l.version >= minVersion + && l.version < maxVersion)) + (throw "Version ${minVersion} in language ${lang} not supported") + allVersions diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dedabba0e5a8..ff933dd1867a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32635,6 +32635,8 @@ with pkgs; trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; }; + wolfram-engine = callPackage ../applications/science/math/wolfram-engine { }; + ipopt = callPackage ../development/libraries/science/math/ipopt { }; gmsh = callPackage ../applications/science/math/gmsh { }; From 55a070a61664412398e561d2fdac7ace618c44d6 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Tue, 1 Feb 2022 13:59:56 +0100 Subject: [PATCH 202/385] wolfram-for-jupyter-kernel: init at 0.9.2 Also, add a script 'wolfram-notebook' to easily start a jupyter notebook for working with the Wolfram Engine. Co-authored-by: Sandro --- .../jupyter-kernels/wolfram/default.nix | 22 +++++++++++++ .../jupyter-kernels/wolfram/kernel.nix | 32 +++++++++++++++++++ .../science/math/wolfram-engine/notebook.nix | 9 ++++++ pkgs/top-level/all-packages.nix | 4 +++ 4 files changed, 67 insertions(+) create mode 100644 pkgs/applications/editors/jupyter-kernels/wolfram/default.nix create mode 100644 pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix create mode 100644 pkgs/applications/science/math/wolfram-engine/notebook.nix diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix new file mode 100644 index 000000000000..2d00d6e1fc2e --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix @@ -0,0 +1,22 @@ +{ callPackage +, wolfram-engine +}: + +# To test: +# $(nix-build -E 'with import ./. {}; jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }')/bin/jupyter-notebook +let kernel = callPackage ./kernel.nix {}; +in { + definition = { + displayName = "Wolfram Language ${wolfram-engine.version}"; + argv = [ + "${wolfram-engine}/bin/wolfram" + "-script" + "${kernel}/share/Wolfram/WolframLanguageForJupyter/Resources/KernelForWolframLanguageForJupyter.wl" + "{connection_file}" + "ScriptInstall" # suppresses prompt + ]; + language = "Wolfram Language"; + logo32 = "${wolfram-engine}/share/icons/hicolor/32x32/apps/wolfram-wolframlanguage.png"; + logo64 = "${wolfram-engine}/share/icons/hicolor/64x64/apps/wolfram-wolframlanguage.png"; + }; +} diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix new file mode 100644 index 000000000000..65b02bac59b8 --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "wolfram-for-jupyter-kernel"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "WolframResearch"; + repo = "WolframLanguageForJupyter"; + rev = "v${version}"; + sha256 = "19d9dvr0bv7iy0x8mk4f576ha7z7h7id39nyrggwf9cp7gymxf47"; + }; + + dontConfigure = true; + + installPhase = '' + patchShebangs ./configure-jupyter.wls + mkdir -p $out/share/Wolfram + cp -r {WolframLanguageForJupyter,images,extras,LICENSE} $out/share/Wolfram + ''; + + # no tests + doCheck = false; + + meta = with lib; { + description = "A Jupyter kernel for Wolfram Language."; + homepage = "https://github.com/WolframResearch/WolframLanguageForJupyter"; + license = licenses.mit; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/applications/science/math/wolfram-engine/notebook.nix new file mode 100644 index 000000000000..85570eeca7fb --- /dev/null +++ b/pkgs/applications/science/math/wolfram-engine/notebook.nix @@ -0,0 +1,9 @@ +{ lib, stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: + +let + wolfram-jupyter = jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }; +in + writeScriptBin "wolfram-notebook" '' + #! ${stdenv.shell} + ${wolfram-jupyter}/bin/jupyter-notebook + '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff933dd1867a..114e26a92f3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32637,6 +32637,10 @@ with pkgs; wolfram-engine = callPackage ../applications/science/math/wolfram-engine { }; + wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { }; + + wolfram-notebook = callPackage ../applications/science/math/wolfram-engine/notebook.nix { }; + ipopt = callPackage ../development/libraries/science/math/ipopt { }; gmsh = callPackage ../applications/science/math/gmsh { }; From 3cc26915217f1bdf93bb883f504c05f72b182e4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 09:56:29 +0000 Subject: [PATCH 203/385] python310Packages.sphinxcontrib-bibtex: 2.4.1 -> 2.4.2 --- .../python-modules/sphinxcontrib-bibtex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index f7fd32a3aff4..7bde439a2565 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "2.4.1"; + version = "2.4.2"; pname = "sphinxcontrib-bibtex"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "282223309bbaf34cd20a8fe1ba346fe8642f403a8930607e77a8cb08ae81fc5f"; + sha256 = "sha256-ZbAj7kfzXx8DrE1xyCTmfGJMfsrBuyboNiMnGgH52oY="; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; From adab6ce5527a8c87f87ed0cae60a020cf9a8d942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 8 Apr 2022 14:29:13 +0100 Subject: [PATCH 204/385] nixos/systemd-stage-1: Minor fixups - Fix the name of the env - Add the correct kmod to the initrd - Add `less` to make journalctl usable - Fix SYSTEMD_SULOGIN_FORCe for rescue.target - Add some missing binaries --- nixos/modules/system/boot/systemd/initrd.nix | 14 +++++++------- pkgs/os-specific/linux/kbd/default.nix | 1 + pkgs/os-specific/linux/systemd/default.nix | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index c383486bb0bc..681293d8fed6 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -125,7 +125,7 @@ let }; initrdBinEnv = pkgs.buildEnv { - name = "initrd-emergency-env"; + name = "initrd-bin-env"; paths = map getBin cfg.initrdBin; pathsToLink = ["/bin" "/sbin"]; postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -s '${v}' $out/bin/'${n}'") cfg.extraBin); @@ -355,8 +355,9 @@ in { boot.initrd.availableKernelModules = [ "autofs4" ]; # systemd needs this for some features boot.initrd.systemd = { - initrdBin = [pkgs.bash pkgs.coreutils pkgs.kmod cfg.package] ++ config.system.fsPackages; + initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package] ++ config.system.fsPackages; extraBin = { + less = "${pkgs.less}/bin/less"; mount = "${cfg.package.util-linux}/bin/mount"; umount = "${cfg.package.util-linux}/bin/umount"; }; @@ -367,7 +368,7 @@ in { "/etc/systemd/system.conf".text = '' [Manager] - DefaultEnvironment=PATH=/bin:/sbin + DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"} ''; "/etc/fstab".source = fstab; @@ -394,7 +395,9 @@ in { "${cfg.package}/lib/systemd/systemd-journald" "${cfg.package}/lib/systemd/systemd-makefs" "${cfg.package}/lib/systemd/systemd-modules-load" + "${cfg.package}/lib/systemd/systemd-random-seed" "${cfg.package}/lib/systemd/systemd-remount-fs" + "${cfg.package}/lib/systemd/systemd-shutdown" "${cfg.package}/lib/systemd/systemd-sulogin-shell" "${cfg.package}/lib/systemd/systemd-sysctl" "${cfg.package}/lib/systemd/systemd-udevd" @@ -410,7 +413,7 @@ in { "${cfg.package.util-linux}/bin/sulogin" # so NSS can look up usernames - "${pkgs.glibc}/lib/libnss_files.so" + "${pkgs.glibc}/lib/libnss_files.so.2" ] ++ jobScripts; targets.initrd.aliases = ["default.target"]; @@ -428,9 +431,6 @@ in { (v: let n = escapeSystemdPath v.where; in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts); - services.emergency = mkIf (isBool cfg.emergencyAccess && cfg.emergencyAccess) { - environment.SYSTEMD_SULOGIN_FORCE = "1"; - }; # The unit in /run/systemd/generator shadows the unit in # /etc/systemd/system, but will still apply drop-ins from # /etc/systemd/system/foo.service.d/ diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 23a523b15d72..4c89d8c82197 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch; }; + passthru.gzip = gzip; meta = with lib; { homepage = "https://kbd-project.org/"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 73c27b0b61f0..e130abbf27ff 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -675,7 +675,7 @@ stdenv.mkDerivation { # runtime; otherwise we can't and we need to reboot. interfaceVersion = 2; - inherit withCryptsetup util-linux; + inherit withCryptsetup util-linux kmod kbd; tests = { inherit (nixosTests) switchTest; From 33772708c6d0e33f697426ba386aa0149cbcbecb Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+a-m-joseph@users.noreply.github.com> Date: Mon, 11 Apr 2022 10:33:51 +0000 Subject: [PATCH 205/385] s2n-tls: disable unsupported feature (post-quantum cryptography) on mips64 (#161163) Co-authored-by: Sandro --- pkgs/development/libraries/s2n-tls/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index c22ff6c37309..e6e35f9b2c42 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror + ] ++ lib.optionals stdenv.hostPlatform.isMips64 [ + # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609 + "-DS2N_NO_PQ=ON" ]; propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). From 63528cb1a6183fceb4f18ca1b74617eca8dd67a1 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 11 Apr 2022 13:01:40 +0200 Subject: [PATCH 206/385] nixos/systemd: remove duplicate definition of `systemd.user.timers` It's already defined in `systemd/user.nix`. This is a leftover from commit b6d50528dd0af3ddbcd333402473589f3897d278 where all `systemd.user` settings were moved to `systemd/user.nix`. --- nixos/modules/system/boot/systemd.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 844a6793c154..2c9ee9fc319f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -573,14 +573,6 @@ in }) (filterAttrs (name: service: service.enable && service.startAt != []) cfg.services); - # Generate timer units for all services that have a ‘startAt’ value. - systemd.user.timers = - mapAttrs (name: service: - { wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = service.startAt; - }) - (filterAttrs (name: service: service.startAt != []) cfg.user.services); - # Some overrides to upstream units. systemd.services."systemd-backlight@".restartIfChanged = false; systemd.services."systemd-fsck@".restartIfChanged = false; From ef5a14b6ad54bc3508599e04b54580514871fbda Mon Sep 17 00:00:00 2001 From: Samyak S Sarnayak Date: Mon, 11 Apr 2022 16:33:05 +0530 Subject: [PATCH 207/385] toipe: 0.3.1 -> 0.4.0 Release notes: https://github.com/Samyak2/toipe/releases/tag/v0.4.0 --- pkgs/applications/misc/toipe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/applications/misc/toipe/default.nix index e9cd39162caf..ca842ff6db00 100644 --- a/pkgs/applications/misc/toipe/default.nix +++ b/pkgs/applications/misc/toipe/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "toipe"; - version = "0.3.1"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/vO5ABMldw3soh7mscjhN5TAZOcs+iMTaMxcdMmV0Xo="; + sha256 = "sha256-lAvFCvNm55SjRmrhIkMBiM0nSlAG+jUEKLlLaGs1RkY="; }; - cargoSha256 = "sha256-AsRQ8kvDy1cH4/kaFAoU7en3dzDiG1T+O+4r6PKa0hM="; + cargoSha256 = "sha256-WmWH/x69H17uHQEB0+GRUtApJnSEkoeFLLweP8NoBrk="; meta = with lib; { description = "Trusty terminal typing tester"; From 553189b37462ede694d0138587cdab829f8d4828 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 Apr 2022 04:09:19 -0700 Subject: [PATCH 208/385] gopls: 0.8.1 -> 0.8.2 (#168261) --- pkgs/development/tools/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 8d533d359df5..4ff3ef5715a0 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-ypuZQt6iF1QRk/FsoTKnJlb5CWIEkvK7r37t4rSxhmU="; + sha256 = "sha256-BXalq73nXMDQg7+x/SJOAeiBK3yLVxH6pPPqPYWZ7KY="; }; modRoot = "gopls"; - vendorSha256 = "sha256-SY08322wuJl8F790oXGmYo82Yadi14kDpoVGCGVMF0c="; + vendorSha256 = "sha256-oH3w/17Vem+q2MahM1A5gmEniWLNhTXi0L7ozhza15o="; doCheck = false; From 46a3a7b9a247f77af0800ceefe868c37f9efe6a4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Apr 2022 23:37:18 +0000 Subject: [PATCH 209/385] nixos/udev: remove rule for kqemu kqemu was removed from Nixpkgs in 2013 in 181dc4032dc ("Remove the old KQEMU accelerator module"), so it should be safe to drop this rule now. --- nixos/modules/services/hardware/udev.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 61448af2d33b..5fdf97fbdf83 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -23,7 +23,6 @@ let nixosRules = '' # Miscellaneous devices. KERNEL=="kvm", MODE="0666" - KERNEL=="kqemu", MODE="0666" # Needed for gpm. SUBSYSTEM=="input", KERNEL=="mice", TAG+="systemd" From b2116b65610d1ca1c53237293305ceec446773ae Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 5 Dec 2021 15:28:00 +0100 Subject: [PATCH 210/385] sonixd: init at 0.14.0 --- pkgs/applications/audio/sonixd/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/audio/sonixd/default.nix diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix new file mode 100644 index 000000000000..151d3e392e44 --- /dev/null +++ b/pkgs/applications/audio/sonixd/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchurl +, appimageTools +}: + +appimageTools.wrapType2 rec { + pname = "sonixd"; + version = "0.14.0"; + + src = fetchurl { + url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; + sha256 = "sha256-q+26Ut5wN9gFDBdqirR+he/ppu/b1wiqq23WkcRAQd4="; + }; + + extraInstallCommands = '' + mv $out/bin/sonixd-${version} $out/bin/sonixd + ''; + + meta = with lib; { + description = "Full-featured Subsonic/Jellyfin compatible desktop music player"; + homepage = "https://github.com/jeffvli/sonixd"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7838db410f1..ec3169447da6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25882,6 +25882,8 @@ with pkgs; singularity = callPackage ../applications/virtualization/singularity { }; + sonixd = callPackage ../applications/audio/sonixd { }; + spectmorph = callPackage ../applications/audio/spectmorph { }; smallwm = callPackage ../applications/window-managers/smallwm { }; From ee3d6e2354ee612345f4f798e441b7d053ee31c9 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Mon, 11 Apr 2022 14:58:12 +0200 Subject: [PATCH 211/385] rust-analyzer-unwrapped: 2022-04-04 -> 2022-04-11 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 78ce0626ae5a..92d731c79b55 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-04-04"; - cargoSha256 = "sha256-5PA4EHCwuRO3uOK+Q+Lkp8Fs4MMlmOSOqdcEctkME4A="; + version = "2022-04-11"; + cargoSha256 = "sha256-pc8S+5g67vN9170ABiHGe1t4Go0F63UiOeLd71USYCI="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-ZzghqbLHMxAabG+RDu7Zniy8bJQMdtQVn3oLTnP3jLc="; + sha256 = "sha256-miMIrDawSS1zXh6EuX03x5ACM2NTabksssSyutSNpjY="; }; patches = [ From ce686f05056e971be5d81f5ee4f34c434e5b98d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 Apr 2022 06:25:10 -0700 Subject: [PATCH 212/385] oh-my-zsh: 2022-04-06 -> 2022-04-09 (#168073) --- 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 05453444650e..3ea77d9bd17b 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-04-06"; + version = "2022-04-09"; pname = "oh-my-zsh"; - rev = "b3999a4b156185b617a5608317497399f88dc8fe"; + rev = "fcceeb666452c5a41b786f3cde9c8635ddde5448"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "yXM+fLdNWOrUU03K7527NgtaAwSql5r0wPaWgUZqGhY="; + sha256 = "c929KV77wACO0AlEABwOPPz03Za8V4G7RRXalY+zfGg="; }; installPhase = '' From 28539842d8c2b4a41c7ab4b31da5eeae828dbe2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 11 Apr 2022 10:51:54 +0200 Subject: [PATCH 213/385] nixos/utils: move removePackagesByName to here from gnome --- nixos/lib/utils.nix | 16 ++++++++++++++++ .../services/x11/desktop-managers/cinnamon.nix | 4 ++-- .../services/x11/desktop-managers/gnome.nix | 10 +++++----- .../services/x11/desktop-managers/lxqt.nix | 2 +- .../services/x11/desktop-managers/mate.nix | 2 +- .../services/x11/desktop-managers/pantheon.nix | 6 +++--- nixos/modules/services/x11/xserver.nix | 4 ++-- pkgs/desktops/gnome/default.nix | 15 --------------- 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 80341dd48fcd..497d98aa4d19 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -194,6 +194,22 @@ rec { (( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit ''; + /* Remove packages of packagesToRemove from packages, based on their names. + Relies on package names and has quadratic complexity so use with caution! + + Type: + removePackagesByName :: [package] -> [package] -> [package] + + Example: + removePackagesByName [ nautilus file-roller ] [ file-roller totem ] + => [ nautilus ] + */ + removePackagesByName = packages: packagesToRemove: + let + namesToRemove = map lib.getName packagesToRemove; + in + lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages; + systemdUtils = { lib = import ./systemd-lib.nix { inherit lib config pkgs; }; unitOptions = import ./systemd-unit-options.nix { inherit lib systemdUtils; }; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 3a78a526460c..a8ec5d5e5906 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -196,7 +196,7 @@ in programs.evince.enable = mkDefault true; programs.file-roller.enable = mkDefault true; - environment.systemPackages = (with pkgs // pkgs.gnome // pkgs.cinnamon; pkgs.gnome.removePackagesByName [ + environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; lib.utils.removePackagesByName [ # cinnamon team apps bulky blueberry @@ -212,7 +212,7 @@ in # external apps shipped with linux-mint hexchat gnome-calculator - ] config.environment.cinnamon.excludePackages); + ] config.environment.cinnamon.excludePackages; }) ]; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index f87258ac8dc5..35d80abb05f3 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -455,7 +455,7 @@ in (mkIf serviceCfg.core-utilities.enable { environment.systemPackages = with pkgs.gnome; - removePackagesByName + lib.utils.removePackagesByName ([ baobab cheese @@ -515,7 +515,7 @@ in }) (mkIf serviceCfg.games.enable { - environment.systemPackages = (with pkgs.gnome; removePackagesByName [ + environment.systemPackages = with pkgs.gnome; lib.utils.removePackagesByName [ aisleriot atomix five-or-more @@ -536,12 +536,12 @@ in quadrapassel swell-foop tali - ] config.environment.gnome.excludePackages); + ] config.environment.gnome.excludePackages; }) # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst (mkIf serviceCfg.core-developer-tools.enable { - environment.systemPackages = (with pkgs.gnome; removePackagesByName [ + environment.systemPackages = with pkgs.gnome; lib.utils.removePackagesByName [ dconf-editor devhelp pkgs.gnome-builder @@ -550,7 +550,7 @@ in # in default configurations. # https://github.com/NixOS/nixpkgs/issues/60908 /* gnome-boxes */ - ] config.environment.gnome.excludePackages); + ] config.environment.gnome.excludePackages; services.sysprof.enable = notExcluded pkgs.sysprof; }) diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 720985ba0d94..9c8bfab077a6 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -51,7 +51,7 @@ in environment.systemPackages = pkgs.lxqt.preRequisitePackages ++ pkgs.lxqt.corePackages ++ - (pkgs.gnome.removePackagesByName + (lib.utils.removePackagesByName pkgs.lxqt.optionalPackages config.environment.lxqt.excludePackages); diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index a7fda4be9796..d09c3cf88201 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -74,7 +74,7 @@ in # Debugging environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; - environment.systemPackages = pkgs.gnome.removePackagesByName + environment.systemPackages = lib.utils.removePackagesByName (pkgs.mate.basePackages ++ pkgs.mate.extraPackages ++ [ diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 3528b0f40e7b..004d14b634d4 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, utils, pkgs, ... }: with lib; @@ -214,7 +214,7 @@ in elementary-settings-daemon pantheon-agent-geoclue2 pantheon-agent-polkit - ]) ++ (gnome.removePackagesByName [ + ]) ++ (utils.removePackagesByName [ gnome.gnome-font-viewer gnome.gnome-settings-daemon338 ] config.environment.pantheon.excludePackages); @@ -272,7 +272,7 @@ in }) (mkIf serviceCfg.apps.enable { - environment.systemPackages = with pkgs.pantheon; pkgs.gnome.removePackagesByName ([ + environment.systemPackages = with pkgs.pantheon; utils.removePackagesByName ([ elementary-calculator elementary-calendar elementary-camera diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 2e760e2773d0..d488e9b55d43 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, utils, pkgs, ... }: with lib; @@ -662,7 +662,7 @@ in ${cfgPath}.source = xorg.xf86inputevdev.out + "/share" + cfgPath; }); - environment.systemPackages = pkgs.gnome.removePackagesByName + environment.systemPackages = utils.removePackagesByName [ xorg.xorgserver.out xorg.xrandr xorg.xrdb diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 1809604bec52..a0561ca00300 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -3,21 +3,6 @@ lib.makeScope pkgs.newScope (self: with self; { updateScript = callPackage ./update.nix { }; - /* Remove packages of packagesToRemove from packages, based on their names - - Type: - removePackagesByName :: [package] -> [package] -> [package] - - Example: - removePackagesByName [ nautilus file-roller ] [ file-roller totem ] - => [ nautilus ] - */ - removePackagesByName = packages: packagesToRemove: - let - namesToRemove = map lib.getName packagesToRemove; - in - lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; From 597ebfcae25188cb7a1de01c99f88299323c545e Mon Sep 17 00:00:00 2001 From: Maximilian Wende Date: Mon, 11 Apr 2022 15:21:52 +0200 Subject: [PATCH 214/385] astc-encoder: limit to 64-bit target architectures Mark this package as supported only on 64 bit architectures, as the build fails for 32 bit targets. Maybe this can be fixed in the future --- pkgs/tools/graphics/astc-encoder/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 8e7f71e68a47..e2af1494874b 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -73,5 +73,6 @@ gccStdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; maintainers = with maintainers; [ dasisdormax ]; + broken = !gccStdenv.is64bit; }; } From e56a8b16ebc794fe8cd3edf8c8d5f6f2ae35cb91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 Apr 2022 07:28:29 -0700 Subject: [PATCH 215/385] python310Packages.jupyterlab: 3.3.2 -> 3.3.3 (#167705) --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index fbea0935ff30..49d345d10743 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.3.2"; + version = "3.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PHFr9VkssoxcVcYVxuW9PvxxiY9pV9E3GbVkeLu7WHo="; + sha256 = "sha256-KU1nEmAVujl/axyAVj3uyGLkfgQmI4Ubvip9hw1p62o="; }; nativeBuildInputs = [ From b6a852d51d310a9cb514631490b5d2ca139f6c9a Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 11 Apr 2022 15:58:37 +0100 Subject: [PATCH 216/385] kubescape: 2.0.150 -> 2.0.152 --- pkgs/tools/security/kubescape/default.nix | 27 +++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 377327e6571c..23f52e3b52ed 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,31 +6,38 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.150"; + version = "2.0.152"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-1D/ixtZI7/H05MD6zRtZCF8yhW1FhvRpdPWieAPwxHs="; + hash = "sha256-hibXmA2JerfnkGiSnBUCMHGPm4Tefnsl/x2VAS5z0Fo="; }; + vendorSha256 = "sha256-HfsQfoz1n3FEd2eVBBz3Za2jYCSrozXpL34Z8CgQsTA="; nativeBuildInputs = [ installShellFiles ]; - modRoot = "cmd"; - vendorSha256 = "sha256-Nznf793OMQ7ZCWb5voVcLyMiBa1Z8Dswp7Tdn1AzlJA="; - ldflags = [ "-s" "-w" - "-X github.com/armosec/kubescape/core/cautils.BuildNumber=v${version}" + "-X github.com/armosec/kubescape/v2/core/cautils.BuildNumber=v${version}" ]; - postBuild = '' - # kubescape/cmd should be called kubescape - mv $GOPATH/bin/{cmd,kubescape} + subPackages = [ "." ]; + + preCheck = '' + # Feed in all but the integration tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + # Skip httphandler tests - the checkPhase doesn't care about excludedPackages + getGoDirs() { + go list ./... | grep -v httphandler + } + + rm core/pkg/resourcehandler/{repositoryscanner,urlloader}_test.go ''; postInstall = '' @@ -44,6 +51,8 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/kubescape --help + # `--version` vs `version` shows the version without checking for latest + # if the flag is missing the BuildNumber may have moved $out/bin/kubescape --version | grep "v${version}" runHook postInstallCheck ''; From bc50e0ec126ef55b96d3d75b4ddd62c8492c2568 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 Apr 2022 08:08:29 -0700 Subject: [PATCH 217/385] python310Packages.pip-tools: 6.5.1 -> 6.6.0 (#167660) --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 307e99c04d80..e2f2f565862f 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.5.1"; + version = "6.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gPViqmmfx2pCRTlpfgvvQeSQoFDlemohRoUxmBqdQZ4="; + sha256 = "sha256-mKokAERAocBInXGlZ6Tor98jx3gr/0g9EhmIHnMC3oM="; }; checkInputs = [ From ab55499253468ea2be69d3760077073c17da9103 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 23 Feb 2022 15:31:16 +0100 Subject: [PATCH 218/385] cassandra: Add updateScript --- pkgs/servers/nosql/cassandra/3.0.nix | 1 - pkgs/servers/nosql/cassandra/3.11.nix | 1 - pkgs/servers/nosql/cassandra/generic.nix | 4 ++- pkgs/servers/nosql/cassandra/update.sh | 42 ++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100755 pkgs/servers/nosql/cassandra/update.sh diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index d9f5978f2649..df484778740d 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,5 +1,4 @@ { callPackage, ... } @ args: - callPackage ./generic.nix (args // { version = "3.0.26"; sha256 = "09wim1w2yizcqpja62jk64fhaw3jgnrgrjlrm4kgmcc3g3bsmw6i"; diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index fc839fa8c356..838ece0e8a6c 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,5 +1,4 @@ { callPackage, ... } @ args: - callPackage ./generic.nix (args // { version = "3.11.12"; sha256 = "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw"; diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index ca11b838e325..41d33a497bef 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchurl { inherit sha256; - url = "mirror://apache/cassandra/${version}/apache-${pname}-${version}-bin.tar.gz"; + url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz"; }; nativeBuildInputs = [ makeWrapper coreutils ]; @@ -113,6 +113,8 @@ stdenv.mkDerivation rec { assert test.testPackage.version == version; test; }; + + updateScript = ./update.sh; }; meta = with lib; { diff --git a/pkgs/servers/nosql/cassandra/update.sh b/pkgs/servers/nosql/cassandra/update.sh new file mode 100755 index 000000000000..e49536051174 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash +#!nix-shell -p git + +cd "$(dirname "$0")" +set -eux -o pipefail + +tmp="$(mktemp -d)" +cleanup() { + rm -rf "$tmp" +} +trap cleanup EXIT + +# get numeric-only versions, sort them latest first +git ls-remote --tags https://github.com/apache/cassandra \ + | awk '{ if (match($0, /refs.tags.cassandra-([0-9.]*)$/, m)) print m[1] }' \ + | sort -V \ + | tac >$tmp/versions + +version="$(grep -E '3[.]11[.]' <$tmp/versions | head -n 1)" +hash="$(nix-prefetch-url "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz")" +cat >3.11.nix <3.0.nix < Date: Wed, 6 Apr 2022 11:16:40 +0200 Subject: [PATCH 219/385] cassandra: Make updateScript update individual version --- pkgs/servers/nosql/cassandra/generic.nix | 3 +- .../servers/nosql/cassandra/update-script.nix | 45 +++++++++++++++++++ pkgs/servers/nosql/cassandra/update.sh | 42 ----------------- 3 files changed, 47 insertions(+), 43 deletions(-) create mode 100644 pkgs/servers/nosql/cassandra/update-script.nix delete mode 100755 pkgs/servers/nosql/cassandra/update.sh diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 41d33a497bef..9d62279e74e4 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -16,6 +16,7 @@ , version , sha256 , extraMeta ? { } +, callPackage , ... }: @@ -114,7 +115,7 @@ stdenv.mkDerivation rec { test; }; - updateScript = ./update.sh; + updateScript = callPackage ./update-script.nix { inherit generation; }; }; meta = with lib; { diff --git a/pkgs/servers/nosql/cassandra/update-script.nix b/pkgs/servers/nosql/cassandra/update-script.nix new file mode 100644 index 000000000000..fd79d1fb43b8 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/update-script.nix @@ -0,0 +1,45 @@ +{ git +, lib +, runtimeShell +, writeScript +, generation +}: +let + inherit (lib) makeBinPath; + filename = lib.strings.replaceStrings [ "_" ] [ "." ] generation + ".nix"; + regex = lib.strings.replaceStrings [ "_" ] [ "[.]" ] generation; +in +writeScript "update-cassandra_${generation}" '' + #!${runtimeShell} + set -eux -o pipefail + test -d pkgs -a -d nixos -a -d lib || { + echo >&2 "$0 expects to be run in a nixpkgs checkout" + exit 1 + } + cd pkgs/servers/nosql/cassandra + PATH="${makeBinPath [git]}:$PATH" + + tmp="$(mktemp -d)" + cleanup() { + rm -rf "$tmp" + } + trap cleanup EXIT + + # get numeric-only versions, sort them latest first + git ls-remote --tags https://github.com/apache/cassandra \ + | awk '{ if (match($0, /refs.tags.cassandra-([0-9.]*)$/, m)) print m[1] }' \ + | sort -V \ + | tac >$tmp/versions + + version="$(grep -E '^${regex}' <$tmp/versions | head -n 1)" + hash="$(nix-prefetch-url "mirror://apache/cassandra/$version/apache-cassandra-$version-bin.tar.gz")" + cat >${filename} <$tmp/versions - -version="$(grep -E '3[.]11[.]' <$tmp/versions | head -n 1)" -hash="$(nix-prefetch-url "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz")" -cat >3.11.nix <3.0.nix < Date: Wed, 6 Apr 2022 11:26:19 +0200 Subject: [PATCH 220/385] cassandra.updateScript: Generate JSON --- pkgs/servers/nosql/cassandra/update-script.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/update-script.nix b/pkgs/servers/nosql/cassandra/update-script.nix index fd79d1fb43b8..73906b7a811a 100644 --- a/pkgs/servers/nosql/cassandra/update-script.nix +++ b/pkgs/servers/nosql/cassandra/update-script.nix @@ -6,7 +6,7 @@ }: let inherit (lib) makeBinPath; - filename = lib.strings.replaceStrings [ "_" ] [ "." ] generation + ".nix"; + filename = lib.strings.replaceStrings [ "_" ] [ "." ] generation + ".json"; regex = lib.strings.replaceStrings [ "_" ] [ "[.]" ] generation; in writeScript "update-cassandra_${generation}" '' @@ -34,12 +34,9 @@ writeScript "update-cassandra_${generation}" '' version="$(grep -E '^${regex}' <$tmp/versions | head -n 1)" hash="$(nix-prefetch-url "mirror://apache/cassandra/$version/apache-cassandra-$version-bin.tar.gz")" cat >${filename} < Date: Wed, 6 Apr 2022 11:32:16 +0200 Subject: [PATCH 221/385] cassandra*: Refactor: store versions in JSON --- pkgs/servers/nosql/cassandra/2.1.json | 4 ++++ pkgs/servers/nosql/cassandra/2.1.nix | 19 ++++++++++--------- pkgs/servers/nosql/cassandra/2.2.json | 4 ++++ pkgs/servers/nosql/cassandra/2.2.nix | 19 ++++++++++--------- pkgs/servers/nosql/cassandra/3.0.json | 4 ++++ pkgs/servers/nosql/cassandra/3.0.nix | 11 ++++++----- pkgs/servers/nosql/cassandra/3.11.json | 4 ++++ pkgs/servers/nosql/cassandra/3.11.nix | 11 ++++++----- 8 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 pkgs/servers/nosql/cassandra/2.1.json create mode 100644 pkgs/servers/nosql/cassandra/2.2.json create mode 100644 pkgs/servers/nosql/cassandra/3.0.json create mode 100644 pkgs/servers/nosql/cassandra/3.11.json diff --git a/pkgs/servers/nosql/cassandra/2.1.json b/pkgs/servers/nosql/cassandra/2.1.json new file mode 100644 index 000000000000..d1af24106b69 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/2.1.json @@ -0,0 +1,4 @@ +{ + "version": "2.1.22", + "sha256": "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3" +} diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 63d89a29d13f..02f954ebd1fe 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -1,11 +1,12 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // { - version = "2.1.22"; - sha256 = "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3"; - generation = "2_1"; - extraMeta.knownVulnerabilities = [ - # Fixed in 3.* but 2.* hasn't been released since - "CVE-2020-17516" - ]; -}) +callPackage ./generic.nix ( + args + // builtins.fromJSON (builtins.readFile ./2.1.json) + // { + generation = "2_1"; + extraMeta.knownVulnerabilities = [ + # Fixed in 3.* but 2.* hasn't been released since + "CVE-2020-17516" + ]; + }) diff --git a/pkgs/servers/nosql/cassandra/2.2.json b/pkgs/servers/nosql/cassandra/2.2.json new file mode 100644 index 000000000000..694e66f4f463 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/2.2.json @@ -0,0 +1,4 @@ +{ + "version": "2.2.14", + "sha256": "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q" +} diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix index dc04c374b3d5..bcb2eaec123c 100644 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ b/pkgs/servers/nosql/cassandra/2.2.nix @@ -1,11 +1,12 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // { - version = "2.2.14"; - sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q"; - generation = "2_2"; - extraMeta.knownVulnerabilities = [ - # Fixed in 3.* but 2.* hasn't been released since - "CVE-2020-17516" - ]; -}) +callPackage ./generic.nix ( + args + // builtins.fromJSON (builtins.readFile ./2.2.json) + // { + generation = "2_2"; + extraMeta.knownVulnerabilities = [ + # Fixed in 3.* but 2.* hasn't been released since + "CVE-2020-17516" + ]; + }) diff --git a/pkgs/servers/nosql/cassandra/3.0.json b/pkgs/servers/nosql/cassandra/3.0.json new file mode 100644 index 000000000000..665a5604d773 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/3.0.json @@ -0,0 +1,4 @@ +{ + "version": "3.0.26", + "sha256": "09wim1w2yizcqpja62jk64fhaw3jgnrgrjlrm4kgmcc3g3bsmw6i" +} diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index df484778740d..9c62901a4808 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,6 +1,7 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // { - version = "3.0.26"; - sha256 = "09wim1w2yizcqpja62jk64fhaw3jgnrgrjlrm4kgmcc3g3bsmw6i"; - generation = "3_0"; -}) +callPackage ./generic.nix ( + args + // builtins.fromJSON (builtins.readFile ./3.0.json) + // { + generation = "3_0"; + }) diff --git a/pkgs/servers/nosql/cassandra/3.11.json b/pkgs/servers/nosql/cassandra/3.11.json new file mode 100644 index 000000000000..e47f78b7baf8 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/3.11.json @@ -0,0 +1,4 @@ +{ + "version": "3.11.12", + "sha256": "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw" +} diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index 838ece0e8a6c..ffb29743405b 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,6 +1,7 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // { - version = "3.11.12"; - sha256 = "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw"; - generation = "3_11"; -}) +callPackage ./generic.nix ( + args + // builtins.fromJSON (builtins.readFile ./3.11.json) + // { + generation = "3_11"; + }) From 22c4920c8062b3e35d3d12e9b4a5a8bfad0b80ef Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 6 Apr 2022 14:09:35 +0200 Subject: [PATCH 222/385] cassandra.updateScript: Add signature check --- pkgs/servers/nosql/cassandra/update-script.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/update-script.nix b/pkgs/servers/nosql/cassandra/update-script.nix index 73906b7a811a..b407b704fdfd 100644 --- a/pkgs/servers/nosql/cassandra/update-script.nix +++ b/pkgs/servers/nosql/cassandra/update-script.nix @@ -3,6 +3,7 @@ , runtimeShell , writeScript , generation +, gnupg }: let inherit (lib) makeBinPath; @@ -17,7 +18,7 @@ writeScript "update-cassandra_${generation}" '' exit 1 } cd pkgs/servers/nosql/cassandra - PATH="${makeBinPath [git]}:$PATH" + PATH="${makeBinPath [git gnupg]}:$PATH" tmp="$(mktemp -d)" cleanup() { @@ -32,7 +33,19 @@ writeScript "update-cassandra_${generation}" '' | tac >$tmp/versions version="$(grep -E '^${regex}' <$tmp/versions | head -n 1)" - hash="$(nix-prefetch-url "mirror://apache/cassandra/$version/apache-cassandra-$version-bin.tar.gz")" + path="cassandra/$version/apache-cassandra-$version-bin.tar.gz" + curl "https://downloads.apache.org/$path" >$tmp/src.tar.gz + curl "https://downloads.apache.org/$path.asc" >$tmp/src.tar.gz.asc + + # See https://downloads.apache.org/cassandra/KEYS + # Make sure that any new key corresponds to someone on the project + for key in A4C465FEA0C552561A392A61E91335D77E3E87CB; do + gpg --trustdb-name "$tmp/trust.db" --batch --recv-keys "$key" + echo "$key:5:" | gpg --trustdb-name "$tmp/trust.db" --batch --import-ownertrust + done + gpg --trustdb-name "$tmp/trust.db" --batch --verify --trust-model direct $tmp/src.tar.gz.asc $tmp/src.tar.gz + + hash="$(nix-prefetch-url "file://$tmp/src.tar.gz")" cat >${filename} < Date: Mon, 11 Apr 2022 15:47:09 +0000 Subject: [PATCH 223/385] =?UTF-8?q?n8n:=200.171.0=20=E2=86=92=200.172.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/n8n/node-packages.nix | 208 +++++++++--------- 1 file changed, 101 insertions(+), 107 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 1793956b1d3a..db0dd2546e72 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -112,13 +112,13 @@ let sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg=="; }; }; - "@babel/runtime-7.17.8" = { + "@babel/runtime-7.17.9" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.17.8"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz"; - sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz"; + sha512 = "lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg=="; }; }; "@colors/colors-1.5.0" = { @@ -967,13 +967,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1106.0" = { + "aws-sdk-2.1111.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1106.0"; + version = "2.1111.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1106.0.tgz"; - sha512 = "3dr0TTR2LI70ST8fa4IgXHpWdH4yv7FLnt9YEndwFQ8ar2EMCMpMU67wwCGBA72GUi0aOg4+lsLjGmCvIq3jug=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1111.0.tgz"; + sha512 = "WRyNcCckzmu1djTAWfR2r+BuI/PbuLrhG3oa+oH39v4NZ4EecYWFL1CoCPlC2kRUML4maSba5T4zlxjcNl7ELQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1381,13 +1381,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "cfb-1.2.1" = { + "cfb-1.2.2" = { name = "cfb"; packageName = "cfb"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/cfb/-/cfb-1.2.1.tgz"; - sha512 = "wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ=="; + url = "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz"; + sha512 = "KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA=="; }; }; "chalk-1.1.3" = { @@ -1840,13 +1840,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "crc-32-1.2.1" = { + "crc-32-1.2.2" = { name = "crc-32"; packageName = "crc-32"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz"; - sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz"; + sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="; }; }; "cron-1.7.2" = { @@ -2137,22 +2137,22 @@ let sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; }; }; - "dom-serializer-1.3.2" = { + "dom-serializer-1.4.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; - sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; + sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; }; }; - "domelementtype-2.2.0" = { + "domelementtype-2.3.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; - sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; + sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; }; }; "domhandler-4.3.1" = { @@ -2902,13 +2902,13 @@ let sha512 = "UWXQ7BpSCW8erDespU2I4cri22xsKgwOCyhsJal0OJhi2tFpwJpsYNJt4vCiFPL1p2HzCGiS713LKpNR25n9Kg=="; }; }; - "graceful-fs-4.2.9" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.9"; + version = "4.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "handlebars-4.7.7" = { @@ -3865,13 +3865,13 @@ let sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg=="; }; }; - "libphonenumber-js-1.9.50" = { + "libphonenumber-js-1.9.51" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.9.50"; + version = "1.9.51"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.50.tgz"; - sha512 = "cCzQPChw2XbordcO2LKiw5Htx5leHVfFk/EXkxNHqJfFo7Fndcb1kF5wPJpc316vCJhhikedYnVysMh3Sc7Ocw=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.51.tgz"; + sha512 = "MGidRDs7s2nUybwrB/UjZT4nPXZPYQZQTu/sF3/O2v/DocmD8N6G+a9kwDt2qm7DaOo35XRt7hAIbYL+ml942Q=="; }; }; "libqp-1.1.0" = { @@ -4153,6 +4153,15 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lru-cache-7.8.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "7.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz"; + sha512 = "E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg=="; + }; + }; "lru-memoizer-2.1.4" = { name = "lru-memoizer"; packageName = "lru-memoizer"; @@ -4405,13 +4414,13 @@ let sha512 = "lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg=="; }; }; - "moment-2.29.1" = { + "moment-2.29.2" = { name = "moment"; packageName = "moment"; - version = "2.29.1"; + version = "2.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; - sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz"; + sha512 = "UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg=="; }; }; "moment-timezone-0.5.34" = { @@ -4531,49 +4540,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.112.0" = { + "n8n-core-0.113.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.112.0"; + version = "0.113.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.112.0.tgz"; - sha512 = "1b/J9XWBrjqMCcDAM1vZlsEpeBXI7gZ9Jpxgpgu4eHh3l/BJfyeqq5KXgULfyDtolDn/bil0s7qXA2njmZLerw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.113.0.tgz"; + sha512 = "4LZWnno0N7gibiVF6tiMY63cyn+un1TwSXyjZvLzp9TH4UvxC457PSjWrS/IZOQYOHRfOR0SmO2Mz3j3NTYxFQ=="; }; }; - "n8n-design-system-0.16.0" = { + "n8n-design-system-0.17.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.16.0.tgz"; - sha512 = "X7Qa+DoXRyJL4gqh7x59udnPIBYAUgDvhchL33dpI/Rgq9gaFajT9eAuOFQnXKMUaL0FZ5hu3rRGcAmwwEA/bA=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.17.0.tgz"; + sha512 = "7Gcy0uAiNjLIuVEPOb4UABhUgFA7ov287g2RMnAysC2edI4G7oeSvzMl/rlRojOGlTY4zjKiV6Wz4bkDlkiVbw=="; }; }; - "n8n-editor-ui-0.138.0" = { + "n8n-editor-ui-0.139.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.138.0"; + version = "0.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.138.0.tgz"; - sha512 = "1/mUJYSWG4vmUfMlT65lvtQzfDBMCHxhdIU3TUG2umvdIEsSHJM1gZwAPfoJZppoZ6DX/ApuxXY/67OXfgatQw=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.139.0.tgz"; + sha512 = "OaU3JI1uRhd26WqSxmHb6T14n4o8wXAjELj2OJ/f5TtrWwkmeL1ttmAJNH/yAAD7blAmIjjKqsacuhBk7lHP2w=="; }; }; - "n8n-nodes-base-0.169.0" = { + "n8n-nodes-base-0.170.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.169.0"; + version = "0.170.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.169.0.tgz"; - sha512 = "O8vwS7ROybSRLqXwG58xdLNrbA8hAvX4jSodXsztpGChbDWcrYJUXBewN9+Lfh1UAegz12G1devygc1W92qveQ=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.170.0.tgz"; + sha512 = "OIoh35VZyCLWHFrDW3Uu4jUhd8ulx8y5K3vWBY2hkOCpFthMkwjseZDwaLuKIz2TApFpDPicKEm3gLkf1Tm09g=="; }; }; - "n8n-workflow-0.94.0" = { + "n8n-workflow-0.95.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.94.0"; + version = "0.95.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.94.0.tgz"; - sha512 = "cVs5XPlbNDcCrGU5IoYzjO7IOsYNsNtEt5vVxkL9q5EgEmHhPYakValJN4GyLQ7Otdpsf47lJg/0EG3TvOssGQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.95.0.tgz"; + sha512 = "XxjwF3Zmcp2LOvgZ0Bfg15zegpwo1d2DHbFxYogUJT2CW7/S4gwE3opKzf/juaEWA14kOh0klNnOhdktDqTCAw=="; }; }; "named-placeholders-1.1.2" = { @@ -5467,15 +5476,6 @@ let sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; }; }; - "printj-1.3.1" = { - name = "printj"; - packageName = "printj"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz"; - sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; - }; - }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -6196,13 +6196,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.5" = { + "semver-7.3.6" = { name = "semver"; packageName = "semver"; - version = "7.3.5"; + version = "7.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz"; + sha512 = "HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w=="; }; }; "send-0.17.2" = { @@ -6322,13 +6322,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.5.0" = { + "simple-git-3.6.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz"; - sha512 = "fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.6.0.tgz"; + sha512 = "2e+4QhOVO59GeLsHgwSMKNrSKCnuACeA/gMNrLCYR8ID9qwm4hViVt4WsODcUGjx//KDv6GMLC6Hs/MeosgXxg=="; }; }; "simple-lru-cache-0.0.2" = { @@ -7375,13 +7375,13 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; - "winston-3.6.0" = { + "winston-3.7.2" = { name = "winston"; packageName = "winston"; - version = "3.6.0"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz"; - sha512 = "9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w=="; + url = "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz"; + sha512 = "QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng=="; }; }; "winston-transport-4.5.0" = { @@ -7624,10 +7624,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.171.0"; + version = "0.172.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.171.0.tgz"; - sha512 = "GenMxluqj0PfttyWndoMUsmyJ8r5pilWoY7xT+TVjCl5znhtIUT+3GTeDZ8K3vYqJILHXVxspyF5yLz2Ytnjow=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.172.0.tgz"; + sha512 = "VPoIa8p2sP0AfEPOZrUkNpwIFqnBAupITV2Qho2gdEoPWfoRwuSzr0z8Ktx8uwCDGpaXth1dgITe5wY06w0Oig=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7679,7 +7679,7 @@ in sources."tslib-2.3.1" ]; }) - sources."@babel/runtime-7.17.8" + sources."@babel/runtime-7.17.9" sources."@colors/colors-1.5.0" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ @@ -7808,7 +7808,7 @@ in ]; }) sources."avsc-5.7.4" - (sources."aws-sdk-2.1106.0" // { + (sources."aws-sdk-2.1111.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7896,10 +7896,9 @@ in ]; }) sources."caseless-0.12.0" - (sources."cfb-1.2.1" // { + (sources."cfb-1.2.2" // { dependencies = [ sources."adler-32-1.3.1" - sources."printj-1.3.1" ]; }) sources."chalk-4.1.2" @@ -7981,17 +7980,12 @@ in sources."cookie-signature-1.0.6" sources."core-js-3.21.1" sources."core-util-is-1.0.2" - (sources."crc-32-1.2.1" // { - dependencies = [ - sources."printj-1.3.1" - ]; - }) + sources."crc-32-1.2.2" sources."cron-1.7.2" sources."cron-parser-2.18.0" (sources."cross-spawn-4.0.2" // { dependencies = [ sources."lru-cache-4.1.5" - sources."yallist-2.1.2" ]; }) sources."crypt-0.0.2" @@ -8017,8 +8011,8 @@ in sources."difflib-0.2.4" sources."dir-glob-3.0.1" sources."discontinuous-range-1.0.0" - sources."dom-serializer-1.3.2" - sources."domelementtype-2.2.0" + sources."dom-serializer-1.4.1" + sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" (sources."dot-case-3.0.4" // { @@ -8149,7 +8143,7 @@ in ]; }) sources."google-timezones-json-1.0.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -8261,7 +8255,7 @@ in sources."iconv-lite-0.6.2" ]; }) - sources."libphonenumber-js-1.9.50" + sources."libphonenumber-js-1.9.51" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-3.0.3" @@ -8298,11 +8292,10 @@ in sources."tslib-2.3.1" ]; }) - sources."lru-cache-6.0.0" + sources."lru-cache-7.8.1" (sources."lru-memoizer-2.1.4" // { dependencies = [ sources."lru-cache-4.0.2" - sources."yallist-2.1.2" ]; }) sources."luxon-2.3.1" @@ -8349,7 +8342,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."moment-2.29.1" + sources."moment-2.29.2" sources."moment-timezone-0.5.34" sources."monaco-editor-0.29.1" sources."mongodb-3.7.3" @@ -8374,22 +8367,23 @@ in dependencies = [ sources."denque-2.0.1" sources."iconv-lite-0.6.3" + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" ]; }) sources."mz-2.7.0" - sources."n8n-core-0.112.0" - sources."n8n-design-system-0.16.0" - sources."n8n-editor-ui-0.138.0" - (sources."n8n-nodes-base-0.169.0" // { + sources."n8n-core-0.113.0" + sources."n8n-design-system-0.17.0" + sources."n8n-editor-ui-0.139.0" + (sources."n8n-nodes-base-0.170.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.94.0" + sources."n8n-workflow-0.95.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" - sources."yallist-2.1.2" ]; }) sources."nanoclone-0.2.1" @@ -8631,7 +8625,7 @@ in sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" sources."selderee-0.6.0" - sources."semver-7.3.5" + sources."semver-7.3.6" (sources."send-0.17.2" // { dependencies = [ (sources."debug-2.6.9" // { @@ -8663,7 +8657,7 @@ in sources."shell-escape-0.2.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.5.0" + sources."simple-git-3.6.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" @@ -8831,7 +8825,7 @@ in sources."which-boxed-primitive-1.0.2" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - (sources."winston-3.6.0" // { + (sources."winston-3.7.2" // { dependencies = [ sources."async-3.2.3" sources."readable-stream-3.6.0" @@ -8862,7 +8856,7 @@ in }) sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-4.0.0" + sources."yallist-2.1.2" (sources."yargonaut-1.1.4" // { dependencies = [ sources."ansi-regex-2.1.1" From 1bc3080a83280d8b2b0f4af06874b4b60c9ee436 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 16:28:21 +0000 Subject: [PATCH 224/385] gremlin-console: 3.5.2 -> 3.5.3 --- pkgs/applications/misc/gremlin-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 8c596b06fd0f..9e505bf8ae99 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.5.2"; + version = "3.5.3"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-PCr8lDQzypgozKCzD8FV4X4ls5lYZRMey1vfcFzo+Uc="; + sha256 = "sha256-pcxJYK+hBFlJ8CmuHGcI+U3x3nE/f9Nu37Nkd3C2Hy8="; }; nativeBuildInputs = [ makeWrapper ]; From e0e7a0a702d61ddb24ef519d40d916d5ef69f909 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 11 Apr 2022 19:34:22 +0300 Subject: [PATCH 225/385] gnss-sdr: Fix build with boost patch --- pkgs/applications/radio/gnss-sdr/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 383c5710808f..f6e834d53fb3 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , armadillo , cmake , gmp @@ -34,6 +35,11 @@ gnuradio.pkgs.mkDerivation rec { # cpu_features which is bundled in the source. NOTE: Perhaps this patch # should be sent upstream. ./fix_libcpu_features_install_path.patch + # Fixes a compilation issue, should be removed on next release. + (fetchpatch { + url = "https://github.com/gnss-sdr/gnss-sdr/commit/8a42967c854e575f2dd9ee7ca81a2522eebb864b.patch"; + sha256 = "sha256-W8BwC08QVtW0LUj5Q+j28aYG+713s+vQIzsWyrNUs1Q="; + }) ]; nativeBuildInputs = [ From 1258b99c8a5c4554d9988da325f84db47db2e5d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 16:39:50 +0000 Subject: [PATCH 226/385] aliyun-cli: 3.0.115 -> 3.0.116 --- pkgs/tools/admin/aliyun-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 4ccb5c9fb954..0f431e5e40c8 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.115"; + version = "3.0.116"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-lWWycvzZaVoEzEHp392mEDGcrksC4Y9XjGZYeL9RY6s="; + sha256 = "sha256-KZZT7XVhJLfrQ7L3FFOTw9bLT5GqewvDTGQQd/ovjbg="; }; vendorSha256 = "sha256-f3GXkAvTe8rPFWCR5TM4mDK/VOQWt2lrZrfJ/Wvw8Uc="; From 5e8f01e28e6f3a39fbf63f9159dd362d3a3291ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 16:50:27 +0000 Subject: [PATCH 227/385] python310Packages.sunpy: 3.1.4 -> 3.1.6 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 9c88dc3462ac..8f1653d91abf 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.1.4"; + version = "3.1.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TDslY1KUohR9zyyJ6+B95MMMsUL1TBl49L+nSCvZ9nI="; + sha256 = "sha256-mI5W4EDzTk3GryTQbnmvP+ks3VJDzw4drew9wD9+tIE="; }; nativeBuildInputs = [ From a51fea4403cac553ef31f8036c04fb946db0f75b Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sat, 26 Mar 2022 18:56:55 -0500 Subject: [PATCH 228/385] microcodeAmd, microcodeIntel: fix reproducibility --- pkgs/os-specific/linux/microcode/amd.nix | 7 ++++--- pkgs/os-specific/linux/microcode/intel.nix | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 0f3d0f18186a..051ad131be93 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -12,13 +12,14 @@ stdenv.mkDerivation { buildPhase = '' mkdir -p kernel/x86/microcode - find ${linux-firmware}/lib/firmware/amd-ucode -name \*.bin \ - -exec sh -c 'cat {} >> kernel/x86/microcode/AuthenticAMD.bin' \; + find ${linux-firmware}/lib/firmware/amd-ucode -name \*.bin -print0 | sort -z |\ + xargs -0 -I{} sh -c 'cat {} >> kernel/x86/microcode/AuthenticAMD.bin' ''; installPhase = '' mkdir -p $out - echo kernel/x86/microcode/AuthenticAMD.bin | bsdcpio -o -H newc -R 0:0 > $out/amd-ucode.img + touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/AuthenticAMD.bin + echo kernel/x86/microcode/AuthenticAMD.bin | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- > $out/amd-ucode.img ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 923047ead11a..f239cb307c74 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { mkdir -p $out kernel/x86/microcode iucode_tool -w kernel/x86/microcode/GenuineIntel.bin intel-ucode/ - echo kernel/x86/microcode/GenuineIntel.bin | bsdcpio -o -H newc -R 0:0 > $out/intel-ucode.img + touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/GenuineIntel.bin + echo kernel/x86/microcode/GenuineIntel.bin | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- > $out/intel-ucode.img runHook postInstall ''; From 14aaf6173597170c03aee42fcfd64e03d7392eed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 18:11:18 +0000 Subject: [PATCH 229/385] calamares: 3.2.54 -> 3.2.55 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 08c7ab17e52d..911204150212 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.54"; + version = "3.2.55"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-TfdLbDsjjPC/8BoEVm4mXePxQ8KX+9jgwKqUR1lcyOk="; + sha256 = "sha256-1xf02rjy6+83zbU2yxGUGjcIGJfYS8ryqi4CBzrh7kI="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 77d6781cdc7b472bc5d6991b5afc5b6c0928d3d6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 25 Mar 2022 01:41:25 -0700 Subject: [PATCH 230/385] openssl: specify the ABI explicitly on mips64 When *not* cross-compiling, OpenSSL will not attempt to detect the host ABI. For mips64, the OpenSSL authors have chosen to assume that the n32 ABI is used. Since nixpkgs knows the correct ABI based on stdenv.hostPlatform, let's pass this information to OpenSSL explicitly. At the moment (bootstrappable) nixpkgs on mips64 can only be used with the n64 ABI due to the fact that boost-context (required by nix) does not support the n32 ABI. Without this commit the openssl expression can be cross-compiled to a mips64 host, but a mips64 host cannot self-compile the expression due to OpenSSL's incorrect assumption. https://github.com/NixOS/nixpkgs/pull/165746#pullrequestreview-924423243 --- pkgs/development/libraries/openssl/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 33ddbf7018c5..e364cc3dd76e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -69,6 +69,12 @@ let x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; riscv64-linux = "./Configure linux64-riscv64"; + mips64el-linux = + if stdenv.hostPlatform.isMips64n64 + then "./Configure linux64-mips64" + else if stdenv.hostPlatform.isMips64n32 + then "./Configure linux-mips64" + else throw "unsupported ABI for ${stdenv.hostPlatform.system}"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" From fb44ecd129c8ee49fb599f82f2ff8041ebd34682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 5 Apr 2022 14:45:50 +0100 Subject: [PATCH 231/385] nixos/udev: Add systemd stage 1 support --- nixos/modules/services/hardware/udev.nix | 84 ++++++++++++++++++-- nixos/modules/system/boot/systemd/initrd.nix | 14 ++-- 2 files changed, 82 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 61448af2d33b..b0cdfd551e49 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -30,10 +30,10 @@ let ''; # Perform substitutions in all udev rules files. - udevRules = pkgs.runCommand "udev-rules" + udevRulesFor = { name, udevPackages, udevPath, udev, systemd, binPackages, initrdBin ? null }: pkgs.runCommand name { preferLocalBuild = true; allowSubstitutes = false; - packages = unique (map toString cfg.packages); + packages = unique (map toString udevPackages); } '' mkdir -p $out @@ -61,6 +61,9 @@ let --replace \"/bin/mount \"${pkgs.util-linux}/bin/mount \ --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \ --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename + ${optionalString (initrdBin != null) '' + substituteInPlace $i --replace '/run/current-system/systemd' "${removeSuffix "/bin" initrdBin}" + ''} done echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... " @@ -85,8 +88,9 @@ let for i in $import_progs $run_progs; do # if the path refers to /run/current-system/systemd, replace with config.systemd.package if [[ $i == /run/current-system/systemd* ]]; then - i="${config.systemd.package}/''${i#/run/current-system/systemd/}" + i="${systemd}/''${i#/run/current-system/systemd/}" fi + if [[ ! -x $i ]]; then echo "FAIL" echo "$i is called in udev rules but is not executable or does not exist" @@ -103,7 +107,7 @@ let echo "Consider fixing the following udev rules:" echo "$filesToFixup" | while read localFile; do remoteFile="origin unknown" - for i in ${toString cfg.packages}; do + for i in ${toString binPackages}; do for j in "$i"/*/udev/rules.d/*; do [ -e "$out/$(basename "$j")" ] || continue [ "$(basename "$j")" = "$(basename "$localFile")" ] || continue @@ -126,7 +130,7 @@ let ${optionalString (!config.boot.hardwareScan) '' ln -s /dev/null $out/80-drivers.rules ''} - ''; # */ + ''; hwdbBin = pkgs.runCommand "hwdb.bin" { preferLocalBuild = true; @@ -193,6 +197,34 @@ in apply = map getBin; }; + initrdPackages = mkOption { + type = types.listOf types.path; + default = []; + visible = false; + description = '' + This will only be used when systemd is used in stage 1. + + List of packages containing udev rules that will be copied to stage 1. + All files found in + pkg/etc/udev/rules.d and + pkg/lib/udev/rules.d + will be included. + ''; + }; + + initrdBinPackages = mkOption { + type = types.listOf types.path; + default = []; + visible = false; + description = '' + This will only be used when systemd is used in stage 1. + + Packages to search for binaries that are referenced by the udev rules in stage 1. + This list always contains /bin of the initrd. + ''; + apply = map getBin; + }; + path = mkOption { type = types.listOf types.path; default = []; @@ -298,16 +330,54 @@ in boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ]; - boot.initrd.extraUdevRulesCommands = optionalString (cfg.initrdRules != "") + boot.initrd.extraUdevRulesCommands = optionalString (!config.boot.initrd.systemd.enable && cfg.initrdRules != "") '' cat <<'EOF' > $out/99-local.rules ${cfg.initrdRules} EOF ''; + boot.initrd.systemd.additionalUpstreamUnits = [ + # TODO: "initrd-udevadm-cleanup-db.service" is commented out because of https://github.com/systemd/systemd/issues/12953 + "systemd-udevd-control.socket" + "systemd-udevd-kernel.socket" + "systemd-udevd.service" + "systemd-udev-settle.service" + "systemd-udev-trigger.service" + ]; + boot.initrd.systemd.storePaths = [ + "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd" + "${config.boot.initrd.systemd.package}/lib/udev" + ] ++ map toString cfg.initrdBinPackages; + + # Generate the udev rules for the initrd + boot.initrd.systemd.contents = { + "/etc/udev/rules.d".source = udevRulesFor { + name = "initrd-udev-rules"; + initrdBin = config.boot.initrd.systemd.contents."/bin".source; + udevPackages = cfg.initrdPackages; + udevPath = config.boot.initrd.systemd.contents."/bin".source; + udev = config.boot.initrd.systemd.package; + systemd = config.boot.initrd.systemd.package; + binPackages = cfg.initrdBinPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ]; + }; + }; + # Insert custom rules + services.udev.initrdPackages = mkIf (cfg.initrdRules != "") (pkgs.writeTextFile { + name = "initrd-udev-rules"; + destination = "/etc/udev/rules.d/99-local.rules"; + text = cfg.initrdRules; + }); + environment.etc = { - "udev/rules.d".source = udevRules; + "udev/rules.d".source = udevRulesFor { + name = "udev-rules"; + udevPackages = cfg.packages; + systemd = config.systemd.package; + binPackages = cfg.packages; + inherit udevPath udev; + }; "udev/hwdb.bin".source = hwdbBin; }; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index c383486bb0bc..6f884d41d63c 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -34,7 +34,6 @@ let "initrd-switch-root.service" "initrd-switch-root.target" "initrd.target" - "initrd-udevadm-cleanup-db.service" "kexec.target" "kmod-static-nodes.service" "local-fs-pre.target" @@ -71,12 +70,6 @@ let "systemd-sysctl.service" "systemd-tmpfiles-setup-dev.service" "systemd-tmpfiles-setup.service" - "systemd-udevd-control.socket" - "systemd-udevd-kernel.socket" - "systemd-udevd.service" - "systemd-udev-settle.service" - "systemd-udev-trigger.service" - "systemd-vconsole-setup.service" "timers.target" "umount.target" @@ -384,6 +377,11 @@ in { "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe"; "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf"; + "/etc/modprobe.d/ubuntu.conf".source = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { } '' + ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out + ''; + "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; + }; storePaths = [ @@ -397,12 +395,10 @@ in { "${cfg.package}/lib/systemd/systemd-remount-fs" "${cfg.package}/lib/systemd/systemd-sulogin-shell" "${cfg.package}/lib/systemd/systemd-sysctl" - "${cfg.package}/lib/systemd/systemd-udevd" "${cfg.package}/lib/systemd/systemd-vconsole-setup" # additional systemd directories "${cfg.package}/lib/systemd/system-generators" - "${cfg.package}/lib/udev" # utilities needed by systemd "${cfg.package.util-linux}/bin/mount" From 7a32fdb1fe99937e506532005a2559c5f7162ae0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 05:27:49 +0000 Subject: [PATCH 232/385] xmrig: 6.16.4 -> 6.17.0 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index e40a0d7e5ade..b771bd7e6212 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.16.4"; + version = "6.17.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-hfdKhTUGoVN4DIURO+e3MOSpsL6GWxOV3LItd0nA51Y="; + sha256 = "sha256-K8mN3Wzlay2Qgoo70mu3Bh4lXUXNDpXYt17aNnwWkIc="; }; nativeBuildInputs = [ cmake ]; From d123a1a575560335079e7494655f165ed805ce02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 11:15:53 +0000 Subject: [PATCH 233/385] gqrx: 2.15.8 -> 2.15.9 --- pkgs/applications/radio/gqrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 28be25920a45..d138dd350c04 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -23,13 +23,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.15.8"; + version = "2.15.9"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-RxwkiJdPHWyhU3azSpWV2M0tG5GInQBpc/ls16V1B94="; + sha256 = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; }; nativeBuildInputs = [ From 2ff94ac9d4c096c03f8e1338f0a435486afbb09e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 19:01:19 +0000 Subject: [PATCH 234/385] python310Packages.pycfmodel: 0.18.2 -> 0.19.0 --- pkgs/development/python-modules/pycfmodel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index c9e787c68aa6..2dca6e47654f 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.18.2"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JZRM4CwO69BJBTm0LzA41oNv/iViIdU3Mq01Fa/KlUs="; + hash = "sha256-u1XuUW5OFl5NDP11nd6HK17NBXjqvzLFp2jUmecWP8E="; }; propagatedBuildInputs = [ From 3df2691e6b5500e853bb62591fce613603fc2478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 4 Apr 2022 12:57:32 +0100 Subject: [PATCH 235/385] nixos/stage-1-systemd: Handover between the systemds directly --- nixos/modules/system/activation/top-level.nix | 12 ++- nixos/modules/system/boot/stage-2-init.sh | 100 +++++++++++------- nixos/modules/system/boot/systemd/initrd.nix | 61 +++++++++++ nixos/tests/systemd-initrd-simple.nix | 29 +++-- 4 files changed, 151 insertions(+), 51 deletions(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index b8aeee8c11b3..df8db7f34d0d 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -55,11 +55,15 @@ let substituteInPlace $out/dry-activate --subst-var out chmod u+x $out/activate $out/dry-activate unset activationScript dryActivationScript - ${pkgs.stdenv.shellDryRun} $out/activate - ${pkgs.stdenv.shellDryRun} $out/dry-activate - cp ${config.system.build.bootStage2} $out/init - substituteInPlace $out/init --subst-var-by systemConfig $out + ${if config.boot.initrd.systemd.enable then '' + cp ${config.system.build.bootStage2} $out/prepare-root + substituteInPlace $out/prepare-root --subst-var-by systemConfig $out + ln -s "$systemd/lib/systemd/systemd" $out/init + '' else '' + cp ${config.system.build.bootStage2} $out/init + substituteInPlace $out/init --subst-var-by systemConfig $out + ''} ln -s ${config.system.build.etc}/etc $out/etc ln -s ${config.system.path} $out/sw diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 096a051f8684..f2a839d07868 100755 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -5,28 +5,30 @@ systemConfig=@systemConfig@ export HOME=/root PATH="@path@" -# Process the kernel command line. -for o in $(>>\e[0m" -echo + # Print a greeting. + echo + echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m" + echo -# Normally, stage 1 mounts the root filesystem read/writable. -# However, in some environments, stage 2 is executed directly, and the -# root is read-only. So make it writable here. -if [ -z "$container" ]; then - mount -n -o remount,rw none / + # Normally, stage 1 mounts the root filesystem read/writable. + # However, in some environments, stage 2 is executed directly, and the + # root is read-only. So make it writable here. + if [ -z "$container" ]; then + mount -n -o remount,rw none / + fi fi @@ -39,6 +41,12 @@ if [ ! -e /proc/1 ]; then local options="$3" local fsType="$4" + # We must not overwrite this mount because it's bind-mounted + # from stage 1's /run + if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" = true ] && [ "${mountPoint}" = /run ]; then + return + fi + install -m 0755 -d "$mountPoint" mount -n -t "$fsType" -o "$options" "$device" "$mountPoint" } @@ -46,7 +54,11 @@ if [ ! -e /proc/1 ]; then fi -echo "booting system configuration $systemConfig" > /dev/kmsg +if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" = true ]; then + echo "booting system configuration ${systemConfig}" +else + echo "booting system configuration $systemConfig" > /dev/kmsg +fi # Make /nix/store a read-only bind mount to enforce immutability of @@ -68,24 +80,26 @@ if [ -n "@readOnlyStore@" ]; then fi -# Use /etc/resolv.conf supplied by systemd-nspawn, if applicable. -if [ -n "@useHostResolvConf@" ] && [ -e /etc/resolv.conf ]; then - resolvconf -m 1000 -a host &1 {logErrFd}>&2 -if test -w /dev/kmsg; then - exec > >(tee -i /proc/self/fd/"$logOutFd" | while read -r line; do - if test -n "$line"; then - echo "<7>stage-2-init: $line" > /dev/kmsg - fi - done) 2>&1 -else - mkdir -p /run/log - exec > >(tee -i /run/log/stage-2-init.log) 2>&1 + # Log the script output to /dev/kmsg or /run/log/stage-2-init.log. + # Only at this point are all the necessary prerequisites ready for these commands. + exec {logOutFd}>&1 {logErrFd}>&2 + if test -w /dev/kmsg; then + exec > >(tee -i /proc/self/fd/"$logOutFd" | while read -r line; do + if test -n "$line"; then + echo "<7>stage-2-init: $line" > /dev/kmsg + fi + done) 2>&1 + else + mkdir -p /run/log + exec > >(tee -i /run/log/stage-2-init.log) 2>&1 + fi fi @@ -116,11 +130,15 @@ ln -sfn "$systemConfig" /run/booted-system : >> /etc/machine-id -# Reset the logging file descriptors. -exec 1>&$logOutFd 2>&$logErrFd -exec {logOutFd}>&- {logErrFd}>&- +# No need to restore the stdout/stderr streams we never redirected and +# especially no need to start systemd +if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" != true ]; then + # Reset the logging file descriptors. + exec 1>&$logOutFd 2>&$logErrFd + exec {logOutFd}>&- {logErrFd}>&- -# Start systemd in a clean environment. -echo "starting systemd..." -exec @systemdExecutable@ "$@" + # Start systemd in a clean environment. + echo "starting systemd..." + exec @systemdExecutable@ "$@" +fi diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 681293d8fed6..dab06a7b98e7 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -445,6 +445,67 @@ in { '')]; services."systemd-makefs@".unitConfig.IgnoreOnIsolate = true; services."systemd-growfs@".unitConfig.IgnoreOnIsolate = true; + + services.initrd-nixos-activation = { + after = [ "initrd-fs.target" ]; + requiredBy = [ "initrd.target" ]; + unitConfig.AssertPathExists = "/etc/initrd-release"; + serviceConfig.Type = "oneshot"; + description = "NixOS Activation"; + + script = /* bash */ '' + set -uo pipefail + export PATH="/bin:${cfg.package.util-linux}/bin" + + # Figure out what closure to boot + closure= + for o in $(< /proc/cmdline); do + case $o in + init=*) + IFS== read -r -a initParam <<< "$o" + closure="$(dirname "''${initParam[1]}")" + ;; + esac + done + + # Sanity check + if [ -z "''${closure:-}" ]; then + echo 'No init= parameter on the kernel command line' >&2 + exit 1 + fi + + # If we are not booting a NixOS closure (e.g. init=/bin/sh), + # we don't know what root to prepare so we don't do anything + if ! [ -x "/sysroot$closure/prepare-root" ]; then + echo "NEW_INIT=''${initParam[1]}" > /etc/switch-root.conf + echo "$closure does not look like a NixOS installation - not activating" + exit 0 + fi + echo 'NEW_INIT=' > /etc/switch-root.conf + + + # We need to propagate /run for things like /run/booted-system + # and /run/current-system. + mkdir -p /sysroot/run + mount --bind /run /sysroot/run + + # Initialize the system + export IN_NIXOS_SYSTEMD_STAGE1=true + exec chroot /sysroot $closure/prepare-root + ''; + }; + + # This will either call systemctl with the new init as the last parameter (which + # is the case when not booting a NixOS system) or with an empty string, causing + # systemd to bypass its verification code that checks whether the next file is a systemd + # and using its compiled-in value + services.initrd-switch-root.serviceConfig = { + EnvironmentFile = "-/etc/switch-root.conf"; + ExecStart = [ + "" + ''systemctl --no-block switch-root /sysroot "''${NEW_INIT}"'' + ]; + }; }; }; } diff --git a/nixos/tests/systemd-initrd-simple.nix b/nixos/tests/systemd-initrd-simple.nix index ba62cdf3bbc7..959cc87c0f26 100644 --- a/nixos/tests/systemd-initrd-simple.nix +++ b/nixos/tests/systemd-initrd-simple.nix @@ -14,14 +14,31 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { testScript = '' import subprocess - oldAvail = machine.succeed("df --output=avail / | sed 1d") - machine.shutdown() + with subtest("handover to stage-2 systemd works"): + machine.wait_for_unit("multi-user.target") + machine.succeed("systemd-analyze | grep -q '(initrd)'") # direct handover + machine.succeed("touch /testfile") # / is writable + machine.fail("touch /nix/store/testfile") # /nix/store is not writable + # Special filesystems are mounted by systemd + machine.succeed("[ -e /run/booted-system ]") # /run + machine.succeed("[ -e /sys/class ]") # /sys + machine.succeed("[ -e /dev/null ]") # /dev + machine.succeed("[ -e /proc/1 ]") # /proc + # stage-2-init mounted more special filesystems + machine.succeed("[ -e /dev/shm ]") # /dev/shm + machine.succeed("[ -e /dev/pts/ptmx ]") # /dev/pts + machine.succeed("[ -e /run/keys ]") # /run/keys - subprocess.check_call(["qemu-img", "resize", "vm-state-machine/machine.qcow2", "+1G"]) - machine.start() - newAvail = machine.succeed("df --output=avail / | sed 1d") + with subtest("growfs works"): + oldAvail = machine.succeed("df --output=avail / | sed 1d") + machine.shutdown() - assert int(oldAvail) < int(newAvail), "File system did not grow" + subprocess.check_call(["qemu-img", "resize", "vm-state-machine/machine.qcow2", "+1G"]) + + machine.start() + newAvail = machine.succeed("df --output=avail / | sed 1d") + + assert int(oldAvail) < int(newAvail), "File system did not grow" ''; }) From f8be8367014bdc550732429b0988d14e832a1c81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 19:05:30 +0000 Subject: [PATCH 236/385] cargo-deny: 0.11.3 -> 0.11.4 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 78e7fa7b4c8d..8c05a5fc9a03 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-QpYwH9ZmD/muCGtL+9wzz4UKRyHWaga7vrjNjKz4uVQ="; + sha256 = "sha256-lwVoV+zxJfmWvlt14FFmxPCdKCoojVvRVGS1rq1QF44="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-DFGCjA0AENYDs5EnQ3WDkbCEw14ndjOh7qx2ZFgNGH0="; + cargoSha256 = "sha256-I+kpHaCxuNzq8+GdqQEuSdE4aD+/lBccUrSf+XW2OKE="; nativeBuildInputs = [ pkg-config ]; From ffe759bb5bc99c4b56db60f411961045b6db70a7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 5 Apr 2022 07:31:41 +0200 Subject: [PATCH 237/385] =?UTF-8?q?coqPackages.gappalib:=201.5.0=20?= =?UTF-8?q?=E2=86=92=201.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/gappalib/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 02905dcffed5..23cbd46743b1 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -6,7 +6,8 @@ with lib; mkCoqDerivation { owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if versions.range "8.8" "8.14" coq.coq-version then "1.5.0" else null; + defaultVersion = if versions.range "8.8" "8.15" coq.coq-version then "1.5.1" else null; + release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n"; release."1.4.5".sha256 = "081hib1d9wfm29kis390qsqch8v6fs3q71g2rgbbzx5y5cf48n9k"; release."1.4.4".sha256 = "114q2hgw64j6kqa9mg3qcp1nlf0ia46z2xadq81fnkxqm856ml7l"; From af31997fe2823d292803799a85d5938fd6754da3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 19:35:54 +0000 Subject: [PATCH 238/385] python310Packages.hahomematic: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 2b35bf5c6c98..6bf0d0dff358 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-qdOkF8Ob2vYzmIlFM7LbrcuvMWLk4Pd+DTSe3E+8Df8="; + sha256 = "sha256-Wxdh9NzrZVPnDbkb6M8tTqA7RQ4enULLq3GFr0qfynY="; }; propagatedBuildInputs = [ From 3f7da58c0b8c93bb225b3ab4ffd4db9278904ea6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Apr 2022 21:45:54 +0200 Subject: [PATCH 239/385] python3Packages.sphinxcontrib-bibtex: disable on older Python releases --- .../sphinxcontrib-bibtex/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 7bde439a2565..94c545a694ef 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , oset , pybtex , pybtex-docutils @@ -9,20 +9,28 @@ }: buildPythonPackage rec { - version = "2.4.2"; pname = "sphinxcontrib-bibtex"; + version = "2.4.2"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZbAj7kfzXx8DrE1xyCTmfGJMfsrBuyboNiMnGgH52oY="; + hash = "sha256-ZbAj7kfzXx8DrE1xyCTmfGJMfsrBuyboNiMnGgH52oY="; }; - propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; + propagatedBuildInputs = [ + oset + pybtex + pybtex-docutils + sphinx + ]; doCheck = false; - pythonImportsCheck = [ "sphinxcontrib.bibtex" ]; + + pythonImportsCheck = [ + "sphinxcontrib.bibtex" + ]; meta = with lib; { description = "A Sphinx extension for BibTeX style citations"; From 672f7edb4d7a14e6d2e8026f49c66be270818b0a Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 11 Apr 2022 19:51:45 +0000 Subject: [PATCH 240/385] python3Packages.tensorflow-datasets: fix build --- .../python-modules/tensorflow-datasets/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 1fc9f5ae25dc..959ecd9092ab 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -9,6 +9,8 @@ , future , imagemagick , importlib-resources +, jax +, jaxlib , jinja2 , langdetect , lib @@ -78,6 +80,8 @@ buildPythonPackage rec { beautifulsoup4 ffmpeg imagemagick + jax + jaxlib jinja2 langdetect matplotlib @@ -119,6 +123,9 @@ buildPythonPackage rec { # Requires `tensorflow_io` which is not packaged in `nixpkgs`. "tensorflow_datasets/image/lsun_test.py" + # Requires `envlogger` which is not packaged in `nixpkgs`. + "tensorflow_datasets/rlds/robosuite_panda_pick_place_can/robosuite_panda_pick_place_can_test.py" + # Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments` # deep in TF AutoGraph. Doesn't reproduce in Docker with Ubuntu 22.04 => might be related # to the differences in some of the dependencies? From d7160ccdfc767bc25f5da34b879ae382bd0dd7e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Apr 2022 22:30:40 +0200 Subject: [PATCH 241/385] python3Packages.pyoverkiz: 1.3.14 -> 1.4.0 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index f39b17a67541..019a7682a7ef 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.3.14"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "v${version}"; - hash = "sha256-dyT2hrTQwYoKEZAVIed2N4259YlR2JmvOEpAuPLCur4="; + hash = "sha256-uaeSyRtnokUJ3jWTioVMuo+T3jFoH+SYTBT3HPCPjm8="; }; nativeBuildInputs = [ From 660a36f173cfcf049623ed075d518bb753b0fbb8 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 20 Nov 2021 19:51:04 +0300 Subject: [PATCH 242/385] nixos/nginx: fix http3 configuration --- .../services/web-servers/nginx/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 7caaf5611cc0..c5adbef3ec67 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -255,20 +255,19 @@ let else defaultListen; listenString = { addr, port, ssl, extraParameters ? [], ... }: - "listen ${addr}:${toString port} " - + optionalString ssl "ssl " + (if ssl && vhost.http3 then " + # UDP listener for **QUIC+HTTP/3 + listen ${addr}:${toString port} http3 " + + optionalString vhost.default "default_server " + + ";" else "") + + " + + listen ${addr}:${toString port} " + optionalString (ssl && vhost.http2) "http2 " + + optionalString ssl "ssl " + optionalString vhost.default "default_server " + optionalString (extraParameters != []) (concatStringsSep " " extraParameters) - + ";" - + (if ssl && vhost.http3 then '' - # UDP listener for **QUIC+HTTP/3 - listen ${addr}:${toString port} http3 reuseport; - # Advertise that HTTP/3 is available - add_header Alt-Svc 'h3=":443"'; - # Sent when QUIC was used - add_header QUIC-Status $quic; - '' else ""); + + ";"; redirectListen = filter (x: !x.ssl) defaultListen; @@ -321,6 +320,11 @@ let ssl_conf_command Options KTLS; ''} + ${optionalString (hasSSL && vhost.http3) '' + # Advertise that HTTP/3 is available + add_header Alt-Svc 'h3=":443"; ma=86400' always; + ''} + ${mkBasicAuth vhostName vhost} ${mkLocations vhost.locations} From c508da303b0e27b2d4003f0550e3ba3d79716b8f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 7 Mar 2022 15:44:24 +0300 Subject: [PATCH 243/385] nixos/nginx: add reuseport option --- .../services/web-servers/nginx/default.nix | 2 ++ .../services/web-servers/nginx/vhost-options.nix | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index c5adbef3ec67..5cbdea5116a5 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -259,6 +259,7 @@ let # UDP listener for **QUIC+HTTP/3 listen ${addr}:${toString port} http3 " + optionalString vhost.default "default_server " + + optionalString vhost.reuseport "reuseport " + ";" else "") + " @@ -266,6 +267,7 @@ let + optionalString (ssl && vhost.http2) "http2 " + optionalString ssl "ssl " + optionalString vhost.default "default_server " + + optionalString vhost.reuseport "reuseport " + optionalString (extraParameters != []) (concatStringsSep " " extraParameters) + ";"; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index c4e8285dc48b..2c77d6ee8162 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -20,7 +20,7 @@ with lib; serverAliases = mkOption { type = types.listOf types.str; default = []; - example = ["www.example.org" "example.org"]; + example = [ "www.example.org" "example.org" ]; description = '' Additional names of virtual hosts served by this virtual host configuration. ''; @@ -31,11 +31,11 @@ with lib; addr = mkOption { type = str; description = "IP address."; }; port = mkOption { type = int; description = "Port number."; default = 80; }; ssl = mkOption { type = bool; description = "Enable SSL."; default = false; }; - extraParameters = mkOption { type = listOf str; description = "Extra parameters of this listen directive."; default = []; example = [ "reuseport" "deferred" ]; }; + extraParameters = mkOption { type = listOf str; description = "Extra parameters of this listen directive."; default = []; example = [ "backlog=1024" "deferred" ]; }; }; }); default = []; example = [ - { addr = "195.154.1.1"; port = 443; ssl = true;} + { addr = "195.154.1.1"; port = 443; ssl = true; } { addr = "192.154.1.1"; port = 80; } ]; description = '' @@ -207,6 +207,15 @@ with lib; ''; }; + reuseport = mkOption { + type = types.bool; + default = false; + description = '' + Create an individual listening socket . + It is required to specify only once on one of the hosts. + ''; + }; + root = mkOption { type = types.nullOr types.path; default = null; From e87240e2163a32f989eb43b9b7a4a562745c0c31 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 7 Mar 2022 15:49:43 +0300 Subject: [PATCH 244/385] nixos/nginx: add extraParameters to http3 protocol --- nixos/modules/services/web-servers/nginx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 5cbdea5116a5..0c2333399e81 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -260,6 +260,7 @@ let listen ${addr}:${toString port} http3 " + optionalString vhost.default "default_server " + optionalString vhost.reuseport "reuseport " + + optionalString (extraParameters != []) (concatStringsSep " " extraParameters) + ";" else "") + " From 097be28b9ba10b659d7d3ad7c7ca79d5b4f0bc94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Apr 2022 22:39:41 +0200 Subject: [PATCH 245/385] python3Packages.devolo-home-control-api: 0.17.4 -> 0.18.1 --- .../python-modules/devolo-home-control-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index badbd3afbdb6..31e9da795d3a 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.17.4"; + version = "0.18.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4="; + sha256 = "sha256-Xj5k09uEVxZgG0oLbiPOBx/dALsRjqkZbLKit4X4q9Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 904e3139be692bdde04c9f101c8a161dcb285439 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Apr 2022 22:43:47 +0200 Subject: [PATCH 246/385] python3Packages.xknx: 0.20.1 -> 0.20.2 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 6269c52c664b..36b7f616e3d2 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.20.1"; + version = "0.20.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-7g1uAkBGlNcmfjqGNH2MS+X26Pq1hTKQy9eLJVTqxhA="; + sha256 = "sha256-9OEoU2r6/tThEoLjssWD0jrgF2oYk5IRCWLTeF4ddGc="; }; propagatedBuildInputs = [ From 9faba97d247efa0977b9b67d0e8b67fc573b7036 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 4 Apr 2022 18:30:41 +0000 Subject: [PATCH 247/385] paperless-ngx: init at 1.6.0 --- .../office/paperless-ngx/default.nix | 192 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 194 insertions(+) create mode 100644 pkgs/applications/office/paperless-ngx/default.nix diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix new file mode 100644 index 000000000000..be22ca7c26cd --- /dev/null +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -0,0 +1,192 @@ +{ lib +, fetchurl +, fetchpatch +, nixosTests +, python3 +, ghostscript +, imagemagick +, jbig2enc +, optipng +, pngquant +, qpdf +, tesseract4 +, unpaper +, liberation_ttf +}: + +let + py = python3.override { + packageOverrides = self: super: { + django = super.django_3; + + # Incompatible with aioredis 2 + aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec { + version = "1.3.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; + }; + }); + }; + }; + + path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ]; +in +py.pkgs.pythonPackages.buildPythonApplication rec { + pname = "paperless-ngx"; + version = "1.6.0"; + + src = fetchurl { + url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/ngx-${version}/${pname}-${version}.tar.xz"; + sha256 = "07mrxbwahkm00n9nvssd6d13p80w333g84cd38bzp0l34nzim5zl"; + }; + + format = "other"; + + propagatedBuildInputs = with py.pkgs.pythonPackages; [ + aioredis + arrow + asgiref + async-timeout + attrs + autobahn + automat + blessed + certifi + cffi + channels-redis + channels + chardet + click + coloredlogs + concurrent-log-handler + constantly + cryptography + daphne + dateparser + django-cors-headers + django-extensions + django-filter + django-picklefield + django-q + django + djangorestframework + filelock + fuzzywuzzy + gunicorn + h11 + hiredis + httptools + humanfriendly + hyperlink + idna + imap-tools + img2pdf + incremental + inotify-simple + inotifyrecursive + joblib + langdetect + lxml + msgpack + numpy + ocrmypdf + pathvalidate + pdfminer + pikepdf + pillow + pluggy + portalocker + psycopg2 + pyasn1-modules + pyasn1 + pycparser + pyopenssl + python-dateutil + python-dotenv + python-gnupg + python-Levenshtein + python_magic + pytz + pyyaml + redis + regex + reportlab + requests + scikit-learn + scipy + service-identity + six + sortedcontainers + sqlparse + threadpoolctl + tika + tqdm + twisted.extras.tls + txaio + tzlocal + urllib3 + uvicorn + uvloop + watchdog + watchgod + wcwidth + websockets + whitenoise + whoosh + zope_interface + ]; + + # Compile manually because `pythonRecompileBytecodeHook` only works for + # files in `python.sitePackages` + postBuild = '' + ${py.interpreter} -OO -m compileall src + ''; + + installPhase = '' + mkdir -p $out/lib + cp -r . $out/lib/paperless-ngx + chmod +x $out/lib/paperless-ngx/src/manage.py + makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : "${path}" + ''; + + checkInputs = with py.pkgs.pythonPackages; [ + pytest-django + pytest-env + pytest-sugar + pytest-xdist + factory_boy + pytestCheckHook + ]; + + pytestFlagsArray = [ "src" ]; + + # The tests require: + # - PATH with runtime binaries + # - A temporary HOME directory for gnupg + # - XDG_DATA_DIRS with test-specific fonts + preCheck = '' + export PATH="${path}:$PATH" + export HOME=$(mktemp -d) + export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" + + # Disable unneeded code coverage test + substituteInPlace src/setup.cfg \ + --replace "--cov --cov-report=html" "" + ''; + + passthru = { + # PYTHONPATH of all dependencies used by the package + pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; + inherit path; + }; + + meta = with lib; { + description = "A supercharged version of paperless: scan, index, and archive all of your physical documents"; + homepage = "https://paperless-ngx.readthedocs.io/en/latest/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ lukegb ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf2854ac7ed8..223fddea8bdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8804,6 +8804,8 @@ with pkgs; paperless-ng = callPackage ../applications/office/paperless-ng { }; + paperless-ngx = callPackage ../applications/office/paperless-ngx { }; + paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; papertrail = callPackage ../tools/text/papertrail { }; From 99f40c2c13e48dc9c22221462d4d8b06d0930790 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 11 Apr 2022 17:06:01 +0200 Subject: [PATCH 248/385] paperless-ng: delete pkg, add alias to `paperless-ngx` --- .../office/paperless-ng/default.nix | 212 ------------------ pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 2 insertions(+), 215 deletions(-) delete mode 100644 pkgs/applications/office/paperless-ng/default.nix diff --git a/pkgs/applications/office/paperless-ng/default.nix b/pkgs/applications/office/paperless-ng/default.nix deleted file mode 100644 index ab140f90ceda..000000000000 --- a/pkgs/applications/office/paperless-ng/default.nix +++ /dev/null @@ -1,212 +0,0 @@ -{ lib -, fetchurl -, fetchpatch -, nixosTests -, python3 -, ghostscript -, imagemagick -, jbig2enc -, optipng -, pngquant -, qpdf -, tesseract4 -, unpaper -, liberation_ttf -}: - -let - py = python3.override { - packageOverrides = self: super: { - django = super.django_3; - # Avoid warning in django-q versions > 1.3.4 - # https://github.com/jonaswinkler/paperless-ng/issues/857 - # https://github.com/Koed00/django-q/issues/526 - django-q = super.django-q.overridePythonAttrs (oldAttrs: rec { - version = "1.3.4"; - src = oldAttrs.src.override { - inherit version; - sha256 = "Uj1U3PG2YVLBtlj5FPAO07UYo0MqnezUiYc4yo274Q8="; - }; - }); - - # Incompatible with aioredis 2 - aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec { - version = "1.3.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; - }; - }); - }; - }; - - path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ]; -in -py.pkgs.pythonPackages.buildPythonApplication rec { - pname = "paperless-ng"; - version = "1.5.0"; - - src = fetchurl { - url = "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-${version}/${pname}-${version}.tar.xz"; - sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw="; - }; - - patches = [ - # Fix the `slow_write_pdf` test: - # https://github.com/NixOS/nixpkgs/issues/136626 - (fetchpatch { - url = "https://github.com/paperless-ngx/paperless-ngx/commit/4fbabe43ea12811864e9676b04d82a82b38e799d.patch"; - sha256 = "sha256-8ULep5aeW3wJAQGy2OEAjFYybELNq1DzCC1uBrZx36I="; - }) - ]; - - format = "other"; - - # Make bind address configurable - postPatch = '' - substituteInPlace gunicorn.conf.py --replace "bind = '0.0.0.0:8000'" "" - ''; - - propagatedBuildInputs = with py.pkgs.pythonPackages; [ - aioredis - arrow - asgiref - async-timeout - attrs - autobahn - automat - blessed - certifi - cffi - channels-redis - channels - chardet - click - coloredlogs - concurrent-log-handler - constantly - cryptography - daphne - dateparser - django-cors-headers - django-extensions - django-filter - django-picklefield - django-q - django - djangorestframework - filelock - fuzzywuzzy - gunicorn - h11 - hiredis - httptools - humanfriendly - hyperlink - idna - imap-tools - img2pdf - incremental - inotify-simple - inotifyrecursive - joblib - langdetect - lxml - msgpack - numpy - ocrmypdf - pathvalidate - pdfminer - pikepdf - pillow - pluggy - portalocker - psycopg2 - pyasn1-modules - pyasn1 - pycparser - pyopenssl - python-dateutil - python-dotenv - python-gnupg - python-Levenshtein - python_magic - pytz - pyyaml - redis - regex - reportlab - requests - scikit-learn - scipy - service-identity - six - sortedcontainers - sqlparse - threadpoolctl - tika - tqdm - twisted.extras.tls - txaio - tzlocal - urllib3 - uvicorn - uvloop - watchdog - watchgod - wcwidth - websockets - whitenoise - whoosh - zope_interface - ]; - - installPhase = '' - mkdir -p $out/lib - cp -r . $out/lib/paperless-ng - chmod +x $out/lib/paperless-ng/src/manage.py - makeWrapper $out/lib/paperless-ng/src/manage.py $out/bin/paperless-ng \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PATH : "${path}" - ''; - - checkInputs = with py.pkgs.pythonPackages; [ - pytest-django - pytest-env - pytest-sugar - pytest-xdist - factory_boy - pytestCheckHook - ]; - - pytestFlagsArray = [ "src" ]; - - # The tests require: - # - PATH with runtime binaries - # - A temporary HOME directory for gnupg - # - XDG_DATA_DIRS with test-specific fonts - preCheck = '' - export PATH="${path}:$PATH" - export HOME=$(mktemp -d) - export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" - - # Disable unneeded code coverage test - substituteInPlace src/setup.cfg \ - --replace "--cov --cov-report=html" "" - ''; - - passthru = { - # PYTHONPATH of all dependencies used by the package - pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; - inherit path; - - tests = { inherit (nixosTests) paperless-ng; }; - }; - - meta = with lib; { - description = "A supercharged version of paperless: scan, index, and archive all of your physical documents"; - homepage = "https://paperless-ng.readthedocs.io/en/latest/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ earvstedt Flakebi ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 897005fecaeb..ba8063c60ca1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -901,7 +901,8 @@ mapAliases ({ p11_kit = throw "'p11_kit' has been renamed to/replaced by 'p11-kit'"; # Converted to throw 2022-02-22 packet-cli = metal-cli; # Added 2021-10-25 - paperless = paperless-ng; # Added 2021-06-06 + paperless = paperless-ngx; # Added 2021-06-06 + paperless-ng = paperless-ngx; # Added 2022-04-11 parity = openethereum; # Added 2020-08-01 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 223fddea8bdc..df3b962820c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8802,8 +8802,6 @@ with pkgs; pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; - paperless-ng = callPackage ../applications/office/paperless-ng { }; - paperless-ngx = callPackage ../applications/office/paperless-ngx { }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; From 308c4bf0f7caaf59a42a9092d0e3a889490c7902 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 11 Apr 2022 17:06:02 +0200 Subject: [PATCH 249/385] nixos/paperless-ng: minor improvments Service: - Fix misleading comment: We could in fact implement password copying as a preStart script by amending BindReadOnlyPaths, but adding an extra service is simpler. Test: - Add more detailed subtest names - Simplify date check --- nixos/modules/services/misc/paperless-ng.nix | 4 +--- nixos/tests/paperless-ng.nix | 15 +++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/misc/paperless-ng.nix b/nixos/modules/services/misc/paperless-ng.nix index 881fa93c04ee..159aad3504bc 100644 --- a/nixos/modules/services/misc/paperless-ng.nix +++ b/nixos/modules/services/misc/paperless-ng.nix @@ -248,9 +248,7 @@ in after = [ "redis-paperless-ng.service" ]; }; - # Password copying can't be implemented as a privileged preStart script - # in 'paperless-ng-server' because 'defaultServiceConfig' limits the filesystem - # paths accessible by the service. + # Reading the user-provided password file requires root access systemd.services.paperless-ng-copy-password = mkIf (cfg.passwordFile != null) { requiredBy = [ "paperless-ng-server.service" ]; before = [ "paperless-ng-server.service" ]; diff --git a/nixos/tests/paperless-ng.nix b/nixos/tests/paperless-ng.nix index 618eeec6b125..8e9e28801910 100644 --- a/nixos/tests/paperless-ng.nix +++ b/nixos/tests/paperless-ng.nix @@ -11,9 +11,11 @@ import ./make-test-python.nix ({ lib, ... }: { }; testScript = '' + import json + machine.wait_for_unit("paperless-ng-consumer.service") - with subtest("Create test doc"): + with subtest("Add a document via the file system"): machine.succeed( "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " "-annotate +5+20 'hello world 16-10-2005' /var/lib/paperless/consume/doc.png" @@ -24,7 +26,7 @@ import ./make-test-python.nix ({ lib, ... }: { # Wait until server accepts connections machine.wait_until_succeeds("curl -fs localhost:28981") - with subtest("Create web test doc"): + with subtest("Add a document via the web interface"): machine.succeed( "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " "-annotate +5+20 'hello web 16-10-2005' /tmp/webdoc.png" @@ -35,11 +37,8 @@ import ./make-test-python.nix ({ lib, ... }: { machine.wait_until_succeeds( "(($(curl -u admin:admin -fs localhost:28981/api/documents/ | jq .count) == 2))" ) - assert "2005-10-16" in machine.succeed( - "curl -u admin:admin -fs localhost:28981/api/documents/ | jq '.results | .[0] | .created'" - ) - assert "2005-10-16" in machine.succeed( - "curl -u admin:admin -fs localhost:28981/api/documents/ | jq '.results | .[1] | .created'" - ) + docs = json.loads(machine.succeed("curl -u admin:admin -fs localhost:28981/api/documents/"))['results'] + assert "2005-10-16" in docs[0]['created'] + assert "2005-10-16" in docs[1]['created'] ''; }) From 69319ee4a6a611729e0907d6cc970201c9d2a654 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 11 Apr 2022 17:06:03 +0200 Subject: [PATCH 250/385] nixos/paperless-ng: fix /proc access for service This allows django-q to set the number of workers according to the CPU core count and to show memory stats via `manage.py qmonitor`. This also fixes a non-critical psutil error in paperless-ng-server. --- nixos/modules/services/misc/paperless-ng.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/paperless-ng.nix b/nixos/modules/services/misc/paperless-ng.nix index 159aad3504bc..632e824755c4 100644 --- a/nixos/modules/services/misc/paperless-ng.nix +++ b/nixos/modules/services/misc/paperless-ng.nix @@ -53,7 +53,6 @@ let PrivateNetwork = true; PrivateTmp = true; PrivateUsers = true; - ProcSubset = "pid"; ProtectClock = true; # Breaks if the home dir of the user is in /home # Also does not add much value in combination with the TemporaryFileSystem. @@ -66,6 +65,10 @@ let ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; + # Don't restrict ProcSubset because django-q requires read access to /proc/stat + # to query CPU and memory information. + # Note that /proc only contains processes of user `paperless`, so this is safe. + # ProcSubset = "pid"; RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; RestrictNamespaces = true; RestrictRealtime = true; From 158b9d526d7adebfaedab83604ab961c824edb33 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 11 Apr 2022 20:57:28 +0000 Subject: [PATCH 251/385] python3Packages.chex: unstable-2021-12-16 -> 0.1.2 --- pkgs/development/python-modules/chex/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index bb873f2c3bfd..a06cb4ec84bb 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -12,16 +12,14 @@ buildPythonPackage rec { pname = "chex"; - # As of 2021-12-29, the latest official version has broken tests with jax 0.2.26: - # `AttributeError: module 'jax.interpreters.xla' has no attribute 'xb'` - version = "unstable-2021-12-16"; + version = "0.1.2"; format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; - rev = "5adc10e0b4218f8ec775567fca38b68bbad42a3a"; - sha256 = "00xib6zv9pwid2q7wcr109qj3fa3g3b852skz8444kw7r0qxy7z3"; + rev = "v${version}"; + hash = "sha256-NtZYOHByKBcKmhRaNULwaQqxfoPRmgbtJ3cFHNfy4E8="; }; propagatedBuildInputs = [ From a62d3aa8bf4fe2be14a78b26ff737f1987cbbd62 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Apr 2022 22:57:38 +0200 Subject: [PATCH 252/385] metasploit: 6.1.36 -> 6.1.37 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 43 ++++++---- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 94 +++++++++++++++------ 4 files changed, 96 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4c1ad65ed7a3..fe38b6cd19c5 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.36" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.37" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 8ebeadbdfb08..4a8f6c4be93d 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: b3ad212ba393cc87bb9e621dbad9d04362f1151c - ref: refs/tags/6.1.36 + revision: 214817055bc104e6876882ef794f1de1031edb53 + ref: refs/tags/6.1.37 specs: - metasploit-framework (6.1.36) + metasploit-framework (6.1.37) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,13 +31,14 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.77) + metasploit-payloads (= 2.0.80) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt msgpack nessus_rest net-ldap + net-smtp net-ssh network_interface nexpose @@ -128,7 +129,7 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.573.0) + aws-partitions (1.575.0) aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -158,6 +159,7 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.1) + digest (3.1.0) dnsruby (1.61.9) simpleidn (~> 0.1) domain_name (0.5.20190701) @@ -234,11 +236,11 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.5) - metasploit-concern (4.0.3) + metasploit-concern (4.0.4) activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-credential (5.0.5) + metasploit-credential (5.0.7) metasploit-concern metasploit-model metasploit_data_models (>= 5.0.0) @@ -248,12 +250,12 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (4.0.3) + metasploit-model (4.0.4) activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.77) - metasploit_data_models (5.0.4) + metasploit-payloads (2.0.80) + metasploit_data_models (5.0.5) activerecord (~> 6.0) activesupport (~> 6.0) arel-helpers @@ -268,18 +270,24 @@ GEM mini_portile2 (2.8.0) minitest (5.15.0) mqtt (0.5.0) - msgpack (1.4.5) + msgpack (1.5.1) multi_json (1.15.0) multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) net-ldap (0.17.0) + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.13.3) + nokogiri (1.13.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) nori (2.6.0) @@ -335,12 +343,12 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.27) + rex-core (0.1.28) rex-encoder (0.1.6) metasm rex-arch rex-text - rex-exploitation (0.1.29) + rex-exploitation (0.1.30) jsobfu metasm rex-arch @@ -354,7 +362,7 @@ GEM rex-arch rex-ole (0.1.7) rex-text - rex-powershell (0.1.95) + rex-powershell (0.1.96) rex-random_identifier rex-text ruby-rc4 @@ -365,7 +373,7 @@ GEM metasm rex-core rex-text - rex-socket (0.1.34) + rex-socket (0.1.35) rex-core rex-sslscan (0.1.7) rex-core @@ -407,6 +415,7 @@ GEM rack (>= 1, < 3) thor (1.2.1) tilt (2.0.10) + timeout (0.2.0) ttfunk (1.7.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) @@ -447,4 +456,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.3.6 + 2.3.9 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 97948171bf5c..cc359dcd0699 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.36"; + version = "6.1.37"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-j90/ygZpwdMb0KL1bJPHpysokC3BoN/kUK/dsBo6HsU="; + sha256 = "sha256-umSWJq9jJrjawP+eXkZEKcomJNHpt7IOk+ZI1iAM6OU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 40c1d05ae29e..76c8ed6fe3f5 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "162x55is7jfdy6cf1xw2llbrxcnk5gv3dsqfmi1klf6c2xfm87gm"; + sha256 = "07kbrac2r883h4bsw4qhgkd97v0f4p05saqj8zsy300wx56nyssm"; type = "gem"; }; - version = "1.573.0"; + version = "1.575.0"; }; aws-sdk-core = { groups = ["default"]; @@ -259,6 +259,16 @@ }; version = "1.4.1"; }; + digest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39"; + type = "gem"; + }; + version = "3.1.0"; + }; dnsruby = { groups = ["default"]; platforms = []; @@ -664,62 +674,62 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmvwja6v7s12g0fq9mp2d3sgashl526apfjqk5fchqvnfqw4gsb"; + sha256 = "1m7dykwravbjdq4zs1z5lqdwrmfjsswjg7iygn4a187xn9ml1rj6"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a17zm8cq71rd8qilxai7s3dzb8n5lzvjfwyxk7slblfcgbsl9np"; + sha256 = "073bhxlyszk5iknx6896kch4yfcjk48wq7q5vnjd5k7akx0k9h8p"; type = "gem"; }; - version = "5.0.5"; + version = "5.0.7"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "b3ad212ba393cc87bb9e621dbad9d04362f1151c"; - sha256 = "1i8y78db1pdga3jdz8615n82hax7qy9nrxd2s0dx7hb90v53zpcg"; + rev = "214817055bc104e6876882ef794f1de1031edb53"; + sha256 = "1rg81hhdcj76jc7b5dz9s4j2dji98i35x7pzq3dbh9k3mwk9cr5s"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.36"; + version = "6.1.37"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13zg6jw8vbspq95s4dpcbjxnjiacy21il7y8l2dq3rd04mickryy"; + sha256 = "16mc0f7hqpqmnvyqar3hn3yr83xxvnm1ikmq6sxwbf08zhgz6v64"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; metasploit-payloads = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0chd5rn13210fgsvm0yqd59lfgg9kpmyx82jbf33dfiw6qh6mmi1"; + sha256 = "12xggj210fqprkcd6zb4rnis12l9q2fi42gmwh2hfdwvbm3syvzy"; type = "gem"; }; - version = "2.0.77"; + version = "2.0.80"; }; metasploit_data_models = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hnkrkgx89dskfr8ywpxk51y0nqnnj37qjz856f45z7ymx1nzip"; + sha256 = "1h7w6kavbylbs55rkv12hg28wcchwqvzmagw9yrkqmncwdavl0dl"; type = "gem"; }; - version = "5.0.4"; + version = "5.0.5"; }; metasploit_payloads-mettle = { groups = ["default"]; @@ -776,10 +786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125"; + sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; type = "gem"; }; - version = "1.4.5"; + version = "1.5.1"; }; multi_json = { groups = ["default"]; @@ -831,6 +841,26 @@ }; version = "0.17.0"; }; + net-protocol = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; + type = "gem"; + }; + version = "0.1.3"; + }; + net-smtp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s358kfv9mnfxcjbpr1d5a2gs1q7wkw7ffpn86mf1b3s9p31bw9s"; + type = "gem"; + }; + version = "0.3.1"; + }; net-ssh = { groups = ["default"]; platforms = []; @@ -877,10 +907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.4"; }; nori = { groups = ["default"]; @@ -1147,10 +1177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a5fb8g6ksak1g1syhvh5rh87shnx617l7nl6afl80in0h4fd4xd"; + sha256 = "17kgimw778flsqg66cyccz655kfdaasgv9g0zyk7zb5psigjadbl"; type = "gem"; }; - version = "0.1.27"; + version = "0.1.28"; }; rex-encoder = { groups = ["default"]; @@ -1167,10 +1197,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0asx13g0xqb8wnslrmsld2l1w2qpl6kjrcbfl945kw1nm7k5bwxb"; + sha256 = "0x1gqdqvsgll1r5x6cz4ica24nb3ph8y36mf3hwabgb1a6y3s0zr"; type = "gem"; }; - version = "0.1.29"; + version = "0.1.30"; }; rex-java = { groups = ["default"]; @@ -1217,10 +1247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ydzvakfg8can56jn0i8qnrf742csyk82krj50b44sj93ncj7h54"; + sha256 = "1a9ky6gp8r6xymdcgnf7paqphy07m9alw28y1lhzg760h8a1kvc6"; type = "gem"; }; - version = "0.1.95"; + version = "0.1.96"; }; rex-random_identifier = { groups = ["default"]; @@ -1257,10 +1287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rsgssbnnl5frxgnq17xq0n6rpxns6xdmxpya9852c2n72nm5ac0"; + sha256 = "1lisy36pcyhqvhxkl55pgcyw67n9birzsyrgkm0b7sbkn4jpv0d0"; type = "gem"; }; - version = "0.1.34"; + version = "0.1.35"; }; rex-sslscan = { groups = ["default"]; @@ -1472,6 +1502,16 @@ }; version = "2.0.10"; }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10bx1hcyrjqgq6a848fc1i0cgrvx42gcy8hk4vp90y6zc7k8xzbk"; + type = "gem"; + }; + version = "0.2.0"; + }; ttfunk = { groups = ["default"]; platforms = []; From b3a47430aebd96f925cd743d67dc183d1e744968 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 11 Apr 2022 21:45:36 +0200 Subject: [PATCH 253/385] ipfs: 0.12.1 -> 0.12.2 https://github.com/ipfs/go-ipfs/releases/tag/v0.12.2 --- pkgs/applications/networking/ipfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 04854840112f..e501137fa838 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "ipfs"; - version = "0.12.1"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.12.2"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; repoVersion = "12"; # Also update ipfs-migrator when changing the repo version @@ -10,7 +10,7 @@ buildGoModule rec { # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "sha256-fUExCvE6x5VFBl66y52DGvr8ZNSXZ6MYpVQP/D7X328="; + sha256 = "sha256-66NNLMSfeBHQh/QlnETB/ssra9CKbD+jtaJuX+14x00="; }; # tarball contains multiple files/directories From ec0ae67667c9d87f5ad79f7367aace1cbd8b7cce Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 11 Apr 2022 22:43:17 +0300 Subject: [PATCH 254/385] plymouth: fix maintainer list --- pkgs/os-specific/linux/plymouth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 62950b085258..4e755a28db8b 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/wiki/Software/Plymouth/"; description = "Boot splash and boot logger"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu teams.gnome.members ]; + maintainers = [ maintainers.goibhniu ] ++ teams.gnome.members; platforms = platforms.linux; }; } From 8442d63c5b662958c9ceb1bbf08bb492bf4a6d9b Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 11 Apr 2022 21:07:50 +0000 Subject: [PATCH 255/385] python3Packages.dm-haiku: fix build --- pkgs/development/python-modules/dm-haiku/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 03677faa689f..8a6eabfde0f5 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "deepmind"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM="; + hash = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { checkInputs = [ chex cloudpickle + dill dm-tree jaxlib pytest-xdist @@ -55,6 +56,11 @@ buildPythonPackage rec { "haiku/_src/integration/jax2tf_test.py" ]; + disabledTests = [ + # See https://github.com/deepmind/dm-haiku/issues/366. + "test_jit_Recurrent" + ]; + meta = with lib; { description = "Haiku is a simple neural network library for JAX developed by some of the authors of Sonnet."; homepage = "https://github.com/deepmind/dm-haiku"; From 333035257da88ae644f414cc13d9cb4de4fded7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 21:54:33 +0000 Subject: [PATCH 256/385] duckdb: 0.3.2 -> 0.3.3 --- pkgs/development/libraries/duckdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 7d12d9fabf2f..9e253588e2a5 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-F5YOqDeY3rgcnuu5SNqOfUxhsaXgqvdJZTnD1unI0tc="; + sha256 = "sha256-WxJj5hOJsRuKUHjpGZWsa0PxRZZJcX88p1/typ+yqEw="; }; patches = [ ./version.patch ]; From 910e566d350e282a45c3d5ed4b0f010adcdeb8be Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+a-m-joseph@users.noreply.github.com> Date: Mon, 11 Apr 2022 22:36:57 +0000 Subject: [PATCH 257/385] qutebrowser: honor pipewireSupport (#161020) --- .../networking/browsers/qutebrowser/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 6d919ce520f5..7ca37d114ea2 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,10 +1,12 @@ { stdenv, lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, pipewire_0_2 +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true , withMediaPlayback ? true , backend ? "webengine" +, pipewireSupport ? stdenv.isLinux +, pipewire_0_2 }: assert withMediaPlayback -> gst_all_1 != null; @@ -121,7 +123,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { "''${qtWrapperArgs[@]}" --add-flags '--backend ${backend}' --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" - ${lib.optionalString (!stdenv.isDarwin && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} ) ''; From bd3b4c54834e038e42c050b3486bfcf8d5ebdb6f Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+a-m-joseph@users.noreply.github.com> Date: Mon, 11 Apr 2022 22:47:41 +0000 Subject: [PATCH 258/385] qtwebengine: honor pipewireSupport (#161018) --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 01d0c5932828..3c5256908d88 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -12,7 +12,6 @@ , libcap , pciutils , systemd -, pipewire_0_2 , enableProprietaryCodecs ? true , gn , cctools, libobjc, libunwind, sandbox, xnu @@ -23,6 +22,8 @@ , lib, stdenv, fetchpatch , version ? null , qtCompatVersion +, pipewireSupport ? stdenv.isLinux +, pipewire_0_2 }: qtModule { @@ -137,7 +138,7 @@ qtModule { ''; qmakeFlags = [ "--" "-system-ffmpeg" ] - ++ lib.optional (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" + ++ lib.optional (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ @@ -171,7 +172,7 @@ qtModule { xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile - ] ++ lib.optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [ + ] ++ lib.optionals (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) [ # Pipewire pipewire_0_2 ] From a26c5495cd40f6adb9e36cb68d1fa5300fa7f182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Apr 2022 00:58:51 +0200 Subject: [PATCH 259/385] git: add reasonable defaults for boolean flags --- .../version-management/git-and-tools/git/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 1f08cd26ef36..f2038e95d259 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -4,15 +4,15 @@ , openssh, pcre2, bash , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv -, svnSupport, subversionClient, perlLibs, smtpPerlLibs +, svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform , nlsSupport ? true , osxkeychainSupport ? stdenv.isDarwin -, guiSupport +, guiSupport ? false , withManual ? true , pythonSupport ? true , withpcre2 ? true -, sendEmailSupport +, sendEmailSupport ? false , darwin , nixosTests , withLibsecret ? false diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf2854ac7ed8..071f4d86eea5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26139,9 +26139,6 @@ with pkgs; }; git = callPackage ../applications/version-management/git-and-tools/git { - svnSupport = false; # for git-svn support - guiSupport = false; # requires tcl/tk - sendEmailSupport = false; # requires plenty of perl libraries perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; smtpPerlLibs = [ perlPackages.libnet perlPackages.NetSMTPSSL From 271564ed3c57e8e0fb7ae513ac0a63c35dbd55ea Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 11 Apr 2022 23:58:59 +0100 Subject: [PATCH 260/385] glfw: remove merged X11 patch --- pkgs/development/libraries/glfw/3.x.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 660ad1ba607a..3aedaab5658c 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-aWwt6FRq/ofQmZAeavDa8inrJfrPxb8iyo1XYdQsrKc="; }; - # Fix freezing on Wayland (https://github.com/glfw/glfw/pull/1711) - # and linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) - patches = if waylandSupport then ./wayland.patch else ./x11.patch; + # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) + patches = lib.optional (!waylandSupport) ./x11.patch; propagatedBuildInputs = [ libGL ]; From b130f233d6e2ca4d06989174e31ea17e35ea93ff Mon Sep 17 00:00:00 2001 From: TilCreator J Date: Tue, 12 Apr 2022 02:03:57 +0200 Subject: [PATCH 261/385] pipecontrol: init at 0.2.2 (#164808) Co-authored-by: Fabian Affolter --- .../audio/pipecontrol/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/audio/pipecontrol/default.nix diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix new file mode 100644 index 000000000000..4acba5d75ee0 --- /dev/null +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, pipewire +, cmake +, extra-cmake-modules +, gnumake +, wrapQtAppsHook +, qtbase +, qttools +, kirigami2 +, kcoreaddons +, ki18n +, qtquickcontrols2 +}: + +stdenv.mkDerivation rec { + pname = "pipecontrol"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "portaloffreedom"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-BeubRDx82MQX1gB7GnGJlQ2FyYX1S83C3gqPZgIjgoM="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + wrapQtAppsHook + qttools + ]; + + buildInputs = [ + pipewire + qtbase + kirigami2 + kcoreaddons + ki18n + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Pipewire control GUI program in Qt (Kirigami2)"; + homepage = "https://github.com/portaloffreedom/pipecontrol"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tilcreator ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f9bd5ef4e2f..3e110a000da0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8856,6 +8856,8 @@ with pkgs; pipe-rename = callPackage ../tools/misc/pipe-rename { }; + pipecontrol = libsForQt5.callPackage ../applications/audio/pipecontrol { }; + pipectl = callPackage ../tools/misc/pipectl { }; pitivi = callPackage ../applications/video/pitivi { }; From 82841125f55180291787dd56d190337510f4b9f6 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 7 Apr 2022 15:49:40 -0300 Subject: [PATCH 262/385] assh: enable tests --- pkgs/tools/networking/assh/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 0d3b08ae478a..a52e9bf00444 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , openssh , makeWrapper +, ps }: buildGoModule rec { @@ -18,14 +20,14 @@ buildGoModule rec { vendorSha256 = "sha256-xLsiYM0gZL5O+Y3IkiMmzJReNW7XFN3Xejz2CkCqp5M="; - doCheck = false; - ldflags = [ "-s" "-w" "-X moul.io/assh/v2/pkg/version.Version=${version}" ]; nativeBuildInputs = [ makeWrapper ]; + checkInputs = lib.optionals stdenv.isDarwin [ ps ]; + postInstall = '' wrapProgram "$out/bin/assh" \ --prefix PATH : ${openssh}/bin From dad93dbbd3ef5f950c094bab6b7a39299ee796f5 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 9 Apr 2022 15:32:51 +0200 Subject: [PATCH 263/385] invocieplane: Add patches for CVE-2021-29024, CVE-2021-29023 --- .../servers/web-apps/invoiceplane/default.nix | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/invoiceplane/default.nix b/pkgs/servers/web-apps/invoiceplane/default.nix index 6c9ffd44b9d7..fa79997fbd01 100644 --- a/pkgs/servers/web-apps/invoiceplane/default.nix +++ b/pkgs/servers/web-apps/invoiceplane/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, writeText, unzip, nixosTests }: +{ lib, stdenv, fetchurl, writeText, unzip, nixosTests, fetchpatch }: stdenv.mkDerivation rec { pname = "invoiceplane"; @@ -9,6 +9,37 @@ stdenv.mkDerivation rec { sha256 = "137g0xps4kb3j7f5gz84ql18iggbya6d9dnrfp05g2qcbbp8kqad"; }; + patches = [ + + # Fix CVE-2021-29024, unauthenticated directory listing + # Should be included in a later release > 1.5.11 + # https://github.com/NixOS/nixpkgs/issues/166655 + # https://github.com/InvoicePlane/InvoicePlane/pull/754 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/InvoicePlane/InvoicePlane/pull/754.patch"; + sha256 = "sha256-EHXw7Zqli/nA3tPIrhxpt8ueXvDtshz0XRzZT78sdQk="; + }) + + # Fix CVE-2021-29023, password reset rate-limiting + # Should be included in a later release > 1.5.11 + # https://github.com/NixOS/nixpkgs/issues/166655 + # https://github.com/InvoicePlane/InvoicePlane/pull/739 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/InvoicePlane/InvoicePlane/pull/739.patch"; + sha256 = "sha256-6ksJjW6awr3lZsDRxa22pCcRGBVBYyV8+TbhOp6HBq0="; + }) + + # Fix CVE-2021-29022, full path disclosure + # Should be included in a later release > 1.5.11 + # https://github.com/NixOS/nixpkgs/issues/166655 + # https://github.com/InvoicePlane/InvoicePlane/pull/767 + #(fetchpatch { + # url = "https://patch-diff.githubusercontent.com/raw/InvoicePlane/InvoicePlane/pull/767.patch"; + # sha256 = "sha256-rSWDH8KeHSRWLyQEa7RSwv+8+ja9etTz+6Q9XThuwUo="; + #}) + + ]; + nativeBuildInputs = [ unzip ]; sourceRoot = "."; From ac71310ddc5b4a4e662eafeff9aed785b47c54c9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 12 Apr 2022 07:40:54 +1000 Subject: [PATCH 264/385] stylua: 0.13.0 -> 0.13.1 https://github.com/JohnnyMorganz/StyLua/releases/tag/v0.13.1 --- pkgs/development/tools/stylua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 729c0c191885..60fd43d09cd3 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ecv6am4JT4cJKAApieOWQZG3XZkeCpmLrs6K7+4c8xA="; + sha256 = "sha256-0Pl8SogCSZcboLHVAI45JqCLojAqIWBFuoZAK4gTzrs="; }; - cargoSha256 = "sha256-r09fTZTmOZQCI3qIWcnQnhUXYLVK8pF5y0y/dQl88CI="; + cargoSha256 = "sha256-VFgA5kOwUJG0GgKU4AUYCB/psAPM2GdTz5oRFgkrNi8="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; From 9a0899888935a4469d82362f8ef88030673a3325 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Mar 2022 10:05:49 +0000 Subject: [PATCH 265/385] lisgd: 0.3.2 -> 0.3.3 --- pkgs/tools/inputmethods/lisgd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/tools/inputmethods/lisgd/default.nix index 368f1efa7593..3592f2373b26 100644 --- a/pkgs/tools/inputmethods/lisgd/default.nix +++ b/pkgs/tools/inputmethods/lisgd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "lisgd"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromSourcehut { owner = "~mil"; repo = "lisgd"; rev = version; - sha256 = "sha256-yE2CUv1XDvo8fW0bLS1O2oxgDUu4drCO3jFpxPgAYKU="; + sha256 = "sha256-zcDxR2fKsjuX+vxjhr5UcqEsiNM+zWd2SBaA6Xly3AI="; }; inherit patches; From 3957a12e9d51489a11e64d4c5d64bfb263beac25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 04:51:49 +0200 Subject: [PATCH 266/385] python3Packages.pygatt: split off GATTTOOL extra --- pkgs/development/python-modules/pygatt/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index 9d596e17236e..8d6f67a4c751 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -22,15 +22,19 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pexpect pyserial ]; + passthru.extras-require.GATTTOOL = [ + pexpect + ]; + checkInputs = [ mock nose pytestCheckHook - ]; + ] + ++ passthru.extras-require.GATTTOOL; postPatch = '' # Not support for Python < 3.4 From 7e2881905c9c7af1e7a9f73fbebfc154370b9f5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 04:58:48 +0200 Subject: [PATCH 267/385] python3Packages.py3rijndael: init at 0.3.3 --- .../python-modules/py3rijndael/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/py3rijndael/default.nix diff --git a/pkgs/development/python-modules/py3rijndael/default.nix b/pkgs/development/python-modules/py3rijndael/default.nix new file mode 100644 index 000000000000..be098df6a6a8 --- /dev/null +++ b/pkgs/development/python-modules/py3rijndael/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +let + pname = "py3rijndael"; + version = "0.3.3"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tmVaPr/zoQVA6u0EnoeI7qOsk9a3GzpqwrACJLvs6ag="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Rijndael algorithm library"; + homepage = "https://github.com/meyt/py3rijndael"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b675f9355377..176f61539985 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6679,6 +6679,8 @@ in { py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + py3rijndael = callPackage ../development/python-modules/py3rijndael { }; + py3status = callPackage ../development/python-modules/py3status { }; py3to2 = callPackage ../development/python-modules/3to2 { }; From 7b12ac7d5813513c658770e2ca1d3d57662369f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 05:02:38 +0200 Subject: [PATCH 268/385] python3Packages.samsungtvws: enable tests, split off extras --- .../python-modules/samsungtvws/default.nix | 51 +++++++++++++++---- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index 05dc36947650..383841caffa4 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -1,29 +1,62 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, aiohttp +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 + +# propagates: , requests , websocket-client + +# extras: async +, aiohttp , websockets + +# extras: encrypted +, cryptography +, py3rijndael + +# tests +, aioresponses +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { pname = "samsungtvws"; version = "2.5.0"; + format = "setuptools"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-AFCN1b80GZ24g3oWe1qqc72yWQy4+/sorL8zwOYM7vo="; + src = fetchFromGitHub { + owner = "xchwarze"; + repo = "samsung-tv-ws-api"; + rev = "v${version}"; + hash = "sha256-AimG5tyTRBETpivC2BwCuoR4o7y98YT6u5sogJlcmoo="; }; propagatedBuildInputs = [ - aiohttp requests websocket-client - websockets ]; - # no tests - doCheck = false; + passthru.extras-require = { + async = [ + aiohttp + websockets + ]; + encrypted = [ + cryptography + py3rijndael + ]; + }; + + checkInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ] + ++ passthru.extras-require.async + ++ passthru.extras-require.encrypted; pythonImportsCheck = [ "samsungtvws" ]; From 7d4be895ad489fcabc68831eceecc645d5d626e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 05:08:10 +0200 Subject: [PATCH 269/385] python3Packages.samsungctl: split off websocket extra --- .../python-modules/samsungctl/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index 174af9023512..f917c265973a 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -1,4 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi + +# extra: websocket , websocket-client }: @@ -11,9 +15,12 @@ buildPythonPackage rec { sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; }; - propagatedBuildInputs = [ - websocket-client - ]; + passthru.extras-require = { + websocket = [ + websocket-client + ]; + # interactive_ui requires curses package + }; # no tests doCheck = false; From e365a5bc06b466245b5d206f4e7ad6ff423de2c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 05:11:15 +0200 Subject: [PATCH 270/385] python3Packages.pytradfri: split off async extra --- .../python-modules/pytradfri/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index e1c74b084613..70f9acd0380f 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -21,14 +21,17 @@ buildPythonPackage rec { hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; }; - propagatedBuildInputs = [ - aiocoap - dtlssocket - ]; + passthru.extras-require = { + async = [ + aiocoap + dtlssocket + ]; + }; checkInputs = [ pytestCheckHook - ]; + ] + ++ passthru.extras-require.async; pythonImportsCheck = [ "pytradfri" From aa90072fc9ed83aa646a947ef3ca741beb11f702 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 05:15:13 +0200 Subject: [PATCH 271/385] python3Packages.adb-shell: split off extra requires --- .../python-modules/adb-shell/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 907cf155ea10..792729da1fac 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -28,18 +28,27 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - aiofiles cryptography - libusb1 pyasn1 rsa ]; + passthru.extras-require = { + async = [ + aiofiles + ]; + usb = [ + libusb1 + ]; + }; + checkInputs = [ mock pycryptodome pytestCheckHook - ]; + ] + ++ passthru.extras-require.async + ++ passthru.extras-require.usb; disabledTests = lib.optionals (pythonAtLeast "3.10") [ # Tests are failing with Python 3.10 From 83f634c4e4a39352465ada45c4c90b4f4ee28dbe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 05:17:30 +0200 Subject: [PATCH 272/385] python3Packages.androidtv: split off extra requires --- .../development/python-modules/androidtv/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 2ea8dc5bad5b..f116cef3dc75 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -25,14 +25,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ adb-shell - aiofiles pure-python-adb ]; + passthru.extras-require = { + async = [ + aiofiles + ]; + inherit (adb-shell.extras-require) usb; + }; + checkInputs = [ mock pytestCheckHook - ]; + ] + ++ passthru.extras-require.async + ++ passthru.extras-require.usb; disabledTests = [ # Requires git but fails anyway From 139ba48b97da3e3dcbd7bc4bd946e89fb711ec83 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 05:22:48 +0200 Subject: [PATCH 273/385] python3Packages.pure-python-adb: split off async requirements --- .../pure-python-adb/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index c562f20e5ecb..d6e8bbdf6831 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -1,4 +1,10 @@ -{ aiofiles, buildPythonPackage, fetchPypi, lib, pythonOlder }: +{ aiofiles +, buildPythonPackage +, fetchPypi +, lib +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "pure-python-adb"; @@ -11,11 +17,21 @@ buildPythonPackage rec { sha256 = "0kdr7w2fhgjpcf1k3l6an9im583iqkr6v8hb4q1zw30nh3bqkk0f"; }; - propagatedBuildInputs = [ aiofiles ]; - # Disable tests as they require docker, docker-compose and a dedicated - # android emulator - doCheck = false; - pythonImportsCheck = [ "ppadb.client" "ppadb.client_async" ]; + passthru.extras-require = { + async = [ + aiofiles + ]; + }; + + checkInputs = [ + pytestCheckHook + ] + ++ passthru.extras-require.async; + + pythonImportsCheck = [ + "ppadb.client" + "ppadb.client_async" + ]; meta = with lib; { description = "Pure python implementation of the adb client"; From 612a4ba51fb02e5e61d556bdfa67561c9e000600 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 11 Apr 2022 22:43:50 +0200 Subject: [PATCH 274/385] python310Packages.pure-python-adb: disable tests All tests result in RuntimeError. Make the pythonImportsCheck for the async parts conditional on doCheck, as checkInput only works when doCheck is true. --- pkgs/development/python-modules/pure-python-adb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index d6e8bbdf6831..cb054feaf10f 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { ]; }; + doCheck = pythonOlder "3.10"; # all tests result in RuntimeError on 3.10 + checkInputs = [ pytestCheckHook ] @@ -30,6 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ppadb.client" + ] ++ lib.optionals doCheck [ "ppadb.client_async" ]; From ce697cdfa8776187760033cc3d46151c010d9991 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 05:24:06 +0200 Subject: [PATCH 275/385] home-assistant: allow requirements parser to deal with extras --- .../home-assistant/parse-requirements.py | 56 ++++++++++++++++--- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 0e3d5d5553e7..c9fc53401ef4 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -98,13 +98,37 @@ def get_reqs(components: Dict[str, Dict[str, Any]], component: str, processed: S return requirements +def repository_root() -> str: + return os.path.abspath(sys.argv[0] + "/../../../..") + + +# For a package attribute and and an extra, check if the package exposes it via passthru.extras-require +def has_extra(package: str, extra: str): + cmd = [ + "nix-instantiate", + repository_root(), + "-A", + f"{package}.extras-require.{extra}", + ] + try: + subprocess.run( + cmd, + check=True, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + except subprocess.CalledProcessError: + return False + return True + + def dump_packages() -> Dict[str, Dict[str, str]]: # Store a JSON dump of Nixpkgs' python3Packages output = subprocess.check_output( [ "nix-env", "-f", - os.path.dirname(sys.argv[0]) + "/../../..", + repository_root(), "-qa", "-A", PKG_SET, @@ -158,6 +182,7 @@ def main() -> None: outdated = {} for component in sorted(components.keys()): attr_paths = [] + extra_attrs = [] missing_reqs = [] reqs = sorted(get_reqs(components, component, set())) for req in reqs: @@ -165,9 +190,10 @@ def main() -> None: # Therefore, if there's a "#" in the line, only take the part after it req = req[req.find("#") + 1 :] name, required_version = req.split("==", maxsplit=1) - # Remove extra_require from name, e.g. samsungctl instead of - # samsungctl[websocket] + # Split package name and extra requires + extras = [] if name.endswith("]"): + extras = name[name.find("[")+1:name.find("]")].split(",") name = name[:name.find("[")] attr_path = name_to_attr_path(name, packages) if our_version := get_pkg_version(name, packages): @@ -178,11 +204,20 @@ def main() -> None: } if attr_path is not None: # Add attribute path without "python3Packages." prefix - attr_paths.append(attr_path[len(PKG_SET + ".") :]) + pname = attr_path[len(PKG_SET + "."):] + attr_paths.append(pname) + for extra in extras: + # Check if package advertises extra requirements + extra_attr = f"{pname}.extras-require.{extra}" + if has_extra(attr_path, extra): + extra_attrs.append(extra_attr) + else: + missing_reqs.append(extra_attr) + else: missing_reqs.append(name) else: - build_inputs[component] = (attr_paths, missing_reqs) + build_inputs[component] = (attr_paths, extra_attrs, missing_reqs) with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f: f.write("# Generated by parse-requirements.py\n") @@ -191,11 +226,14 @@ def main() -> None: f.write(f' version = "{version}";\n') f.write(" components = {\n") for component, deps in build_inputs.items(): - available, missing = deps + available, extras, missing = deps f.write(f' "{component}" = ps: with ps; [') if available: - f.write(" " + " ".join(available)) - f.write(" ];") + f.write("\n " + "\n ".join(available)) + f.write("\n ]") + if extras: + f.write("\n ++ " + "\n ++ ".join(extras)) + f.write(";") if len(missing) > 0: f.write(f" # missing inputs: {' '.join(missing)}") f.write("\n") @@ -203,7 +241,7 @@ def main() -> None: f.write(" # components listed in tests/components for which all dependencies are packaged\n") f.write(" supportedComponentsWithTests = [\n") for component, deps in build_inputs.items(): - available, missing = deps + available, extras, missing = deps if len(missing) == 0 and component in components_with_tests: f.write(f' "{component}"' + "\n") f.write(" ];\n") From 3966e8d69d6817b5a327d0f26a1f6666b6b25868 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Apr 2022 05:24:11 +0200 Subject: [PATCH 276/385] home-assistant: update component packages --- .../home-assistant/component-packages.nix | 4119 +++++++++++++---- 1 file changed, 3107 insertions(+), 1012 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d28507247eec..20218f4f256d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4,1018 +4,3113 @@ { version = "2022.4.0"; components = { - "abode" = ps: with ps; [ abodepy ]; - "accuweather" = ps: with ps; [ accuweather ]; - "acer_projector" = ps: with ps; [ pyserial ]; - "acmeda" = ps: with ps; [ aiopulse ]; - "actiontec" = ps: with ps; [ ]; - "adax" = ps: with ps; [ adax-local adax ]; - "adguard" = ps: with ps; [ adguardhome ]; - "ads" = ps: with ps; [ pyads ]; - "advantage_air" = ps: with ps; [ advantage-air ]; - "aemet" = ps: with ps; [ aemet-opendata ]; - "aftership" = ps: with ps; [ pyaftership ]; - "agent_dvr" = ps: with ps; [ agent-py ]; - "air_quality" = ps: with ps; [ ]; - "airly" = ps: with ps; [ airly ]; - "airnow" = ps: with ps; [ pyairnow ]; - "airthings" = ps: with ps; [ airthings-cloud ]; - "airtouch4" = ps: with ps; [ airtouch4pyapi ]; - "airvisual" = ps: with ps; [ pyairvisual ]; - "airzone" = ps: with ps; [ aioairzone ]; - "aladdin_connect" = ps: with ps; [ aladdin-connect ]; - "alarm_control_panel" = ps: with ps; [ ]; - "alarmdecoder" = ps: with ps; [ adext ]; - "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; - "almond" = ps: with ps; [ aiohttp-cors pyalmond ]; - "alpha_vantage" = ps: with ps; [ alpha-vantage ]; - "amazon_polly" = ps: with ps; [ boto3 ]; - "ambee" = ps: with ps; [ ambee ]; - "amberelectric" = ps: with ps; [ amberelectric ]; - "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; - "ambient_station" = ps: with ps; [ aioambient ]; - "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; - "ampio" = ps: with ps; [ asmog ]; - "analytics" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ]; - "android_ip_webcam" = ps: with ps; [ pydroid-ipcam ]; - "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; - "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant - "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav - "apache_kafka" = ps: with ps; [ aiokafka ]; - "apcupsd" = ps: with ps; [ apcaccess ]; - "api" = ps: with ps; [ aiohttp-cors ]; - "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr pyatv zeroconf ]; - "apprise" = ps: with ps; [ apprise ]; - "aprs" = ps: with ps; [ aprslib geopy ]; - "aqualogic" = ps: with ps; [ aqualogic ]; - "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc - "arcam_fmj" = ps: with ps; [ arcam-fmj ]; - "arest" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ ha-ffmpeg pyarlo ]; - "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg - "aruba" = ps: with ps; [ pexpect ]; - "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "aseko_pool_live" = ps: with ps; [ aioaseko ]; - "asterisk_cdr" = ps: with ps; [ asterisk-mbox ]; - "asterisk_mbox" = ps: with ps; [ asterisk-mbox ]; - "asuswrt" = ps: with ps; [ aioasuswrt ]; - "atag" = ps: with ps; [ pyatag ]; - "aten_pe" = ps: with ps; [ atenpdu ]; - "atome" = ps: with ps; [ pyatome ]; - "august" = ps: with ps; [ yalexs ]; - "aurora" = ps: with ps; [ auroranoaa ]; - "aurora_abb_powerone" = ps: with ps; [ aurorapy ]; - "aussie_broadband" = ps: with ps; [ pyaussiebb ]; - "auth" = ps: with ps; [ aiohttp-cors ]; - "automation" = ps: with ps; [ aiohttp-cors ]; - "avea" = ps: with ps; [ avea ]; - "avion" = ps: with ps; [ avion ]; - "awair" = ps: with ps; [ python-awair ]; - "aws" = ps: with ps; [ aiobotocore ]; - "axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ]; - "azure_devops" = ps: with ps; [ aioazuredevops ]; - "azure_event_hub" = ps: with ps; [ azure-eventhub ]; - "azure_service_bus" = ps: with ps; [ azure-servicebus ]; - "backup" = ps: with ps; [ aiohttp-cors ]; # missing inputs: securetar - "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip - "balboa" = ps: with ps; [ pybalboa ]; - "bayesian" = ps: with ps; [ ]; - "bbox" = ps: with ps; [ ]; # missing inputs: pybbox - "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim - "binary_sensor" = ps: with ps; [ ]; - "bitcoin" = ps: with ps; [ blockchain ]; - "bizkaibus" = ps: with ps; [ bizkaibus ]; - "blackbird" = ps: with ps; [ pyblackbird ]; - "blebox" = ps: with ps; [ blebox-uniapi ]; - "blink" = ps: with ps; [ blinkpy ]; - "blinksticklight" = ps: with ps; [ BlinkStick ]; - "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api - "bloomsky" = ps: with ps; [ ]; - "blueprint" = ps: with ps; [ ]; - "bluesound" = ps: with ps; [ xmltodict ]; - "bluetooth_le_tracker" = ps: with ps; [ pygatt ]; - "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ]; - "bmw_connected_drive" = ps: with ps; [ bimmer-connected ]; - "bond" = ps: with ps; [ bond-api ]; - "bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ]; - "braviatv" = ps: with ps; [ bravia-tv ]; - "broadlink" = ps: with ps; [ broadlink ]; - "brother" = ps: with ps; [ brother ]; - "brottsplatskartan" = ps: with ps; [ brottsplatskartan ]; - "browser" = ps: with ps; [ ]; - "brunt" = ps: with ps; [ ]; # missing inputs: brunt - "bsblan" = ps: with ps; [ bsblan ]; - "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist - "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist - "buienradar" = ps: with ps; [ buienradar ]; - "button" = ps: with ps; [ ]; - "caldav" = ps: with ps; [ caldav ]; - "calendar" = ps: with ps; [ aiohttp-cors ]; - "camera" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; - "canary" = ps: with ps; [ ha-ffmpeg py-canary ]; - "cast" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; - "cert_expiry" = ps: with ps; [ ]; - "channels" = ps: with ps; [ pychannels ]; - "circuit" = ps: with ps; [ circuit-webhook ]; - "cisco_ios" = ps: with ps; [ pexpect ]; - "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; - "cisco_webex_teams" = ps: with ps; [ webexteamssdk ]; - "citybikes" = ps: with ps; [ ]; - "clementine" = ps: with ps; [ ]; # missing inputs: python-clementine-remote - "clickatell" = ps: with ps; [ ]; - "clicksend" = ps: with ps; [ ]; - "clicksend_tts" = ps: with ps; [ ]; - "climacell" = ps: with ps; [ pyclimacell ]; # missing inputs: pytomorrowio - "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ]; - "cloudflare" = ps: with ps; [ pycfdns ]; - "cmus" = ps: with ps; [ ]; # missing inputs: pycmus - "co2signal" = ps: with ps; [ co2signal ]; - "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase - "color_extractor" = ps: with ps; [ colorthief ]; - "comed_hourly_pricing" = ps: with ps; [ ]; - "comfoconnect" = ps: with ps; [ pycomfoconnect ]; - "command_line" = ps: with ps; [ ]; - "compensation" = ps: with ps; [ numpy ]; - "concord232" = ps: with ps; [ ]; # missing inputs: concord232 - "config" = ps: with ps; [ aiohttp-cors ]; - "configurator" = ps: with ps; [ ]; - "control4" = ps: with ps; [ pycontrol4 ]; - "conversation" = ps: with ps; [ aiohttp-cors ]; - "coolmaster" = ps: with ps; [ pycoolmasternet-async ]; - "coronavirus" = ps: with ps; [ coronavirus ]; - "counter" = ps: with ps; [ ]; - "cover" = ps: with ps; [ ]; - "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy - "cpuspeed" = ps: with ps; [ py-cpuinfo ]; - "crownstone" = ps: with ps; [ aiohttp-cors crownstone-cloud crownstone-sse crownstone-uart pyserial pyudev ]; - "cups" = ps: with ps; [ pycups ]; - "currencylayer" = ps: with ps; [ ]; - "daikin" = ps: with ps; [ pydaikin ]; - "danfoss_air" = ps: with ps; [ pydanfossair ]; - "darksky" = ps: with ps; [ python-forecastio ]; - "datadog" = ps: with ps; [ datadog ]; - "ddwrt" = ps: with ps; [ ]; - "debugpy" = ps: with ps; [ debugpy ]; - "deconz" = ps: with ps; [ pydeconz ]; - "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora - "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client fnvhash hass-nabucasa home-assistant-frontend ifaddr lru-dict pillow pyserial pyudev scapy sqlalchemy zeroconf ]; - "delijn" = ps: with ps; [ pydelijn ]; - "deluge" = ps: with ps; [ deluge-client ]; - "demo" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ]; - "denon" = ps: with ps; [ ]; - "denonavr" = ps: with ps; [ denonavr ]; - "derivative" = ps: with ps; [ ]; - "deutsche_bahn" = ps: with ps; [ schiene ]; - "device_automation" = ps: with ps; [ ]; - "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; - "device_tracker" = ps: with ps; [ ]; - "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api ifaddr zeroconf ]; - "devolo_home_network" = ps: with ps; [ devolo-plc-api ]; - "dexcom" = ps: with ps; [ pydexcom ]; - "dhcp" = ps: with ps; [ aiodiscover scapy ]; - "diagnostics" = ps: with ps; [ aiohttp-cors ]; - "dialogflow" = ps: with ps; [ aiohttp-cors ]; - "digital_ocean" = ps: with ps; [ digital-ocean ]; - "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower - "directv" = ps: with ps; [ directv ]; - "discogs" = ps: with ps; [ discogs-client ]; - "discord" = ps: with ps; [ nextcord ]; - "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; - "dlib_face_detect" = ps: with ps; [ face_recognition ]; - "dlib_face_identify" = ps: with ps; [ face_recognition ]; - "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 - "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; - "dlna_dms" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; - "dnsip" = ps: with ps; [ aiodns ]; - "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi - "doods" = ps: with ps; [ pillow pydoods ]; - "doorbird" = ps: with ps; [ aiohttp-cors doorbirdpy ]; - "dovado" = ps: with ps; [ ]; # missing inputs: dovado - "downloader" = ps: with ps; [ ]; - "dsmr" = ps: with ps; [ dsmr-parser ]; - "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "dte_energy_bridge" = ps: with ps; [ ]; - "dublin_bus_transport" = ps: with ps; [ ]; - "duckdns" = ps: with ps; [ ]; - "dunehd" = ps: with ps; [ pdunehd ]; - "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; - "dweet" = ps: with ps; [ ]; # missing inputs: dweepy - "dynalite" = ps: with ps; [ dynalite-devices ]; - "eafm" = ps: with ps; [ aioeafm ]; - "ebox" = ps: with ps; [ ]; # missing inputs: pyebox - "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy - "ecoal_boiler" = ps: with ps; [ ecoaliface ]; - "ecobee" = ps: with ps; [ python-ecobee-api ]; - "econet" = ps: with ps; [ pyeconet ]; - "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks - "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools - "edimax" = ps: with ps; [ pyedimax ]; - "edl21" = ps: with ps; [ pysml ]; - "efergy" = ps: with ps; [ pyefergy ]; - "egardia" = ps: with ps; [ pythonegardia ]; - "eight_sleep" = ps: with ps; [ pyeight ]; - "elgato" = ps: with ps; [ elgato ]; - "eliqonline" = ps: with ps; [ eliqonline ]; - "elkm1" = ps: with ps; [ aiohttp-cors elkm1-lib ifaddr ]; - "elmax" = ps: with ps; [ elmax-api ]; - "elv" = ps: with ps; [ pypca ]; - "emby" = ps: with ps; [ pyemby ]; - "emoncms" = ps: with ps; [ ]; - "emoncms_history" = ps: with ps; [ ]; - "emonitor" = ps: with ps; [ aioemonitor ]; - "emulated_hue" = ps: with ps; [ aiohttp-cors ifaddr ]; - "emulated_kasa" = ps: with ps; [ sense-energy ]; - "emulated_roku" = ps: with ps; [ aiohttp-cors emulated-roku ifaddr ]; - "energy" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ]; - "enigma2" = ps: with ps; [ openwebifpy ]; - "enocean" = ps: with ps; [ enocean ]; - "enphase_envoy" = ps: with ps; [ envoy-reader ]; - "entur_public_transport" = ps: with ps; [ enturclient ]; - "environment_canada" = ps: with ps; [ env-canada ]; - "envisalink" = ps: with ps; [ pyenvisalink ]; - "ephember" = ps: with ps; [ pyephember ]; - "epson" = ps: with ps; [ epson-projector ]; - "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter - "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt - "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors ifaddr zeroconf ]; - "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api - "eufy" = ps: with ps; [ ]; # missing inputs: lakeside - "everlights" = ps: with ps; [ pyeverlights ]; - "evil_genius_labs" = ps: with ps; [ pyevilgenius ]; - "evohome" = ps: with ps; [ evohome-async ]; - "ezviz" = ps: with ps; [ ha-ffmpeg pyezviz ]; - "faa_delays" = ps: with ps; [ faadelays ]; - "facebook" = ps: with ps; [ ]; - "facebox" = ps: with ps; [ ]; - "fail2ban" = ps: with ps; [ ]; - "familyhub" = ps: with ps; [ ]; # missing inputs: python-family-hub-local - "fan" = ps: with ps; [ ]; - "fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom - "feedreader" = ps: with ps; [ feedparser ]; - "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; - "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; - "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; - "fibaro" = ps: with ps; [ fiblary3-fork ]; - "fido" = ps: with ps; [ pyfido ]; - "file" = ps: with ps; [ ]; - "filesize" = ps: with ps; [ ]; - "filter" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; - "fints" = ps: with ps; [ fints ]; - "fireservicerota" = ps: with ps; [ pyfireservicerota ]; - "firmata" = ps: with ps; [ pymata-express ]; - "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; - "fivem" = ps: with ps; [ ]; # missing inputs: fivem-api - "fixer" = ps: with ps; [ fixerio ]; - "fjaraskupan" = ps: with ps; [ fjaraskupan ]; - "fleetgo" = ps: with ps; [ ritassist ]; - "flexit" = ps: with ps; [ pymodbus ]; - "flic" = ps: with ps; [ pyflic ]; - "flick_electric" = ps: with ps; [ pyflick ]; - "flipr" = ps: with ps; [ flipr-api ]; - "flo" = ps: with ps; [ aioflo ]; - "flock" = ps: with ps; [ ]; - "flume" = ps: with ps; [ pyflume ]; - "flunearyou" = ps: with ps; [ pyflunearyou ]; - "flux" = ps: with ps; [ ]; - "flux_led" = ps: with ps; [ aiohttp-cors flux-led ifaddr ]; - "folder" = ps: with ps; [ ]; - "folder_watcher" = ps: with ps; [ watchdog ]; - "foobot" = ps: with ps; [ foobot-async ]; - "forecast_solar" = ps: with ps; [ forecast-solar ]; - "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java - "fortios" = ps: with ps; [ fortiosapi ]; - "foscam" = ps: with ps; [ libpyfoscam ]; - "foursquare" = ps: with ps; [ aiohttp-cors ]; - "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms - "freebox" = ps: with ps; [ freebox-api ]; - "freedns" = ps: with ps; [ ]; - "freedompro" = ps: with ps; [ pyfreedompro ]; - "fritz" = ps: with ps; [ aiohttp-cors fritzconnection ifaddr xmltodict ]; - "fritzbox" = ps: with ps; [ pyfritzhome ]; - "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; - "fronius" = ps: with ps; [ pyfronius ]; - "frontend" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; - "frontier_silicon" = ps: with ps; [ afsapi ]; - "futurenow" = ps: with ps; [ pyfnip ]; - "garadget" = ps: with ps; [ ]; - "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; - "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 - "gdacs" = ps: with ps; [ aio-georss-gdacs ]; - "generic" = ps: with ps; [ av pillow ]; - "generic_hygrostat" = ps: with ps; [ ]; - "generic_thermostat" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; - "geniushub" = ps: with ps; [ geniushub-client ]; - "geo_json_events" = ps: with ps; [ ]; # missing inputs: aio_geojson_generic_client - "geo_location" = ps: with ps; [ ]; - "geo_rss_events" = ps: with ps; [ georss-generic-client ]; - "geofency" = ps: with ps; [ aiohttp-cors ]; - "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes ]; - "geonetnz_volcano" = ps: with ps; [ aio-geojson-geonetnz-volcano ]; - "gios" = ps: with ps; [ gios ]; - "github" = ps: with ps; [ aiogithubapi ]; - "gitlab_ci" = ps: with ps; [ python-gitlab ]; - "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy - "glances" = ps: with ps; [ glances-api ]; - "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher - "goalzero" = ps: with ps; [ goalzero ]; - "gogogate2" = ps: with ps; [ ismartgate ]; - "goodwe" = ps: with ps; [ goodwe ]; - "google" = ps: with ps; [ aiohttp-cors google-api-python-client httplib2 oauth2client ]; - "google_assistant" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; - "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; - "google_domains" = ps: with ps; [ ]; - "google_maps" = ps: with ps; [ locationsharinglib ]; - "google_pubsub" = ps: with ps; [ google-cloud-pubsub ]; - "google_translate" = ps: with ps; [ gtts ]; - "google_travel_time" = ps: with ps; [ googlemaps ]; - "google_wifi" = ps: with ps; [ ]; - "gpsd" = ps: with ps; [ gps3 ]; - "gpslogger" = ps: with ps; [ aiohttp-cors ]; - "graphite" = ps: with ps; [ ]; - "gree" = ps: with ps; [ greeclimate ]; - "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor - "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality - "group" = ps: with ps; [ ]; - "growatt_server" = ps: with ps; [ growattserver ]; - "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player - "gtfs" = ps: with ps; [ pygtfs ]; - "guardian" = ps: with ps; [ aioguardian ]; - "habitica" = ps: with ps; [ habitipy ]; - "hangouts" = ps: with ps; [ hangups ]; - "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr - "harmony" = ps: with ps; [ aioharmony ]; - "hassio" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; - "haveibeenpwned" = ps: with ps; [ ]; - "hddtemp" = ps: with ps; [ ]; - "hdmi_cec" = ps: with ps; [ pycec ]; - "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 - "heos" = ps: with ps; [ pyheos ]; - "here_travel_time" = ps: with ps; [ herepy ]; - "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik - "hikvisioncam" = ps: with ps; [ hikvision ]; - "hisense_aehw4a1" = ps: with ps; [ pyaehw4a1 ]; - "history" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ]; - "history_stats" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; - "hitron_coda" = ps: with ps; [ ]; - "hive" = ps: with ps; [ pyhiveapi ]; - "hlk_sw16" = ps: with ps; [ hlk-sw16 ]; - "home_connect" = ps: with ps; [ aiohttp-cors homeconnect ]; - "home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ]; - "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ hap-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg ifaddr zeroconf ]; - "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors ifaddr zeroconf ]; - "homematic" = ps: with ps; [ pyhomematic ]; - "homematicip_cloud" = ps: with ps; [ homematicip ]; - "homewizard" = ps: with ps; [ aiohwenergy ]; - "homeworks" = ps: with ps; [ pyhomeworks ]; - "honeywell" = ps: with ps; [ somecomfort ]; - "horizon" = ps: with ps; [ ]; # missing inputs: horimote - "hp_ilo" = ps: with ps; [ python-hpilo ]; - "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; - "http" = ps: with ps; [ aiohttp-cors ]; - "huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ]; - "hue" = ps: with ps; [ aiohue ]; - "huisbaasje" = ps: with ps; [ huisbaasje-client ]; - "humidifier" = ps: with ps; [ ]; - "hunterdouglas_powerview" = ps: with ps; [ aiopvapi ]; - "hvv_departures" = ps: with ps; [ pygti ]; - "hydrawise" = ps: with ps; [ hydrawiser ]; - "hyperion" = ps: with ps; [ hyperion-py ]; - "ialarm" = ps: with ps; [ pyialarm ]; - "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter - "iaqualink" = ps: with ps; [ iaqualink ]; - "icloud" = ps: with ps; [ pyicloud ]; - "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py - "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; - "iglo" = ps: with ps; [ ]; # missing inputs: iglo - "ign_sismologia" = ps: with ps; [ georss-ign-sismologia-client ]; - "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk - "image" = ps: with ps; [ aiohttp-cors pillow ]; - "image_processing" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; - "imap" = ps: with ps; [ aioimaplib ]; - "imap_email_content" = ps: with ps; [ ]; - "incomfort" = ps: with ps; [ incomfort-client ]; - "influxdb" = ps: with ps; [ influxdb-client influxdb ]; - "input_boolean" = ps: with ps; [ ]; - "input_button" = ps: with ps; [ ]; - "input_datetime" = ps: with ps; [ ]; - "input_number" = ps: with ps; [ ]; - "input_select" = ps: with ps; [ ]; - "input_text" = ps: with ps; [ ]; - "insteon" = ps: with ps; [ pyinsteon ]; - "integration" = ps: with ps; [ ]; - "intellifire" = ps: with ps; [ intellifire4py ]; - "intent" = ps: with ps; [ aiohttp-cors ]; - "intent_script" = ps: with ps; [ ]; - "intesishome" = ps: with ps; [ pyintesishome ]; - "ios" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; - "iotawatt" = ps: with ps; [ iotawattpy ]; - "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 - "ipma" = ps: with ps; [ pyipma ]; - "ipp" = ps: with ps; [ pyipp ]; - "iqvia" = ps: with ps; [ numpy pyiqvia ]; - "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail - "islamic_prayer_times" = ps: with ps; [ prayer-times-calculator ]; - "iss" = ps: with ps; [ ]; # missing inputs: pyiss - "isy994" = ps: with ps; [ pyisy ]; - "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir - "itunes" = ps: with ps; [ ]; - "izone" = ps: with ps; [ python-izone ]; - "jellyfin" = ps: with ps; [ jellyfin-apiclient-python ]; - "jewish_calendar" = ps: with ps; [ hdate ]; - "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api - "juicenet" = ps: with ps; [ python-juicenet ]; - "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client - "kaleidescape" = ps: with ps; [ ]; # missing inputs: pykaleidescape - "kankun" = ps: with ps; [ ]; - "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact - "keenetic_ndms2" = ps: with ps; [ ndms2-client ]; - "kef" = ps: with ps; [ aiokef getmac ]; - "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput - "keyboard_remote" = ps: with ps; [ aionotify evdev ]; - "kira" = ps: with ps; [ pykira ]; - "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client - "kmtronic" = ps: with ps; [ pykmtronic ]; - "knx" = ps: with ps; [ xknx ]; - "kodi" = ps: with ps; [ aiohttp-cors pykodi ]; - "konnected" = ps: with ps; [ aiohttp-cors konnected ]; - "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore - "kraken" = ps: with ps; [ krakenex pykrakenapi ]; - "kulersky" = ps: with ps; [ pykulersky ]; - "kwb" = ps: with ps; [ ]; # missing inputs: pykwb - "lacrosse" = ps: with ps; [ pylacrosse ]; - "lametric" = ps: with ps; [ lmnotify ]; - "lannouncer" = ps: with ps; [ ]; - "lastfm" = ps: with ps; [ pylast ]; - "launch_library" = ps: with ps; [ pylaunches ]; - "lcn" = ps: with ps; [ pypck ]; - "lg_netcast" = ps: with ps; [ pylgnetcast ]; - "lg_soundbar" = ps: with ps; [ temescal ]; - "life360" = ps: with ps; [ life360 ]; - "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; - "lifx_cloud" = ps: with ps; [ ]; - "light" = ps: with ps; [ ]; - "lightwave" = ps: with ps; [ lightwave ]; - "limitlessled" = ps: with ps; [ limitlessled ]; - "linksys_smart" = ps: with ps; [ ]; - "linode" = ps: with ps; [ linode-api ]; - "linux_battery" = ps: with ps; [ batinfo ]; - "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc - "litejet" = ps: with ps; [ ]; # missing inputs: pylitejet - "litterrobot" = ps: with ps; [ pylitterbot ]; - "llamalab_automate" = ps: with ps; [ ]; - "local_file" = ps: with ps; [ ]; - "local_ip" = ps: with ps; [ aiohttp-cors ifaddr ]; - "locative" = ps: with ps; [ aiohttp-cors ]; - "lock" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; - "logentries" = ps: with ps; [ ]; - "logger" = ps: with ps; [ ]; - "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle - "london_air" = ps: with ps; [ ]; - "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status - "lookin" = ps: with ps; [ aiolookin ]; - "lovelace" = ps: with ps; [ ]; - "luci" = ps: with ps; [ openwrt-luci-rpc ]; - "luftdaten" = ps: with ps; [ luftdaten ]; - "lupusec" = ps: with ps; [ lupupy ]; - "lutron" = ps: with ps; [ pylutron ]; - "lutron_caseta" = ps: with ps; [ pylutron-caseta ]; - "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 - "lyric" = ps: with ps; [ aiohttp-cors aiolyric ]; - "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed - "mailbox" = ps: with ps; [ aiohttp-cors ]; - "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner - "manual" = ps: with ps; [ ]; - "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "map" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; - "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary - "mastodon" = ps: with ps; [ mastodon-py ]; - "matrix" = ps: with ps; [ matrix-client ]; - "maxcube" = ps: with ps; [ maxcube-api ]; - "mazda" = ps: with ps; [ pymazda ]; - "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; - "media_player" = ps: with ps; [ aiohttp-cors ]; - "media_source" = ps: with ps; [ aiohttp-cors ]; - "mediaroom" = ps: with ps; [ pymediaroom ]; - "melcloud" = ps: with ps; [ pymelcloud ]; - "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate - "meraki" = ps: with ps; [ aiohttp-cors ]; - "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird - "met" = ps: with ps; [ pymetno ]; - "met_eireann" = ps: with ps; [ pymeteireann ]; - "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api - "meteoalarm" = ps: with ps; [ meteoalertapi ]; - "meteoclimatic" = ps: with ps; [ pymeteoclimatic ]; - "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint - "mfi" = ps: with ps; [ ]; # missing inputs: mficlient - "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts - "microsoft_face" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; - "microsoft_face_detect" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; - "microsoft_face_identify" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; - "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora - "mikrotik" = ps: with ps; [ librouteros ]; - "mill" = ps: with ps; [ mill-local millheater ]; - "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ aiodns getmac mcstatus ]; - "minio" = ps: with ps; [ minio ]; - "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt - "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa pillow ]; - "mochad" = ps: with ps; [ ]; # missing inputs: pymochad - "modbus" = ps: with ps; [ pymodbus ]; - "modem_callerid" = ps: with ps; [ aiohttp-cors phone-modem pyserial pyudev ]; - "modern_forms" = ps: with ps; [ aiomodernforms ]; - "moehlenhoff_alpha2" = ps: with ps; [ ]; # missing inputs: moehlenhoff-alpha2 - "mold_indicator" = ps: with ps; [ ]; - "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice - "moon" = ps: with ps; [ ]; - "motion_blinds" = ps: with ps; [ aiohttp-cors ifaddr motionblinds ]; - "motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ]; - "mpd" = ps: with ps; [ mpd2 ]; - "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "msteams" = ps: with ps; [ pymsteams ]; - "mullvad" = ps: with ps; [ mullvad-api ]; - "mutesync" = ps: with ps; [ mutesync ]; - "mvglive" = ps: with ps; [ PyMVGLive ]; - "my" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; - "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi - "myq" = ps: with ps; [ pymyq ]; - "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; - "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; - "mythicbeastsdns" = ps: with ps; [ mbddns ]; - "nad" = ps: with ps; [ nad-receiver ]; - "nam" = ps: with ps; [ nettigo-air-monitor ]; - "namecheapdns" = ps: with ps; [ defusedxml ]; - "nanoleaf" = ps: with ps; [ aionanoleaf ]; - "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; - "nederlandse_spoorwegen" = ps: with ps; [ nsapi ]; - "ness_alarm" = ps: with ps; [ nessclient ]; - "nest" = ps: with ps; [ aiohttp-cors google-nest-sdm ha-ffmpeg python-nest ]; - "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; - "netdata" = ps: with ps; [ netdata ]; - "netgear" = ps: with ps; [ pynetgear ]; - "netgear_lte" = ps: with ps; [ eternalegypt ]; - "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio - "network" = ps: with ps; [ aiohttp-cors ifaddr ]; - "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio - "nexia" = ps: with ps; [ nexia ]; - "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext - "nextcloud" = ps: with ps; [ nextcloudmonitor ]; - "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv - "nightscout" = ps: with ps; [ py-nightscout ]; - "niko_home_control" = ps: with ps; [ niko-home-control ]; - "nilu" = ps: with ps; [ niluclient ]; - "nina" = ps: with ps; [ pynina ]; - "nissan_leaf" = ps: with ps; [ pycarwings2 ]; - "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup - "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail - "no_ip" = ps: with ps; [ ]; - "noaa_tides" = ps: with ps; [ ]; # missing inputs: noaa-coops - "norway_air" = ps: with ps; [ pymetno ]; - "notify" = ps: with ps; [ ]; - "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events - "notion" = ps: with ps; [ aionotion ]; - "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client - "nsw_rural_fire_service_feed" = ps: with ps; [ aio-geojson-nsw-rfs-incidents ]; - "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat - "nuki" = ps: with ps; [ pynuki ]; - "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio - "number" = ps: with ps; [ ]; - "nut" = ps: with ps; [ pynut2 ]; - "nws" = ps: with ps; [ pynws ]; - "nx584" = ps: with ps; [ pynx584 ]; - "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi - "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics - "obihai" = ps: with ps; [ pyobihai ]; - "octoprint" = ps: with ps; [ pyoctoprintapi ]; - "oem" = ps: with ps; [ oemthermostat ]; - "ohmconnect" = ps: with ps; [ defusedxml ]; - "ombi" = ps: with ps; [ pyombi ]; - "omnilogic" = ps: with ps; [ omnilogic ]; - "onboarding" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; - "oncue" = ps: with ps; [ aiooncue ]; - "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; - "onewire" = ps: with ps; [ pi1wire pyownet ]; - "onkyo" = ps: with ps; [ onkyo-eiscp ]; - "onvif" = ps: with ps; [ wsdiscovery ha-ffmpeg onvif-zeep-async ]; - "open_meteo" = ps: with ps; [ open-meteo ]; - "openalpr_cloud" = ps: with ps; [ ]; - "openalpr_local" = ps: with ps; [ ]; - "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless - "openerz" = ps: with ps; [ openerz-api ]; - "openevse" = ps: with ps; [ openevsewifi ]; - "openexchangerates" = ps: with ps; [ ]; - "opengarage" = ps: with ps; [ open-garage ]; - "openhardwaremonitor" = ps: with ps; [ ]; - "openhome" = ps: with ps; [ openhomedevice ]; - "opensensemap" = ps: with ps; [ opensensemap-api ]; - "opensky" = ps: with ps; [ ]; - "opentherm_gw" = ps: with ps; [ pyotgw ]; - "openuv" = ps: with ps; [ pyopenuv ]; - "openweathermap" = ps: with ps; [ pyowm ]; - "opnsense" = ps: with ps; [ pyopnsense ]; - "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio - "oru" = ps: with ps; [ ]; # missing inputs: oru - "orvibo" = ps: with ps; [ orvibo ]; - "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify - "otp" = ps: with ps; [ pyotp ]; - "overkiz" = ps: with ps; [ pyoverkiz ]; - "ovo_energy" = ps: with ps; [ ovoenergy ]; - "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; - "p1_monitor" = ps: with ps; [ p1monitor ]; - "panasonic_bluray" = ps: with ps; [ panacotta ]; - "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera - "pandora" = ps: with ps; [ pexpect ]; - "panel_custom" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; - "panel_iframe" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; - "peco" = ps: with ps; [ ]; # missing inputs: peco - "pencom" = ps: with ps; [ ]; # missing inputs: pencompy - "persistent_notification" = ps: with ps; [ ]; - "person" = ps: with ps; [ aiohttp-cors pillow ]; - "philips_js" = ps: with ps; [ ha-philipsjs ]; - "pi_hole" = ps: with ps; [ hole ]; - "picnic" = ps: with ps; [ python-picnic-api ]; - "picotts" = ps: with ps; [ ]; - "pilight" = ps: with ps; [ ]; # missing inputs: pilight - "ping" = ps: with ps; [ icmplib ]; - "pioneer" = ps: with ps; [ ]; - "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 - "plaato" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyplaato ]; - "plant" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; - "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket ]; - "plugwise" = ps: with ps; [ plugwise ]; - "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad - "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts - "point" = ps: with ps; [ aiohttp-cors pypoint ]; - "poolsense" = ps: with ps; [ poolsense ]; - "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall - "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ]; - "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw - "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix - "prometheus" = ps: with ps; [ aiohttp-cors prometheus-client ]; - "prosegur" = ps: with ps; [ pyprosegur ]; - "prowl" = ps: with ps; [ ]; - "proximity" = ps: with ps; [ ]; - "proxmoxve" = ps: with ps; [ proxmoxer ]; - "proxy" = ps: with ps; [ pillow ]; - "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen - "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; - "pure_energie" = ps: with ps; [ gridnet ]; - "push" = ps: with ps; [ aiohttp-cors ]; - "pushbullet" = ps: with ps; [ pushbullet ]; - "pushover" = ps: with ps; [ pushover-complete ]; - "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ pvo ]; - "pvpc_hourly_pricing" = ps: with ps; [ aiopvpc ]; - "pyload" = ps: with ps; [ ]; - "python_script" = ps: with ps; [ restrictedpython ]; - "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent - "qld_bushfire" = ps: with ps; [ georss-qld-bushfire-alert-client ]; - "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats - "qrcode" = ps: with ps; [ pillow pyzbar ]; - "quantum_gateway" = ps: with ps; [ quantum-gateway ]; - "qvr_pro" = ps: with ps; [ pyqvrpro ]; - "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ]; - "radarr" = ps: with ps; [ ]; - "radio_browser" = ps: with ps; [ radios ]; - "radiotherm" = ps: with ps; [ radiotherm ]; - "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird - "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy - "rainforest_eagle" = ps: with ps; [ aioeagle ueagle ]; - "rainmachine" = ps: with ps; [ regenmaschine ]; - "random" = ps: with ps; [ ]; - "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client - "rdw" = ps: with ps; [ vehicle ]; - "recollect_waste" = ps: with ps; [ aiorecollect ]; - "recorder" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; - "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch - "reddit" = ps: with ps; [ praw ]; - "rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl - "remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI - "remote" = ps: with ps; [ ]; - "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero - "renault" = ps: with ps; [ renault-api ]; - "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetierng - "rest" = ps: with ps; [ jsonpath xmltodict ]; - "rest_command" = ps: with ps; [ ]; - "rflink" = ps: with ps; [ rflink ]; - "rfxtrx" = ps: with ps; [ pyrfxtrx ]; - "ridwell" = ps: with ps; [ aioridwell ]; - "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ]; - "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api - "risco" = ps: with ps; [ pyrisco ]; - "rituals_perfume_genie" = ps: with ps; [ pyrituals ]; - "rmvtransport" = ps: with ps; [ pyrmvtransport ]; - "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API - "roku" = ps: with ps; [ rokuecp ]; - "roomba" = ps: with ps; [ roombapy ]; - "roon" = ps: with ps; [ roonapi ]; - "route53" = ps: with ps; [ boto3 ]; - "rova" = ps: with ps; [ ]; # missing inputs: rova - "rpi_camera" = ps: with ps; [ ]; - "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO - "rpi_power" = ps: with ps; [ rpi-bad-power ]; - "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; - "rtorrent" = ps: with ps; [ ]; - "rtsp_to_webrtc" = ps: with ps; [ pyturbojpeg aiohttp-cors rtsp-to-webrtc ]; - "ruckus_unleashed" = ps: with ps; [ pyruckus ]; - "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio - "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound - "sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ pyturbojpeg aiohttp-cors fnvhash hass-nabucasa home-assistant-frontend lru-dict pillow sqlalchemy ]; - "saj" = ps: with ps; [ ]; # missing inputs: pysaj - "samsungtv" = ps: with ps; [ aiohttp-cors async-upnp-client getmac ifaddr samsungctl samsungtvws wakeonlan zeroconf ]; - "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra - "scene" = ps: with ps; [ ]; - "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter - "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict ]; - "screenlogic" = ps: with ps; [ screenlogicpy ]; - "script" = ps: with ps; [ ]; - "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate - "search" = ps: with ps; [ aiohttp-cors ]; - "season" = ps: with ps; [ ephem ]; - "select" = ps: with ps; [ ]; - "sendgrid" = ps: with ps; [ sendgrid ]; - "sense" = ps: with ps; [ sense-energy ]; - "senseme" = ps: with ps; [ aiosenseme ]; - "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo - "sensor" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; - "sentry" = ps: with ps; [ sentry-sdk ]; - "serial" = ps: with ps; [ pyserial-asyncio ]; - "serial_pm" = ps: with ps; [ pmsensor ]; - "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 - "seven_segments" = ps: with ps; [ pillow ]; - "seventeentrack" = ps: with ps; [ py17track ]; - "sharkiq" = ps: with ps; [ ]; # missing inputs: sharkiq - "shell_command" = ps: with ps; [ ]; - "shelly" = ps: with ps; [ aioshelly ]; - "shiftr" = ps: with ps; [ paho-mqtt ]; - "shodan" = ps: with ps; [ shodan ]; - "shopping_list" = ps: with ps; [ aiohttp-cors ]; - "sia" = ps: with ps; [ pysiaalarm ]; - "sigfox" = ps: with ps; [ ]; - "sighthound" = ps: with ps; [ pillow simplehound ]; - "signal_messenger" = ps: with ps; [ pysignalclirestapi ]; - "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush - "simplisafe" = ps: with ps; [ simplisafe-python ]; - "simulated" = ps: with ps; [ ]; - "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms - "siren" = ps: with ps; [ ]; - "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control - "sky_hub" = ps: with ps; [ pyskyqhub ]; - "skybeacon" = ps: with ps; [ pygatt ]; - "skybell" = ps: with ps; [ skybellpy ]; - "slack" = ps: with ps; [ slackclient ]; - "sleepiq" = ps: with ps; [ asyncsleepiq ]; - "slide" = ps: with ps; [ ]; # missing inputs: goslide-api - "sma" = ps: with ps; [ pysma ]; - "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; - "smart_meter_texas" = ps: with ps; [ smart-meter-texas ]; - "smartthings" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pysmartapp pysmartthings ]; - "smarttub" = ps: with ps; [ python-smarttub ]; - "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty - "smhi" = ps: with ps; [ smhi-pkg ]; - "sms" = ps: with ps; [ python-gammu ]; - "smtp" = ps: with ps; [ ]; - "snapcast" = ps: with ps; [ snapcast ]; - "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "snmp" = ps: with ps; [ pysnmp ]; - "solaredge" = ps: with ps; [ solaredge stringcase ]; - "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local - "solarlog" = ps: with ps; [ sunwatcher ]; - "solax" = ps: with ps; [ solax ]; - "soma" = ps: with ps; [ pysoma ]; - "somfy" = ps: with ps; [ aiohttp-cors pymfy ]; - "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; - "sonarr" = ps: with ps; [ aiopyarr ]; - "songpal" = ps: with ps; [ python-songpal ]; - "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco spotipy zeroconf ]; - "sony_projector" = ps: with ps; [ pysdcp ]; - "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; - "spaceapi" = ps: with ps; [ aiohttp-cors ]; - "spc" = ps: with ps; [ pyspcwebgw ]; - "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; - "spider" = ps: with ps; [ spiderpy ]; - "splunk" = ps: with ps; [ ]; # missing inputs: hass_splunk - "spotify" = ps: with ps; [ aiohttp-cors spotipy ]; - "sql" = ps: with ps; [ sqlalchemy ]; - "squeezebox" = ps: with ps; [ pysqueezebox ]; - "srp_energy" = ps: with ps; [ srpenergy ]; - "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; - "starline" = ps: with ps; [ starline ]; - "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank - "startca" = ps: with ps; [ xmltodict ]; - "statistics" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; - "statsd" = ps: with ps; [ statsd ]; - "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd - "steamist" = ps: with ps; [ aiohttp-cors aiosteamist discovery30303 ifaddr ]; - "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron - "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert - "stream" = ps: with ps; [ pyturbojpeg aiohttp-cors av ]; - "streamlabswater" = ps: with ps; [ streamlabswater ]; - "stt" = ps: with ps; [ aiohttp-cors ]; - "subaru" = ps: with ps; [ subarulink ]; - "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez - "sun" = ps: with ps; [ ]; - "supervisord" = ps: with ps; [ ]; - "supla" = ps: with ps; [ ]; # missing inputs: asyncpysupla - "surepetcare" = ps: with ps; [ surepy ]; - "swiss_hydrological_data" = ps: with ps; [ swisshydrodata ]; - "swiss_public_transport" = ps: with ps; [ python-opendata-transport ]; - "swisscom" = ps: with ps; [ ]; - "switch" = ps: with ps; [ ]; - "switch_as_x" = ps: with ps; [ ]; - "switchbot" = ps: with ps; [ pyswitchbot ]; - "switcher_kis" = ps: with ps; [ aioswitcher ]; - "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate - "syncthing" = ps: with ps; [ aiosyncthing ]; - "syncthru" = ps: with ps; [ pysyncthru url-normalize ]; - "synology_chat" = ps: with ps; [ ]; - "synology_dsm" = ps: with ps; [ py-synologydsm-api ]; - "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm - "syslog" = ps: with ps; [ ]; - "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ]; - "system_health" = ps: with ps; [ aiohttp-cors ]; - "system_log" = ps: with ps; [ ]; - "systemmonitor" = ps: with ps; [ psutil ]; - "tado" = ps: with ps; [ python-tado ]; - "tag" = ps: with ps; [ ]; - "tailscale" = ps: with ps; [ tailscale ]; - "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility - "tankerkoenig" = ps: with ps; [ pytankerkoenig ]; - "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff - "tasmota" = ps: with ps; [ aiohttp-cors hatasmota paho-mqtt ]; - "tautulli" = ps: with ps; [ pytautulli ]; - "tcp" = ps: with ps; [ ]; - "ted5000" = ps: with ps; [ xmltodict ]; - "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; - "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; - "tellduslive" = ps: with ps; [ tellduslive ]; - "tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py - "telnet" = ps: with ps; [ ]; - "temper" = ps: with ps; [ ]; # missing inputs: temperusb - "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow pycocotools tensorflow ]; # missing inputs: tf-models-official - "tesla_wall_connector" = ps: with ps; [ tesla-wall-connector ]; - "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac - "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke - "thethingsnetwork" = ps: with ps; [ ]; - "thingspeak" = ps: with ps; [ ]; # missing inputs: thingspeak - "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner - "thomson" = ps: with ps; [ ]; - "threshold" = ps: with ps; [ ]; - "tibber" = ps: with ps; [ fnvhash lru-dict pytibber sqlalchemy ]; - "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck - "tile" = ps: with ps; [ pytile ]; - "time_date" = ps: with ps; [ ]; - "timer" = ps: with ps; [ ]; - "tmb" = ps: with ps; [ tmb ]; - "tod" = ps: with ps; [ ]; - "todoist" = ps: with ps; [ todoist ]; - "tolo" = ps: with ps; [ tololib ]; - "tomato" = ps: with ps; [ ]; - "tomorrowio" = ps: with ps; [ ]; # missing inputs: pytomorrowio - "toon" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa toonapi ]; - "torque" = ps: with ps; [ aiohttp-cors ]; - "totalconnect" = ps: with ps; [ total-connect-client ]; - "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline - "tplink" = ps: with ps; [ aiohttp-cors ifaddr python-kasa ]; - "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected - "traccar" = ps: with ps; [ aiohttp-cors pytraccar stringcase ]; - "trace" = ps: with ps; [ ]; - "tractive" = ps: with ps; [ aiotractive ]; - "tradfri" = ps: with ps; [ pytradfri ]; - "trafikverket_train" = ps: with ps; [ pytrafikverket ]; - "trafikverket_weatherstation" = ps: with ps; [ pytrafikverket ]; - "transmission" = ps: with ps; [ transmissionrpc ]; - "transport_nsw" = ps: with ps; [ pytransportnsw ]; - "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy - "trend" = ps: with ps; [ numpy ]; - "tts" = ps: with ps; [ aiohttp-cors mutagen ]; - "tuya" = ps: with ps; [ ha-ffmpeg tuya-iot-py-sdk ]; - "twentemilieu" = ps: with ps; [ twentemilieu ]; - "twilio" = ps: with ps; [ aiohttp-cors twilio ]; - "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; - "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; - "twinkly" = ps: with ps; [ ttls ]; - "twitch" = ps: with ps; [ twitchapi ]; - "twitter" = ps: with ps; [ twitterapi ]; - "ubus" = ps: with ps; [ openwrt-ubus-rpc ]; - "ue_smart_radio" = ps: with ps; [ ]; - "uk_transport" = ps: with ps; [ ]; - "unifi" = ps: with ps; [ aiounifi ]; - "unifi_direct" = ps: with ps; [ pexpect ]; - "unifiled" = ps: with ps; [ unifiled ]; - "unifiprotect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyunifiprotect unifi-discovery - "universal" = ps: with ps; [ ]; - "upb" = ps: with ps; [ upb-lib ]; - "upc_connect" = ps: with ps; [ connect-box ]; - "upcloud" = ps: with ps; [ upcloud-api ]; - "update" = ps: with ps; [ ]; - "updater" = ps: with ps; [ ]; - "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; - "uptime" = ps: with ps; [ ]; - "uptimerobot" = ps: with ps; [ pyuptimerobot ]; - "usb" = ps: with ps; [ aiohttp-cors pyserial pyudev ]; - "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus - "usgs_earthquakes_feed" = ps: with ps; [ geojson-client ]; - "utility_meter" = ps: with ps; [ croniter ]; - "uvc" = ps: with ps; [ uvcclient ]; - "vacuum" = ps: with ps; [ ]; - "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api - "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp - "velbus" = ps: with ps; [ aiohttp-cors pyserial pyudev velbus-aio ]; - "velux" = ps: with ps; [ pyvlx ]; - "venstar" = ps: with ps; [ venstarcolortouch ]; - "vera" = ps: with ps; [ pyvera ]; - "verisure" = ps: with ps; [ vsure ]; - "versasense" = ps: with ps; [ pyversasense ]; - "version" = ps: with ps; [ pyhaversion ]; - "vesync" = ps: with ps; [ pyvesync ]; - "viaggiatreno" = ps: with ps; [ ]; - "vicare" = ps: with ps; [ pyvicare ]; - "vilfo" = ps: with ps; [ vilfo-api-client ]; - "vivotek" = ps: with ps; [ libpyvivotek ]; - "vizio" = ps: with ps; [ pyvizio ]; - "vlc" = ps: with ps; [ python-vlc ]; - "vlc_telnet" = ps: with ps; [ aiovlc ]; - "voicerss" = ps: with ps; [ ]; - "volkszaehler" = ps: with ps; [ volkszaehler ]; - "volumio" = ps: with ps; [ pyvolumio ]; - "volvooncall" = ps: with ps; [ volvooncall ]; - "vulcan" = ps: with ps; [ vulcan-api ]; - "vultr" = ps: with ps; [ vultr ]; - "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 - "wake_on_lan" = ps: with ps; [ wakeonlan ]; - "wallbox" = ps: with ps; [ wallbox ]; - "waqi" = ps: with ps; [ waqiasync ]; - "water_heater" = ps: with ps; [ ]; - "waterfurnace" = ps: with ps; [ waterfurnace ]; - "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf - "watson_tts" = ps: with ps; [ ibm-watson ]; - "watttime" = ps: with ps; [ aiowatttime ]; - "waze_travel_time" = ps: with ps; [ wazeroutecalculator ]; - "weather" = ps: with ps; [ ]; - "webhook" = ps: with ps; [ aiohttp-cors ]; - "webostv" = ps: with ps; [ aiowebostv ]; - "websocket_api" = ps: with ps; [ aiohttp-cors ]; - "wemo" = ps: with ps; [ pywemo ]; - "whirlpool" = ps: with ps; [ whirlpool-sixth-sense ]; - "whois" = ps: with ps; [ whois ]; - "wiffi" = ps: with ps; [ wiffi ]; - "wilight" = ps: with ps; [ pywilight ]; - "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy - "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api - "wiz" = ps: with ps; [ aiohttp-cors ifaddr pywizlight ]; - "wled" = ps: with ps; [ wled ]; - "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset - "workday" = ps: with ps; [ holidays ]; - "worldclock" = ps: with ps; [ ]; - "worldtidesinfo" = ps: with ps; [ ]; - "worxlandroid" = ps: with ps; [ ]; - "wsdot" = ps: with ps; [ ]; - "x10" = ps: with ps; [ ]; - "xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ]; - "xbox_live" = ps: with ps; [ xboxapi ]; - "xeoma" = ps: with ps; [ pyxeoma ]; - "xiaomi" = ps: with ps; [ ha-ffmpeg ]; - "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors ifaddr netdisco zeroconf ]; - "xiaomi_miio" = ps: with ps; [ construct micloud python-miio ]; - "xiaomi_tv" = ps: with ps; [ pymitv ]; - "xmpp" = ps: with ps; [ slixmpp ]; - "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client - "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; - "yamaha" = ps: with ps; [ rxv ]; - "yamaha_musiccast" = ps: with ps; [ aiohttp-cors aiomusiccast async-upnp-client ifaddr zeroconf ]; - "yandex_transport" = ps: with ps; [ aioymaps ]; - "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr yeelight zeroconf ]; - "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower - "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; - "youless" = ps: with ps; [ youless-api ]; - "zabbix" = ps: with ps; [ py-zabbix ]; - "zamg" = ps: with ps; [ ]; - "zengge" = ps: with ps; [ bluepy ]; # missing inputs: zengge - "zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; - "zerproc" = ps: with ps; [ pyzerproc ]; - "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial pyudev zeroconf zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; - "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac - "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl - "zodiac" = ps: with ps; [ ]; - "zone" = ps: with ps; [ ]; - "zoneminder" = ps: with ps; [ zm-py ]; - "zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ]; - "zwave_me" = ps: with ps; [ aiohttp-cors ifaddr url-normalize zeroconf ]; # missing inputs: zwave_me_ws + "abode" = ps: with ps; [ + abodepy + ]; + "accuweather" = ps: with ps; [ + accuweather + ]; + "acer_projector" = ps: with ps; [ + pyserial + ]; + "acmeda" = ps: with ps; [ + aiopulse + ]; + "actiontec" = ps: with ps; [ + ]; + "adax" = ps: with ps; [ + adax-local + adax + ]; + "adguard" = ps: with ps; [ + adguardhome + ]; + "ads" = ps: with ps; [ + pyads + ]; + "advantage_air" = ps: with ps; [ + advantage-air + ]; + "aemet" = ps: with ps; [ + aemet-opendata + ]; + "aftership" = ps: with ps; [ + pyaftership + ]; + "agent_dvr" = ps: with ps; [ + agent-py + ]; + "air_quality" = ps: with ps; [ + ]; + "airly" = ps: with ps; [ + airly + ]; + "airnow" = ps: with ps; [ + pyairnow + ]; + "airthings" = ps: with ps; [ + airthings-cloud + ]; + "airtouch4" = ps: with ps; [ + airtouch4pyapi + ]; + "airvisual" = ps: with ps; [ + pyairvisual + ]; + "airzone" = ps: with ps; [ + aioairzone + ]; + "aladdin_connect" = ps: with ps; [ + aladdin-connect + ]; + "alarm_control_panel" = ps: with ps; [ + ]; + "alarmdecoder" = ps: with ps; [ + adext + ]; + "alert" = ps: with ps; [ + ]; + "alexa" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + ]; + "almond" = ps: with ps; [ + aiohttp-cors + pyalmond + ]; + "alpha_vantage" = ps: with ps; [ + alpha-vantage + ]; + "amazon_polly" = ps: with ps; [ + boto3 + ]; + "ambee" = ps: with ps; [ + ambee + ]; + "amberelectric" = ps: with ps; [ + amberelectric + ]; + "ambiclimate" = ps: with ps; [ + aiohttp-cors + ambiclimate + ]; + "ambient_station" = ps: with ps; [ + aioambient + ]; + "amcrest" = ps: with ps; [ + amcrest + ha-ffmpeg + ]; + "ampio" = ps: with ps; [ + asmog + ]; + "analytics" = ps: with ps; [ + aiohttp-cors + fnvhash + lru-dict + sqlalchemy + ]; + "android_ip_webcam" = ps: with ps; [ + pydroid-ipcam + ]; + "androidtv" = ps: with ps; [ + adb-shell + androidtv + pure-python-adb + ] + ++ adb-shell.extras-require.async + ++ androidtv.extras-require.async + ++ pure-python-adb.extras-require.async; + "anel_pwrctrl" = ps: with ps; [ + ]; # missing inputs: anel_pwrctrl-homeassistant + "anthemav" = ps: with ps; [ + ]; # missing inputs: anthemav + "apache_kafka" = ps: with ps; [ + aiokafka + ]; + "apcupsd" = ps: with ps; [ + apcaccess + ]; + "api" = ps: with ps; [ + aiohttp-cors + ]; + "apple_tv" = ps: with ps; [ + aiohttp-cors + ifaddr + pyatv + zeroconf + ]; + "apprise" = ps: with ps; [ + apprise + ]; + "aprs" = ps: with ps; [ + aprslib + geopy + ]; + "aqualogic" = ps: with ps; [ + aqualogic + ]; + "aquostv" = ps: with ps; [ + ]; # missing inputs: sharp_aquos_rc + "arcam_fmj" = ps: with ps; [ + arcam-fmj + ]; + "arest" = ps: with ps; [ + ]; + "arlo" = ps: with ps; [ + ha-ffmpeg + pyarlo + ]; + "arris_tg2492lg" = ps: with ps; [ + ]; # missing inputs: arris-tg2492lg + "aruba" = ps: with ps; [ + pexpect + ]; + "arwn" = ps: with ps; [ + aiohttp-cors + paho-mqtt + ]; + "aseko_pool_live" = ps: with ps; [ + aioaseko + ]; + "asterisk_cdr" = ps: with ps; [ + asterisk-mbox + ]; + "asterisk_mbox" = ps: with ps; [ + asterisk-mbox + ]; + "asuswrt" = ps: with ps; [ + aioasuswrt + ]; + "atag" = ps: with ps; [ + pyatag + ]; + "aten_pe" = ps: with ps; [ + atenpdu + ]; + "atome" = ps: with ps; [ + pyatome + ]; + "august" = ps: with ps; [ + yalexs + ]; + "aurora" = ps: with ps; [ + auroranoaa + ]; + "aurora_abb_powerone" = ps: with ps; [ + aurorapy + ]; + "aussie_broadband" = ps: with ps; [ + pyaussiebb + ]; + "auth" = ps: with ps; [ + aiohttp-cors + ]; + "automation" = ps: with ps; [ + aiohttp-cors + ]; + "avea" = ps: with ps; [ + avea + ]; + "avion" = ps: with ps; [ + avion + ]; + "awair" = ps: with ps; [ + python-awair + ]; + "aws" = ps: with ps; [ + aiobotocore + ]; + "axis" = ps: with ps; [ + aiohttp-cors + axis + paho-mqtt + ]; + "azure_devops" = ps: with ps; [ + aioazuredevops + ]; + "azure_event_hub" = ps: with ps; [ + azure-eventhub + ]; + "azure_service_bus" = ps: with ps; [ + azure-servicebus + ]; + "backup" = ps: with ps; [ + aiohttp-cors + ]; # missing inputs: securetar + "baidu" = ps: with ps; [ + ]; # missing inputs: baidu-aip + "balboa" = ps: with ps; [ + pybalboa + ]; + "bayesian" = ps: with ps; [ + ]; + "bbox" = ps: with ps; [ + ]; # missing inputs: pybbox + "beewi_smartclim" = ps: with ps; [ + ]; # missing inputs: beewi_smartclim + "binary_sensor" = ps: with ps; [ + ]; + "bitcoin" = ps: with ps; [ + blockchain + ]; + "bizkaibus" = ps: with ps; [ + bizkaibus + ]; + "blackbird" = ps: with ps; [ + pyblackbird + ]; + "blebox" = ps: with ps; [ + blebox-uniapi + ]; + "blink" = ps: with ps; [ + blinkpy + ]; + "blinksticklight" = ps: with ps; [ + BlinkStick + ]; + "blockchain" = ps: with ps; [ + ]; # missing inputs: python-blockchain-api + "bloomsky" = ps: with ps; [ + ]; + "blueprint" = ps: with ps; [ + ]; + "bluesound" = ps: with ps; [ + xmltodict + ]; + "bluetooth_le_tracker" = ps: with ps; [ + pygatt + ] + ++ pygatt.extras-require.GATTTOOL; + "bluetooth_tracker" = ps: with ps; [ + bt-proximity + pybluez + ]; + "bmw_connected_drive" = ps: with ps; [ + bimmer-connected + ]; + "bond" = ps: with ps; [ + bond-api + ]; + "bosch_shc" = ps: with ps; [ + aiohttp-cors + boschshcpy + ifaddr + zeroconf + ]; + "braviatv" = ps: with ps; [ + bravia-tv + ]; + "broadlink" = ps: with ps; [ + broadlink + ]; + "brother" = ps: with ps; [ + brother + ]; + "brottsplatskartan" = ps: with ps; [ + brottsplatskartan + ]; + "browser" = ps: with ps; [ + ]; + "brunt" = ps: with ps; [ + ]; # missing inputs: brunt + "bsblan" = ps: with ps; [ + bsblan + ]; + "bt_home_hub_5" = ps: with ps; [ + ]; # missing inputs: bthomehub5-devicelist + "bt_smarthub" = ps: with ps; [ + ]; # missing inputs: btsmarthub_devicelist + "buienradar" = ps: with ps; [ + buienradar + ]; + "button" = ps: with ps; [ + ]; + "caldav" = ps: with ps; [ + caldav + ]; + "calendar" = ps: with ps; [ + aiohttp-cors + ]; + "camera" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + ]; + "canary" = ps: with ps; [ + ha-ffmpeg + py-canary + ]; + "cast" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + hass-nabucasa + ifaddr + mutagen + plexapi + plexauth + plexwebsocket + PyChromecast + zeroconf + ]; + "cert_expiry" = ps: with ps; [ + ]; + "channels" = ps: with ps; [ + pychannels + ]; + "circuit" = ps: with ps; [ + circuit-webhook + ]; + "cisco_ios" = ps: with ps; [ + pexpect + ]; + "cisco_mobility_express" = ps: with ps; [ + ciscomobilityexpress + ]; + "cisco_webex_teams" = ps: with ps; [ + webexteamssdk + ]; + "citybikes" = ps: with ps; [ + ]; + "clementine" = ps: with ps; [ + ]; # missing inputs: python-clementine-remote + "clickatell" = ps: with ps; [ + ]; + "clicksend" = ps: with ps; [ + ]; + "clicksend_tts" = ps: with ps; [ + ]; + "climacell" = ps: with ps; [ + pyclimacell + ]; # missing inputs: pytomorrowio + "climate" = ps: with ps; [ + ]; + "cloud" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + hass-nabucasa + ]; + "cloudflare" = ps: with ps; [ + pycfdns + ]; + "cmus" = ps: with ps; [ + ]; # missing inputs: pycmus + "co2signal" = ps: with ps; [ + co2signal + ]; + "coinbase" = ps: with ps; [ + ]; # missing inputs: coinbase + "color_extractor" = ps: with ps; [ + colorthief + ]; + "comed_hourly_pricing" = ps: with ps; [ + ]; + "comfoconnect" = ps: with ps; [ + pycomfoconnect + ]; + "command_line" = ps: with ps; [ + ]; + "compensation" = ps: with ps; [ + numpy + ]; + "concord232" = ps: with ps; [ + ]; # missing inputs: concord232 + "config" = ps: with ps; [ + aiohttp-cors + ]; + "configurator" = ps: with ps; [ + ]; + "control4" = ps: with ps; [ + pycontrol4 + ]; + "conversation" = ps: with ps; [ + aiohttp-cors + ]; + "coolmaster" = ps: with ps; [ + pycoolmasternet-async + ]; + "coronavirus" = ps: with ps; [ + coronavirus + ]; + "counter" = ps: with ps; [ + ]; + "cover" = ps: with ps; [ + ]; + "cppm_tracker" = ps: with ps; [ + ]; # missing inputs: clearpasspy + "cpuspeed" = ps: with ps; [ + py-cpuinfo + ]; + "crownstone" = ps: with ps; [ + aiohttp-cors + crownstone-cloud + crownstone-sse + crownstone-uart + pyserial + pyudev + ]; + "cups" = ps: with ps; [ + pycups + ]; + "currencylayer" = ps: with ps; [ + ]; + "daikin" = ps: with ps; [ + pydaikin + ]; + "danfoss_air" = ps: with ps; [ + pydanfossair + ]; + "darksky" = ps: with ps; [ + python-forecastio + ]; + "datadog" = ps: with ps; [ + datadog + ]; + "ddwrt" = ps: with ps; [ + ]; + "debugpy" = ps: with ps; [ + debugpy + ]; + "deconz" = ps: with ps; [ + pydeconz + ]; + "decora" = ps: with ps; [ + bluepy + ]; # missing inputs: decora + "decora_wifi" = ps: with ps; [ + ]; # missing inputs: decora_wifi + "default_config" = ps: with ps; [ + pynacl + pyturbojpeg + aiodiscover + aiohttp-cors + async-upnp-client + fnvhash + hass-nabucasa + home-assistant-frontend + ifaddr + lru-dict + pillow + pyserial + pyudev + scapy + sqlalchemy + zeroconf + ]; + "delijn" = ps: with ps; [ + pydelijn + ]; + "deluge" = ps: with ps; [ + deluge-client + ]; + "demo" = ps: with ps; [ + aiohttp-cors + fnvhash + lru-dict + sqlalchemy + ]; + "denon" = ps: with ps; [ + ]; + "denonavr" = ps: with ps; [ + denonavr + ]; + "derivative" = ps: with ps; [ + ]; + "deutsche_bahn" = ps: with ps; [ + schiene + ]; + "device_automation" = ps: with ps; [ + ]; + "device_sun_light_trigger" = ps: with ps; [ + aiohttp-cors + pillow + ]; + "device_tracker" = ps: with ps; [ + ]; + "devolo_home_control" = ps: with ps; [ + aiohttp-cors + devolo-home-control-api + ifaddr + zeroconf + ]; + "devolo_home_network" = ps: with ps; [ + devolo-plc-api + ]; + "dexcom" = ps: with ps; [ + pydexcom + ]; + "dhcp" = ps: with ps; [ + aiodiscover + scapy + ]; + "diagnostics" = ps: with ps; [ + aiohttp-cors + ]; + "dialogflow" = ps: with ps; [ + aiohttp-cors + ]; + "digital_ocean" = ps: with ps; [ + digital-ocean + ]; + "digitalloggers" = ps: with ps; [ + ]; # missing inputs: dlipower + "directv" = ps: with ps; [ + directv + ]; + "discogs" = ps: with ps; [ + discogs-client + ]; + "discord" = ps: with ps; [ + nextcord + ]; + "discovery" = ps: with ps; [ + aiohttp-cors + ifaddr + netdisco + zeroconf + ]; + "dlib_face_detect" = ps: with ps; [ + face_recognition + ]; + "dlib_face_identify" = ps: with ps; [ + face_recognition + ]; + "dlink" = ps: with ps; [ + ]; # missing inputs: pyW215 + "dlna_dmr" = ps: with ps; [ + aiohttp-cors + async-upnp-client + ifaddr + zeroconf + ]; + "dlna_dms" = ps: with ps; [ + aiohttp-cors + async-upnp-client + ifaddr + zeroconf + ]; + "dnsip" = ps: with ps; [ + aiodns + ]; + "dominos" = ps: with ps; [ + aiohttp-cors + ]; # missing inputs: pizzapi + "doods" = ps: with ps; [ + pillow + pydoods + ]; + "doorbird" = ps: with ps; [ + aiohttp-cors + doorbirdpy + ]; + "dovado" = ps: with ps; [ + ]; # missing inputs: dovado + "downloader" = ps: with ps; [ + ]; + "dsmr" = ps: with ps; [ + dsmr-parser + ]; + "dsmr_reader" = ps: with ps; [ + aiohttp-cors + paho-mqtt + ]; + "dte_energy_bridge" = ps: with ps; [ + ]; + "dublin_bus_transport" = ps: with ps; [ + ]; + "duckdns" = ps: with ps; [ + ]; + "dunehd" = ps: with ps; [ + pdunehd + ]; + "dwd_weather_warnings" = ps: with ps; [ + dwdwfsapi + ]; + "dweet" = ps: with ps; [ + ]; # missing inputs: dweepy + "dynalite" = ps: with ps; [ + dynalite-devices + ]; + "eafm" = ps: with ps; [ + aioeafm + ]; + "ebox" = ps: with ps; [ + ]; # missing inputs: pyebox + "ebusd" = ps: with ps; [ + ]; # missing inputs: ebusdpy + "ecoal_boiler" = ps: with ps; [ + ecoaliface + ]; + "ecobee" = ps: with ps; [ + python-ecobee-api + ]; + "econet" = ps: with ps; [ + pyeconet + ]; + "ecovacs" = ps: with ps; [ + ]; # missing inputs: sucks + "eddystone_temperature" = ps: with ps; [ + construct + ]; # missing inputs: beacontools + "edimax" = ps: with ps; [ + pyedimax + ]; + "edl21" = ps: with ps; [ + pysml + ]; + "efergy" = ps: with ps; [ + pyefergy + ]; + "egardia" = ps: with ps; [ + pythonegardia + ]; + "eight_sleep" = ps: with ps; [ + pyeight + ]; + "elgato" = ps: with ps; [ + elgato + ]; + "eliqonline" = ps: with ps; [ + eliqonline + ]; + "elkm1" = ps: with ps; [ + aiohttp-cors + elkm1-lib + ifaddr + ]; + "elmax" = ps: with ps; [ + elmax-api + ]; + "elv" = ps: with ps; [ + pypca + ]; + "emby" = ps: with ps; [ + pyemby + ]; + "emoncms" = ps: with ps; [ + ]; + "emoncms_history" = ps: with ps; [ + ]; + "emonitor" = ps: with ps; [ + aioemonitor + ]; + "emulated_hue" = ps: with ps; [ + aiohttp-cors + ifaddr + ]; + "emulated_kasa" = ps: with ps; [ + sense-energy + ]; + "emulated_roku" = ps: with ps; [ + aiohttp-cors + emulated-roku + ifaddr + ]; + "energy" = ps: with ps; [ + aiohttp-cors + fnvhash + lru-dict + sqlalchemy + ]; + "enigma2" = ps: with ps; [ + openwebifpy + ]; + "enocean" = ps: with ps; [ + enocean + ]; + "enphase_envoy" = ps: with ps; [ + envoy-reader + ]; + "entur_public_transport" = ps: with ps; [ + enturclient + ]; + "environment_canada" = ps: with ps; [ + env-canada + ]; + "envisalink" = ps: with ps; [ + pyenvisalink + ]; + "ephember" = ps: with ps; [ + pyephember + ]; + "epson" = ps: with ps; [ + epson-projector + ]; + "epsonworkforce" = ps: with ps; [ + ]; # missing inputs: epsonprinter + "eq3btsmart" = ps: with ps; [ + construct + ]; # missing inputs: python-eq3bt + "esphome" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + ifaddr + zeroconf + ]; + "etherscan" = ps: with ps; [ + ]; # missing inputs: python-etherscan-api + "eufy" = ps: with ps; [ + ]; # missing inputs: lakeside + "everlights" = ps: with ps; [ + pyeverlights + ]; + "evil_genius_labs" = ps: with ps; [ + pyevilgenius + ]; + "evohome" = ps: with ps; [ + evohome-async + ]; + "ezviz" = ps: with ps; [ + ha-ffmpeg + pyezviz + ]; + "faa_delays" = ps: with ps; [ + faadelays + ]; + "facebook" = ps: with ps; [ + ]; + "facebox" = ps: with ps; [ + ]; + "fail2ban" = ps: with ps; [ + ]; + "familyhub" = ps: with ps; [ + ]; # missing inputs: python-family-hub-local + "fan" = ps: with ps; [ + ]; + "fastdotcom" = ps: with ps; [ + ]; # missing inputs: fastdotcom + "feedreader" = ps: with ps; [ + feedparser + ]; + "ffmpeg" = ps: with ps; [ + ha-ffmpeg + ]; + "ffmpeg_motion" = ps: with ps; [ + ha-ffmpeg + ]; + "ffmpeg_noise" = ps: with ps; [ + ha-ffmpeg + ]; + "fibaro" = ps: with ps; [ + fiblary3-fork + ]; + "fido" = ps: with ps; [ + pyfido + ]; + "file" = ps: with ps; [ + ]; + "filesize" = ps: with ps; [ + ]; + "filter" = ps: with ps; [ + fnvhash + lru-dict + sqlalchemy + ]; + "fints" = ps: with ps; [ + fints + ]; + "fireservicerota" = ps: with ps; [ + pyfireservicerota + ]; + "firmata" = ps: with ps; [ + pymata-express + ]; + "fitbit" = ps: with ps; [ + aiohttp-cors + fitbit + ]; + "fivem" = ps: with ps; [ + ]; # missing inputs: fivem-api + "fixer" = ps: with ps; [ + fixerio + ]; + "fjaraskupan" = ps: with ps; [ + fjaraskupan + ]; + "fleetgo" = ps: with ps; [ + ritassist + ]; + "flexit" = ps: with ps; [ + pymodbus + ]; + "flic" = ps: with ps; [ + pyflic + ]; + "flick_electric" = ps: with ps; [ + pyflick + ]; + "flipr" = ps: with ps; [ + flipr-api + ]; + "flo" = ps: with ps; [ + aioflo + ]; + "flock" = ps: with ps; [ + ]; + "flume" = ps: with ps; [ + pyflume + ]; + "flunearyou" = ps: with ps; [ + pyflunearyou + ]; + "flux" = ps: with ps; [ + ]; + "flux_led" = ps: with ps; [ + aiohttp-cors + flux-led + ifaddr + ]; + "folder" = ps: with ps; [ + ]; + "folder_watcher" = ps: with ps; [ + watchdog + ]; + "foobot" = ps: with ps; [ + foobot-async + ]; + "forecast_solar" = ps: with ps; [ + forecast-solar + ]; + "forked_daapd" = ps: with ps; [ + ]; # missing inputs: pyforked-daapd pylibrespot-java + "fortios" = ps: with ps; [ + fortiosapi + ]; + "foscam" = ps: with ps; [ + libpyfoscam + ]; + "foursquare" = ps: with ps; [ + aiohttp-cors + ]; + "free_mobile" = ps: with ps; [ + ]; # missing inputs: freesms + "freebox" = ps: with ps; [ + freebox-api + ]; + "freedns" = ps: with ps; [ + ]; + "freedompro" = ps: with ps; [ + pyfreedompro + ]; + "fritz" = ps: with ps; [ + aiohttp-cors + fritzconnection + ifaddr + xmltodict + ]; + "fritzbox" = ps: with ps; [ + pyfritzhome + ]; + "fritzbox_callmonitor" = ps: with ps; [ + fritzconnection + ]; + "fronius" = ps: with ps; [ + pyfronius + ]; + "frontend" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "frontier_silicon" = ps: with ps; [ + afsapi + ]; + "futurenow" = ps: with ps; [ + pyfnip + ]; + "garadget" = ps: with ps; [ + ]; + "garages_amsterdam" = ps: with ps; [ + garages-amsterdam + ]; + "gc100" = ps: with ps; [ + ]; # missing inputs: python-gc100 + "gdacs" = ps: with ps; [ + aio-georss-gdacs + ]; + "generic" = ps: with ps; [ + av + pillow + ]; + "generic_hygrostat" = ps: with ps; [ + ]; + "generic_thermostat" = ps: with ps; [ + fnvhash + lru-dict + sqlalchemy + ]; + "geniushub" = ps: with ps; [ + geniushub-client + ]; + "geo_json_events" = ps: with ps; [ + ]; # missing inputs: aio_geojson_generic_client + "geo_location" = ps: with ps; [ + ]; + "geo_rss_events" = ps: with ps; [ + georss-generic-client + ]; + "geofency" = ps: with ps; [ + aiohttp-cors + ]; + "geonetnz_quakes" = ps: with ps; [ + aio-geojson-geonetnz-quakes + ]; + "geonetnz_volcano" = ps: with ps; [ + aio-geojson-geonetnz-volcano + ]; + "gios" = ps: with ps; [ + gios + ]; + "github" = ps: with ps; [ + aiogithubapi + ]; + "gitlab_ci" = ps: with ps; [ + python-gitlab + ]; + "gitter" = ps: with ps; [ + ]; # missing inputs: gitterpy + "glances" = ps: with ps; [ + glances-api + ]; + "goalfeed" = ps: with ps; [ + ]; # missing inputs: pysher + "goalzero" = ps: with ps; [ + goalzero + ]; + "gogogate2" = ps: with ps; [ + ismartgate + ]; + "goodwe" = ps: with ps; [ + goodwe + ]; + "google" = ps: with ps; [ + aiohttp-cors + google-api-python-client + httplib2 + oauth2client + ]; + "google_assistant" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + ]; + "google_cloud" = ps: with ps; [ + google-cloud-texttospeech + ]; + "google_domains" = ps: with ps; [ + ]; + "google_maps" = ps: with ps; [ + locationsharinglib + ]; + "google_pubsub" = ps: with ps; [ + google-cloud-pubsub + ]; + "google_translate" = ps: with ps; [ + gtts + ]; + "google_travel_time" = ps: with ps; [ + googlemaps + ]; + "google_wifi" = ps: with ps; [ + ]; + "gpsd" = ps: with ps; [ + gps3 + ]; + "gpslogger" = ps: with ps; [ + aiohttp-cors + ]; + "graphite" = ps: with ps; [ + ]; + "gree" = ps: with ps; [ + greeclimate + ]; + "greeneye_monitor" = ps: with ps; [ + ]; # missing inputs: greeneye_monitor + "greenwave" = ps: with ps; [ + ]; # missing inputs: greenwavereality + "group" = ps: with ps; [ + ]; + "growatt_server" = ps: with ps; [ + growattserver + ]; + "gstreamer" = ps: with ps; [ + ]; # missing inputs: gstreamer-player + "gtfs" = ps: with ps; [ + pygtfs + ]; + "guardian" = ps: with ps; [ + aioguardian + ]; + "habitica" = ps: with ps; [ + habitipy + ]; + "hangouts" = ps: with ps; [ + hangups + ]; + "harman_kardon_avr" = ps: with ps; [ + ]; # missing inputs: hkavr + "harmony" = ps: with ps; [ + aioharmony + ]; + "hassio" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "haveibeenpwned" = ps: with ps; [ + ]; + "hddtemp" = ps: with ps; [ + ]; + "hdmi_cec" = ps: with ps; [ + pycec + ]; + "heatmiser" = ps: with ps; [ + ]; # missing inputs: heatmiserV3 + "heos" = ps: with ps; [ + pyheos + ]; + "here_travel_time" = ps: with ps; [ + herepy + ]; + "hikvision" = ps: with ps; [ + ]; # missing inputs: pyhik + "hikvisioncam" = ps: with ps; [ + hikvision + ]; + "hisense_aehw4a1" = ps: with ps; [ + pyaehw4a1 + ]; + "history" = ps: with ps; [ + aiohttp-cors + fnvhash + lru-dict + sqlalchemy + ]; + "history_stats" = ps: with ps; [ + fnvhash + lru-dict + sqlalchemy + ]; + "hitron_coda" = ps: with ps; [ + ]; + "hive" = ps: with ps; [ + pyhiveapi + ]; + "hlk_sw16" = ps: with ps; [ + hlk-sw16 + ]; + "home_connect" = ps: with ps; [ + aiohttp-cors + homeconnect + ]; + "home_plus_control" = ps: with ps; [ + aiohttp-cors + homepluscontrol + ]; + "homeassistant" = ps: with ps; [ + ]; + "homekit" = ps: with ps; [ + hap-python + pyqrcode + pyturbojpeg + aiohttp-cors + base36 + fnvhash + ha-ffmpeg + ifaddr + zeroconf + ]; + "homekit_controller" = ps: with ps; [ + aiohomekit + aiohttp-cors + ifaddr + zeroconf + ]; + "homematic" = ps: with ps; [ + pyhomematic + ]; + "homematicip_cloud" = ps: with ps; [ + homematicip + ]; + "homewizard" = ps: with ps; [ + aiohwenergy + ]; + "homeworks" = ps: with ps; [ + pyhomeworks + ]; + "honeywell" = ps: with ps; [ + somecomfort + ]; + "horizon" = ps: with ps; [ + ]; # missing inputs: horimote + "hp_ilo" = ps: with ps; [ + python-hpilo + ]; + "html5" = ps: with ps; [ + aiohttp-cors + pywebpush + ]; + "http" = ps: with ps; [ + aiohttp-cors + ]; + "huawei_lte" = ps: with ps; [ + huawei-lte-api + stringcase + url-normalize + ]; + "hue" = ps: with ps; [ + aiohue + ]; + "huisbaasje" = ps: with ps; [ + huisbaasje-client + ]; + "humidifier" = ps: with ps; [ + ]; + "hunterdouglas_powerview" = ps: with ps; [ + aiopvapi + ]; + "hvv_departures" = ps: with ps; [ + pygti + ]; + "hydrawise" = ps: with ps; [ + hydrawiser + ]; + "hyperion" = ps: with ps; [ + hyperion-py + ]; + "ialarm" = ps: with ps; [ + pyialarm + ]; + "iammeter" = ps: with ps; [ + ]; # missing inputs: iammeter + "iaqualink" = ps: with ps; [ + iaqualink + ]; + "icloud" = ps: with ps; [ + pyicloud + ]; + "idteck_prox" = ps: with ps; [ + ]; # missing inputs: rfk101py + "ifttt" = ps: with ps; [ + aiohttp-cors + pyfttt + ]; + "iglo" = ps: with ps; [ + ]; # missing inputs: iglo + "ign_sismologia" = ps: with ps; [ + georss-ign-sismologia-client + ]; + "ihc" = ps: with ps; [ + defusedxml + ]; # missing inputs: ihcsdk + "image" = ps: with ps; [ + aiohttp-cors + pillow + ]; + "image_processing" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + ]; + "imap" = ps: with ps; [ + aioimaplib + ]; + "imap_email_content" = ps: with ps; [ + ]; + "incomfort" = ps: with ps; [ + incomfort-client + ]; + "influxdb" = ps: with ps; [ + influxdb-client + influxdb + ]; + "input_boolean" = ps: with ps; [ + ]; + "input_button" = ps: with ps; [ + ]; + "input_datetime" = ps: with ps; [ + ]; + "input_number" = ps: with ps; [ + ]; + "input_select" = ps: with ps; [ + ]; + "input_text" = ps: with ps; [ + ]; + "insteon" = ps: with ps; [ + pyinsteon + ]; + "integration" = ps: with ps; [ + ]; + "intellifire" = ps: with ps; [ + intellifire4py + ]; + "intent" = ps: with ps; [ + aiohttp-cors + ]; + "intent_script" = ps: with ps; [ + ]; + "intesishome" = ps: with ps; [ + pyintesishome + ]; + "ios" = ps: with ps; [ + aiohttp-cors + ifaddr + zeroconf + ]; + "iotawatt" = ps: with ps; [ + iotawattpy + ]; + "iperf3" = ps: with ps; [ + ]; # missing inputs: iperf3 + "ipma" = ps: with ps; [ + pyipma + ]; + "ipp" = ps: with ps; [ + pyipp + ]; + "iqvia" = ps: with ps; [ + numpy + pyiqvia + ]; + "irish_rail_transport" = ps: with ps; [ + ]; # missing inputs: pyirishrail + "islamic_prayer_times" = ps: with ps; [ + prayer-times-calculator + ]; + "iss" = ps: with ps; [ + ]; # missing inputs: pyiss + "isy994" = ps: with ps; [ + pyisy + ]; + "itach" = ps: with ps; [ + ]; # missing inputs: pyitachip2ir + "itunes" = ps: with ps; [ + ]; + "izone" = ps: with ps; [ + python-izone + ]; + "jellyfin" = ps: with ps; [ + jellyfin-apiclient-python + ]; + "jewish_calendar" = ps: with ps; [ + hdate + ]; + "joaoapps_join" = ps: with ps; [ + ]; # missing inputs: python-join-api + "juicenet" = ps: with ps; [ + python-juicenet + ]; + "kaiterra" = ps: with ps; [ + ]; # missing inputs: kaiterra-async-client + "kaleidescape" = ps: with ps; [ + ]; # missing inputs: pykaleidescape + "kankun" = ps: with ps; [ + ]; + "keba" = ps: with ps; [ + ]; # missing inputs: keba-kecontact + "keenetic_ndms2" = ps: with ps; [ + ndms2-client + ]; + "kef" = ps: with ps; [ + aiokef + getmac + ]; + "keyboard" = ps: with ps; [ + ]; # missing inputs: pyuserinput + "keyboard_remote" = ps: with ps; [ + aionotify + evdev + ]; + "kira" = ps: with ps; [ + pykira + ]; + "kiwi" = ps: with ps; [ + ]; # missing inputs: kiwiki-client + "kmtronic" = ps: with ps; [ + pykmtronic + ]; + "knx" = ps: with ps; [ + xknx + ]; + "kodi" = ps: with ps; [ + aiohttp-cors + pykodi + ]; + "konnected" = ps: with ps; [ + aiohttp-cors + konnected + ]; + "kostal_plenticore" = ps: with ps; [ + ]; # missing inputs: kostal_plenticore + "kraken" = ps: with ps; [ + krakenex + pykrakenapi + ]; + "kulersky" = ps: with ps; [ + pykulersky + ]; + "kwb" = ps: with ps; [ + ]; # missing inputs: pykwb + "lacrosse" = ps: with ps; [ + pylacrosse + ]; + "lametric" = ps: with ps; [ + lmnotify + ]; + "lannouncer" = ps: with ps; [ + ]; + "lastfm" = ps: with ps; [ + pylast + ]; + "launch_library" = ps: with ps; [ + pylaunches + ]; + "lcn" = ps: with ps; [ + pypck + ]; + "lg_netcast" = ps: with ps; [ + pylgnetcast + ]; + "lg_soundbar" = ps: with ps; [ + temescal + ]; + "life360" = ps: with ps; [ + life360 + ]; + "lifx" = ps: with ps; [ + aiolifx + aiolifx-effects + ]; + "lifx_cloud" = ps: with ps; [ + ]; + "light" = ps: with ps; [ + ]; + "lightwave" = ps: with ps; [ + lightwave + ]; + "limitlessled" = ps: with ps; [ + limitlessled + ]; + "linksys_smart" = ps: with ps; [ + ]; + "linode" = ps: with ps; [ + linode-api + ]; + "linux_battery" = ps: with ps; [ + batinfo + ]; + "lirc" = ps: with ps; [ + ]; # missing inputs: python-lirc + "litejet" = ps: with ps; [ + ]; # missing inputs: pylitejet + "litterrobot" = ps: with ps; [ + pylitterbot + ]; + "llamalab_automate" = ps: with ps; [ + ]; + "local_file" = ps: with ps; [ + ]; + "local_ip" = ps: with ps; [ + aiohttp-cors + ifaddr + ]; + "locative" = ps: with ps; [ + aiohttp-cors + ]; + "lock" = ps: with ps; [ + ]; + "logbook" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "logentries" = ps: with ps; [ + ]; + "logger" = ps: with ps; [ + ]; + "logi_circle" = ps: with ps; [ + aiohttp-cors + ha-ffmpeg + ]; # missing inputs: logi_circle + "london_air" = ps: with ps; [ + ]; + "london_underground" = ps: with ps; [ + ]; # missing inputs: london-tube-status + "lookin" = ps: with ps; [ + aiolookin + ]; + "lovelace" = ps: with ps; [ + ]; + "luci" = ps: with ps; [ + openwrt-luci-rpc + ]; + "luftdaten" = ps: with ps; [ + luftdaten + ]; + "lupusec" = ps: with ps; [ + lupupy + ]; + "lutron" = ps: with ps; [ + pylutron + ]; + "lutron_caseta" = ps: with ps; [ + pylutron-caseta + ]; + "lw12wifi" = ps: with ps; [ + ]; # missing inputs: lw12 + "lyric" = ps: with ps; [ + aiohttp-cors + aiolyric + ]; + "magicseaweed" = ps: with ps; [ + ]; # missing inputs: magicseaweed + "mailbox" = ps: with ps; [ + aiohttp-cors + ]; + "mailgun" = ps: with ps; [ + aiohttp-cors + ]; # missing inputs: pymailgunner + "manual" = ps: with ps; [ + ]; + "manual_mqtt" = ps: with ps; [ + aiohttp-cors + paho-mqtt + ]; + "map" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "marytts" = ps: with ps; [ + ]; # missing inputs: speak2mary + "mastodon" = ps: with ps; [ + mastodon-py + ]; + "matrix" = ps: with ps; [ + matrix-client + ]; + "maxcube" = ps: with ps; [ + maxcube-api + ]; + "mazda" = ps: with ps; [ + pymazda + ]; + "media_extractor" = ps: with ps; [ + aiohttp-cors + youtube-dl-light + ]; + "media_player" = ps: with ps; [ + aiohttp-cors + ]; + "media_source" = ps: with ps; [ + aiohttp-cors + ]; + "mediaroom" = ps: with ps; [ + pymediaroom + ]; + "melcloud" = ps: with ps; [ + pymelcloud + ]; + "melissa" = ps: with ps; [ + ]; # missing inputs: py-melissa-climate + "meraki" = ps: with ps; [ + aiohttp-cors + ]; + "message_bird" = ps: with ps; [ + ]; # missing inputs: messagebird + "met" = ps: with ps; [ + pymetno + ]; + "met_eireann" = ps: with ps; [ + pymeteireann + ]; + "meteo_france" = ps: with ps; [ + ]; # missing inputs: meteofrance-api + "meteoalarm" = ps: with ps; [ + meteoalertapi + ]; + "meteoclimatic" = ps: with ps; [ + pymeteoclimatic + ]; + "metoffice" = ps: with ps; [ + ]; # missing inputs: datapoint + "mfi" = ps: with ps; [ + ]; # missing inputs: mficlient + "microsoft" = ps: with ps; [ + ]; # missing inputs: pycsspeechtts + "microsoft_face" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + ]; + "microsoft_face_detect" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + ]; + "microsoft_face_identify" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + ]; + "miflora" = ps: with ps; [ + bluepy + ]; # missing inputs: miflora + "mikrotik" = ps: with ps; [ + librouteros + ]; + "mill" = ps: with ps; [ + mill-local + millheater + ]; + "min_max" = ps: with ps; [ + ]; + "minecraft_server" = ps: with ps; [ + aiodns + getmac + mcstatus + ]; + "minio" = ps: with ps; [ + minio + ]; + "mitemp_bt" = ps: with ps; [ + ]; # missing inputs: mitemp_bt + "mjpeg" = ps: with ps; [ + ]; + "mobile_app" = ps: with ps; [ + pynacl + pyturbojpeg + aiohttp-cors + hass-nabucasa + pillow + ]; + "mochad" = ps: with ps; [ + ]; # missing inputs: pymochad + "modbus" = ps: with ps; [ + pymodbus + ]; + "modem_callerid" = ps: with ps; [ + aiohttp-cors + phone-modem + pyserial + pyudev + ]; + "modern_forms" = ps: with ps; [ + aiomodernforms + ]; + "moehlenhoff_alpha2" = ps: with ps; [ + ]; # missing inputs: moehlenhoff-alpha2 + "mold_indicator" = ps: with ps; [ + ]; + "monoprice" = ps: with ps; [ + ]; # missing inputs: pymonoprice + "moon" = ps: with ps; [ + ]; + "motion_blinds" = ps: with ps; [ + aiohttp-cors + ifaddr + motionblinds + ]; + "motioneye" = ps: with ps; [ + aiohttp-cors + motioneye-client + ]; + "mpd" = ps: with ps; [ + mpd2 + ]; + "mqtt" = ps: with ps; [ + aiohttp-cors + paho-mqtt + ]; + "mqtt_eventstream" = ps: with ps; [ + aiohttp-cors + paho-mqtt + ]; + "mqtt_json" = ps: with ps; [ + aiohttp-cors + paho-mqtt + ]; + "mqtt_room" = ps: with ps; [ + aiohttp-cors + paho-mqtt + ]; + "mqtt_statestream" = ps: with ps; [ + aiohttp-cors + paho-mqtt + ]; + "msteams" = ps: with ps; [ + pymsteams + ]; + "mullvad" = ps: with ps; [ + mullvad-api + ]; + "mutesync" = ps: with ps; [ + mutesync + ]; + "mvglive" = ps: with ps; [ + PyMVGLive + ]; + "my" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "mycroft" = ps: with ps; [ + ]; # missing inputs: mycroftapi + "myq" = ps: with ps; [ + pymyq + ]; + "mysensors" = ps: with ps; [ + aiohttp-cors + paho-mqtt + pymysensors + ]; + "mystrom" = ps: with ps; [ + aiohttp-cors + python-mystrom + ]; + "mythicbeastsdns" = ps: with ps; [ + mbddns + ]; + "nad" = ps: with ps; [ + nad-receiver + ]; + "nam" = ps: with ps; [ + nettigo-air-monitor + ]; + "namecheapdns" = ps: with ps; [ + defusedxml + ]; + "nanoleaf" = ps: with ps; [ + aionanoleaf + ]; + "neato" = ps: with ps; [ + aiohttp-cors + pybotvac + ]; + "nederlandse_spoorwegen" = ps: with ps; [ + nsapi + ]; + "ness_alarm" = ps: with ps; [ + nessclient + ]; + "nest" = ps: with ps; [ + aiohttp-cors + google-nest-sdm + ha-ffmpeg + python-nest + ]; + "netatmo" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + hass-nabucasa + pyatmo + ]; + "netdata" = ps: with ps; [ + netdata + ]; + "netgear" = ps: with ps; [ + pynetgear + ]; + "netgear_lte" = ps: with ps; [ + eternalegypt + ]; + "netio" = ps: with ps; [ + aiohttp-cors + ]; # missing inputs: pynetio + "network" = ps: with ps; [ + aiohttp-cors + ifaddr + ]; + "neurio_energy" = ps: with ps; [ + ]; # missing inputs: neurio + "nexia" = ps: with ps; [ + nexia + ]; + "nextbus" = ps: with ps; [ + ]; # missing inputs: py_nextbusnext + "nextcloud" = ps: with ps; [ + nextcloudmonitor + ]; + "nfandroidtv" = ps: with ps; [ + ]; # missing inputs: notifications-android-tv + "nightscout" = ps: with ps; [ + py-nightscout + ]; + "niko_home_control" = ps: with ps; [ + niko-home-control + ]; + "nilu" = ps: with ps; [ + niluclient + ]; + "nina" = ps: with ps; [ + pynina + ]; + "nissan_leaf" = ps: with ps; [ + pycarwings2 + ]; + "nmap_tracker" = ps: with ps; [ + aiohttp-cors + getmac + ifaddr + netmap + ]; # missing inputs: mac-vendor-lookup + "nmbs" = ps: with ps; [ + ]; # missing inputs: pyrail + "no_ip" = ps: with ps; [ + ]; + "noaa_tides" = ps: with ps; [ + ]; # missing inputs: noaa-coops + "norway_air" = ps: with ps; [ + pymetno + ]; + "notify" = ps: with ps; [ + ]; + "notify_events" = ps: with ps; [ + ]; # missing inputs: notify-events + "notion" = ps: with ps; [ + aionotion + ]; + "nsw_fuel_station" = ps: with ps; [ + ]; # missing inputs: nsw-fuel-api-client + "nsw_rural_fire_service_feed" = ps: with ps; [ + aio-geojson-nsw-rfs-incidents + ]; + "nuheat" = ps: with ps; [ + ]; # missing inputs: nuheat + "nuki" = ps: with ps; [ + pynuki + ]; + "numato" = ps: with ps; [ + ]; # missing inputs: numato-gpio + "number" = ps: with ps; [ + ]; + "nut" = ps: with ps; [ + pynut2 + ]; + "nws" = ps: with ps; [ + pynws + ]; + "nx584" = ps: with ps; [ + pynx584 + ]; + "nzbget" = ps: with ps; [ + ]; # missing inputs: pynzbgetapi + "oasa_telematics" = ps: with ps; [ + ]; # missing inputs: oasatelematics + "obihai" = ps: with ps; [ + pyobihai + ]; + "octoprint" = ps: with ps; [ + pyoctoprintapi + ]; + "oem" = ps: with ps; [ + oemthermostat + ]; + "ohmconnect" = ps: with ps; [ + defusedxml + ]; + "ombi" = ps: with ps; [ + pyombi + ]; + "omnilogic" = ps: with ps; [ + omnilogic + ]; + "onboarding" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "oncue" = ps: with ps; [ + aiooncue + ]; + "ondilo_ico" = ps: with ps; [ + aiohttp-cors + ondilo + ]; + "onewire" = ps: with ps; [ + pi1wire + pyownet + ]; + "onkyo" = ps: with ps; [ + onkyo-eiscp + ]; + "onvif" = ps: with ps; [ + wsdiscovery + ha-ffmpeg + onvif-zeep-async + ]; + "open_meteo" = ps: with ps; [ + open-meteo + ]; + "openalpr_cloud" = ps: with ps; [ + ]; + "openalpr_local" = ps: with ps; [ + ]; + "opencv" = ps: with ps; [ + numpy + ]; # missing inputs: opencv-python-headless + "openerz" = ps: with ps; [ + openerz-api + ]; + "openevse" = ps: with ps; [ + openevsewifi + ]; + "openexchangerates" = ps: with ps; [ + ]; + "opengarage" = ps: with ps; [ + open-garage + ]; + "openhardwaremonitor" = ps: with ps; [ + ]; + "openhome" = ps: with ps; [ + openhomedevice + ]; + "opensensemap" = ps: with ps; [ + opensensemap-api + ]; + "opensky" = ps: with ps; [ + ]; + "opentherm_gw" = ps: with ps; [ + pyotgw + ]; + "openuv" = ps: with ps; [ + pyopenuv + ]; + "openweathermap" = ps: with ps; [ + pyowm + ]; + "opnsense" = ps: with ps; [ + pyopnsense + ]; + "opple" = ps: with ps; [ + ]; # missing inputs: pyoppleio + "oru" = ps: with ps; [ + ]; # missing inputs: oru + "orvibo" = ps: with ps; [ + orvibo + ]; + "osramlightify" = ps: with ps; [ + ]; # missing inputs: lightify + "otp" = ps: with ps; [ + pyotp + ]; + "overkiz" = ps: with ps; [ + pyoverkiz + ]; + "ovo_energy" = ps: with ps; [ + ovoenergy + ]; + "owntracks" = ps: with ps; [ + pynacl + pyturbojpeg + aiohttp-cors + hass-nabucasa + paho-mqtt + ]; + "p1_monitor" = ps: with ps; [ + p1monitor + ]; + "panasonic_bluray" = ps: with ps; [ + panacotta + ]; + "panasonic_viera" = ps: with ps; [ + ]; # missing inputs: panasonic_viera + "pandora" = ps: with ps; [ + pexpect + ]; + "panel_custom" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "panel_iframe" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "peco" = ps: with ps; [ + ]; # missing inputs: peco + "pencom" = ps: with ps; [ + ]; # missing inputs: pencompy + "persistent_notification" = ps: with ps; [ + ]; + "person" = ps: with ps; [ + aiohttp-cors + pillow + ]; + "philips_js" = ps: with ps; [ + ha-philipsjs + ]; + "pi_hole" = ps: with ps; [ + hole + ]; + "picnic" = ps: with ps; [ + python-picnic-api + ]; + "picotts" = ps: with ps; [ + ]; + "pilight" = ps: with ps; [ + ]; # missing inputs: pilight + "ping" = ps: with ps; [ + icmplib + ]; + "pioneer" = ps: with ps; [ + ]; + "pjlink" = ps: with ps; [ + ]; # missing inputs: pypjlink2 + "plaato" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + hass-nabucasa + pyplaato + ]; + "plant" = ps: with ps; [ + fnvhash + lru-dict + sqlalchemy + ]; + "plex" = ps: with ps; [ + aiohttp-cors + plexapi + plexauth + plexwebsocket + ]; + "plugwise" = ps: with ps; [ + plugwise + ]; + "plum_lightpad" = ps: with ps; [ + ]; # missing inputs: plumlightpad + "pocketcasts" = ps: with ps; [ + ]; # missing inputs: pycketcasts + "point" = ps: with ps; [ + aiohttp-cors + pypoint + ]; + "poolsense" = ps: with ps; [ + poolsense + ]; + "powerwall" = ps: with ps; [ + ]; # missing inputs: tesla-powerwall + "profiler" = ps: with ps; [ + guppy3 + objgraph + pyprof2calltree + ]; + "progettihwsw" = ps: with ps; [ + ]; # missing inputs: progettihwsw + "proliphix" = ps: with ps; [ + ]; # missing inputs: proliphix + "prometheus" = ps: with ps; [ + aiohttp-cors + prometheus-client + ]; + "prosegur" = ps: with ps; [ + pyprosegur + ]; + "prowl" = ps: with ps; [ + ]; + "proximity" = ps: with ps; [ + ]; + "proxmoxve" = ps: with ps; [ + proxmoxer + ]; + "proxy" = ps: with ps; [ + pillow + ]; + "ps4" = ps: with ps; [ + ]; # missing inputs: pyps4-2ndscreen + "pulseaudio_loopback" = ps: with ps; [ + pulsectl + ]; + "pure_energie" = ps: with ps; [ + gridnet + ]; + "push" = ps: with ps; [ + aiohttp-cors + ]; + "pushbullet" = ps: with ps; [ + pushbullet + ]; + "pushover" = ps: with ps; [ + pushover-complete + ]; + "pushsafer" = ps: with ps; [ + ]; + "pvoutput" = ps: with ps; [ + pvo + ]; + "pvpc_hourly_pricing" = ps: with ps; [ + aiopvpc + ]; + "pyload" = ps: with ps; [ + ]; + "python_script" = ps: with ps; [ + restrictedpython + ]; + "qbittorrent" = ps: with ps; [ + ]; # missing inputs: python-qbittorrent + "qld_bushfire" = ps: with ps; [ + georss-qld-bushfire-alert-client + ]; + "qnap" = ps: with ps; [ + ]; # missing inputs: qnapstats + "qrcode" = ps: with ps; [ + pillow + pyzbar + ]; + "quantum_gateway" = ps: with ps; [ + quantum-gateway + ]; + "qvr_pro" = ps: with ps; [ + pyqvrpro + ]; + "qwikswitch" = ps: with ps; [ + ]; # missing inputs: pyqwikswitch + "rachio" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + hass-nabucasa + rachiopy + ]; + "radarr" = ps: with ps; [ + ]; + "radio_browser" = ps: with ps; [ + radios + ]; + "radiotherm" = ps: with ps; [ + radiotherm + ]; + "rainbird" = ps: with ps; [ + ]; # missing inputs: pyrainbird + "raincloud" = ps: with ps; [ + ]; # missing inputs: raincloudy + "rainforest_eagle" = ps: with ps; [ + aioeagle + ueagle + ]; + "rainmachine" = ps: with ps; [ + regenmaschine + ]; + "random" = ps: with ps; [ + ]; + "raspyrfm" = ps: with ps; [ + ]; # missing inputs: raspyrfm-client + "rdw" = ps: with ps; [ + vehicle + ]; + "recollect_waste" = ps: with ps; [ + aiorecollect + ]; + "recorder" = ps: with ps; [ + fnvhash + lru-dict + sqlalchemy + ]; + "recswitch" = ps: with ps; [ + ]; # missing inputs: pyrecswitch + "reddit" = ps: with ps; [ + praw + ]; + "rejseplanen" = ps: with ps; [ + ]; # missing inputs: rjpl + "remember_the_milk" = ps: with ps; [ + httplib2 + ]; # missing inputs: RtmAPI + "remote" = ps: with ps; [ + ]; + "remote_rpi_gpio" = ps: with ps; [ + ]; # missing inputs: gpiozero + "renault" = ps: with ps; [ + renault-api + ]; + "repetier" = ps: with ps; [ + ]; # missing inputs: pyrepetierng + "rest" = ps: with ps; [ + jsonpath + xmltodict + ]; + "rest_command" = ps: with ps; [ + ]; + "rflink" = ps: with ps; [ + rflink + ]; + "rfxtrx" = ps: with ps; [ + pyrfxtrx + ]; + "ridwell" = ps: with ps; [ + aioridwell + ]; + "ring" = ps: with ps; [ + ha-ffmpeg + ring-doorbell + ]; + "ripple" = ps: with ps; [ + ]; # missing inputs: python-ripple-api + "risco" = ps: with ps; [ + pyrisco + ]; + "rituals_perfume_genie" = ps: with ps; [ + pyrituals + ]; + "rmvtransport" = ps: with ps; [ + pyrmvtransport + ]; + "rocketchat" = ps: with ps; [ + ]; # missing inputs: rocketchat-API + "roku" = ps: with ps; [ + rokuecp + ]; + "roomba" = ps: with ps; [ + roombapy + ]; + "roon" = ps: with ps; [ + roonapi + ]; + "route53" = ps: with ps; [ + boto3 + ]; + "rova" = ps: with ps; [ + ]; # missing inputs: rova + "rpi_camera" = ps: with ps; [ + ]; + "rpi_gpio" = ps: with ps; [ + ]; # missing inputs: RPi.GPIO + "rpi_power" = ps: with ps; [ + rpi-bad-power + ]; + "rss_feed_template" = ps: with ps; [ + aiohttp-cors + ]; + "rtorrent" = ps: with ps; [ + ]; + "rtsp_to_webrtc" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + rtsp-to-webrtc + ]; + "ruckus_unleashed" = ps: with ps; [ + pyruckus + ]; + "russound_rio" = ps: with ps; [ + ]; # missing inputs: russound_rio + "russound_rnet" = ps: with ps; [ + ]; # missing inputs: russound + "sabnzbd" = ps: with ps; [ + aiohttp-cors + ifaddr + netdisco + zeroconf + ]; # missing inputs: pysabnzbd + "safe_mode" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + fnvhash + hass-nabucasa + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "saj" = ps: with ps; [ + ]; # missing inputs: pysaj + "samsungtv" = ps: with ps; [ + aiohttp-cors + async-upnp-client + getmac + ifaddr + samsungctl + samsungtvws + wakeonlan + zeroconf + ] + ++ samsungctl.extras-require.websocket + ++ samsungtvws.extras-require.async + ++ samsungtvws.extras-require.encrypted; + "satel_integra" = ps: with ps; [ + ]; # missing inputs: satel_integra + "scene" = ps: with ps; [ + ]; + "schluter" = ps: with ps; [ + ]; # missing inputs: py-schluter + "scrape" = ps: with ps; [ + beautifulsoup4 + jsonpath + xmltodict + ]; + "screenlogic" = ps: with ps; [ + screenlogicpy + ]; + "script" = ps: with ps; [ + ]; + "scsgate" = ps: with ps; [ + ]; # missing inputs: scsgate + "search" = ps: with ps; [ + aiohttp-cors + ]; + "season" = ps: with ps; [ + ephem + ]; + "select" = ps: with ps; [ + ]; + "sendgrid" = ps: with ps; [ + sendgrid + ]; + "sense" = ps: with ps; [ + sense-energy + ]; + "senseme" = ps: with ps; [ + aiosenseme + ]; + "sensibo" = ps: with ps; [ + ]; # missing inputs: pysensibo + "sensor" = ps: with ps; [ + fnvhash + lru-dict + sqlalchemy + ]; + "sentry" = ps: with ps; [ + sentry-sdk + ]; + "serial" = ps: with ps; [ + pyserial-asyncio + ]; + "serial_pm" = ps: with ps; [ + pmsensor + ]; + "sesame" = ps: with ps; [ + ]; # missing inputs: pysesame2 + "seven_segments" = ps: with ps; [ + pillow + ]; + "seventeentrack" = ps: with ps; [ + py17track + ]; + "sharkiq" = ps: with ps; [ + ]; # missing inputs: sharkiq + "shell_command" = ps: with ps; [ + ]; + "shelly" = ps: with ps; [ + aioshelly + ]; + "shiftr" = ps: with ps; [ + paho-mqtt + ]; + "shodan" = ps: with ps; [ + shodan + ]; + "shopping_list" = ps: with ps; [ + aiohttp-cors + ]; + "sia" = ps: with ps; [ + pysiaalarm + ]; + "sigfox" = ps: with ps; [ + ]; + "sighthound" = ps: with ps; [ + pillow + simplehound + ]; + "signal_messenger" = ps: with ps; [ + pysignalclirestapi + ]; + "simplepush" = ps: with ps; [ + ]; # missing inputs: simplepush + "simplisafe" = ps: with ps; [ + simplisafe-python + ]; + "simulated" = ps: with ps; [ + ]; + "sinch" = ps: with ps; [ + ]; # missing inputs: clx-sdk-xms + "siren" = ps: with ps; [ + ]; + "sisyphus" = ps: with ps; [ + ]; # missing inputs: sisyphus-control + "sky_hub" = ps: with ps; [ + pyskyqhub + ]; + "skybeacon" = ps: with ps; [ + pygatt + ] + ++ pygatt.extras-require.GATTTOOL; + "skybell" = ps: with ps; [ + skybellpy + ]; + "slack" = ps: with ps; [ + slackclient + ]; + "sleepiq" = ps: with ps; [ + asyncsleepiq + ]; + "slide" = ps: with ps; [ + ]; # missing inputs: goslide-api + "sma" = ps: with ps; [ + pysma + ]; + "smappee" = ps: with ps; [ + aiohttp-cors + pysmappee + ]; + "smart_meter_texas" = ps: with ps; [ + smart-meter-texas + ]; + "smartthings" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + hass-nabucasa + pysmartapp + pysmartthings + ]; + "smarttub" = ps: with ps; [ + python-smarttub + ]; + "smarty" = ps: with ps; [ + ]; # missing inputs: pysmarty + "smhi" = ps: with ps; [ + smhi-pkg + ]; + "sms" = ps: with ps; [ + python-gammu + ]; + "smtp" = ps: with ps; [ + ]; + "snapcast" = ps: with ps; [ + snapcast + ]; + "snips" = ps: with ps; [ + aiohttp-cors + paho-mqtt + ]; + "snmp" = ps: with ps; [ + pysnmp + ]; + "solaredge" = ps: with ps; [ + solaredge + stringcase + ]; + "solaredge_local" = ps: with ps; [ + ]; # missing inputs: solaredge-local + "solarlog" = ps: with ps; [ + sunwatcher + ]; + "solax" = ps: with ps; [ + solax + ]; + "soma" = ps: with ps; [ + pysoma + ]; + "somfy" = ps: with ps; [ + aiohttp-cors + pymfy + ]; + "somfy_mylink" = ps: with ps; [ + somfy-mylink-synergy + ]; + "sonarr" = ps: with ps; [ + aiopyarr + ]; + "songpal" = ps: with ps; [ + python-songpal + ]; + "sonos" = ps: with ps; [ + aiohttp-cors + async-upnp-client + ifaddr + plexapi + plexauth + plexwebsocket + soco + spotipy + zeroconf + ]; + "sony_projector" = ps: with ps; [ + pysdcp + ]; + "soundtouch" = ps: with ps; [ + aiohttp-cors + ifaddr + libsoundtouch + zeroconf + ]; + "spaceapi" = ps: with ps; [ + aiohttp-cors + ]; + "spc" = ps: with ps; [ + pyspcwebgw + ]; + "speedtestdotnet" = ps: with ps; [ + speedtest-cli + ]; + "spider" = ps: with ps; [ + spiderpy + ]; + "splunk" = ps: with ps; [ + ]; # missing inputs: hass_splunk + "spotify" = ps: with ps; [ + aiohttp-cors + spotipy + ]; + "sql" = ps: with ps; [ + sqlalchemy + ]; + "squeezebox" = ps: with ps; [ + pysqueezebox + ]; + "srp_energy" = ps: with ps; [ + srpenergy + ]; + "ssdp" = ps: with ps; [ + aiohttp-cors + async-upnp-client + ifaddr + zeroconf + ]; + "starline" = ps: with ps; [ + starline + ]; + "starlingbank" = ps: with ps; [ + ]; # missing inputs: starlingbank + "startca" = ps: with ps; [ + xmltodict + ]; + "statistics" = ps: with ps; [ + fnvhash + lru-dict + sqlalchemy + ]; + "statsd" = ps: with ps; [ + statsd + ]; + "steam_online" = ps: with ps; [ + ]; # missing inputs: steamodd + "steamist" = ps: with ps; [ + aiohttp-cors + aiosteamist + discovery30303 + ifaddr + ]; + "stiebel_eltron" = ps: with ps; [ + pymodbus + ]; # missing inputs: pystiebeleltron + "stookalert" = ps: with ps; [ + ]; # missing inputs: stookalert + "stream" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + av + ]; + "streamlabswater" = ps: with ps; [ + streamlabswater + ]; + "stt" = ps: with ps; [ + aiohttp-cors + ]; + "subaru" = ps: with ps; [ + subarulink + ]; + "suez_water" = ps: with ps; [ + ]; # missing inputs: pysuez + "sun" = ps: with ps; [ + ]; + "supervisord" = ps: with ps; [ + ]; + "supla" = ps: with ps; [ + ]; # missing inputs: asyncpysupla + "surepetcare" = ps: with ps; [ + surepy + ]; + "swiss_hydrological_data" = ps: with ps; [ + swisshydrodata + ]; + "swiss_public_transport" = ps: with ps; [ + python-opendata-transport + ]; + "swisscom" = ps: with ps; [ + ]; + "switch" = ps: with ps; [ + ]; + "switch_as_x" = ps: with ps; [ + ]; + "switchbot" = ps: with ps; [ + pyswitchbot + ]; + "switcher_kis" = ps: with ps; [ + aioswitcher + ]; + "switchmate" = ps: with ps; [ + ]; # missing inputs: pySwitchmate + "syncthing" = ps: with ps; [ + aiosyncthing + ]; + "syncthru" = ps: with ps; [ + pysyncthru + url-normalize + ]; + "synology_chat" = ps: with ps; [ + ]; + "synology_dsm" = ps: with ps; [ + py-synologydsm-api + ]; + "synology_srm" = ps: with ps; [ + ]; # missing inputs: synology-srm + "syslog" = ps: with ps; [ + ]; + "system_bridge" = ps: with ps; [ + aiohttp-cors + ifaddr + systembridge + zeroconf + ]; + "system_health" = ps: with ps; [ + aiohttp-cors + ]; + "system_log" = ps: with ps; [ + ]; + "systemmonitor" = ps: with ps; [ + psutil + ]; + "tado" = ps: with ps; [ + python-tado + ]; + "tag" = ps: with ps; [ + ]; + "tailscale" = ps: with ps; [ + tailscale + ]; + "tank_utility" = ps: with ps; [ + ]; # missing inputs: tank_utility + "tankerkoenig" = ps: with ps; [ + pytankerkoenig + ]; + "tapsaff" = ps: with ps; [ + ]; # missing inputs: tapsaff + "tasmota" = ps: with ps; [ + aiohttp-cors + hatasmota + paho-mqtt + ]; + "tautulli" = ps: with ps; [ + pytautulli + ]; + "tcp" = ps: with ps; [ + ]; + "ted5000" = ps: with ps; [ + xmltodict + ]; + "telegram" = ps: with ps; [ + pysocks + aiohttp-cors + python-telegram-bot + ]; + "telegram_bot" = ps: with ps; [ + pysocks + aiohttp-cors + python-telegram-bot + ]; + "tellduslive" = ps: with ps; [ + tellduslive + ]; + "tellstick" = ps: with ps; [ + ]; # missing inputs: tellcore-net tellcore-py + "telnet" = ps: with ps; [ + ]; + "temper" = ps: with ps; [ + ]; # missing inputs: temperusb + "template" = ps: with ps; [ + ]; + "tensorflow" = ps: with ps; [ + numpy + pillow + pycocotools + tensorflow + ]; # missing inputs: tf-models-official + "tesla_wall_connector" = ps: with ps; [ + tesla-wall-connector + ]; + "tfiac" = ps: with ps; [ + ]; # missing inputs: pytfiac + "thermoworks_smoke" = ps: with ps; [ + stringcase + ]; # missing inputs: thermoworks_smoke + "thethingsnetwork" = ps: with ps; [ + ]; + "thingspeak" = ps: with ps; [ + ]; # missing inputs: thingspeak + "thinkingcleaner" = ps: with ps; [ + ]; # missing inputs: pythinkingcleaner + "thomson" = ps: with ps; [ + ]; + "threshold" = ps: with ps; [ + ]; + "tibber" = ps: with ps; [ + fnvhash + lru-dict + pytibber + sqlalchemy + ]; + "tikteck" = ps: with ps; [ + ]; # missing inputs: tikteck + "tile" = ps: with ps; [ + pytile + ]; + "time_date" = ps: with ps; [ + ]; + "timer" = ps: with ps; [ + ]; + "tmb" = ps: with ps; [ + tmb + ]; + "tod" = ps: with ps; [ + ]; + "todoist" = ps: with ps; [ + todoist + ]; + "tolo" = ps: with ps; [ + tololib + ]; + "tomato" = ps: with ps; [ + ]; + "tomorrowio" = ps: with ps; [ + ]; # missing inputs: pytomorrowio + "toon" = ps: with ps; [ + pyturbojpeg + aiohttp-cors + hass-nabucasa + toonapi + ]; + "torque" = ps: with ps; [ + aiohttp-cors + ]; + "totalconnect" = ps: with ps; [ + total-connect-client + ]; + "touchline" = ps: with ps; [ + ]; # missing inputs: pytouchline + "tplink" = ps: with ps; [ + aiohttp-cors + ifaddr + python-kasa + ]; + "tplink_lte" = ps: with ps; [ + ]; # missing inputs: tp-connected + "traccar" = ps: with ps; [ + aiohttp-cors + pytraccar + stringcase + ]; + "trace" = ps: with ps; [ + ]; + "tractive" = ps: with ps; [ + aiotractive + ]; + "tradfri" = ps: with ps; [ + pytradfri + ] + ++ pytradfri.extras-require.async; + "trafikverket_train" = ps: with ps; [ + pytrafikverket + ]; + "trafikverket_weatherstation" = ps: with ps; [ + pytrafikverket + ]; + "transmission" = ps: with ps; [ + transmissionrpc + ]; + "transport_nsw" = ps: with ps; [ + pytransportnsw + ]; + "travisci" = ps: with ps; [ + ]; # missing inputs: TravisPy + "trend" = ps: with ps; [ + numpy + ]; + "tts" = ps: with ps; [ + aiohttp-cors + mutagen + ]; + "tuya" = ps: with ps; [ + ha-ffmpeg + tuya-iot-py-sdk + ]; + "twentemilieu" = ps: with ps; [ + twentemilieu + ]; + "twilio" = ps: with ps; [ + aiohttp-cors + twilio + ]; + "twilio_call" = ps: with ps; [ + aiohttp-cors + twilio + ]; + "twilio_sms" = ps: with ps; [ + aiohttp-cors + twilio + ]; + "twinkly" = ps: with ps; [ + ttls + ]; + "twitch" = ps: with ps; [ + twitchapi + ]; + "twitter" = ps: with ps; [ + twitterapi + ]; + "ubus" = ps: with ps; [ + openwrt-ubus-rpc + ]; + "ue_smart_radio" = ps: with ps; [ + ]; + "uk_transport" = ps: with ps; [ + ]; + "unifi" = ps: with ps; [ + aiounifi + ]; + "unifi_direct" = ps: with ps; [ + pexpect + ]; + "unifiled" = ps: with ps; [ + unifiled + ]; + "unifiprotect" = ps: with ps; [ + aiohttp-cors + ]; # missing inputs: pyunifiprotect unifi-discovery + "universal" = ps: with ps; [ + ]; + "upb" = ps: with ps; [ + upb-lib + ]; + "upc_connect" = ps: with ps; [ + connect-box + ]; + "upcloud" = ps: with ps; [ + upcloud-api + ]; + "update" = ps: with ps; [ + ]; + "updater" = ps: with ps; [ + ]; + "upnp" = ps: with ps; [ + aiohttp-cors + async-upnp-client + ifaddr + zeroconf + ]; + "uptime" = ps: with ps; [ + ]; + "uptimerobot" = ps: with ps; [ + pyuptimerobot + ]; + "usb" = ps: with ps; [ + aiohttp-cors + pyserial + pyudev + ]; + "uscis" = ps: with ps; [ + ]; # missing inputs: uscisstatus + "usgs_earthquakes_feed" = ps: with ps; [ + geojson-client + ]; + "utility_meter" = ps: with ps; [ + croniter + ]; + "uvc" = ps: with ps; [ + uvcclient + ]; + "vacuum" = ps: with ps; [ + ]; + "vallox" = ps: with ps; [ + ]; # missing inputs: vallox-websocket-api + "vasttrafik" = ps: with ps; [ + ]; # missing inputs: vtjp + "velbus" = ps: with ps; [ + aiohttp-cors + pyserial + pyudev + velbus-aio + ]; + "velux" = ps: with ps; [ + pyvlx + ]; + "venstar" = ps: with ps; [ + venstarcolortouch + ]; + "vera" = ps: with ps; [ + pyvera + ]; + "verisure" = ps: with ps; [ + vsure + ]; + "versasense" = ps: with ps; [ + pyversasense + ]; + "version" = ps: with ps; [ + pyhaversion + ]; + "vesync" = ps: with ps; [ + pyvesync + ]; + "viaggiatreno" = ps: with ps; [ + ]; + "vicare" = ps: with ps; [ + pyvicare + ]; + "vilfo" = ps: with ps; [ + vilfo-api-client + ]; + "vivotek" = ps: with ps; [ + libpyvivotek + ]; + "vizio" = ps: with ps; [ + pyvizio + ]; + "vlc" = ps: with ps; [ + python-vlc + ]; + "vlc_telnet" = ps: with ps; [ + aiovlc + ]; + "voicerss" = ps: with ps; [ + ]; + "volkszaehler" = ps: with ps; [ + volkszaehler + ]; + "volumio" = ps: with ps; [ + pyvolumio + ]; + "volvooncall" = ps: with ps; [ + volvooncall + ]; + "vulcan" = ps: with ps; [ + vulcan-api + ]; + "vultr" = ps: with ps; [ + vultr + ]; + "w800rf32" = ps: with ps; [ + ]; # missing inputs: pyW800rf32 + "wake_on_lan" = ps: with ps; [ + wakeonlan + ]; + "wallbox" = ps: with ps; [ + wallbox + ]; + "waqi" = ps: with ps; [ + waqiasync + ]; + "water_heater" = ps: with ps; [ + ]; + "waterfurnace" = ps: with ps; [ + waterfurnace + ]; + "watson_iot" = ps: with ps; [ + ]; # missing inputs: ibmiotf + "watson_tts" = ps: with ps; [ + ibm-watson + ]; + "watttime" = ps: with ps; [ + aiowatttime + ]; + "waze_travel_time" = ps: with ps; [ + wazeroutecalculator + ]; + "weather" = ps: with ps; [ + ]; + "webhook" = ps: with ps; [ + aiohttp-cors + ]; + "webostv" = ps: with ps; [ + aiowebostv + ]; + "websocket_api" = ps: with ps; [ + aiohttp-cors + ]; + "wemo" = ps: with ps; [ + pywemo + ]; + "whirlpool" = ps: with ps; [ + whirlpool-sixth-sense + ]; + "whois" = ps: with ps; [ + whois + ]; + "wiffi" = ps: with ps; [ + wiffi + ]; + "wilight" = ps: with ps; [ + pywilight + ]; + "wirelesstag" = ps: with ps; [ + ]; # missing inputs: wirelesstagpy + "withings" = ps: with ps; [ + aiohttp-cors + ]; # missing inputs: withings-api + "wiz" = ps: with ps; [ + aiohttp-cors + ifaddr + pywizlight + ]; + "wled" = ps: with ps; [ + wled + ]; + "wolflink" = ps: with ps; [ + ]; # missing inputs: wolf_smartset + "workday" = ps: with ps; [ + holidays + ]; + "worldclock" = ps: with ps; [ + ]; + "worldtidesinfo" = ps: with ps; [ + ]; + "worxlandroid" = ps: with ps; [ + ]; + "wsdot" = ps: with ps; [ + ]; + "x10" = ps: with ps; [ + ]; + "xbox" = ps: with ps; [ + aiohttp-cors + xbox-webapi + ]; + "xbox_live" = ps: with ps; [ + xboxapi + ]; + "xeoma" = ps: with ps; [ + pyxeoma + ]; + "xiaomi" = ps: with ps; [ + ha-ffmpeg + ]; + "xiaomi_aqara" = ps: with ps; [ + pyxiaomigateway + aiohttp-cors + ifaddr + netdisco + zeroconf + ]; + "xiaomi_miio" = ps: with ps; [ + construct + micloud + python-miio + ]; + "xiaomi_tv" = ps: with ps; [ + pymitv + ]; + "xmpp" = ps: with ps; [ + slixmpp + ]; + "xs1" = ps: with ps; [ + ]; # missing inputs: xs1-api-client + "yale_smart_alarm" = ps: with ps; [ + yalesmartalarmclient + ]; + "yamaha" = ps: with ps; [ + rxv + ]; + "yamaha_musiccast" = ps: with ps; [ + aiohttp-cors + aiomusiccast + async-upnp-client + ifaddr + zeroconf + ]; + "yandex_transport" = ps: with ps; [ + aioymaps + ]; + "yandextts" = ps: with ps; [ + ]; + "yeelight" = ps: with ps; [ + aiohttp-cors + async-upnp-client + ifaddr + yeelight + zeroconf + ]; + "yeelightsunflower" = ps: with ps; [ + ]; # missing inputs: yeelightsunflower + "yi" = ps: with ps; [ + aioftp + ha-ffmpeg + ]; + "youless" = ps: with ps; [ + youless-api + ]; + "zabbix" = ps: with ps; [ + py-zabbix + ]; + "zamg" = ps: with ps; [ + ]; + "zengge" = ps: with ps; [ + bluepy + ]; # missing inputs: zengge + "zeroconf" = ps: with ps; [ + aiohttp-cors + ifaddr + zeroconf + ]; + "zerproc" = ps: with ps; [ + pyzerproc + ]; + "zestimate" = ps: with ps; [ + xmltodict + ]; + "zha" = ps: with ps; [ + aiohttp-cors + bellows + ifaddr + pyserial-asyncio + pyserial + pyudev + zeroconf + zha-quirks + zigpy-deconz + zigpy-xbee + zigpy-zigate + zigpy-znp + zigpy + ]; + "zhong_hong" = ps: with ps; [ + ]; # missing inputs: zhong_hong_hvac + "ziggo_mediabox_xl" = ps: with ps; [ + ]; # missing inputs: ziggo-mediabox-xl + "zodiac" = ps: with ps; [ + ]; + "zone" = ps: with ps; [ + ]; + "zoneminder" = ps: with ps; [ + zm-py + ]; + "zwave_js" = ps: with ps; [ + aiohttp-cors + pyserial + pyudev + zwave-js-server-python + ]; + "zwave_me" = ps: with ps; [ + aiohttp-cors + ifaddr + url-normalize + zeroconf + ]; # missing inputs: zwave_me_ws }; # components listed in tests/components for which all dependencies are packaged supportedComponentsWithTests = [ From 24ce3fcf7c756389d955b2334840089c194690b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 05:14:23 +0200 Subject: [PATCH 277/385] python311: 3.11.0a6 -> 3.11.0a7 https://www.python.org/downloads/release/python-3110a7/ https://pythoninsider.blogspot.com/2022/04/the-last-python-311-alpha-3110a7-is.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 6c566544f329..47871fff320e 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -199,9 +199,9 @@ in { major = "3"; minor = "11"; patch = "0"; - suffix = "a6"; + suffix = "a7"; }; - sha256 = "sha256-HFOi/3WHljPjDKwp0qpregEONVuV8L+axpG+zPX50So="; + sha256 = "sha256-t8Vt10wvRy1Ja1qNNWvWrZ75sD8mKIwyN9P/aYqwPXQ="; inherit (darwin) configd; inherit passthruFun; }; From 3bbfc7849e9ab88ffac01a16b214e54862572c4c Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 4 Mar 2022 09:11:17 -0500 Subject: [PATCH 278/385] nixos/prometheus: Remove upstream-deprecated alertManagerTimeout When started, Prometheus prints: > The flag --alertmanager.timeout has no effect and will be removed in > the future. See also https://github.com/prometheus/prometheus/commit/2316062d4ed661e63c5b5079724ca334b560f28d --- .../manual/from_md/release-notes/rl-2205.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ .../services/monitoring/prometheus/default.nix | 11 ++--------- 3 files changed, 11 insertions(+), 9 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 abb176196135..51395b1f2105 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 @@ -443,6 +443,13 @@ } + + + services.prometheus.alertManagerTimeout has + been removed as it has been deprecated upstream and has no + effect. + + The DHCP server (services.dhcpd4, diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 909b6cd8b7ba..51d7b2db8956 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -150,6 +150,8 @@ In addition to numerous new and upgraded packages, this release has the followin } ``` +- `services.prometheus.alertManagerTimeout` has been removed as it has been deprecated upstream and has no effect. + - The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened. The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities. The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed. diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index f563861b61c0..52525e8935ba 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -74,7 +74,6 @@ let }" "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}" "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" - "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" ] ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}" ++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}"; @@ -1563,6 +1562,8 @@ in (mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ]) (mkRemovedOptionModule [ "services" "prometheus" "environmentFile" ] "It has been removed since it was causing issues (https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files, i.e. `basic_auth.password_file` and `authorization.credentials_file`.") + (mkRemovedOptionModule [ "services" "prometheus" "alertmanagerTimeout" ] + "Deprecated upstream and no longer had any effect") ]; options.services.prometheus = { @@ -1719,14 +1720,6 @@ in ''; }; - alertmanagerTimeout = mkOption { - type = types.int; - default = 10; - description = '' - Alert manager HTTP API timeout (in seconds). - ''; - }; - webExternalUrl = mkOption { type = types.nullOr types.str; default = null; From f7341940275e24857369bf468923c60073defc99 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 11 Apr 2022 23:18:29 -0300 Subject: [PATCH 279/385] pkgconf: refactor --- .../tools/misc/pkgconf/default.nix | 45 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index e3e0de4e7f16..8db8a709bb6e 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -1,31 +1,35 @@ -{ lib, stdenv, fetchurl, removeReferencesTo }: +{ lib +, stdenv +, fetchurl +, removeReferencesTo +}: stdenv.mkDerivation rec { pname = "pkgconf"; version = "1.8.0"; - nativeBuildInputs = [ removeReferencesTo ]; + src = fetchurl { + url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-75x+YYIrfLg1bm6eHcpY2VVvMgDXisqzXkNH6dTCu68="; + }; outputs = [ "out" "lib" "dev" "man" "doc" ]; + nativeBuildInputs = [ removeReferencesTo ]; + enableParallelBuilding = true; - src = fetchurl { - url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-75x+YYIrfLg1bm6eHcpY2VVvMgDXisqzXkNH6dTCu68="; - }; - - # Debian has outputs like these too: - # https://packages.debian.org/source/buster/pkgconf, so take it this - # reference removing is safe. + # Debian has outputs like these too + # (https://packages.debian.org/source/bullseye/pkgconf), so it is safe to + # remove those references postFixup = '' + remove-references-to \ + -t "${placeholder "out"}" \ + "${placeholder "lib"}"/lib/* remove-references-to \ -t "${placeholder "dev"}" \ "${placeholder "lib"}"/lib/* \ "${placeholder "out"}"/bin/* - remove-references-to \ - -t "${placeholder "out"}" \ - "${placeholder "lib"}"/lib/* '' # Move back share/aclocal. Yes, this normally goes in the dev output for good # reason, but in this case the dev output is for the `libpkgconf` library, @@ -37,10 +41,19 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://github.com/pkgconf/pkgconf"; description = "Package compiler and linker metadata toolkit"; - homepage = "https://git.dereferenced.org/pkgconf/pkgconf"; - platforms = platforms.all; + longDescription = '' + pkgconf is a program which helps to configure compiler and linker flags + for development libraries. It is similar to pkg-config from + freedesktop.org. + + libpkgconf is a library which provides access to most of pkgconf's + functionality, to allow other tooling such as compilers and IDEs to + discover and use libraries configured by pkgconf. + ''; license = licenses.isc; - maintainers = with maintainers; [ zaninime ]; + maintainers = with maintainers; [ zaninime AndersonTorres ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a72406d6f1a1..da6285295488 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15540,7 +15540,7 @@ with pkgs; pmccabe = callPackage ../development/tools/misc/pmccabe { }; - pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf {}; + pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf { }; pkgconf = callPackage ../build-support/pkg-config-wrapper { pkg-config = pkgconf-unwrapped; baseBinName = "pkgconf"; From 9e4ba681fddd06b0d84048e3b512f86ce9f8131d Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 10 Apr 2022 01:50:31 -0700 Subject: [PATCH 280/385] openjdk: add support for powerpc64le This commit adds entries to the Rosetta Stones in adoptopenjdk-bin/generate-sources.py and compilers/openjdk/8.nix, and runs adoptopenjdk-bin/generate-sources.py to regenerate adoptopenjdk-bin/sources.json. With this commit, `nix-build . -A jdk8_headless` succeeds on powerpc64le. Headless jdk is used as part of the build process for many packages so this opens up access to them. --- .../adoptopenjdk-bin/generate-sources.py | 1 + .../compilers/adoptopenjdk-bin/sources.json | 344 +++++++++++++----- pkgs/development/compilers/openjdk/8.nix | 3 +- 3 files changed, 247 insertions(+), 101 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index d90953c71d9c..967612619a73 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -15,6 +15,7 @@ arch_to_nixos = { "x64": ("x86_64",), "aarch64": ("aarch64",), "arm": ("armv6l", "armv7l"), + "ppc64le": ("powerpc64le",), } def get_sha256(url): diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index b4a8ff4892e2..80b3d1709cde 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -4,30 +4,36 @@ "jdk": { "hotspot": { "aarch64": { - "build": "9", - "sha256": "4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" }, "armv6l": { - "build": "9", - "sha256": "2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "f4d53a1753cdde830d7872c6a1279df441f3f9aeb5d5037a568b3a392ebce9c2", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" }, "armv7l": { - "build": "9", - "sha256": "2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "f4d53a1753cdde830d7872c6a1279df441f3f9aeb5d5037a568b3a392ebce9c2", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" }, "packageType": "jdk", + "powerpc64le": { + "build": "101", + "sha256": "9750e11721282a9afd18a07743f19c699b2b71ce20d02f3f0a906088b9ae6d9a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" + }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" } }, "openj9": { @@ -38,6 +44,12 @@ "version": "11.0.11-ea" }, "packageType": "jdk", + "powerpc64le": { + "build": "9", + "sha256": "691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" + }, "vmType": "openj9", "x86_64": { "build": "9", @@ -50,30 +62,36 @@ "jre": { "hotspot": { "aarch64": { - "build": "9", - "sha256": "fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "6426ce7dfdacaa798ec7779e0bec30ec8510df491fb2c965e8e6bf2f88af27e9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" }, "armv6l": { - "build": "9", - "sha256": "ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "964a5d3c1f63209e5ad908a302220b3ba2e81a6574b7b7a5020f736e1496835f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" }, "armv7l": { - "build": "9", - "sha256": "ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "964a5d3c1f63209e5ad908a302220b3ba2e81a6574b7b7a5020f736e1496835f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" }, "packageType": "jre", + "powerpc64le": { + "build": "101", + "sha256": "8c9efc13680f43b742a54ecb3be614efd62749d401e780143fef3ac5403a6284", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" + }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "b5a6960bc6bb0b1a967e307f908ea9b06ad7adbbd9df0b8954ab51374faa8a98", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_linux_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" } }, "openj9": { @@ -84,6 +102,12 @@ "version": "11.0.11-ea" }, "packageType": "jre", + "powerpc64le": { + "build": "9", + "sha256": "f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" + }, "vmType": "openj9", "x86_64": { "build": "9", @@ -100,10 +124,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "d851a220e77473a4b483d8bd6b6570e04fd83fdd48d6584b58b041f5997186c2", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "8c69808f5d9d209b195575e979de0e43cdf5d0f1acec1853a569601fe2c1f743", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" } }, "openj9": { @@ -122,10 +146,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "ccb38c0b73bd0ba7006d00234a51eee9504ec8108c835e1f1763191806374707", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.11_9.tar.gz", - "version": "11.0.11" + "build": "101", + "sha256": "1b2f792ad05af9dba876db962c189527e645b48f50ceb842b4e39169de553303", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_mac_hotspot_11.0.14.1_1.tar.gz", + "version": "11.0.14" } }, "openj9": { @@ -164,6 +188,12 @@ "version": "13.0.2" }, "packageType": "jdk", + "powerpc64le": { + "build": "8.1", + "sha256": "fb3362e34aac091a4682394d20dcdc3daea51995d369d62c28424573e0fc04aa", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_ppc64le_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" + }, "vmType": "hotspot", "x86_64": { "build": "8.1", @@ -174,6 +204,12 @@ }, "openj9": { "packageType": "jdk", + "powerpc64le": { + "build": "8.1", + "sha256": "f71513e525172dfef695b7c27b25e151f232e05b2281648c2b794650c4970832", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_ppc64le_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" + }, "vmType": "openj9", "x86_64": { "build": "8.1", @@ -192,6 +228,12 @@ "version": "13.0.2" }, "packageType": "jre", + "powerpc64le": { + "build": "8.1", + "sha256": "43d6fb71bdf7b6ad9295087c46dfc9b00bf26db1b5cdcff0c418cbe43b49904a", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_ppc64le_linux_hotspot_13.0.2_8.tar.gz", + "version": "13.0.2" + }, "vmType": "hotspot", "x86_64": { "build": "8.1", @@ -202,6 +244,12 @@ }, "openj9": { "packageType": "jre", + "powerpc64le": { + "build": "8.1", + "sha256": "7bf8dc4c3b95e87b154f7bc2f9388a6539413fe76d49b362bba878217ccb7ed7", + "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_ppc64le_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", + "version": "13.0.2" + }, "vmType": "openj9", "x86_64": { "build": "8.1", @@ -282,6 +330,12 @@ "version": "14.0.2" }, "packageType": "jdk", + "powerpc64le": { + "build": "12", + "sha256": "465a3b8e931896b8d95e452d479615c4bf543535c05b6ea246323ae114e67d7d", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_ppc64le_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + }, "vmType": "hotspot", "x86_64": { "build": "12", @@ -292,6 +346,12 @@ }, "openj9": { "packageType": "jdk", + "powerpc64le": { + "build": "12", + "sha256": "177fd161ae14df92203d70cd618559daf889ec0c172d6ee615859352f68a2371", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz", + "version": "14.0.2" + }, "vmType": "openj9", "x86_64": { "build": "12", @@ -322,6 +382,12 @@ "version": "14.0.2" }, "packageType": "jre", + "powerpc64le": { + "build": "12", + "sha256": "0f96998be562cfbe8a4114581349dbd2609d0a23091e538fe142dcd9c83e70cf", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_ppc64le_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + }, "vmType": "hotspot", "x86_64": { "build": "12", @@ -332,6 +398,12 @@ }, "openj9": { "packageType": "jre", + "powerpc64le": { + "build": "12", + "sha256": "ad7a55a3669878c0c7d7c66faafe7c626d4341374719b6fdd81d2986c6e80945", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz", + "version": "14.0.2" + }, "vmType": "openj9", "x86_64": { "build": "12", @@ -412,6 +484,12 @@ "version": "15.0.2" }, "packageType": "jdk", + "powerpc64le": { + "build": "7", + "sha256": "486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" + }, "vmType": "hotspot", "x86_64": { "build": "7", @@ -428,6 +506,12 @@ "version": "15.0.2-ea" }, "packageType": "jdk", + "powerpc64le": { + "build": "7", + "sha256": "5b2158268de0be247801b7823ee3e7f739254d77718a1879848627181feee2f4", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", + "version": "15.0.2" + }, "vmType": "openj9", "x86_64": { "build": "7", @@ -458,6 +542,12 @@ "version": "15.0.2" }, "packageType": "jre", + "powerpc64le": { + "build": "7", + "sha256": "dc2480948ac3e6b192fb77c9d37227510f44482e52a330002d6e7497a62a7d67", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.2_7.tar.gz", + "version": "15.0.2" + }, "vmType": "hotspot", "x86_64": { "build": "7", @@ -474,6 +564,12 @@ "version": "15.0.2-ea" }, "packageType": "jre", + "powerpc64le": { + "build": "7", + "sha256": "79f657141f1cd0e4a70d041b9215b8b00140d479ce73ed71bc4f3dd015157958", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", + "version": "15.0.2" + }, "vmType": "openj9", "x86_64": { "build": "7", @@ -536,30 +632,36 @@ "jdk": { "hotspot": { "aarch64": { - "build": "9", - "sha256": "3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" + "build": "7", + "sha256": "cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" }, "armv6l": { - "build": "9", - "sha256": "20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" + "build": "7", + "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" }, "armv7l": { - "build": "9", - "sha256": "20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" + "build": "7", + "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" }, "packageType": "jdk", + "powerpc64le": { + "build": "7", + "sha256": "36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" + "build": "7", + "sha256": "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" } }, "openj9": { @@ -570,6 +672,12 @@ "version": "16.0.1-ea" }, "packageType": "jdk", + "powerpc64le": { + "build": "9", + "sha256": "9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" + }, "vmType": "openj9", "x86_64": { "build": "9", @@ -600,6 +708,12 @@ "version": "16.0.1" }, "packageType": "jre", + "powerpc64le": { + "build": "9", + "sha256": "495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" + }, "vmType": "hotspot", "x86_64": { "build": "9", @@ -616,6 +730,12 @@ "version": "16.0.1-ea" }, "packageType": "jre", + "powerpc64le": { + "build": "9", + "sha256": "f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" + }, "vmType": "openj9", "x86_64": { "build": "9", @@ -632,10 +752,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "3be78eb2b0bf0a6edef2a8f543958d6e249a70c71e4d7347f9edb831135a16b8", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_mac_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" + "build": "7", + "sha256": "27975d9e695cfbb93861540926f9f7bcac973a254ceecbee549706a99cbbdf95", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" } }, "openj9": { @@ -678,30 +798,36 @@ "jdk": { "hotspot": { "aarch64": { - "build": "10", - "sha256": "a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "42ed3ff5a859f9015a1362fb7e650026b913d688eab471714f795651120be173", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" }, "armv6l": { - "build": "10", - "sha256": "0de107b7df38314c1daab78571383b8b39fdc506790aaef5d870b3e70048881b", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "0666c466b8aefcc66ab25aea9c0605f5c6eda3b174b1b817a4e4e74da0de0365", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" }, "armv7l": { - "build": "10", - "sha256": "0de107b7df38314c1daab78571383b8b39fdc506790aaef5d870b3e70048881b", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "0666c466b8aefcc66ab25aea9c0605f5c6eda3b174b1b817a4e4e74da0de0365", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" }, "packageType": "jdk", + "powerpc64le": { + "build": "6", + "sha256": "c7cc9c5b237e9e1f1e3296593aba427375823592e4604fadf89a8c234c2574e1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" + }, "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "3d62362a78c9412766471b05253507a4cfc212daea5cdf122860173ce902400e", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" } }, "openj9": { @@ -712,6 +838,12 @@ "version": "8.0.292-ea" }, "packageType": "jdk", + "powerpc64le": { + "build": "10", + "sha256": "bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" + }, "vmType": "openj9", "x86_64": { "build": "10", @@ -724,30 +856,36 @@ "jre": { "hotspot": { "aarch64": { - "build": "10", - "sha256": "b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "22496d5e677aaccc5a85e90584d0a012c51a08898f0e09e259eabe67ed81da2b", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" }, "armv6l": { - "build": "10", - "sha256": "7f7707a7a3998737d2221080ea65d50ea96f5dde5226961ebcebd3ec99a82a32", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_arm_linux_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "48181f17b85a13c0e2f260c8f4b39483e61664cf07ea00e6210a666fb5210492", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_arm_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" }, "armv7l": { - "build": "10", - "sha256": "7f7707a7a3998737d2221080ea65d50ea96f5dde5226961ebcebd3ec99a82a32", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_arm_linux_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "48181f17b85a13c0e2f260c8f4b39483e61664cf07ea00e6210a666fb5210492", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_arm_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" }, "packageType": "jre", + "powerpc64le": { + "build": "6", + "sha256": "f15b536a97c27d114c0b59c86de07ca80a271d3979ed0aa056318ea329e31e5d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" + }, "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "9c4607cee01919a21c57a36e8c009a7aca7aefd63010c64d7a3023fe8590ebe1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz", + "version": "8.0.322" } }, "openj9": { @@ -758,6 +896,12 @@ "version": "8.0.292-ea" }, "packageType": "jre", + "powerpc64le": { + "build": "10", + "sha256": "b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" + }, "vmType": "openj9", "x86_64": { "build": "10", @@ -774,10 +918,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "5646fbe9e4138c902c910bb7014d41463976598097ad03919e4848634c7e8007", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "96a3124bf0f5ca777954239893cc89ea34c4bc9a9b7c1559aa2c69baa0ee84e3", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz", + "version": "8.0.322" } }, "openj9": { @@ -796,10 +940,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "bfe1cecf686b4d129594916b0f10d98b71c8d2caec1b96bbbee7f40aa053f1c8", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_mac_hotspot_8u292b10.tar.gz", - "version": "8.0.292" + "build": "6", + "sha256": "42d4ada88e39b0f222ffdcf3c833f442af22852687992997eca82c573e65b86f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_mac_hotspot_8u322b06.tar.gz", + "version": "8.0.322" } }, "openj9": { diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index dae405ff3b2f..c232b1f01f16 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -17,7 +17,8 @@ let i686-linux = "i386"; x86_64-linux = "amd64"; aarch64-linux = "aarch64"; - }.${stdenv.system} or (throw "Unsupported platform"); + powerpc64le-linux = "ppc64le"; + }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); update = "322"; build = "ga"; From d215163ff9d37bf3bac8024c84589ec82a1e70af Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Mon, 11 Apr 2022 18:36:55 +0200 Subject: [PATCH 281/385] nixos/cockroachdb: add `extraArgs` option There are a bunch of args to `cockroach start` that simply can not be set given the current set of options, so this escape hatch enables them. --- nixos/modules/services/databases/cockroachdb.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix index eb061af92621..411f2315f762 100644 --- a/nixos/modules/services/databases/cockroachdb.nix +++ b/nixos/modules/services/databases/cockroachdb.nix @@ -10,7 +10,8 @@ let ifNotNull = v: s: optionalString (v != null) s; startupCommand = lib.concatStringsSep " " - [ # Basic startup + ([ + # Basic startup "${crdb}/bin/cockroach start" "--logtostderr" "--store=/var/lib/cockroachdb" @@ -31,7 +32,7 @@ let # Certificate/security settings. (if cfg.insecure then "--insecure" else "--certs-dir=${cfg.certsDir}") - ]; + ] ++ cfg.extraArgs); addressOption = descr: defaultPort: { address = mkOption { @@ -159,6 +160,16 @@ in only contain open source features and open source code). ''; }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--advertise-addr" "[fe80::f6f2:::]" ]; + description = '' + Extra CLI arguments passed to cockroach start. + For the full list of supported argumemnts, check + ''; + }; }; }; From dccd5a44d1b253d7f8595517287aad1c74228d14 Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Mon, 11 Apr 2022 18:41:06 +0200 Subject: [PATCH 282/385] nixos/cockroachdb: use `escapeSystemdExecArgs` for ExecStart args Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> --- .../services/databases/cockroachdb.nix | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix index 411f2315f762..9a7aebe4f6ae 100644 --- a/nixos/modules/services/databases/cockroachdb.nix +++ b/nixos/modules/services/databases/cockroachdb.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -6,47 +6,44 @@ let cfg = config.services.cockroachdb; crdb = cfg.package; - escape = builtins.replaceStrings ["%"] ["%%"]; - ifNotNull = v: s: optionalString (v != null) s; - - startupCommand = lib.concatStringsSep " " + startupCommand = utils.escapeSystemdExecArgs ([ # Basic startup - "${crdb}/bin/cockroach start" + "${crdb}/bin/cockroach" + "start" "--logtostderr" "--store=/var/lib/cockroachdb" - (ifNotNull cfg.locality "--locality='${cfg.locality}'") # WebUI settings - "--http-addr='${cfg.http.address}:${toString cfg.http.port}'" + "--http-addr=${cfg.http.address}:${toString cfg.http.port}" # Cluster listen address - "--listen-addr='${cfg.listen.address}:${toString cfg.listen.port}'" + "--listen-addr=${cfg.listen.address}:${toString cfg.listen.port}" - # Cluster configuration - (ifNotNull cfg.join "--join=${cfg.join}") - - # Cache and memory settings. Must be escaped. - "--cache='${escape cfg.cache}'" - "--max-sql-memory='${escape cfg.maxSqlMemory}'" + # Cache and memory settings. + "--cache=${cfg.cache}" + "--max-sql-memory=${cfg.maxSqlMemory}" # Certificate/security settings. (if cfg.insecure then "--insecure" else "--certs-dir=${cfg.certsDir}") - ] ++ cfg.extraArgs); + ] + ++ lib.optional (cfg.join != null) "--join=${cfg.join}" + ++ lib.optional (cfg.locality != null) "--locality=${cfg.locality}" + ++ cfg.extraArgs); - addressOption = descr: defaultPort: { - address = mkOption { - type = types.str; - default = "localhost"; - description = "Address to bind to for ${descr}"; - }; - - port = mkOption { - type = types.port; - default = defaultPort; - description = "Port to bind to for ${descr}"; - }; + addressOption = descr: defaultPort: { + address = mkOption { + type = types.str; + default = "localhost"; + description = "Address to bind to for ${descr}"; }; + + port = mkOption { + type = types.port; + default = defaultPort; + description = "Port to bind to for ${descr}"; + }; + }; in { From a8f27b19daa85a858b58f004a122e48e8ef63ea5 Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Tue, 12 Apr 2022 10:38:16 +0100 Subject: [PATCH 283/385] atuin: 0.8.0 -> 0.8.1 also add self as a maintainer --- pkgs/tools/misc/atuin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 381711811875..09827928618a 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "atuin"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "ellie"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I/ZDaOAiHdWOkmf+jIWWxZ3C25UHsl6MB7mCRLADFNs="; + sha256 = "sha256-nrWsEPYW4R5P8KUh4R3cZ4VFO9zoID0cl6lz7nNjnp0="; }; - cargoSha256 = "sha256-KMss6Mpn4LHnkhtJyRea+D7mKItBK4lqq9syFEmCiFo="; + cargoSha256 = "sha256-sWVMPjG5ZqAKr7BmMJdBnVmBDr1MWl3hhmOBxQJexJY="; nativeBuildInputs = [ installShellFiles ]; @@ -41,6 +41,6 @@ rustPlatform.buildRustPackage rec { description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines"; homepage = "https://github.com/ellie/atuin"; license = licenses.mit; - maintainers = with maintainers; [ onsails SuperSandro2000 ]; + maintainers = with maintainers; [ onsails SuperSandro2000 sciencentistguy ]; }; } From 01b44fee06b2529c337fda01d55da4b20a75b1a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Apr 2022 10:48:28 +0000 Subject: [PATCH 284/385] python310Packages.phonenumbers: 8.12.44 -> 8.12.46 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 92b621e49c64..603980645e4b 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.44"; + version = "8.12.46"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Js/QJX0XBP4viMr/LKq7cNFqh3seZbaq5R+fu+EKqM4="; + sha256 = "sha256-HEQPYzbLSYk/8agybHC032k4Aq6YHyEPVFzUIVrEgTM="; }; checkInputs = [ From e45e7cab9af6076075c0ecfed97de8f01043026a Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 11 Apr 2022 20:48:50 -0400 Subject: [PATCH 285/385] loki: 2.4.2 -> 2.5.0 --- pkgs/servers/monitoring/loki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 0a460e335b43..c0816808cbad 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.4.2"; + version = "2.5.0"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-HSEdN3PN4wQQ3A7bICNIAgdwhwD/PIUeOdW9ZgwmbCw="; + sha256 = "sha256-3GeWrkTL3HJQsVBafjSQXHsf1nbVzSVSDZWcJlD22Nw="; }; vendorSha256 = null; From c3b1a3bbf41439235e31c8f45a59546650832f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Apr 2022 14:06:58 +0200 Subject: [PATCH 286/385] yq-go: 4.24.2 -> 4.24.4 --- pkgs/development/tools/yq-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 59244b053eff..ae9c956ea12e 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.24.2"; + version = "4.24.4"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-KuaIGIDXdL0d+Wxy2O78XTSBo+2oIrcizfd2jyXghXc="; + sha256 = "sha256-Gkogy8bgm/3Y/8DmK/mS1+L0Ww1c+hlVPKhI88lbISg="; }; vendorSha256 = "sha256-R40zU0jOc/eIFVDsWG3+4o51iro7Sd7jwtyH/fpWVZs="; From 135dbd8ec1f171d1373dfbcd1b669bbf835dad90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Apr 2022 14:31:21 +0200 Subject: [PATCH 287/385] util-linuxCurses: move to aliases --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 897005fecaeb..40837d7a0e6e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1297,6 +1297,7 @@ mapAliases ({ urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 usbguard-nox = usbguard; # Added 2019-09-04 + util-linuxCurses = util-linux; # Added 2022-04-12 utillinux = util-linux; # Added 2020-11-24 ### V ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 487d70ff3ad5..627a407cad2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23475,8 +23475,6 @@ with pkgs; util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { } else unixtools.util-linux; - util-linuxCurses = util-linux; - util-linuxMinimal = if stdenv.isLinux then util-linux.override { nlsSupport = false; ncurses = null; From dacbee21829cdac656711a5362e6eca90d4c2da6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 19 Feb 2022 21:51:01 -0800 Subject: [PATCH 288/385] util-linux: remove `? null` from inputs and convert to boolean flags Prior to this commit, util-linux supported compilation without systemd if systemd==null. This commit preserves that behavior, and additionally triggers it when the global systemdSupport attr is set to false. The systemdSupport argument is understood by many other nixpkgs expressions and can be set globally in ~/.config/nixpkgs/config.nix. Co-authored-by: Sandro --- pkgs/os-specific/linux/util-linux/default.nix | 19 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index d54f577def3e..3efb3914b85e 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,10 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, zlib, shadow, libcap_ng -, ncurses ? null, pam, systemd ? null +, ncursesSupport ? true +, ncurses, pam +, systemdSupport ? stdenv.isLinux +, systemd , nlsSupport ? true }: stdenv.mkDerivation rec { - pname = "util-linux" + lib.optionalString ( !nlsSupport && ncurses == null && systemd == null ) "-minimal"; + pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; version = "2.37.4"; src = fetchurl { @@ -40,9 +43,9 @@ stdenv.mkDerivation rec { "--disable-makeinstall-setuid" "--disable-makeinstall-chown" "--disable-su" # provided by shadow (lib.enableFeature nlsSupport "nls") - (lib.withFeature (ncurses != null) "ncursesw") - (lib.withFeature (systemd != null) "systemd") - (lib.withFeatureAs (systemd != null) + (lib.withFeature ncursesSupport "ncursesw") + (lib.withFeature systemdSupport "systemd") + (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/") "SYSCONFSTATICDIR=${placeholder "lib"}/lib" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) @@ -56,9 +59,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ zlib pam libcap_ng ] - ++ lib.filter (p: p != null) [ ncurses systemd ]; + buildInputs = [ zlib pam libcap_ng ] + ++ lib.optionals ncursesSupport [ ncurses ] + ++ lib.optionals systemdSupport [ systemd ]; doCheck = false; # "For development purpose only. Don't execute on production system!" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 627a407cad2d..81da603405b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23477,8 +23477,8 @@ with pkgs; util-linuxMinimal = if stdenv.isLinux then util-linux.override { nlsSupport = false; - ncurses = null; - systemd = null; + ncursesSupport = false; + systemdSupport = false; } else util-linux; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; From 338ce3ed6a02ab7a236a82ffab9e7f7bd5e6a760 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 5 Apr 2022 12:25:47 +0200 Subject: [PATCH 289/385] yosys: 0.15 -> 0.16 https://github.com/YosysHQ/yosys/releases/tag/yosys-0.16 --- pkgs/development/compilers/yosys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index ecdebdda849a..a48d5319b5ce 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-1NCcsq0otVKTTSSmnX2kCvvngF1yzqYWlRVzu+XY65w="; + hash = "sha256-X1yygoat6ezJt9jLO+W528ryf381nKGDQ3cfrG1ZbIk="; }; enableParallelBuilding = true; From 0a2f8109f4781a9489301b7af90e8f05d189fde9 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 5 Apr 2022 19:05:06 +0200 Subject: [PATCH 290/385] abc-verifier: 2022.03.04 -> 2022.03.22 --- pkgs/applications/science/logic/abc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 60454ca9ce99..20c33f0fbae5 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2022.03.04"; + version = "2022.03.22"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "d7ecb23eeee9c9b4924182ce570c2e33eb18abff"; - hash = "sha256-aufWRTggJNOaUFsjh5+HFDqEur+nuM0hZSsTfGptbks="; + rev = "00b674d5b3ccefc7f2abcbf5b650fc14298ac549"; + hash = "sha256-jQgHptARRuhlF+8R92so8PyBTI5t/q/rSGO5yce5WSs="; }; nativeBuildInputs = [ cmake ]; From 07c6d44239b194d5b3a5791ee69203c90b505057 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 15:40:44 +0200 Subject: [PATCH 291/385] firefox: 99.0 -> 99.0.1 https://www.mozilla.org/en-US/firefox/99.0.1/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index cdaf63179512..d52ec29abcf8 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "99.0"; + version = "99.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c"; + sha512 = "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f"; }; meta = { From d0e5a586b1e782b8a24b6a362d88edb3d6f2c269 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 15:41:08 +0200 Subject: [PATCH 292/385] firefox-bin: 99.0 -> 99.0.1 https://www.mozilla.org/en-US/firefox/99.0.1/releasenotes/ --- .../browsers/firefox-bin/release_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 407bf2ba3753..4a561e9126cc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "99.0"; + version = "99.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ach/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ach/firefox-99.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "86cf773e1637f17ce85810712c6fae9a2e5d9d7ee0bf7b265a30f4a469c87215"; + sha256 = "e2054f03b413f783f287c14fb670ee97415e89181e2ca1f9bbe05a18fb529330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/af/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/af/firefox-99.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "72e525fee2e85110b77057178e77ddb277dd9c58609befbad04653e40cba6842"; + sha256 = "102c4460ae7a8242c770bda09baee07004f84d95a885c621fbe23f2fdb585398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/an/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/an/firefox-99.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "373700cebfc90fad01f5add0d5a0ff49ccab3ce8286adf3b3c91f2d69c51a18a"; + sha256 = "0f8aeacc3a7abbb5f571aff8a6580c9779336bccb0d30005b46d336447123b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ar/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ar/firefox-99.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "50dcb4b8bf1a6df6fd17975c9f5c3a2b54b23697191c853d48e08a01429ea102"; + sha256 = "720c5d872243631ddf67102e6a54504912b33f6e21c666d84e73a399f10a2559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ast/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ast/firefox-99.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "947401a336c715809de254d7e6381b902dc663e350bc1f89bf4ad08819a1f811"; + sha256 = "194345cdce1e9c6462a80423d1b97be4c757dc69b1f5a0055ac14e2624d1d145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/az/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/az/firefox-99.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "87115f184011114f54110b3dcdbe2c7833a90be44f38294395274971710f6162"; + sha256 = "9936c9d172ddd291d34679c33f28d7ec425e4835abdfb25dd0252e50ab5eca09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/be/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/be/firefox-99.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ea0844501b10ece23edc98781a2428de1f9a1b012a06c062765b1558c0d66706"; + sha256 = "420f519aa954b708da735605e32acf9f11bfa2195e7a9bd2ebd954a58df2db10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/bg/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bg/firefox-99.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9cf618bfc8f46e9ec787274b320879d56bb1437685b3a8d057def285a1ab3621"; + sha256 = "2a7cbc2903894934024fb8ea2212e7f23a47c7db707e4c88a33656366b810dfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/bn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bn/firefox-99.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c41c3fd72734b6f81e4b92682a2b004058dab570e29721d227cc32719c5d7433"; + sha256 = "46984d43f628ecdc1674d41f45c57177dfe24eb6dec0e5ae5e6a8efec7157791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/br/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/br/firefox-99.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "627f1cf6109a6c529cabd537ac47a4ba907b7f4a2c2b565f715535d08696d8f4"; + sha256 = "1427aaca5903a1ecb3e17aa7e3351334b1a2183a1180c9a4942535b50f64c0db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/bs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bs/firefox-99.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "283f229ea9b0430613988fce636ee11a91d73e1e5caba2671965b57df39127ed"; + sha256 = "8377ad8c27236c5336e370acf70e901f4dbb53dd25142a74dc61f98fd2beab91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ca-valencia/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ca-valencia/firefox-99.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "1fb7e3474af461ea33769c8ac2bf3f0c7d6376caf7d8de549f11987fd83be198"; + sha256 = "78f8dd650fb9398b1cb999db887bb5764f4b015539c3aac0eee2fdd05477bf3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ca/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ca/firefox-99.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "68045b6c2fae1024fd85c759e3da18857a7ab335da055c105c428244ef98127c"; + sha256 = "18b0acda5e75ec1412273a016d2cc36f6c65b68ebae5251ef13289cf73ef00d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/cak/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cak/firefox-99.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b6bd14470ec62436e99d72097e7f82566cefe70a2a0d57be729b9e3665070004"; + sha256 = "505c3f2c8f39aeea7ca4f8285d59fcef995e5c6c64d318d7b143e7060982d7a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/cs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cs/firefox-99.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ad005d5e99575a0773882f933344453a73478e58c7d48769735a69ed39ca59f8"; + sha256 = "d33f7f5adf068743a523f54fb2dec1edf7302993ef3684dd86cbab25b96c3247"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/cy/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cy/firefox-99.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "6f22fe5b3bc4649b4f73220530571140d94291f69c4fd7c512b88a3471291e3c"; + sha256 = "8a0d5e3a4ad8650d4e8e77e92c24b27da1d5c0b44878e97462ec94597020e548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/da/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/da/firefox-99.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2b1b37cd8e270f410a1bfa1e0e04dfb5acb17853d4f9a184eb52655b79f9d29b"; + sha256 = "c9c8355c3cab4e189a4ba322f4a7e2a189617786e912930f0c17b217ff89c1c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/de/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/de/firefox-99.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a115c9b1a29baa75579dd6fea40f7f498177dba0ba901f4c6de35a07fbcbb9a1"; + sha256 = "83468180a67fae5a5df8810e3b7bfdc6b01faaf60dd18a0914715ac89531c7a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/dsb/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/dsb/firefox-99.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "ecdf01b499c393e06caeba03be7e3c89303a3f770859f228155bceb8c1a9c49b"; + sha256 = "feeda2e3f021d459c98371e244d29b9e6e6fdaa6250a8a6700b34a981f3dcf13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/el/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/el/firefox-99.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "0205616cbfa802c67abff6cbb8e23e26b45fb8b224b5d7c02dece0ff3da4b924"; + sha256 = "4fc65f4b6d84a01c79165ee9e058c980659089e86da72b016cfc5efbe973e592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/en-CA/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-CA/firefox-99.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "764ed326f89e0e3ef0cab0252cbfafe8b1b739268f787f5893d1110e4cfde4b5"; + sha256 = "10e324101932b7290814ea2ab747657363023a88857ca90e25d54f89115ffbcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/en-GB/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-GB/firefox-99.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "dcfe8088136427476353c2797ee9ca159414f60b09fffe126eeb009ea041ebdd"; + sha256 = "83ba931e4f6afd0d0c32b3bf0db55a7ff0fdfda080e906bb3ada5b4e61a4c3f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/en-US/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-US/firefox-99.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "b6d895047c8911a49d944f78f710718091957f0057344cea735096ab4a8c07d1"; + sha256 = "7bc57f06fc9c52e16815f1a4208c33bc5819423c68da441d001f7c2200591bcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/eo/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/eo/firefox-99.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "acdf7d24ac1c91802938e8151c2876765532d935c3add9028a15ff47e0dedb38"; + sha256 = "3fc945331b62f9998d2adb6a99d3390528975c97b6776f97a4c461eb124da462"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-AR/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-AR/firefox-99.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "6d350750f744ff633168008d364b70a07a3becae1eb102c73bd2ddb6ddd8fbf5"; + sha256 = "908723c7445b92b4c4e26fc999562681e4bf3ffffee0ea1db6362aed0f615c0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-CL/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-CL/firefox-99.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "9a4720bdf50e13bea6c98ba2e48b85dcca13683594e7b4d1e280649ac069ac3b"; + sha256 = "77363cfa3c2ce655a9f6203c495f8f54700b44e0b66d021050cea59e2b0e0a3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-ES/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-ES/firefox-99.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "cb78b97c05002db97bd15038b2c34f582199934302c1157912f95a7304112536"; + sha256 = "ee59faf4bd7472a14fd8e420aa7f408abccd72f31d162da0c5f9b530593722f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-MX/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-MX/firefox-99.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "10965923df9ed49c0dbe7a00154f70eb7fcc2254de77d0eacb115a0466881dbd"; + sha256 = "732b1edb21462281e029de794ccdb3c20ceea0c6d5c0f1c885ef76ad57df7abf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/et/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/et/firefox-99.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "dafe509497714b9fa6d97ff279cb0f79b8ab0ddec1a1ca0f538301875acbf22c"; + sha256 = "b816c47c20a674256dc176a15dbeec830b47f8c3eecde31c615f003260e69668"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/eu/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/eu/firefox-99.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "fa3098d1dc3fe3a4775fb431465ff9f1d6bea286cd0753afe373b907a09a7a41"; + sha256 = "4f54fa8f7718bc55b733c6986c8ffa17517afac92383dae03fb972beed876665"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fa/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fa/firefox-99.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "cc7374de92c433d30e98f01e0cc742bb0fe3ec90894953423ead3e756b2377aa"; + sha256 = "ee716492cc2cc0a11c98ea8e8bd7d142ec21c006e2f12a96707d9dad82bf92b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ff/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ff/firefox-99.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "41765b0971f3185b0124726983de84dbfa6ce9f2018ba53cdb69703302ee50f8"; + sha256 = "36d1c4b3966a807c6bc90c4f6fecbef327442398a463167535dae318f286d222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fi/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fi/firefox-99.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b34ac17ab0e2aa8dfce3dbf4f3f50fcc748ad57cb2c5dcfc5026e74243df4b54"; + sha256 = "9855e6d25d34d6df614ef2b48b4b1e60d527fe00c0da132a0609ac6262354623"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fr/firefox-99.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "62c1a24620ab6010c4a279d3e440e654fb446f8a8cd2c2906253d623d3d6a2a4"; + sha256 = "b999d3ed98eb594335e810a4a81de86e7e3466a2c32cc6bef0bc260ae883a6d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fy-NL/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fy-NL/firefox-99.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "34c6bd8a1400f35f970ba5cad69c32826550e3d429e63002a1c34ef5f9c0c98a"; + sha256 = "be9fce28930fb80a94cc5c6343b34ff6b05538a08cee657d995d647f3d9dec7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ga-IE/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ga-IE/firefox-99.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "0e4954e566f128fe93a970d41df9a05c631fc22fd500b7cae43559ba836c1bba"; + sha256 = "92bbd149f59a6c2594d6fe1e2ba8e545bd7f9040ae35ec924414c59d06d0f4c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gd/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gd/firefox-99.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "1dd639f39a95a50d41a7759a43ac0eabea36e1ff80c557222d6b4e8dcf85701c"; + sha256 = "bb2cd80e2d1c9b08363a0025b428473334596f3e34ff321e3d6c69f723fb18f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gl/firefox-99.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ba2525bc4c25c74b0aaaa77dae6c05dd4a7519086d756d34fc462ea907840b8e"; + sha256 = "f74e552aea8622136679cfb162b2c192ccefa91705e8352830efdec3cae9a0b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gn/firefox-99.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "6566afd98454031eca6ad3020323b82e1a8beb20a0e1f1ceacd3785a6e53725a"; + sha256 = "261cb7858277e012b8d67f890312b3fa333522542a6a7c71019f06e1340e0349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gu-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gu-IN/firefox-99.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "afc0da597d00fe408574e4036d2e928c644ff57857f6bf4b3182947e119cde73"; + sha256 = "7a3421aa896d08984f9d2cb38fea3e4bf93d9d0dbcb74bdf06dccb3f5039db44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/he/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/he/firefox-99.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5ec824f60e9b8df7a570eae973489751a2167e423fccdf750ee9320b9a1dee2d"; + sha256 = "f734cef92e78b3713e179959c6af917a64c4b16d00d834c776652337d42bc65e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hi-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hi-IN/firefox-99.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6640405a9361c4f080b552a4da9757cd7b81030fec328a96793a7cc752e00371"; + sha256 = "e0694ff508e38ae758a96ef5023e7d7d39cabc2b7bbb56cff2854b51009a0732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hr/firefox-99.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "75072debad6b291a051dc2af60a52554e9db3e5d87cc3fca2ea2974adfa3c3d5"; + sha256 = "438665aa04f02cb9275c8b76ee5c0ff6d7814fc0c1439f50f714613fb902b9c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hsb/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hsb/firefox-99.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "8ce2a5cf8e65d3d5de31105a7db1280c0379c77186af8deae17e6c23c6bd3edf"; + sha256 = "1b17d24231fd22db70f6f7bcfe793d31390a441355275771749352221320d4cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hu/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hu/firefox-99.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "595be31ce2c0671916bf8ad66f03e81bd8e53d7136d4e62d50fc7f250629bd05"; + sha256 = "d2be4860a0019e9385f48b989300ad42ced0ab2c3873e8074a6863f3afc4719a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hy-AM/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hy-AM/firefox-99.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "2a3bcd22400dfe87e6dfcb38b0d4e970a49b9b4386c3d7bb3598299fbdd06c6f"; + sha256 = "b9decd8f427362e1070c17242a906d170122c2bcc17641a2132d87ab24e52467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ia/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ia/firefox-99.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d13f9cb95fc78bf4f744ada47f2758c61d85ed231b2195ea579635c2aca4c749"; + sha256 = "97a9ec4317bc432ed6c79f796fd0547fab0a156d9c9c959235f6b941ad4fb6fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/id/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/id/firefox-99.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b6e02073e442960c773a5b77f66d54685dc617f3f6c9ad085caa923e84be5b4c"; + sha256 = "621add55642a28cf95ff1f0acde8881862c1d4487500e5cc0705bf3ba0055c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/is/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/is/firefox-99.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c6f45c0ea25b560e1f3f5a8f4c38d3732e7a944fbaf7ea766eef1a6162830631"; + sha256 = "9293bce28c6252e9ee561f41e54b39e6a66d916e18e34965d1fec77a2d8088de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/it/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/it/firefox-99.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "adf2da8dce907f184cfbcad8ee7cc645fe707b0fb2ccec480f5baf503a03ed0d"; + sha256 = "aeeface0275cdb426fe851d91bd49014aa8aadc7becf18f4763b44f0526260a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ja/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ja/firefox-99.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6698d549fdc42794372a32d6a435ebb90300ba42594de94d9ffeaf5aca53002f"; + sha256 = "dc51a842e0a8aaeea874fc73e99de5978615c250afc17309e7edaf80802acb56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ka/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ka/firefox-99.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a16e4e6b86c9d1f62f6267417711a668d8899c2ed3414e32da13ac592bbc70c8"; + sha256 = "85562b0af98292e923c39de4b0c15d2ea0e95cd8fcb7d86c4d941eabdf9a1827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/kab/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kab/firefox-99.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2ee4c463d31a388d22a4039365ed18103b4b56a3b584d32ebe393cfb956b34ea"; + sha256 = "c06e7fd59bcb82a989c90a2095c467eccdd1a98b4e704348befc89061ad9a6da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/kk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kk/firefox-99.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f4d9a8d6e6fec7f38664dd3c1fa9512dcf734481ffa20029295a86c4944c7b23"; + sha256 = "d041abeb5f207a234fde69fd265ec98b5bc94a29ba5d231334d74caccd7c1d16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/km/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/km/firefox-99.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "04fd804bbd428f8441ff1900d356104160dda63ac5c6bdcc54c5fd6ada23185a"; + sha256 = "b02b241b7ca07732c26aad728d1d15b637d4bb032673d92b0ff1a65fefca0d80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/kn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kn/firefox-99.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ab8a5e9c60a9bbe1d44ad4c997491e7fed9cdfe7a2c83dbfeda60d7f1a90e1ce"; + sha256 = "0ad5133784a27dec78031db198ee762e4ee0d0514d03dc175130a64eab93d302"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ko/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ko/firefox-99.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "bf741c3962de3277a00c5aed83e45af14743767000365153a28cbc558a6778d6"; + sha256 = "01adfa538c52df224c6b982cb96ed50a3f19b8e0608d323003f2264e6d1c18c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/lij/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lij/firefox-99.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "bd40f1f0126d60e539baeb2264b275a0983d83ab56dd8881c838f1d40a7299b7"; + sha256 = "1cd93f13d9cc732f7b580c611f31ce8a71ba20436bc7acc996fa1d22c4c8b954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/lt/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lt/firefox-99.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "29f3ea64fbe0e8fd4c53789de1819c29d497688180c5573fadeedd48182d5044"; + sha256 = "fd92972d632c5c3d1822feaf2372bd6a06ea957b0c8a5663b0eda787da53e4c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/lv/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lv/firefox-99.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "f1a6dbf6fb72733e681c000c1ee96b895ad28bd14925185c1f1ba4445e589513"; + sha256 = "cfb5112aca7d7e7af298a0c035ca2d549c849d9ef1536bcc958726df81f64665"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/mk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/mk/firefox-99.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "bc8826ad43d8c51379f4479366b1c52635c69660b7bcc3bcb9897e6be15fc370"; + sha256 = "bd1c8a1175326fce66cd32ebf394585fe09c5a65cf72e0e0598e572583e46515"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/mr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/mr/firefox-99.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7ef006861e0b17df49a08ebd877e91ea78d741c6966569df95554b813d0ad615"; + sha256 = "9912aff12281b1ec3b4605ae72fba291f24e193ff976658e638fdb35a9d40cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ms/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ms/firefox-99.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2ffd658538429e5dbee797c12a95f5c294622bf110a607bf5cb0219680bde05b"; + sha256 = "4f155ab0ce5420d272a86eb8b52cb816b90aabf34900bc5ba56d869e44408733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/my/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/my/firefox-99.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0d533237d125a3c73d36d8a86d58026daf8338df3034cef661510c387109b774"; + sha256 = "5b01096123e71ff94e6a44ba44edaf9453d2770f8918019e349f20f55f4fbe04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/nb-NO/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nb-NO/firefox-99.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "aeef86125435a840bfc23c23d9648e1d49a51079bda1e63276495512c8164391"; + sha256 = "2d4b0706d46e92438a3ec1067515ca4eaa37aa168f6c633339a7c78c1e447f62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ne-NP/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ne-NP/firefox-99.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "30618d33a48ac7cf990e669ff009b36d4ca491f266fb7d917ad64b213d0e47ff"; + sha256 = "3f6e8d2b081bd23bc0a6425b0f956fbb8431c301b01563d43d1ec976ec5daa32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/nl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nl/firefox-99.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "fa30128a44619961b3144b338612b8677bec82c5bb4a3ee37dfda9bc0d54f5bd"; + sha256 = "00d8fb594fd4ced7ab5c7fe3de74bc193630547b5a537f0025a1ac11ec2adc53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/nn-NO/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nn-NO/firefox-99.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "96e31471625624ab0bfeecd2abec6b78bc4414a451ae3b5488ff09fecfac23d2"; + sha256 = "de3b36fabf65ff0d6f8f24c2dd0490214f08fe4216645c7af0a0f271f443aec5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/oc/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/oc/firefox-99.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3802cce7288bf14780f78e117c528324611683dc1e8bf4db7f4c875958dd5610"; + sha256 = "df7391bdfbf21175f3e935dbdb6985b0fbd3550824d4203c93b91d52ef0841e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pa-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pa-IN/firefox-99.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "177241ad04a1d18154657e753c7058e709d260af767bc53d786f5ca76ff2250a"; + sha256 = "653b0bb83de0787c37985968822c1637e4707a9dd96a521450048e25d220f1fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pl/firefox-99.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1691326be5d01826c8ebd207a2fe3f00021a8edfcf3b44ab7f28024466118ebb"; + sha256 = "31e861138205a8d69503550dff92e3a530b5d4212bd2f1f905298cceb53dbf40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pt-BR/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pt-BR/firefox-99.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6b789a430c5c7b80f230fff69b20429a9329deb6c30f174882d71c80e3af9e02"; + sha256 = "20e992c16e7dc1d0c2e641a7ecac46e29fb00bcbe1ddca3a34cfe7a9344eadd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pt-PT/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pt-PT/firefox-99.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "e45567074b0573a3023e6c70241e0203cb8707e4d8c8a250d42aa29f207a969c"; + sha256 = "5be572a2928648ba36d1e775c79967ac17810f341dc84a2c69e8d7bad07e3a21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/rm/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/rm/firefox-99.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8e4ca7411436f910d6a2c271924fd61deb295081d7a1218cd19023635f76b18e"; + sha256 = "47d11d7f4ba7fa8753845f3ab2cb4c36c2a20fa31cd9dd561d7032f3c28a9b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ro/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ro/firefox-99.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9df7c85feafd6611c29c38ca25371b224e36fbbd602e74a986c26ef1f6f7c361"; + sha256 = "c533fb1f8f845970e647a2d612c6ca23962d476b51696d12dde01e143ec50857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ru/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ru/firefox-99.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "61015fdab4d7791a2eae09a99440df7a65828a5092d04a7376049dd7f1b5c062"; + sha256 = "571b016d12ec198148d52fa3e8ed25781cde49f3aaf8187ba881764b52d1c3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sco/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sco/firefox-99.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0481eec6bbe61c586c0a14416d7fc03df661432f2e2ad10c342fd6f6a6132e29"; + sha256 = "b30a42bd17bd2ee8843d791a00ac29f3ac91aa3d4de7b70ae603fe6365fc7906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/si/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/si/firefox-99.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1443ac2cfcea8fc577e341efc3d87406c01c94af9fadcf9672fd5283794d0107"; + sha256 = "509f987eac7b593cf24f6446ac7b78b2dc8e43dbf8b29dd82d0a107a596207f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sk/firefox-99.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4ffc688b2c38af18d28c7110f51a7a910b6671612b3a9ab657b579fabf9fb7f8"; + sha256 = "4f44c500b355c5100dc476a807e8b212962e12c45b058b14cc0b5f84abac81b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sl/firefox-99.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7eba5fe498e694650047a2d5a9bcd0ef12f65b32c554ddb64fe79ba16a097927"; + sha256 = "6ecd0f30d8ecf6e6b63512f59363c7a4a17389f468a21ac1119a98b467ecee39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/son/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/son/firefox-99.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3dec0e49c906b0923229789fac38927a19e43c27a7a6004223f50bf267fb83e4"; + sha256 = "ddefd1ef806f3b39a51cd52d33a286f0145fc106c479e3f14a45a9e63c8ee374"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sq/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sq/firefox-99.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "c2f9c4ad474223a18b11f8b0f7453b0e2a8800030ae506c7c6aabe56440e9677"; + sha256 = "b69459ef0165648ba0b13b6d4ff6b27e80ad81181bf65b415e87574b21a2a021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sr/firefox-99.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "87d70164fa38d2c8ce13bb7af9c86c84d546bba9e2bd9f37ea345664edb27a76"; + sha256 = "8d53bd7943aa99bbea08be26cd4e5465b3889c8ee0dfb718c82f1ab65ce9e2fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sv-SE/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sv-SE/firefox-99.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e6a167e9b9e10232ca338560f80eeeedc4b32854893905e97881102c718f8ef7"; + sha256 = "d70d78df84a39f921253c613518e0737439d1e516248b64c8b79fe29eadf4520"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/szl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/szl/firefox-99.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "49ca939d4a7f714ae4318a13c1229c1f6f5e8b903cba2a31f4ebd98469f6bb14"; + sha256 = "c02e86f128049d894f1d2144bc1baa3ceac4b58745c19428f2de5def7dc8ca36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ta/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ta/firefox-99.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "5f8951a89a1dbe81d5327597373738a87bc5316601714ec759a4dd9d020e7ab6"; + sha256 = "18754112a15bd8d25ebc8ee456e43fd7bc97b5af014a8bb6ebc481e0fc18559d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/te/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/te/firefox-99.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "ad4b82cdacbd019a06acdcc7f76385edcd167efa8127a5bb6456ba53bc879298"; + sha256 = "afeb892e3656d2d3c802d548bc78bada5a9a2d4f7300d5dccbb4af0b96902371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/th/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/th/firefox-99.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "cbd3ecc7e51e35aad4ab16f91e014e502005903b2a1d2fc3bebcac987e033ba3"; + sha256 = "049baf07a0db7abecdc3477c9965119c4acb0da26a9e8a4201fc2311ae3bc966"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/tl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/tl/firefox-99.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "b0466b793df5feb08eb8ff8f53b70e7d58c56602acf6c7b1dc1c97c96a881348"; + sha256 = "9898714292846b9ec1bd277c279d6bc3a33186ad02e1c09a995c766044d168a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/tr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/tr/firefox-99.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9ef3e70378c059075017ab8e3c104651e4845ceb6a981d9da85278881ea05b18"; + sha256 = "378a940ecc44d0016f5e1764f667abd60fa2241ac11477811eda477621085475"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/trs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/trs/firefox-99.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c31471dd116db01c888753a77bdd3078a84ad2bbc19d93b91e54ab79fb4b7de7"; + sha256 = "c338b68e0fb85bde3949abe2bb739e127453acd692e0460ffe1914ea4a5cf150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/uk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/uk/firefox-99.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4fde8729334a29c38d8bccad9d6632b8ba99a4faa769ce34d59b748aded50a93"; + sha256 = "2602c70ef4e449e15f95e661e916a4f5b978158f8e2e998f552ef79c4462d319"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ur/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ur/firefox-99.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "b1476c1b0bdbcc9cc6722db50f12b7fc92dcab3848478a184b6879a927e38d3b"; + sha256 = "bc195325efa7668db62c3307d488b721843c620d804e75754d540789b0545950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/uz/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/uz/firefox-99.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "3efae069d67253c450de209a3b028910aa3a3d0c14aae259d8096414d86d6ab5"; + sha256 = "14cff13fe9ba0bc91629b95cc3f2f6df5164b538be5e285acd54cb8d6656e109"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/vi/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/vi/firefox-99.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d781e5fd73bb219fdfeb9be8e6fc861886724c48aaa4bf480605e1d641ff1c80"; + sha256 = "5852f4eee3136058d7228c5eccc173153706d72b90c61ca632623d926aa84d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/xh/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/xh/firefox-99.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1db80ed81fd431373338693ea81961089e0251dadeeaf9f4e5179b0f5abd657a"; + sha256 = "ca10968059585ceb6bdc0902f94bb69798c9b0666e2dec1cbcf42e5979be97c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/zh-CN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/zh-CN/firefox-99.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b0c1d1cb71947cdab88859e08c09910120a2117440c03ea29f1c2d0b40d29918"; + sha256 = "f9d5c1a1aef830b4276e0af88c783b419674219d599c52c414bc8da3eb99fd4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/zh-TW/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/zh-TW/firefox-99.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d4807ad378d61e01d8dcf53530deec5d4fad7b8d7df50f3df0918d2b591e6d46"; + sha256 = "6857ee348392d9cedc4f2bbe1c355bcbdaa1a886d4babc65ccfb2c95421219c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ach/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ach/firefox-99.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "79b90de5371b68c404db32c4498b4866b4ed6b10dbf58f9a2e4ebcc6d7b17478"; + sha256 = "9b8a8950e770bf53cb85b0fb79f63d6aaed9a09df86421ef2ee30dab3b250ede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/af/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/af/firefox-99.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2a6f75faef4006c878b8a5156412a490c667dd970779d48a891b4d898c664e27"; + sha256 = "fd464ccc673892932cf98fc4696146034928078de14f8c5df68a9103c20076df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/an/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/an/firefox-99.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "613f776853c37115f610206f6769f36adff86ed3b5b46cbe81a2ccece469cacd"; + sha256 = "76837e6555079a23fc33e83bbf9e507d4eb6e896501d43ae78cf5b8536e88a62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ar/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ar/firefox-99.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a436337365e0865801fab136f710cb3134dfcf93896cf59aa78bf28bd70bb5a1"; + sha256 = "8346570bb699370f34d19ee93a705c9f81b57164ca14f7758c339be0837e9319"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ast/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ast/firefox-99.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "85a937e65ac45dde5235e85194c9764056fcbf531f53a443c849fc727bfc5b8a"; + sha256 = "f14088ae65cda0b3ae518cc517d6d786fa4c7a471510ddf4d45f6c268761d324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/az/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/az/firefox-99.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7a154cf0086ee80e03d88740f3b05d3de288dcab25ac151bc5ebc81af30e1220"; + sha256 = "e15d3764842a0febc41882c9f82e607b0b4dd875d765ab4079880b1cf8d0f327"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/be/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/be/firefox-99.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c05628994a45f2bebd6b912175b012aca3af563ec70b85c93f65106ccfa5b4f6"; + sha256 = "e7336bcf602bb95697eb5c134da3ef96cdb9229233a4f135e44d7439fbc3d972"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/bg/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bg/firefox-99.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9fc5b8266fb107b6ace769a0a75ed47bc4af5a9de6e215c4e0cd59e0f99c0711"; + sha256 = "a5c9d5cb091f4a643293879f7f0f0e2afa4a2e53efe08a97eca1fc8f5c77cb41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/bn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bn/firefox-99.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3010fdb412c86b282b6a6bb9531124e8e06c409c64f3738d7c142be7d83277f2"; + sha256 = "2edcbeebb3a7afdb1322c55ad1ac1a8cd4f2dae7e45a009d113cfee4d159ef2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/br/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/br/firefox-99.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "acf68c7dbc8f702f1280136f2443effbc8af793bc8be8621e617a757440c6f72"; + sha256 = "dc78c6a0a71856b42c6654b3f3d2f93bd30808878a90c49dfecf2b724f42532c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/bs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bs/firefox-99.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "233b6b37d7e4f15bc971d48c1a0d55be146bdd430bb281472367a5526867f8af"; + sha256 = "f9ba0d138252aff3abbd8f8447680b59f24f1a9b7a40d6ec753fccb74344a853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ca-valencia/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ca-valencia/firefox-99.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ee80548107642ed65feacfe480c7fa219b77ec6376244865e0deda14ffea8a7e"; + sha256 = "68a8522e03191f286514b648d1cc7d6c9b7d1683638bb7a88d2ba33c3c8031c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ca/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ca/firefox-99.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "244107e338a2a290987d452953b93049642eb5008c897216d952851895011adc"; + sha256 = "71b29981fe6da252296c9669e3b05bcfa8914282b982455f6c21e1e47fc6c452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/cak/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cak/firefox-99.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8db4e710b982e6f4f0c5e09b170884a8bd44db72a01ebb69f1eb899772132538"; + sha256 = "0964328bc005e028371852ecfeefed0b1bb4334840dd9e343ed15b3e0add3cfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/cs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cs/firefox-99.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "768976418cae1fdeddd8ebbbc53edda46c7b05b997db813573705bcb6dc80d80"; + sha256 = "b72dbc0d7bc48884fb55d1e419680d753175e2d2d7fc91b362337e5963c59339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/cy/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cy/firefox-99.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "26705ed485b8436861032e74da2ef27b06b0d4471b6f019003175b8ef99e411b"; + sha256 = "553ba01218ca17602bf67fc4cd7940d6259fd1cedf1d70665d06053b7336311f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/da/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/da/firefox-99.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2828700cbc12e6d349b862bc49258752602ad9ea74a8ad1b52a8171caff3e0ad"; + sha256 = "41c01f3979fdec4823e18031497fcccba3380393a3b5e142ab8b1e59e247c87a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/de/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/de/firefox-99.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b27bf803ca3ac8f4530339f648c2c7248e674f5e52a327d4d62d5dc8055c8683"; + sha256 = "7d88786442c856c8502019d494d8c3b5bd09ad9aa0ce1e5a45216594ac915b5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/dsb/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/dsb/firefox-99.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b3a31746bf575bf2c06227eb01cd07013b59ec2e17f6603babacc3be76222254"; + sha256 = "4b94ebf19d6fdd64e7fd1181bb47f1b89d68f04a5e9b3c29a3cd8e43c36ac898"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/el/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/el/firefox-99.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b220df0d42dee179c02066677db3edc3526d1f91df9399d6555f79dc96212ae6"; + sha256 = "12f61d5b97c906a9532028b14c7d86ef8ee04398460ecdb08496922f4c6abe34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/en-CA/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-CA/firefox-99.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a87252dfa797e7777823a84e80d6f9d8de6d1f17d29f8d2ee4ece46ab8d1b917"; + sha256 = "b5804a8edc39eca3b04ec76fd87f5fc228a3df02b47094ca1a9d2020de0c1c29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/en-GB/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-GB/firefox-99.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "37001a756bf9ea4e042ec043339e86eba4abaa4bc248bc699836ac8338f56ff8"; + sha256 = "211b7adde34ffc0ef075cc4d34fb5bbc50d00543920747db7e434268c0948e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/en-US/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-US/firefox-99.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c6e074e4083c366793dbc6d96968fd323fe0ffec1b8629be16e7c984ab1c3bef"; + sha256 = "da446e05101a645ebc51cb9fb60bb33e68b8570448072c56baea4561b638338a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/eo/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/eo/firefox-99.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "a5b6b630d5e58e20d6af73d6646954f0842ef537f8e0fdd4a424e6d34ccd2d7c"; + sha256 = "e217817389a32bfd05272210b7bef6c80547c58e51d7df69b26e2931b2e89ec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-AR/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-AR/firefox-99.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "84f7042e098eecf4974fef594c3640bd0e4c1c9fdab373c287ed580b2bac0a8b"; + sha256 = "5f5c35e50809f33b769344c986fe468a404dad2b5c0a933f5dccf9481bad32c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-CL/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-CL/firefox-99.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "15a9ee9c9765ad5e0303cd94d22c61af50c723ba5241102d327e88eed2e8110e"; + sha256 = "12434003ff87d5269cbe751adc53ce5396f98f36c8df7ab5535236cf778deb26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-ES/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-ES/firefox-99.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "acd612f04297eed5f09b47615412e3b19099610c7a62ea8468382fdbfccf7d1f"; + sha256 = "eef66f4f53ef38baf4b664b0428528117e376fbc57a743cade265adebe451d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-MX/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-MX/firefox-99.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e86c3e1a68e7b33413b0c97ac1ad63535faa618228db207abd1d0fbdae4f5f08"; + sha256 = "e56dfa4f160d60b70d905c4acde1b78d4598dadaa63a0833f638cdadcc850e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/et/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/et/firefox-99.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "dcb820763848a5bbe5b32dba6be949877bc38e123c9d7553ed569316ed1d436e"; + sha256 = "ab7b3244b55e3d663a89e46f7cf1ee211ab643c6f92112cf921b05343ded25e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/eu/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/eu/firefox-99.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "dd1b5cbb48ea9aef8d3acab9f6a4c8de44128584b9d95fd50b2ed1b1ca79d367"; + sha256 = "b626fa244d85a9c266e2c11f311133e6704adfcfcaa0ebd00a7dbf487e0d7a8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fa/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fa/firefox-99.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "e4e66fb13ac850712bfa9946c05b97bc69f1d750037f8524ad766d6fcde67d86"; + sha256 = "743f58643846d3a769da6ba2fec2ba50f7c00a7f4a4447b684ef08f64d8be16d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ff/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ff/firefox-99.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "a793ad05230d98cfb4a003263082a64de86998eb5148ab3827b3e999e242a758"; + sha256 = "3cd80abe0d157427d17cc502cdfb67fb4f48f237de97c7ba9e9d4af5f8ee1fc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fi/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fi/firefox-99.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0567d3400a281bd569c81c406b462a101d3dcf041c4ec4e0e9753301ec0aa629"; + sha256 = "d7ddda88e29c89e34c56e7467aabd3262430267fda1814933b2b03e1201b549d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fr/firefox-99.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "fbb0392b310297e0ee974486092f7e6ed74f63d1f190218c63796bedf4e2b90d"; + sha256 = "b442b7cd5b1dafe98fb04ef68ef3d21fdb6a6beeacda3537c0fb2ff26a5d0a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fy-NL/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fy-NL/firefox-99.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8eccc6e66de2b523e4e811d5d57b8eb17496ea9c5566c29ae7fedeb751876bf9"; + sha256 = "fbbe401d602c88cec32ea608eab714ebfa873ccf70d07102bfd3b8c59bcc39e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ga-IE/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ga-IE/firefox-99.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "239f4dfc4e5fc29b32a75ce0c4397a8785f3cc0b5e10b61b08565b6902342cbe"; + sha256 = "fe6c9544bf67a30bd8266fafa92c56e1825c0e155d6e30225b5587719a683fe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gd/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gd/firefox-99.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "312c89bee7911e74fb87ce7cd128d55c7e4b0f706dba5950e7b45d39cfd5a817"; + sha256 = "d62bad0b209df9b74173e894af3a5e6c48b8d9321a2bbc3ef05e40f24db972e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gl/firefox-99.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "98d7ee9fb9dc4442d475db37925128858d807f3e686e9624902e62a872322a91"; + sha256 = "caa93a08ac9fe456f6f1480b514492ba884814dada450845a86cfb486463ef90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gn/firefox-99.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "5d1e387fc779d0226347dbc6abfa9acd5ed5c39f30da22f36789dc1b2d68326e"; + sha256 = "eb44f048ae40e1c5693bcb31f7c2b50644b55c7f7229fb087b3757ad7c232fc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gu-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gu-IN/firefox-99.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "51f5f582d2b2bda10ac528a2b0842ca86b29d20421ba83ae56493d791613bbc0"; + sha256 = "5a536e35bb8734541b9a8266def5418c8b4eae66a60323c40dca7e0bc11e2ecd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/he/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/he/firefox-99.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d0192b6ad1508b1ebae13cbd3bc3d7fbf5b5e222d5f5cba1857d2b3d73c1c048"; + sha256 = "b045e3b0a9789804775fdb9f28cf7c8a1293b12adb06f105afc4001648f22dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hi-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hi-IN/firefox-99.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "9bf5814ada09f878d484ccd4a37d56054316372caf9766b8da70cd81f817f208"; + sha256 = "955ba8c9936da6b12f1422b0de5a696a849a72a352b994d62818477b07af5890"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hr/firefox-99.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4c2453a9ac74a71d7f5dfea3474ae68cd5fc2d4a85aeb04e367116d80df9cdbd"; + sha256 = "bbbc1d1bd23b49197861fe389d2ab92580def84ce97f1643e50f4cd8de748e8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hsb/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hsb/firefox-99.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c3904c1a8b1ecedded23ceef7d8168865a0f18f08b81600e013f7cfebc5d5ce7"; + sha256 = "23afed3429959fee426a2e5fc08cb0cba058e2544b5f8c742fbcbdd51ac31afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hu/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hu/firefox-99.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e05debfc803f3752dfaffef6b30e0079f5af44107217c362325e1e5922eb18a0"; + sha256 = "2a42af969db30183a5fc547f4cdc75db99a8405550a2791de4303e5604a24133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hy-AM/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hy-AM/firefox-99.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "364a7408f1d2a150f04ab759da6a45021fad3bca5ba2811931df46960671c1ee"; + sha256 = "79d134d0c95fb3be213ded965d02ec898891efe2c07dd82046e02adeb24641e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ia/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ia/firefox-99.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5dc2a481ce5e9bd54241363fb88b62a655584293fd9d3f7ddf13dd0195d8cea0"; + sha256 = "3e9f078057e53822a59509f1658f64b8d5563ffc69528193aa1473668e390f62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/id/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/id/firefox-99.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b9d5b10461130d5c2895b04604be7eccf8979b87c4e8acc03173709979185eb5"; + sha256 = "5133875012d3165d3941740b80addfa3adcd0eec015dc21a6b1261b4d48b824c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/is/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/is/firefox-99.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "6e4506fd90b7f3ee316a500f5e2fd3e2063fbeea79f3a86dcfc8573b8c355469"; + sha256 = "d59c86f8c71468cbbb7d8d4641e8baa8672fae0ee38a232782a63f29d1ad4d10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/it/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/it/firefox-99.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2bdc9c8aa3f8b0b86b0310a95e4f3aa74de418aef7dadd7ef3c24af51c4bf0ed"; + sha256 = "d583c577d73623e06aec514635c4191a9dbfc14a8cfd88880bc50abb0f5ae308"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ja/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ja/firefox-99.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8e035fa783b64ec5e8503bf329346799aec628df03b013319586cf04969d36f9"; + sha256 = "31fd6b653338050651b8432a84278ae26bccdd7cdf0d4c2674a6208f5a3ad9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ka/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ka/firefox-99.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "59d2b9eaed8a898be979286d7ecf963e4f2241dfcbed9ac8e0d0b1821fb9e2fd"; + sha256 = "09e6a905151bcf7d373c6b9ec3bb00043361a4e06e08752834d581f6f211a595"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/kab/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kab/firefox-99.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2506702d67e1576df307bfcfcb9e20809352a37be3650c9a454e906a5d78fd2c"; + sha256 = "117bd25831806d7d8774907a49288ea91c8160add23d0decce9d1dd95bd3c918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/kk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kk/firefox-99.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "df0e505fd8552384ea55024531378e7228e35d9a40b66288631f524a565b94c3"; + sha256 = "6511f3a53cea4f210b52d37e7298427382c7a5738e1a055b38a4d41b6eb9fe3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/km/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/km/firefox-99.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "fc2202caadc90364dca89329a335869dd9bc8a2240fb95d5b3c6fcfdd6586be1"; + sha256 = "af231614cea8b247215d79c101bd59a135ff86965b6aaab2226016215164d240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/kn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kn/firefox-99.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "8b4fe5e47aeaf7d1f15fa00d74088689f40a9d92df893b79d6c3c950f182c234"; + sha256 = "abe0ba12cad7eb53f8592476efe3fbd93a1cf3d1108828db7eb3d9d6d3b639a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ko/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ko/firefox-99.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "ce2a3f64b6d2b4ca319ed020ef621974977216aa468811609431a618aee9b77e"; + sha256 = "6415de365af3c132afacaf114a804446d4df566693254e6659551d95016ed830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/lij/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lij/firefox-99.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6b8ebcebb1c9ffec9993663ef6040007909136d99dc9a2f724d16d9b9dc1f647"; + sha256 = "d882562d34ea5e49cd035cda2aa2489bc75db90b1e777be1a74dedc394d02e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/lt/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lt/firefox-99.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "798c36f256f173fc5662d5edca6c4eaa55bc0c4f794a481524871aebabcf9b0f"; + sha256 = "59add081878210ffbb9445dacf12f999ea6995fddec1444fb11b9c93c615abb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/lv/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lv/firefox-99.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4ea59a53fcbfd93959540edd12b4760586ca3f0a26fcdbdafa13cad70db7ca0c"; + sha256 = "d11227308bb407aedc6d2559256d92fe931e5ea34498b511f5e23b8091e91766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/mk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/mk/firefox-99.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "c4bab25688564f1dc34b14d96695bb03881af3e2551040a8cd3e4543d8107338"; + sha256 = "34e1a97d0944d241d12b8a5d2f64ff34f7bc7a3c43b23ac05d13d794bf36e960"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/mr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/mr/firefox-99.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "e440be0dcd8714e7f08dad0800ccb642677e98444fd115c9a8ee5684f6b619e7"; + sha256 = "98746bc7f75898bbd5ca5c38b47f311d09d43a2264da85b0303ea4bd01d7a0fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ms/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ms/firefox-99.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "4d09e9925b2c67c1ea082b895f62db8f1282dbad073a851504187ff9b1725e74"; + sha256 = "48a1a0892ad1ef2ab03e3e66f05401c1d6e231801d5f03ac63a7984225624818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/my/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/my/firefox-99.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "be56fa7ae49aa26d174633d7e2bf426fb6931901176d8ecd26fdcc6e02749b6f"; + sha256 = "745a7e7c73d3161aff4bcaba915ed9939970d8e4478cbaebbb32f47380f1c029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/nb-NO/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nb-NO/firefox-99.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "52a14a147126a49314425fb9ce2c964786cf409e176e1fc949ecf9a1c67627aa"; + sha256 = "c67804a726c68c534fc763893f0e7cc94ab55b9fd4844113ffffb467cefb63ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ne-NP/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ne-NP/firefox-99.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "25fa25a6d63008badc2bdab5242c0620520b427df68de45fab873c230f7e948f"; + sha256 = "69073cf042a8e78184f7f01db3ca88bd3b3d59960a3e51124cb9908150452115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/nl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nl/firefox-99.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0d751560dfd83afdbe69aab576449ab25a3b2b66ebed28ff4d13ddfefe520f9b"; + sha256 = "24d30ce7f9cc2ad445c9aca32616a2efb9a3d392e62f855bbf5709d8160823bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/nn-NO/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nn-NO/firefox-99.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "baf6b5ae7d2848344648fe3b3fa95991ccea45d2302eec5c657671a5736cbc7f"; + sha256 = "d3a5034cb8ce135ec245c2ef94e799a31744a8592e6c5ba3935b19a77c087d53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/oc/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/oc/firefox-99.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "bcf9df67acd24f0bdd4794820863f91b60bfe745471b0e88d29a22a225922665"; + sha256 = "dbe0dfd961a543017ca8dcca6fae7168ca4d85a637f4d2dae7b02b6ea671b28f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pa-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pa-IN/firefox-99.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c0d8aaab99ddfa3b0be3bc323483f99094feaa67aa3d94bab4f5cf2ca8612fb7"; + sha256 = "1bcfb488ec1f3934415ee4af684e7dd40966265be65f43488d3d670d14790124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pl/firefox-99.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "df2d1ba0a3db60f32c9031db067d14a56f06ebb8a3e04b540d4d7f15e2bc4367"; + sha256 = "484a8ee788ab6edce6b66f31c94f7fd0e671269ae470569129662ed4b7e9294b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pt-BR/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pt-BR/firefox-99.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8f038e619e5380491b2002909930ac254a60f92215ba922a7fb2ec0895047a91"; + sha256 = "d764f17b9eb2c8ac61c92490a20bcb4dd83810635b89a6405c4a0389ab15104f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pt-PT/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pt-PT/firefox-99.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "749ba7ce1e93dad3a95f28f5ec6bb81e9bcf63a7c4d436487422126d2f04d8c3"; + sha256 = "1a9b64665abf305dd38c6441e22448fa0cd5d142a69de96220b2f8683230a341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/rm/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/rm/firefox-99.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1b3ff965145535d0c3275366c27c4ed3a0d95a47e42d8baa7088dcdd58fb5e13"; + sha256 = "8870c35cf68d654db389cea3df9951660d371c53804cb2d9fb5d8006155cb82c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ro/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ro/firefox-99.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "51640a0f3792d962a31ab494fe9c8f6a31cb6c2093d06f2293b2d2614d82e17a"; + sha256 = "cb72b5316bc807095a64d8767822732ad18a2cec28c7a23bd603dcafbfd08f1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ru/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ru/firefox-99.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "01e25d1e39ad93fdaad2382039dbf3b0d9a7e1c6f7993ebe6088a7f0d6545ad1"; + sha256 = "a5456041bc8cfc22d3f7a96a610c6d37b77bcba32b630fdab7fdb2753e46b40c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sco/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sco/firefox-99.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "cf27b720e94a69df2a18ff9846108672bfe757224b71625a1ff1445ab11d5489"; + sha256 = "539014a44ac79130666c6c4f5205ababf3bbb17d357632a0ba584a73c63bda93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/si/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/si/firefox-99.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "4e64606407dfb9d9bbd44dc8eeb493208d546cb8d79c526a3e261a18b899b050"; + sha256 = "5f231e14acf1c896fdb9778d7821dfda13a756d4f861e74076b8fb02848dd08d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sk/firefox-99.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7917d08b5870a3e02c7d2393a9bfae39e9bc45114ce37c1e2cebbe81d6ed3f60"; + sha256 = "17c32fb881566fa09759d1374e957023c5fc6123b24791d4e8c94d4c2e971405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sl/firefox-99.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "12c7b3b525fc7fa1ab76f12bb837f481ccb30b317202f185cf5e71bda80048d8"; + sha256 = "d6121d2dcf47504111e924150cdf8360b039a5d7c4cef2a42b80ddb876a47127"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/son/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/son/firefox-99.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "b0d0d04af3623eca737b8325e607e330636531525b92e23150d05204b29ba7e3"; + sha256 = "e83f6e4da3820c91cdb3125d49a71e4417cb37c0e7598fcf1bf138f21d94f485"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sq/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sq/firefox-99.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "4ee2854ec755ef5c1e4f4761819cd7125bbcff832d7c8ce6f3ee96e92c343b8c"; + sha256 = "dcf6ed239eb78e370db2a60b9fc0eed96f71e741be66f9ac2a537357648304b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sr/firefox-99.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6a2e415702701fb082beacababab5cf9368790a9876114eb2186f5691f32d265"; + sha256 = "d724ad02d8153aa15bfeba33e476bbbc937c5a5210a3747a5ba253ab3605b725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sv-SE/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sv-SE/firefox-99.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cdae3c72e5f79fb2a5ed988d39eac0f21e321feebe9ca67d8b7362c80160d7d4"; + sha256 = "6c6ce7c4a7bf73b3cc26af264e4d6dfabcf75d88226903ffb11142657cfbf94e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/szl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/szl/firefox-99.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d39ec7a68195af2bded9826a251904b5f501c58dcb3c92789a2ab5251fe2618f"; + sha256 = "d9996d12531225e5d181a2304326ca8de19cd6c0f02efedc890f90e4d5d1b72e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ta/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ta/firefox-99.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "a7220a78f600010125b20c22205865169330c45bb9eacf4496c26ccf780257d2"; + sha256 = "d4b3776a8728da72a233db501eed0014cb60e87dd0c3b76cb4e5fd834dc323da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/te/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/te/firefox-99.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8c4973de96cda2a3448a30ec4776e488ceac9b27a9f5142f2256b92ac5c31102"; + sha256 = "8246cfb157b68d09a7e57f910ae33d522495120112a6debc3cfeb60a3e238d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/th/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/th/firefox-99.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "aefbf224abd9b77303b90437a5ab87bacd4f04334d84c29c3d41c4b9922282e3"; + sha256 = "80c37b977ae6eaf6da2647800584a6ff9c430d6fd368ad89713a1ed7166cb197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/tl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/tl/firefox-99.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d0c1e4c099482fbcbfdea2f45b3f6e1ec6744b3073d5c0ab840ed6eab129aa26"; + sha256 = "f7757f0e751989854f240bf5eb13b8c660a587bdb7f44616ee8e7a41bb71b2d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/tr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/tr/firefox-99.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "97b7f1c90fe846a4eb8c1a0dbef7eb9fa8f3a536f8e37b24565b4cb42ede27bc"; + sha256 = "533a04e78947202d86dbd79b170495e9027c81bd2db8be3d5f281d665e3505d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/trs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/trs/firefox-99.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "3910053c3e0ab255cd595cdebbbb0e0720a32cc1f20d6e74b5fdd3427fbb5137"; + sha256 = "eda683d0df13db0de392bd136ed86c3abbaf41a0617d559ee1d308e28f519487"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/uk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/uk/firefox-99.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4736b57b2beea7f6a09a289b3ce6921082541acf20faf9d6165658ba96e06dc2"; + sha256 = "4c1cce01a785b8fa7c31fd5394337231db614cd96dacfa7963bb612996fc287c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ur/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ur/firefox-99.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "072b4f58064362f74eef2984c94cf42302bff9e61d0f9d8adf13124cef699386"; + sha256 = "628baa7d2e0f200ba2b623aada71bd0e69856b903a92d98c46f0552df8acca4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/uz/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/uz/firefox-99.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "42f99dd9d61f29491ba55edb806131a4768768145676b42c886b5848d09dd451"; + sha256 = "626cc29fd753802c3a57d2521553d5957f985b925561eee6c2046464ded084f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/vi/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/vi/firefox-99.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d9c9cf96117b7e759291d7731fb53b51fc9f7d07b95ec7d479f6a03c34227b9a"; + sha256 = "963ea1b4758b64b67fe05a25d6775a1f8601a438d639bdda0d3ed740fe9ad8a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/xh/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/xh/firefox-99.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "929005cf3eba0a59e13e9af9f1595e218757a1d08c7c9a50cfc2323cd8d2de1c"; + sha256 = "030f5a08c37ecaae8ef9c59f58e007b3c3484b9eabba33dbae91d89710390d85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/zh-CN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/zh-CN/firefox-99.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "06bef0564337cfeab47ce84a095e9bcd347df4f6c821eb5d0404d984689c9e6d"; + sha256 = "097b3e3912b1b024d7cb615ed400ea244af47ef90cdb0c89d7223915a040108d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/zh-TW/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/zh-TW/firefox-99.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7eda1a1131117ceb3b513dc345c62397542bcb58cda1e97ade47fedb4fe704c9"; + sha256 = "ca10fd6cafa25cdbd12b4e087d80a8212c947099a848b0b9f754ec6dbe8c6be9"; } ]; } From 983a9f4bb6fa8f450e932cba57e73c2bf70792bd Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Tue, 29 Mar 2022 15:12:37 -0400 Subject: [PATCH 293/385] ocamlPackages.phylogenetics: 0.0.0 -> 0.1.0 --- pkgs/development/ocaml-modules/phylogenetics/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 1cb348a41656..366ad9cc24ac 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -16,13 +16,11 @@ buildDunePackage rec { pname = "phylogenetics"; - version = "0.0.0"; - - useDune2 = true; + version = "0.1.0"; src = fetchurl { url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256:0knfh2s0jfnsc0vsq5yw5xla7m7i98xd0qv512dyh3jhkh7m00l9"; + sha256 = "sha256:064ldljzh17h8pp0c27xd1pf6c50yhccw2g3hddzhk07a95q8v16"; }; # Ensure compatibility with printbox ≥ 0.6 From adbf08f9ec3247e43e444c57bac01b52dd648ac6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 8 Apr 2022 11:36:20 +0800 Subject: [PATCH 294/385] update-systemd-resolved: inject PATH to avoid wrapping --- .../openvpn/update-systemd-resolved.nix | 34 ++++++++++++------- .../openvpn/update-systemd-resolved.patch | 26 ++++++++++++++ 2 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 pkgs/tools/networking/openvpn/update-systemd-resolved.patch diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index 5a34d5a7ffe7..1b514eae02f0 100644 --- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -1,34 +1,42 @@ -{ lib, stdenv, fetchFromGitHub -, makeWrapper -, iproute2, systemd, coreutils, util-linux }: +{ lib +, stdenv +, fetchFromGitHub +, iproute2 +, runtimeShell +, systemd +, coreutils +, util-linux +}: stdenv.mkDerivation rec { pname = "update-systemd-resolved"; + # when updating this, check if additional binaries need injecting into PATH version = "1.3.0"; src = fetchFromGitHub { owner = "jonathanio"; repo = "update-systemd-resolved"; rev = "v${version}"; - sha256 = "19zhbpyms57yb70hi0ws5sbkpk2yqp9nnix3f86r36h1g93m70lm"; + hash = "sha256-lYJTR3oBmpENcqNHa9PFXsw7ly6agwjBWf4UXf1d8Kc="; }; - nativeBuildInputs = [ makeWrapper ]; - - buildFlags = [ - "PREFIX=${placeholder "out"}/libexec/openvpn" + # set SCRIPT_NAME in case we are wrapped and inject PATH + patches = [ + ./update-systemd-resolved.patch ]; - installPhase = '' - wrapProgram $out/libexec/openvpn/update-systemd-resolved \ - --prefix PATH : ${lib.makeBinPath [ iproute2 systemd coreutils util-linux ]} + PREFIX = "${placeholder "out"}/libexec/openvpn"; + + postInstall = '' + substituteInPlace ${PREFIX}/update-systemd-resolved \ + --subst-var-by PATH ${lib.makeBinPath [ coreutils iproute2 runtimeShell systemd util-linux ]} ''; meta = with lib; { description = "Helper script for OpenVPN to directly update the DNS settings of a link through systemd-resolved via DBus"; homepage = "https://github.com/jonathanio/update-systemd-resolved"; + license = licenses.gpl3Only; maintainers = with maintainers; [ eadwu ]; - license = licenses.gpl3; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.patch b/pkgs/tools/networking/openvpn/update-systemd-resolved.patch new file mode 100644 index 000000000000..e03c476e5090 --- /dev/null +++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 524b6b7..8a880f1 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,6 @@ all: install info + + install: + @install -Dm750 $(SRC) $(DEST) +- @install -Dm644 $(SRC).conf $(DEST).conf + + info: + @printf 'Successfully installed %s to %s.\n' $(SRC) $(DEST) +diff --git a/update-systemd-resolved b/update-systemd-resolved +index 1452e1a..39641cb 100755 +--- a/update-systemd-resolved ++++ b/update-systemd-resolved +@@ -29,7 +29,8 @@ + DBUS_DEST="org.freedesktop.resolve1" + DBUS_NODE="/org/freedesktop/resolve1" + +-SCRIPT_NAME="${BASH_SOURCE[0]##*/}" ++PATH="@PATH@" ++SCRIPT_NAME="update-systemd-resolved" + + log() { + logger -s -t "$SCRIPT_NAME" "$@" From 7aa2c5cfb4c771302c4bcd2f38d0590952bf93df Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 8 Apr 2022 11:36:39 +0800 Subject: [PATCH 295/385] openvpn: use update-systemd-resolved instead of vendoring it --- pkgs/tools/networking/openvpn/default.nix | 29 ++++++++++------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 9200bc3f30e8..71a14b169ac1 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,26 +1,21 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config -, makeWrapper -, runtimeShell , iproute2 , lzo , openssl , pam , useSystemd ? stdenv.isLinux , systemd +, update-systemd-resolved , util-linux , pkcs11Support ? false , pkcs11helper }: -with lib; let - # Check if the script needs to have other binaries wrapped when changing this. - update-resolved = fetchurl { - url = "https://raw.githubusercontent.com/jonathanio/update-systemd-resolved/v1.3.0/update-systemd-resolved"; - sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc"; - }; + inherit (lib) versionOlder optional optionals optionalString; generic = { version, sha256 }: let @@ -36,7 +31,7 @@ let inherit sha256; }; - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lzo openssl ] ++ optional stdenv.isLinux pam @@ -52,15 +47,15 @@ let ++ optional pkcs11Support "--enable-pkcs11" ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; + # We used to vendor the update-systemd-resolved script inside libexec, + # but a separate package was made, that uses libexec/openvpn. Copy it + # into libexec in case any consumers expect it to be there even though + # they should use the update-systemd-resolved package instead. postInstall = '' mkdir -p $out/share/doc/openvpn/examples - cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples - cp -r sample/sample-keys/ $out/share/doc/openvpn/examples - cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples + cp -r sample/sample-{config-files,keys,scripts}/ $out/share/doc/openvpn/examples '' + optionalString useSystemd '' - install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved - wrapProgram $out/libexec/update-systemd-resolved \ - --prefix PATH : ${makeBinPath [ runtimeShell iproute2 systemd util-linux ]} + install -Dm555 -t $out/libexec ${update-systemd-resolved}/libexec/openvpn/* ''; enableParallelBuilding = true; @@ -69,7 +64,7 @@ let description = "A robust and highly flexible tunneling application"; downloadPage = "https://openvpn.net/community-downloads/"; homepage = "https://openvpn.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ viric peterhoeg ]; platforms = platforms.unix; }; From 4f9857143ccd4b4ddf972cae7a1002be01b6fcdf Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 12 Apr 2022 17:12:14 +0200 Subject: [PATCH 296/385] github-runner: 2.289.2 -> 2.290.0 --- .../tools/continuous-integration/github-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index f53ebd645d05..a90b45a2c4b8 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.289.2"; + version = "2.290.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-yISJ/qGJ+tGnJOqpTUe+rkG4UGzTZ5tIXix6wuDKXO0="; + hash = "sha256-5ASKWDtASVtGDPn68tjjx8ZTVv1E14M26OCDpMJ+nJU="; }; nativeBuildInputs = [ From e9e76773efa9d6818b97978bfe8d3bd25c51920f Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 12 Apr 2022 18:33:08 +0300 Subject: [PATCH 297/385] napari: fix after the transition to pyproject.toml --- .../python-modules/magicgui/default.nix | 11 +++- .../python-modules/napari-npe2/default.nix | 54 +++++++++++++++++++ .../python-modules/napari/default.nix | 17 ++++-- pkgs/top-level/python-packages.nix | 2 + 4 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/napari-npe2/default.nix diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index 28fa4c9c4e2a..e437ee7290b2 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -9,20 +9,29 @@ , pyside2 , psygnal , docstring-parser +, napari # a reverse-dependency, for tests }: buildPythonPackage rec { pname = "magicgui"; version = "0.3.7"; + + format = "pyproject"; + src = fetchFromGitHub { owner = "napari"; repo = "magicgui"; rev = "v${version}"; sha256 = "sha256-LYXNNr5lS3ibQk2NIopZkB8kzC7j3yY8moGMk0Gr+hU="; }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; checkInputs = [ pytestCheckHook pytest-mypy-plugins ]; + doCheck = false; # Reports "Fatal Python error" - SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.tests = { inherit napari; }; meta = with lib; { description = "Build GUIs from python functions, using magic. (napari/magicgui)"; diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix new file mode 100644 index 000000000000..0fd2c3e5e979 --- /dev/null +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, appdirs +, pyyaml +, pytomlpp +, pydantic +, magicgui +, typer +, setuptools-scm +, napari # reverse dependency, for tests +}: + +let + pname = "napari-npe2"; + version = "0.3.0"; +in +buildPythonPackage { + inherit pname version; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "napari"; + repo = "npe2"; + rev = "v${version}"; + hash = "sha256-IyDUeztWQ8JWXDo//76iHzAlWWaZP6/0lwCh0eZAZsM="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + # npe2 *can* build without it, + # but then setuptools refuses to acknowledge it when building napari + setuptools-scm + ]; + propagatedBuildInputs = [ + appdirs + pyyaml + pytomlpp + pydantic + magicgui + typer + ]; + + passthru.tests = { inherit napari; }; + + meta = with lib; { + description = "Yet another plugin system for napari (the image visualizer)"; + homepage = "https://github.com/napari/npe2"; + license = licenses.bsd3; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index babdbc4506dc..f7d5b24c19e5 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -6,7 +6,7 @@ , superqt , typing-extensions , tifffile -, napari-plugin-engine +, napari-npe2 , pint , pyyaml , numpydoc @@ -29,15 +29,24 @@ }: mkDerivationWith buildPythonPackage rec { pname = "napari"; version = "0.4.14"; + + format = "pyproject"; + src = fetchFromGitHub { owner = "napari"; repo = pname; rev = "v${version}"; sha256 = "sha256-uDDj5dzsT4tRVV0Y+CYegiCpLM77XFaXEXEZXTnX808="; }; - nativeBuildInputs = [ setuptools-scm wrapQtAppsHook ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + wrapQtAppsHook + ]; propagatedBuildInputs = [ - napari-plugin-engine + napari-npe2 cachey napari-svg napari-console @@ -60,7 +69,7 @@ jsonschema scipy ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + dontUseSetuptoolsCheck = true; postFixup = '' wrapQtApp $out/bin/napari diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5aaf35c45a45..7f29b76457d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5429,6 +5429,8 @@ in { napari-console = callPackage ../development/python-modules/napari-console { }; + napari-npe2 = callPackage ../development/python-modules/napari-npe2 { }; + napari-plugin-engine = callPackage ../development/python-modules/napari-plugin-engine { }; napari-svg = callPackage ../development/python-modules/napari-svg { }; From 239b635ac2d4a252698b60444507c904e30f7627 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 17:52:55 -0300 Subject: [PATCH 298/385] gsctl: fix tests for linux --- pkgs/applications/misc/gsctl/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index de6071ef0600..5014031d6c82 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, kubectl, stdenv }: buildGoModule rec { pname = "gsctl"; @@ -13,10 +13,16 @@ buildGoModule rec { vendorSha256 = "sha256-NeRABlKUpD2ZHRid/vu34Dh9uHZ+7IXWFPX8jkexUog="; - ldflags = - [ "-s" "-w" "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ]; + ldflags = [ + "-s" "-w" + "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" + ]; - doCheck = false; + checkInputs = [ + kubectl + ]; + + doCheck = !stdenv.isDarwin; meta = with lib; { description = "The Giant Swarm command line interface"; From 2e7cca769034e5cb84d56138f2b198ee12fefd11 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 12 Apr 2022 09:37:11 -0600 Subject: [PATCH 299/385] element{-desktop,}: 1.10.8 -> 1.10.9 --- .../element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/pin.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 46ee444c3783..30593d17ba5f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.8", + "version": "1.10.9", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index d487e9ae3160..01d9ed0a7967 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.8", - "desktopSrcHash": "S9MQIn773BzCH4dsTkD1DpIThDzoIGr4Heaie2Qs0jY=", - "desktopYarnHash": "1imx43qbpj08l6d0fji31kcxqshcpr0ch8dzfbbgxyjvblq2p8ln", - "webHash": "02i6l3armzr19kki3hgshhzkdpb3001nilh4h10hr3xw5z711ppr" + "version": "1.10.9", + "desktopSrcHash": "vbVnkb/sVW+c7JGIT8Fcjtwe7i10aY0mBoiNeAD8tvY=", + "desktopYarnHash": "0jm0i1yyfkg1ll11pb3qif1vdxx6rp0yl9kd8jg9nhsg2jzw66pr", + "webHash": "0yp29h2cmi18y8g8scqx3zmc1l80q28gid709ysqqb349gy1kls8" } From a47871ffc46c5e255ddc2c97e8ad3baa06fea72a Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 12 Apr 2022 18:46:37 +0300 Subject: [PATCH 300/385] shibokeh2: mark as broken for python 3.10 --- pkgs/development/python-modules/shiboken2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 11461a9545cd..2a7e7613dfb8 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { license = with licenses; [ gpl2 lgpl21 ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; - broken = stdenv.isDarwin; + broken = stdenv.isDarwin || python.isPy310; }; } From a1d12edc46f08cf09a8caad32bfff64df8bca75e Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 12 Apr 2022 18:49:08 +0300 Subject: [PATCH 301/385] nixVersions.unstable: pre20220322 -> pre20220411 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4ad17072dc85..027efe468694 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -85,12 +85,12 @@ in lib.makeExtensible (self: { unstable = lib.lowPrio (common rec { version = "2.8"; - suffix = "pre20220322_${lib.substring 0 7 src.rev}"; + suffix = "pre20220411_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "d5d4d980427aca3849b90bfe1694b6d1d14532fb"; - sha256 = "sha256-fV7nUcRhVmgIvDUraAzHV2TDVHDn1jETfv2zdDMQ59Y="; + rev = "f7276bc948705f452b2bfcc2a08bc44152f1d5a8"; + sha256 = "sha256-brqGGdr2CzqufY3NXU8tGm6QbCTSFGfboruU2cUWhu8="; }; }); }) From e8d30cd3291c3119270beb0f2312f819eb2203e0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 12 Apr 2022 19:03:43 +0300 Subject: [PATCH 302/385] nixVersions: add artturin to maintainers --- pkgs/tools/package-management/nix/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 2f9a6be8f66b..1cf2beb2bbb5 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -201,7 +201,7 @@ self = stdenv.mkDerivation { ''; homepage = "https://nixos.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ eelco lovesegfault ]; + maintainers = with maintainers; [ eelco lovesegfault artturin ]; platforms = platforms.unix; outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; }; From 46c333138443b76362591318ffd5541fcce53540 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 12 Apr 2022 17:46:57 +0200 Subject: [PATCH 303/385] nixos/paperless-ng: simplify redis logic - Rename `hasCustomRedis` -> `enableRedis` - Extract var `redisServer` --- nixos/modules/services/misc/paperless-ng.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/paperless-ng.nix b/nixos/modules/services/misc/paperless-ng.nix index 632e824755c4..2aa94199b0a4 100644 --- a/nixos/modules/services/misc/paperless-ng.nix +++ b/nixos/modules/services/misc/paperless-ng.nix @@ -6,7 +6,9 @@ let defaultUser = "paperless"; - hasCustomRedis = hasAttr "PAPERLESS_REDIS" cfg.extraConfig; + # Don't start a redis instance if the user sets a custom redis connection + enableRedis = !hasAttr "PAPERLESS_REDIS" cfg.extraConfig; + redisServer = config.services.redis.servers.paperless-ng; env = { PAPERLESS_DATA_DIR = cfg.dataDir; @@ -15,8 +17,8 @@ let GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; } // ( lib.mapAttrs (_: toString) cfg.extraConfig - ) // (optionalAttrs (!hasCustomRedis) { - PAPERLESS_REDIS = "unix://${config.services.redis.servers.paperless-ng.unixSocket}"; + ) // (optionalAttrs enableRedis { + PAPERLESS_REDIS = "unix://${redisServer.unixSocket}"; }); manage = let @@ -36,7 +38,7 @@ let "-/etc/hosts" "-/etc/localtime" "-/run/postgresql" - ] ++ (optional (!hasCustomRedis) config.services.redis.servers.paperless-ng.unixSocket); + ] ++ (optional enableRedis redisServer.unixSocket); BindPaths = [ cfg.consumptionDir cfg.dataDir @@ -73,7 +75,7 @@ let RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; - SupplementaryGroups = optional (!hasCustomRedis) config.services.redis.servers.paperless-ng.user; + SupplementaryGroups = optional enableRedis redisServer.user; SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ]; # Does not work well with the temporary root @@ -198,8 +200,7 @@ in }; config = mkIf cfg.enable { - # Enable redis if no special url is set - services.redis.servers.paperless-ng.enable = mkIf (!hasCustomRedis) true; + services.redis.servers.paperless-ng.enable = mkIf enableRedis true; systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" @@ -247,7 +248,7 @@ in echo "$superuserState" > "$superuserStateFile" fi ''; - } // optionalAttrs (!hasCustomRedis) { + } // optionalAttrs enableRedis { after = [ "redis-paperless-ng.service" ]; }; From b56b2401b8be1c722d751af1e88b2d3f1db94c30 Mon Sep 17 00:00:00 2001 From: Quag Date: Sun, 10 Apr 2022 23:48:03 -0700 Subject: [PATCH 304/385] basiliskii: init at unstable-2022-04-05 --- maintainers/maintainer-list.nix | 6 ++++ .../emulators/basiliskii/default.nix | 28 +++++++++++++++++++ ...ve-redhat-6-workaround-for-scsi-sg.h.patch | 10 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 46 insertions(+) create mode 100644 pkgs/applications/emulators/basiliskii/default.nix create mode 100644 pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 824778ac0327..4344773bd540 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10210,6 +10210,12 @@ githubId = 115877; name = "Kenny Shen"; }; + quag = { + email = "quaggy@gmail.com"; + github = "quag"; + githubId = 35086; + name = "Jonathan Wright"; + }; queezle = { email = "git@queezle.net"; github = "qzle"; diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/applications/emulators/basiliskii/default.nix new file mode 100644 index 000000000000..ec7076db4678 --- /dev/null +++ b/pkgs/applications/emulators/basiliskii/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2 }: +stdenv.mkDerivation { + pname = "basiliskii"; + version = "unstable-2022-04-05"; + + src = fetchFromGitHub { + owner = "kanjitalk755"; + repo = "macemu"; + rev = "d4baa318e49a29d7ea5fc71a637191d6c470546f"; + sha256 = "jBKTC2fIPJ6mSkMABNxcd2ujXJ+duCXw291iz5ZmiVg="; + }; + sourceRoot = "source/BasiliskII/src/Unix"; + patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; + buildInputs = [ SDL2 gtk2 ]; + preConfigure = '' + NO_CONFIGURE=1 ./autogen.sh + ''; + configureFlags = [ "--enable-sdl-video" "--enable-sdl-audio" "--with-bincue" ]; + + meta = with lib; { + description = "68k Macintosh emulator"; + homepage = "https://basilisk.cebix.net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ quag ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch b/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch new file mode 100644 index 000000000000..8535d6227c29 --- /dev/null +++ b/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch @@ -0,0 +1,10 @@ +diff --git a/Linux/scsi_linux.cpp b/Linux/scsi_linux.cpp +--- a/Linux/scsi_linux.cpp ++++ b/Linux/scsi_linux.cpp +@@ -22,5 +22,5 @@ + #include + #include +-#include // workaround for broken RedHat 6.0 /usr/include/scsi ++#include + #include + #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f36274a9ddb1..3e475ee6eceb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33209,6 +33209,8 @@ with pkgs; avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { }; + basiliskii = callPackage ../applications/emulators/basiliskii { }; + beep = callPackage ../misc/beep { }; bees = callPackage ../tools/filesystems/bees { }; From 7be04844b0bd05be311704edbb4f205a6f7a3110 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 11 Apr 2022 10:05:41 +0100 Subject: [PATCH 305/385] jellyfin: add platforms --- pkgs/servers/jellyfin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 814d8eecdc38..55644a5a1452 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { # https://github.com/jellyfin/jellyfin/issues/610#issuecomment-537625510 license = licenses.gpl2Plus; maintainers = with maintainers; [ nyanloutre minijackson purcell jojosch ]; + platforms = dotnet-aspnetcore.meta.platforms; }; } From 592dc9ed7f049c565e9d7c04a4907e57ae17e2d9 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 11 Apr 2022 10:05:51 +0100 Subject: [PATCH 306/385] jellyfin-web: add platforms --- pkgs/servers/jellyfin/web.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index 2b3ce5a1f3df..2520f9ec470a 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { homepage = "https://jellyfin.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nyanloutre minijackson purcell jojosch ]; + platforms = nodejs.meta.platforms; }; } From 0977227b8622daccb5a8435d3d4216eedf845973 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 12 Apr 2022 17:48:53 +0200 Subject: [PATCH 307/385] nixos/paperless-ng: rename to `paperless`, use `paperless-ngx` package Use this opportunity to rename `paperless-(ng)-server` to `paperless-scheduler`. This follows the naming scheme in the paperless repo and docs. --- .../from_md/release-notes/rl-2205.section.xml | 11 +++ .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 2 +- .../misc/{paperless-ng.nix => paperless.nix} | 78 +++++++++---------- nixos/tests/all-tests.nix | 2 +- .../tests/{paperless-ng.nix => paperless.nix} | 8 +- .../office/paperless-ngx/default.nix | 2 + 7 files changed, 58 insertions(+), 47 deletions(-) rename nixos/modules/services/misc/{paperless-ng.nix => paperless.nix} (79%) rename nixos/tests/{paperless-ng.nix => paperless.nix} (90%) 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 a1e7a35ab058..dfc55d7f3109 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 @@ -550,6 +550,17 @@ work. + + + services.paperless-ng was renamed to + services.paperless. Accordingly, the + paperless-ng-manage script (located in + dataDir) was renamed to + paperless-manage. + services.paperless now uses + paperless-ngx. + + The matrix-synapse service diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 20dbcf998d99..fcb356f546fa 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -182,6 +182,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.ipfs.extraFlags` is now escaped with `utils.escapeSystemdExecArgs`. If you rely on systemd interpolating `extraFlags` in the service `ExecStart`, this will no longer work. +- `services.paperless-ng` was renamed to `services.paperless`. Accordingly, the `paperless-ng-manage` script (located in `dataDir`) was renamed to `paperless-manage`. `services.paperless` now uses `paperless-ngx`. + - The `matrix-synapse` service (`services.matrix-synapse`) has been converted to use the `settings` option defined in RFC42. This means that options that are part of your `homeserver.yaml` configuration, and that were specified at the top-level of the module (`services.matrix-synapse`) now need to be moved into `services.matrix-synapse.settings`. And while not all options you diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2901df81bf26..2452ee685eb5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -597,7 +597,7 @@ ./services/misc/osrm.nix ./services/misc/owncast.nix ./services/misc/packagekit.nix - ./services/misc/paperless-ng.nix + ./services/misc/paperless.nix ./services/misc/parsoid.nix ./services/misc/plex.nix ./services/misc/plikd.nix diff --git a/nixos/modules/services/misc/paperless-ng.nix b/nixos/modules/services/misc/paperless.nix similarity index 79% rename from nixos/modules/services/misc/paperless-ng.nix rename to nixos/modules/services/misc/paperless.nix index 2aa94199b0a4..bfaf842fb464 100644 --- a/nixos/modules/services/misc/paperless-ng.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -2,13 +2,13 @@ with lib; let - cfg = config.services.paperless-ng; + cfg = config.services.paperless; defaultUser = "paperless"; # Don't start a redis instance if the user sets a custom redis connection enableRedis = !hasAttr "PAPERLESS_REDIS" cfg.extraConfig; - redisServer = config.services.redis.servers.paperless-ng; + redisServer = config.services.redis.servers.paperless; env = { PAPERLESS_DATA_DIR = cfg.dataDir; @@ -25,7 +25,7 @@ let setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); in pkgs.writeShellScript "manage" '' ${setupEnv} - exec ${cfg.package}/bin/paperless-ng "$@" + exec ${cfg.package}/bin/paperless-ngx "$@" ''; # Secure the services @@ -86,26 +86,22 @@ in meta.maintainers = with maintainers; [ earvstedt Flakebi ]; imports = [ - (mkRemovedOptionModule [ "services" "paperless"] '' - The paperless module has been removed as the upstream project died. - Users should migrate to the paperless-ng module (services.paperless-ng). - More information can be found in the NixOS 21.11 release notes. - '') + (mkRenamedOptionModule [ "services" "paperless-ng" ] [ "services" "paperless" ]) ]; - options.services.paperless-ng = { + options.services.paperless = { enable = mkOption { type = lib.types.bool; default = false; description = '' - Enable Paperless-ng. + Enable Paperless. When started, the Paperless database is automatically created if it doesn't exist and updated if the Paperless package has changed. Both tasks are achieved by running a Django migration. A script to manage the Paperless instance (by wrapping Django's manage.py) is linked to - ''${dataDir}/paperless-ng-manage. + ''${dataDir}/paperless-manage. ''; }; @@ -138,13 +134,13 @@ in passwordFile = mkOption { type = types.nullOr types.path; default = null; - example = "/run/keys/paperless-ng-password"; + example = "/run/keys/paperless-password"; description = '' A file containing the superuser password. A superuser is required to access the web interface. If unset, you can create a superuser manually by running - ''${dataDir}/paperless-ng-manage createsuperuser. + ''${dataDir}/paperless-manage createsuperuser. The default superuser name is admin. To change it, set option . @@ -173,9 +169,9 @@ in type = types.attrs; default = {}; description = '' - Extra paperless-ng config options. + Extra paperless config options. - See the documentation + See the documentation for available options. ''; example = literalExpression '' @@ -193,14 +189,14 @@ in package = mkOption { type = types.package; - default = pkgs.paperless-ng; - defaultText = literalExpression "pkgs.paperless-ng"; + default = pkgs.paperless-ngx; + defaultText = literalExpression "pkgs.paperless-ngx"; description = "The Paperless package to use."; }; }; config = mkIf cfg.enable { - services.redis.servers.paperless-ng.enable = mkIf enableRedis true; + services.redis.servers.paperless.enable = mkIf enableRedis true; systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" @@ -212,11 +208,11 @@ in ) ]; - systemd.services.paperless-ng-server = { - description = "Paperless document server"; + systemd.services.paperless-scheduler = { + description = "Paperless scheduler"; serviceConfig = defaultServiceConfig // { User = cfg.user; - ExecStart = "${cfg.package}/bin/paperless-ng qcluster"; + ExecStart = "${cfg.package}/bin/paperless-ngx qcluster"; Restart = "on-failure"; # The `mbind` syscall is needed for running the classifier. SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; @@ -225,15 +221,15 @@ in }; environment = env; wantedBy = [ "multi-user.target" ]; - wants = [ "paperless-ng-consumer.service" "paperless-ng-web.service" ]; + wants = [ "paperless-consumer.service" "paperless-web.service" ]; preStart = '' - ln -sf ${manage} ${cfg.dataDir}/paperless-ng-manage + ln -sf ${manage} ${cfg.dataDir}/paperless-manage # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" if [[ $(cat "$versionFile" 2>/dev/null) != ${cfg.package} ]]; then - ${cfg.package}/bin/paperless-ng migrate + ${cfg.package}/bin/paperless-ngx migrate echo ${cfg.package} > "$versionFile" fi '' @@ -244,18 +240,18 @@ in superuserStateFile="${cfg.dataDir}/superuser-state" if [[ $(cat "$superuserStateFile" 2>/dev/null) != $superuserState ]]; then - ${cfg.package}/bin/paperless-ng manage_superuser + ${cfg.package}/bin/paperless-ngx manage_superuser echo "$superuserState" > "$superuserStateFile" fi ''; } // optionalAttrs enableRedis { - after = [ "redis-paperless-ng.service" ]; + after = [ "redis-paperless.service" ]; }; # Reading the user-provided password file requires root access - systemd.services.paperless-ng-copy-password = mkIf (cfg.passwordFile != null) { - requiredBy = [ "paperless-ng-server.service" ]; - before = [ "paperless-ng-server.service" ]; + systemd.services.paperless-copy-password = mkIf (cfg.passwordFile != null) { + requiredBy = [ "paperless-scheduler.service" ]; + before = [ "paperless-scheduler.service" ]; serviceConfig = { ExecStart = '' ${pkgs.coreutils}/bin/install --mode 600 --owner '${cfg.user}' --compare \ @@ -265,27 +261,27 @@ in }; }; - systemd.services.paperless-ng-consumer = { + systemd.services.paperless-consumer = { description = "Paperless document consumer"; serviceConfig = defaultServiceConfig // { User = cfg.user; - ExecStart = "${cfg.package}/bin/paperless-ng document_consumer"; + ExecStart = "${cfg.package}/bin/paperless-ngx document_consumer"; Restart = "on-failure"; }; environment = env; - # Bind to `paperless-ng-server` so that the consumer never runs + # Bind to `paperless-scheduler` so that the consumer never runs # during migrations - bindsTo = [ "paperless-ng-server.service" ]; - after = [ "paperless-ng-server.service" ]; + bindsTo = [ "paperless-scheduler.service" ]; + after = [ "paperless-scheduler.service" ]; }; - systemd.services.paperless-ng-web = { + systemd.services.paperless-web = { description = "Paperless web server"; serviceConfig = defaultServiceConfig // { User = cfg.user; ExecStart = '' ${pkgs.python3Packages.gunicorn}/bin/gunicorn \ - -c ${cfg.package}/lib/paperless-ng/gunicorn.conf.py paperless.asgi:application + -c ${cfg.package}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application ''; Restart = "on-failure"; @@ -298,15 +294,15 @@ in }; environment = env // { PATH = mkForce cfg.package.path; - PYTHONPATH = "${cfg.package.pythonPath}:${cfg.package}/lib/paperless-ng/src"; + PYTHONPATH = "${cfg.package.pythonPath}:${cfg.package}/lib/paperless-ngx/src"; }; # Allow the web interface to access the private /tmp directory of the server. # This is required to support uploading files via the web interface. - unitConfig.JoinsNamespaceOf = "paperless-ng-server.service"; - # Bind to `paperless-ng-server` so that the web server never runs + unitConfig.JoinsNamespaceOf = "paperless-scheduler.service"; + # Bind to `paperless-scheduler` so that the web server never runs # during migrations - bindsTo = [ "paperless-ng-server.service" ]; - after = [ "paperless-ng-server.service" ]; + bindsTo = [ "paperless-scheduler.service" ]; + after = [ "paperless-scheduler.service" ]; }; users = optionalAttrs (cfg.user == defaultUser) { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 44eeceda99eb..0a7352913537 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -402,7 +402,7 @@ in pam-ussh = handleTest ./pam/pam-ussh.nix {}; pantalaimon = handleTest ./matrix/pantalaimon.nix {}; pantheon = handleTest ./pantheon.nix {}; - paperless-ng = handleTest ./paperless-ng.nix {}; + paperless = handleTest ./paperless.nix {}; parsedmarc = handleTest ./parsedmarc {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; peerflix = handleTest ./peerflix.nix {}; diff --git a/nixos/tests/paperless-ng.nix b/nixos/tests/paperless.nix similarity index 90% rename from nixos/tests/paperless-ng.nix rename to nixos/tests/paperless.nix index 8e9e28801910..51fe7c207851 100644 --- a/nixos/tests/paperless-ng.nix +++ b/nixos/tests/paperless.nix @@ -1,10 +1,10 @@ import ./make-test-python.nix ({ lib, ... }: { - name = "paperless-ng"; + name = "paperless"; meta.maintainers = with lib.maintainers; [ earvstedt Flakebi ]; nodes.machine = { pkgs, ... }: { environment.systemPackages = with pkgs; [ imagemagick jq ]; - services.paperless-ng = { + services.paperless = { enable = true; passwordFile = builtins.toFile "password" "admin"; }; @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ lib, ... }: { testScript = '' import json - machine.wait_for_unit("paperless-ng-consumer.service") + machine.wait_for_unit("paperless-consumer.service") with subtest("Add a document via the file system"): machine.succeed( @@ -22,7 +22,7 @@ import ./make-test-python.nix ({ lib, ... }: { ) with subtest("Web interface gets ready"): - machine.wait_for_unit("paperless-ng-web.service") + machine.wait_for_unit("paperless-web.service") # Wait until server accepts connections machine.wait_until_succeeds("curl -fs localhost:28981") diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index be22ca7c26cd..ec83da852aba 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -181,6 +181,8 @@ py.pkgs.pythonPackages.buildPythonApplication rec { # PYTHONPATH of all dependencies used by the package pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; inherit path; + + tests = { inherit (nixosTests) paperless; }; }; meta = with lib; { From f8dc166d73cdee0bb477fafbaced576d6c4ec023 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 12 Apr 2022 13:49:27 -0300 Subject: [PATCH 308/385] k3s: 1.23.4+k3s1 -> 1.23.5+k3s1 --- .../networking/cluster/k3s/default.nix | 31 ++++++++++++---- ...build-a-static-binary-in-package-cli.patch | 37 ------------------- 2 files changed, 23 insertions(+), 45 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index fa355b65131a..aeca62764f0d 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -46,12 +46,12 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.23.4+k3s1"; # k3s git tag - k3sCommit = "43b1cb48200d8f6af85c16ed944d68fcc96b6506"; # k3s git commit at the above version - k3sRepoSha256 = "1sn7rd5hqfqvwj036blk0skmq6r8igbmiqk1dnpaqnkkddpzdgmc"; - k3sVendorSha256 = "sha256-1/kQvNqFUWwch1JH+twWzBdjNYseoZyVObB1+s9WPM4="; + k3sVersion = "1.23.5+k3s1"; # k3s git tag + k3sCommit = "313aaca547f030752788dce696fdf8c9568bc035"; # k3s git commit at the above version + k3sRepoSha256 = "0vk72609cyyh64irp14jp2zspnxw34jm710cbwgklx0ch6kiz88d"; + k3sVendorSha256 = "sha256-d7kQsJi/eQbaTUDglp3gFpc5Im6CyD9coKeM3kMrbjI="; - k3sServerVendorSha256 = "sha256-2KIFff43jfqWdxX61aWofrjmc5mMkr5aEJRFdGpLyU8="; + k3sServerVendorSha256 = "sha256-E3USXNuXY0lzZH+t3O7BOQ8rKNNQ6avOMItgOEi1cEg="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. @@ -68,8 +68,8 @@ let # taken from go.mod, the 'github.com/containerd/containerd' line # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` - containerdVersion = "1.5.9-k3s1"; - containerdSha256 = "09wfy20z3c9fnla353pibpsb10xzl0f4xwp8qdjh3fwa1q2626gg"; + containerdVersion = "1.5.10-k3s1"; + containerdSha256 = "1ff2sfaqpjimq7w0lprci6ibyi6v65ap6b9sr6b0j12gqr2sqwa5"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.22.0-k3s1"; @@ -228,9 +228,24 @@ buildGoModule rec { patches = [ ./patches/0001-scrips-download-strip-downloading-just-package-CRD.patch - ./patches/0002-Don-t-build-a-static-binary-in-package-cli.patch ]; + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" "''${GO}" generate' + ''; + # Important utilities used by the kubelet, see # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 # Note the list in that issue is stale and some aren't relevant for k3s. diff --git a/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch b/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch deleted file mode 100644 index 886b6ec7409b..000000000000 --- a/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 49c000c7c5dd7a502a2be4c638d2c32b65673c00 Mon Sep 17 00:00:00 2001 -From: Euan Kemp -Date: Sun, 6 Feb 2022 23:13:00 -0800 -Subject: [PATCH] Don't build a static binary in package-cli - -since nixpkgs prefers dynamically linked binaries. - -Also remove "trimpath" for the 'go generate' step because the codegen -they use doesn't work with trimpath set. ---- - scripts/package-cli | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/scripts/package-cli b/scripts/package-cli -index 28927327b7..95dbb469f1 100755 ---- a/scripts/package-cli -+++ b/scripts/package-cli -@@ -48,14 +48,13 @@ fi - - CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} - --"${GO}" generate -+GOFLAGS="" "${GO}" generate - LDFLAGS=" - -X github.com/rancher/k3s/pkg/version.Version=$VERSION - -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} - -w -s - " --STATIC="-extldflags '-static'" --CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go -+CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go - - stat ${CMD_NAME} - --- -2.34.1 - From 72f3b1a4d1cb99ed41f5794fd17cdb8814480f8f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 5 Apr 2022 08:17:15 +0200 Subject: [PATCH 309/385] =?UTF-8?q?coqPackages.CoLoR:=201.8.1=20=E2=86=92?= =?UTF-8?q?=201.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/CoLoR/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 24a7f125599d..9270609c6b2f 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -5,12 +5,13 @@ with lib; mkCoqDerivation { owner = "fblanqui"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - {case = range "8.12" "8.13"; out = "1.8.1"; } + {case = range "8.12" "8.15"; out = "1.8.2"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } {case = range "8.6" "8.7"; out = "1.4.0"; } ] null; + release."1.8.2".sha256 = "sha256:1gvx5cxm582793vxzrvsmhxif7px18h9xsb2jljy2gkphdmsnpqj"; release."1.8.1".sha256 = "0knhca9fffmyldn4q16h9265i7ih0h4jhcarq4rkn0wnn7x8w8yw"; release."1.7.0".rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40"; release."1.7.0".sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3"; From 830c576ad453795dad1e1f019b908c0ed02b7cf4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 12 Apr 2022 20:14:32 +0300 Subject: [PATCH 310/385] coreclr: remove from nixpkgs has been broken for a year and half --- .../development/compilers/coreclr/default.nix | 100 ------------------ .../azure-functions-core-tools/default.nix | 1 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 pkgs/development/compilers/coreclr/default.nix diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix deleted file mode 100644 index f38a38059624..000000000000 --- a/pkgs/development/compilers/coreclr/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ config, lib, stdenv -, fetchFromGitHub -, fetchpatch -, which -, cmake -, llvmPackages -, libunwind -, gettext -, openssl -, python2 -, icu -, lttng-ust -, liburcu -, libuuid -, libkrb5 -, debug ? config.coreclr.debug or false -}: - -stdenv.mkDerivation rec { - pname = "coreclr"; - version = "2.0.7"; - - src = fetchFromGitHub { - owner = "dotnet"; - repo = "coreclr"; - rev = "v${version}"; - sha256 = "0pzkrfgqywhpijbx7j1v4lxa6270h6whymb64jdkp7yj56ipqh2n"; - }; - - patches = [ - (fetchpatch { - # glibc 2.26 - url = "https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch"; - sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq"; - }) - (fetchpatch { - # clang 5 - url = "https://github.com/dotnet/coreclr/commit/9b22e1a767dee38f351001c5601f56d78766a43e.patch"; - sha256 = "1w1lxw5ryvhq8m5m0kv880c4bh6y9xdgypkr76sqbh3v568yghzg"; - }) - ]; - - nativeBuildInputs = [ - which - cmake - llvmPackages.clang - ]; - - buildInputs = [ - llvmPackages.llvm - llvmPackages.lldb - libunwind - gettext - openssl - python2 - icu - lttng-ust - liburcu - libuuid - libkrb5 - ]; - - configurePhase = '' - # override to avoid cmake running - patchShebangs . - ''; - - BuildArch = if stdenv.is64bit then "x64" else "x86"; - BuildType = if debug then "Debug" else "Release"; - - hardeningDisable = [ - "strictoverflow" - "format" - ]; - - buildPhase = '' - runHook preBuild - # disable -Werror which can potentially breaks with every compiler upgrade - ./build.sh $BuildArch $BuildType cmakeargs "-DCLR_CMAKE_WARNINGS_ARE_ERRORS=OFF" - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/dotnet $out/bin - cp -r bin/Product/Linux.$BuildArch.$BuildType/* $out/share/dotnet - for cmd in coreconsole corerun createdump crossgen ilasm ildasm mcs superpmi; do - ln -s $out/share/dotnet/$cmd $out/bin/$cmd - done - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/dotnet/core/"; - description = ".NET is a general purpose development platform"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ kuznero ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index 55720d283110..d201c64f0834 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -11,7 +11,6 @@ , libuuid , dotnetbuildhelpers , dotnetCorePackages -, coreclr , openssl }: diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 897005fecaeb..2bdbe0c6cb29 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -188,6 +188,7 @@ mapAliases ({ corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 + coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12 cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30 cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d963d210c19f..6186f4d67bea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23638,8 +23638,6 @@ with pkgs; comixcursors = callPackage ../data/icons/comixcursors {}; - coreclr = callPackage ../development/compilers/coreclr { }; - corefonts = callPackage ../data/fonts/corefonts { }; courier-prime = callPackage ../data/fonts/courier-prime { }; From 8ef9cc3cc7cb3127695d793b3af1b19e863654fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Apr 2022 20:13:11 +0200 Subject: [PATCH 311/385] nuclei: 2.6.5 -> 2.6.6 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 14539bf21574..c16de2cabe34 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.6.5"; + version = "2.6.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g78sZDhV2+MgoFkJIrE2RbVLa/aPjbKFFRyKj594Hb0="; + sha256 = "sha256-IZxLnJyfF4MF2aTFYDyZoWdhvrd1cUJkGsASqo9KAyk="; }; - vendorSha256 = "sha256-/umoSOQ0ehQplxU8OTGJVmTgO+8xPZxVwRBfM67zMh8="; + vendorSha256 = "sha256-oiRpxCAdxDjlUUHqRmpAHypmESQJpziOmBtTwKig7nk="; modRoot = "./v2"; subPackages = [ From a9b854d4a3bb4d13657056e2565b4e95323801ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Apr 2022 20:15:16 +0200 Subject: [PATCH 312/385] python3Packages.renault-api: 0.1.10 -> 0.1.11 --- pkgs/development/python-modules/renault-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 2312078c5fc6..a2cfdd98d845 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.10"; + version = "0.1.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PXycRRUrKIkU/MgQbW4BjvBhpEi6InY5jZHPw4Nyv2s="; + sha256 = "sha256-71UFVXfww3wgSO2qoRCuV80+33B91Bjl2+nuuCbQRLg="; }; nativeBuildInputs = [ From 5e5e1c80beb2820d6d085ed9b81fae1e4ce2b4ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Apr 2022 20:17:17 +0200 Subject: [PATCH 313/385] python3Packages.tldextract: 3.2.0 -> 3.2.1 --- pkgs/development/python-modules/tldextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index f2f15c8bb7fa..139f58660c4c 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.2.0"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PUtqIQVgC30CkOoje/MLaw3HY+UPy+QOhJoBm9bby/8="; + sha256 = "sha256-rJMEzfgLCcN+6pZXmeDZrAqhzLZTH65Uiqvgm68aJUk="; }; nativeBuildInputs = [ From 0a607aab4a584d8e944b4ad325a358147bb300fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Apr 2022 20:18:40 +0200 Subject: [PATCH 314/385] python3Packages.luxtronik: 0.3.11 -> 0.3.12 --- pkgs/development/python-modules/luxtronik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix index 7466397ebb71..7f7225bdb92a 100644 --- a/pkgs/development/python-modules/luxtronik/default.nix +++ b/pkgs/development/python-modules/luxtronik/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "luxtronik"; - version = "0.3.11"; + version = "0.3.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "python-luxtronik"; rev = version; - sha256 = "sha256-pngtkEuWmOD1MG7/Bh+8iqCxU0l/fGHA8uZxYoxOE5Y="; + sha256 = "sha256-qQwMahZ3EzXzI7FyTL71WzDpLqmIgVYxiJ0IGvlw8dY="; }; # Project has no tests From 7c4cc5125ab27b0d7feb9ef077192e3acb2cc29c Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Tue, 12 Apr 2022 20:44:35 +0200 Subject: [PATCH 315/385] drawio: 17.2.4 -> 17.4.2 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index e53030428e61..f93e415bcd63 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "17.2.4"; + version = "17.4.2"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "sha256-dKl7DxNneoQEL+QhZmpfQCd15RoeDRnkZt3sv8t2KM4="; + sha256 = "294f99d9060bc394490b20d2ddab75ed5c0166d7960850f065eb8897ef31a2e3"; }; nativeBuildInputs = [ From 7024b4e5e369f3d7d47c01dd21c7390657fee4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 10 Apr 2022 18:49:49 +0100 Subject: [PATCH 316/385] nixos/udev: Put all initrd options into a namespace --- nixos/modules/services/hardware/udev.nix | 106 ++++++++++++----------- nixos/tests/networking.nix | 2 +- 2 files changed, 58 insertions(+), 50 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index b0cdfd551e49..f5b77ce24da2 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -197,34 +197,6 @@ in apply = map getBin; }; - initrdPackages = mkOption { - type = types.listOf types.path; - default = []; - visible = false; - description = '' - This will only be used when systemd is used in stage 1. - - List of packages containing udev rules that will be copied to stage 1. - All files found in - pkg/etc/udev/rules.d and - pkg/lib/udev/rules.d - will be included. - ''; - }; - - initrdBinPackages = mkOption { - type = types.listOf types.path; - default = []; - visible = false; - description = '' - This will only be used when systemd is used in stage 1. - - Packages to search for binaries that are referenced by the udev rules in stage 1. - This list always contains /bin of the initrd. - ''; - apply = map getBin; - }; - path = mkOption { type = types.listOf types.path; default = []; @@ -234,20 +206,6 @@ in ''; }; - initrdRules = mkOption { - default = ""; - example = '' - SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1D:60:B9:6D:4F", KERNEL=="eth*", NAME="my_fast_network_card" - ''; - type = types.lines; - description = '' - udev rules to include in the initrd - only. They'll be written into file - 99-local.rules. Thus they are read and applied - after the essential initrd rules. - ''; - }; - extraRules = mkOption { default = ""; example = '' @@ -315,6 +273,52 @@ in ''; }; + boot.initrd.services.udev = { + + packages = mkOption { + type = types.listOf types.path; + default = []; + visible = false; + description = '' + This will only be used when systemd is used in stage 1. + + List of packages containing udev rules that will be copied to stage 1. + All files found in + pkg/etc/udev/rules.d and + pkg/lib/udev/rules.d + will be included. + ''; + }; + + binPackages = mkOption { + type = types.listOf types.path; + default = []; + visible = false; + description = '' + This will only be used when systemd is used in stage 1. + + Packages to search for binaries that are referenced by the udev rules in stage 1. + This list always contains /bin of the initrd. + ''; + apply = map getBin; + }; + + rules = mkOption { + default = ""; + example = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1D:60:B9:6D:4F", KERNEL=="eth*", NAME="my_fast_network_card" + ''; + type = types.lines; + description = '' + udev rules to include in the initrd + only. They'll be written into file + 99-local.rules. Thus they are read and applied + after the essential initrd rules. + ''; + }; + + }; + }; @@ -330,10 +334,10 @@ in boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ]; - boot.initrd.extraUdevRulesCommands = optionalString (!config.boot.initrd.systemd.enable && cfg.initrdRules != "") + boot.initrd.extraUdevRulesCommands = optionalString (!config.boot.initrd.systemd.enable && config.boot.initrd.services.udev.rules != "") '' cat <<'EOF' > $out/99-local.rules - ${cfg.initrdRules} + ${config.boot.initrd.services.udev.rules} EOF ''; @@ -348,25 +352,25 @@ in boot.initrd.systemd.storePaths = [ "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd" "${config.boot.initrd.systemd.package}/lib/udev" - ] ++ map toString cfg.initrdBinPackages; + ] ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages; # Generate the udev rules for the initrd boot.initrd.systemd.contents = { "/etc/udev/rules.d".source = udevRulesFor { name = "initrd-udev-rules"; initrdBin = config.boot.initrd.systemd.contents."/bin".source; - udevPackages = cfg.initrdPackages; + udevPackages = config.boot.initrd.services.udev.packages; udevPath = config.boot.initrd.systemd.contents."/bin".source; udev = config.boot.initrd.systemd.package; systemd = config.boot.initrd.systemd.package; - binPackages = cfg.initrdBinPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ]; + binPackages = config.boot.initrd.services.udev.binPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ]; }; }; # Insert custom rules - services.udev.initrdPackages = mkIf (cfg.initrdRules != "") (pkgs.writeTextFile { + boot.initrd.services.udev.packages = mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile { name = "initrd-udev-rules"; destination = "/etc/udev/rules.d/99-local.rules"; - text = cfg.initrdRules; + text = config.boot.initrd.services.udev.rules; }); environment.etc = @@ -408,4 +412,8 @@ in }; }; + + imports = [ + (mkRenamedOptionModule [ "services" "udev" "initrdRules" ] [ "boot" "initrd" "services" "udev" "rules" ]) + ]; } diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index bd517093eb3d..a1150097a091 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -878,7 +878,7 @@ let linkConfig.Name = "custom_name"; }; } - else { services.udev.initrdRules = '' + else { boot.initrd.services.udev.rules = '' SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="custom_name" ''; }); From a8bdbec20c26a36cf7ec72fc50985640153a84a0 Mon Sep 17 00:00:00 2001 From: devhell Date: Tue, 12 Apr 2022 20:30:01 +0100 Subject: [PATCH 317/385] zettlr: 2.2.4 -> 2.2.5 --- pkgs/applications/misc/zettlr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index b0d1b79509a6..d80c8d03bf43 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.2.4"; + version = "2.2.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-lzXciToyUsHl8WV0IvdP6R2pYegL7/G04YPLb6gbCgQ="; + sha256 = "sha256-KP3lt0CweT1f/BR3IpnjwCqNvhFbrpz9KLg6K8OMs+I="; }; appimageContents = appimageTools.extractType2 { inherit name src; From a67703536a715b35fb14120742de894096f08a8d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 12 Apr 2022 22:10:35 +0200 Subject: [PATCH 318/385] ungoogled-chromium: 100.0.4896.75 -> 100.0.4896.88 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c26edc50b24b..e7249aaa2f1b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "100.0.4896.75", - "sha256": "1h60l1g340gvm4lz2lps6dqpvahpzn24hz47y2qvc6mavx9d6ki4", - "sha256bin64": "0nrrkgwcnqg4l8x1nk1rdxnv9xa0c24ync1yls7s9rc34wkk8sc5", + "version": "100.0.4896.88", + "sha256": "0l628x41krsjgzff9996k5wkbcvcjqf4128z32hpj1pkg23719f5", + "sha256bin64": "1wqzs3f70ayi9vy3ncm5mild22xvhwn4d2lcfra31wwnzxi1nqxm", "deps": { "gn": { "version": "2022-01-21", @@ -56,8 +56,8 @@ "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" }, "ungoogled-patches": { - "rev": "100.0.4896.75-1", - "sha256": "0s31dclgk3x9302wr5yij77361bqam2sfki39p651gwysfizb73n" + "rev": "100.0.4896.88-1", + "sha256": "0f0c5mrjvk6lg59p4x6lg2az4f83y7zzikv5hlmqzpgydivk7c13" } } } From 8255068a6336896806245dab54e340c381b3fe86 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 12 Apr 2022 22:10:35 +0200 Subject: [PATCH 319/385] chromiumDev: 102.0.4987.0 -> 102.0.4997.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c26edc50b24b..80d7b4298963 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "102.0.4987.0", - "sha256": "0rs6smmda0wlhwbvmhmyz0vi43rkb9gyfbm49bn2084bd1x3qpzy", - "sha256bin64": "1knrnjhn98bln81qf3646gz9znn848kgjayyjl5ik0x0fimx524x", + "version": "102.0.4997.0", + "sha256": "05y9b426wcarq18faw5i79qrfqy158dinvba5d7lwrcjnbqyfr1f", + "sha256bin64": "0846y3dbs7vghrb8s2s57a2lk7a0x2dha5q0d915qrn29g5x9c6p", "deps": { "gn": { - "version": "2022-04-05", + "version": "2022-04-07", "url": "https://gn.googlesource.com/gn", - "rev": "5eb3845ec2d8296b4f41da4eca85302eb111fe69", - "sha256": "04yy4d77bw3bhb32q1szlqn6lmif6qaah2c0ns6by0cbnkliyaza" + "rev": "ae110f8b525009255ba1f9ae96982176d3bfad3d", + "sha256": "131y1v2m59hn7s00zc9p7rhfi956p744mp96g2i80f0i020dyl6w" } } }, From d2f296b3e8e2016990c38e6c66e9aa22b4e3a2aa Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 12 Apr 2022 22:10:35 +0200 Subject: [PATCH 320/385] chromium: 100.0.4896.75 -> 100.0.4896.88 https://chromereleases.googleblog.com/2022/04/stable-channel-update-for-desktop_11.html This update includes 11 security fixes. CVEs: CVE-2022-1305 CVE-2022-1306 CVE-2022-1307 CVE-2022-1308 CVE-2022-1309 CVE-2022-1310 CVE-2022-1311 CVE-2022-1312 CVE-2022-1313 CVE-2022-1314 --- .../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 c26edc50b24b..7ea76ddc1019 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "100.0.4896.75", - "sha256": "1h60l1g340gvm4lz2lps6dqpvahpzn24hz47y2qvc6mavx9d6ki4", - "sha256bin64": "0nrrkgwcnqg4l8x1nk1rdxnv9xa0c24ync1yls7s9rc34wkk8sc5", + "version": "100.0.4896.88", + "sha256": "0l628x41krsjgzff9996k5wkbcvcjqf4128z32hpj1pkg23719f5", + "sha256bin64": "1wqzs3f70ayi9vy3ncm5mild22xvhwn4d2lcfra31wwnzxi1nqxm", "deps": { "gn": { "version": "2022-01-21", From 1c5154846809853016a07d2bc8e48827de72e01c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 20 Feb 2022 21:09:26 -0800 Subject: [PATCH 321/385] boost: support for cross-compiling boost to a mips64 target Co-authored-by: Sandro --- pkgs/development/libraries/boost/generic.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 17698216b8d9..12fbf13fa9a0 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -84,7 +84,7 @@ let # TODO: make this unconditional ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}" - "architecture=${toString stdenv.hostPlatform.parsed.cpu.family}" + "architecture=${if stdenv.hostPlatform.isMips64 then "mips64" else toString stdenv.hostPlatform.parsed.cpu.family}" "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}" @@ -92,7 +92,8 @@ let # https://www.boost.org/doc/libs/1_66_0/libs/context/doc/html/context/architectures.html "abi=${if stdenv.hostPlatform.parsed.cpu.family == "arm" then "aapcs" else if stdenv.hostPlatform.isWindows then "ms" - else if stdenv.hostPlatform.isMips then "o32" + else if stdenv.hostPlatform.isMips32 then "o32" + else if stdenv.hostPlatform.isMips64n64 then "n64" else "sysv"}" ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ optional (variant == "release") "debug-symbols=off" @@ -133,6 +134,13 @@ stdenv.mkDerivation { sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0"; stripLen = 1; }) + ++ optional (versionAtLeast version "1.65" && versionOlder version "1.70") (fetchpatch { + # support for Mips64n64 appeared in boost-context 1.70; this patch won't apply to pre-1.65 cleanly + url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch"; + sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI="; + stripLen = 1; + extraPrefix = "libs/context/"; + }) ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch ++ optional (version == "1.77.0") (fetchpatch { @@ -150,6 +158,14 @@ stdenv.mkDerivation { ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" ++ optionals (versionOlder version "1.73") lib.platforms.riscv; maintainers = with maintainers; [ hjones2199 ]; + + broken = + # boost-context lacks support for the N32 ABI on mips64. The build + # will succeed, but packages depending on boost-context will fail with + # a very cryptic error message. + stdenv.hostPlatform.isMips64n32 || + # the patch above does not apply cleanly to pre-1.65 boost + (stdenv.hostPlatform.isMips64n64 && (versionOlder version "1.65")); }; preConfigure = optionalString useMpi '' From 5b367e4e4c9aa81f6478beeeb2e5893fcce5af77 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Wed, 13 Apr 2022 04:10:43 +0530 Subject: [PATCH 322/385] broot: 1.9.1 -> 1.11.1 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 9961416e0d3d..9160790bce31 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.9.1"; + version = "1.11.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-oIStnwbfp48QHkSlXgveH9AM2fmmrrSmwdvXxvbV/tg="; + sha256 = "sha256-MbyfdzeBo12/7M1F/J7upBQGB/tv1M4sZ+90i/vcLjs="; }; - cargoHash = "sha256-DOPFVa2w+ldG7fnundBGb+jM0t2E2jS0nJIIzekD2QE="; + cargoHash = "sha256-GDU7tL+NDKk46DYnZajcAoPMZxGCrg/IS4xhSZrB6Cs="; nativeBuildInputs = [ installShellFiles From 33a1eaa3a8add506ca8bd91146b16dd91fce729f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 04:07:48 +0200 Subject: [PATCH 323/385] python3Packages.rtsp-to-webrtc: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/rtsp-to-webrtc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index 9cc4a85bee6a..2c8fd9e40ba2 100644 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rtsp-to-webrtc"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "rtsp-to-webrtc-client"; rev = version; - hash = "sha256-ry6xNymWgkkvYXliVLUFOUiPz8gbCsQDrSuGmCaH4ZE="; + hash = "sha256-miMBN/8IO4v03mMoclCa3GFl6HCS3Sh6z2HOQ39MRZY="; }; propagatedBuildInputs = [ From b01daaf8f5b6dbcc459902bf4556e0ba30e73bd7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 04:09:42 +0200 Subject: [PATCH 324/385] python3Packages.zigpy: 0.44.1 -> 0.44.2 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 0a152c3825a1..a10e9ae65c79 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.44.1"; + version = "0.44.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-7X3uaxzvVMhSucCGA+rZsgt+fJSNjYQkJLpCGyHOIlc="; + sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I="; }; propagatedBuildInputs = [ From 7e9a2215a4e8cd3873ac5e14d7b2024ff66b7f30 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 04:10:53 +0200 Subject: [PATCH 325/385] python3Packages.zha-quirks: 0.0.69 -> 0.0.72 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 881523b14d25..541eda6185e7 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.69"; + version = "0.0.72"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-qPqgla+NFtZ85i+GB0lRRsoNImVghJsJfww7j8yQcFs="; + sha256 = "sha256-tVCvmQR9tGhSDB4OztNaSCj2BTxPdrX3Gw9WZopRo8k="; }; propagatedBuildInputs = [ From 94fa415923508a4c59dfb77ceec5237f0b5a09bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Apr 2022 04:19:57 +0200 Subject: [PATCH 326/385] home-assistant: 2022.4.0 - 2022.4.2 https://github.com/home-assistant/core/releases/tag/2022.4.1 https://github.com/home-assistant/core/releases/tag/2022.4.2 --- .../home-assistant/component-packages.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 17 ++--------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 20218f4f256d..40a46a3b9ca5 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.4.0"; + version = "2022.4.2"; components = { "abode" = ps: with ps; [ abodepy @@ -2138,7 +2138,7 @@ "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ - ]; # missing inputs: gpiozero + ]; # missing inputs: gpiozero pigpio "renault" = ps: with ps; [ renault-api ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ded617b35f6c..99eb36b338c3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -58,19 +58,6 @@ let }); }) - (self: super: { - aioairzone = super.aioairzone.overridePythonAttrs (oldAttrs: rec { - version = "0.2.3"; - src = fetchFromGitHub { - owner = "Noltari"; - repo = "aioairzone"; - rev = version; - hash = "sha256-vy6NqtlWv2El259rC+Nm0gs/rsY+s8xe7Z+wXvT1Ing="; - }; - }); - }) - - (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { version = "1.4.18"; @@ -178,7 +165,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.4.0"; + hassVersion = "2022.4.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -196,7 +183,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-b/YwcbcQuRIue4fr4+yF2EEXLvmnI7e3xfyz52flwJw="; + hash = "sha256-jFETlFgxS1qlUYnqVUj0Duki6Met21NQbZQOc5pWxpE="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 2ca89bddafab6a170bfb7e3adf48d829a0072a0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 01:40:37 +0200 Subject: [PATCH 327/385] home-assistant: disable tests for rtsp-to-webrtc package Requires fixtures only available in pytest-aiohttp>=1.0.0 --- pkgs/servers/home-assistant/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 99eb36b338c3..81b6091e42d8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -50,6 +50,9 @@ let hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); snitun = super.snitun.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); From 15afc867f1bd36ce82f1f9cebb28205e7dcd5fac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 00:38:16 +0000 Subject: [PATCH 328/385] appthreat-depscan: 2.1.2 -> 2.1.3 --- pkgs/development/tools/appthreat-depscan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index e93dfe845436..5973b25decd6 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; - rev = "v${version}"; - hash = "sha256-hRmTx0qs/QnDLl4KhGbKw5Mucq4wQCaCIkeObrZlJSI="; + rev = "refs/tags/v${version}"; + hash = "sha256-6ifpPNBcqaNGVQjZQ3G48QuwTRRn4zL3awa06yOeveU="; }; propagatedBuildInputs = with python3.pkgs; [ From ef797b8aebd51cccb200d91ad0ad1ef3161dd451 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 03:08:06 +0200 Subject: [PATCH 329/385] python3Packages.renault-api: 0.1.10 -> 0.1.11 --- pkgs/development/python-modules/renault-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 2312078c5fc6..a2cfdd98d845 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.10"; + version = "0.1.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PXycRRUrKIkU/MgQbW4BjvBhpEi6InY5jZHPw4Nyv2s="; + sha256 = "sha256-71UFVXfww3wgSO2qoRCuV80+33B91Bjl2+nuuCbQRLg="; }; nativeBuildInputs = [ From 7cf8a80c3a46860e9d07d14f75ba7c766b102f2b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 03:10:23 +0200 Subject: [PATCH 330/385] home-assistant: 2022.4.2 -> 2022.4.3 https://github.com/home-assistant/core/releases/tag/2022.4.3 Fixes a small statistical mishap in the requirements parser. --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/parse-requirements.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40a46a3b9ca5..39e5c2b5c25a 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.4.2"; + version = "2022.4.3"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 81b6091e42d8..11834937ffa9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -168,7 +168,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.4.2"; + hassVersion = "2022.4.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -186,7 +186,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-jFETlFgxS1qlUYnqVUj0Duki6Met21NQbZQOc5pWxpE="; + hash = "sha256-kubW0JhG9ervVHVl65YmD5jd/0oWenacAyfSP0EPmsU="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index c9fc53401ef4..80974ff0e70c 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -247,7 +247,7 @@ def main() -> None: f.write(" ];\n") f.write("}\n") - supported_components = reduce(lambda n, c: n + (build_inputs[c][1] == []), + supported_components = reduce(lambda n, c: n + (build_inputs[c][2] == []), components.keys(), 0) total_components = len(components) print(f"{supported_components} / {total_components} components supported, " From 8f43f3dc4011a5b39848311cdb934ab74fb806c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 03:32:34 +0200 Subject: [PATCH 331/385] subversion: 1.14.1 -> 1.14.2 https://svn.apache.org/repos/asf/subversion/tags/1.14.2/CHANGES https://subversion.apache.org/security/CVE-2021-28544-advisory.txt https://subversion.apache.org/security/CVE-2022-24070-advisory.txt Fixes: CVE-2021-28544, CVE-2022-24070 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 0f88a18a4787..839ddeba9317 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -125,7 +125,7 @@ in { }; subversion = common { - version = "1.14.1"; - sha256 = "1ag1hvcm9q92kgalzbbgcsq9clxnzmbj9nciz9lmabjx4lyajp9c"; + version = "1.14.2"; + sha256 = "sha256-yRMOjQt1copm8OcDj8dwUuZxgw14W1YWqtU7SBDTzCg="; }; } From 9801fb6c1a0ae7e325443ff2fb0c61700865fbf3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 12 Apr 2022 00:56:28 -0300 Subject: [PATCH 332/385] move muon to muonlang In order to avoid clashing the (future) muon (a meson replacement). --- pkgs/development/compilers/{muon => muonlang}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/compilers/{muon => muonlang}/default.nix (100%) diff --git a/pkgs/development/compilers/muon/default.nix b/pkgs/development/compilers/muonlang/default.nix similarity index 100% rename from pkgs/development/compilers/muon/default.nix rename to pkgs/development/compilers/muonlang/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7a0b0a21dfa..94c747e3e65b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13111,7 +13111,7 @@ with pkgs; mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; - muon = callPackage ../development/compilers/muon { }; + muonlang = callPackage ../development/compilers/muonlang { }; inherit (callPackages ../development/compilers/nim { }) nim-unwrapped nimble-unwrapped nim; From 7eb6efcb4e40f6f30a701f660ee4afad917ca6c5 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 12 Apr 2022 21:31:42 -0300 Subject: [PATCH 333/385] samurai: rewrite --- .../tools/build-managers/samurai/default.nix | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index cd058bfc2632..b13762d63b16 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +}: stdenv.mkDerivation rec { pname = "samurai"; @@ -8,17 +12,21 @@ stdenv.mkDerivation rec { owner = "michaelforney"; repo = pname; rev = version; - sha256 = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI="; + hash = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI="; }; makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; patches = [ + # NULL pointer dereference in writefile() in util.c; remove this at the next + # release (fetchpatch { name = "CVE-2021-30218.patch"; url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch"; sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw="; }) + # NULL pointer dereference in printstatus() in build.c; remove this at the + # next release (fetchpatch { name = "CVE-2021-30219.patch"; url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch"; @@ -27,10 +35,24 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "ninja-compatible build tool written in C"; homepage = "https://github.com/michaelforney/samurai"; + description = "ninja-compatible build tool written in C"; + longDescription = '' + samurai is a ninja-compatible build tool with a focus on simplicity, + speed, and portability. + + It is written in C99, requires various POSIX.1-2008 interfaces, and + nowadays implements ninja build language through version 1.9.0 except for + Microsoft (R) Visual C++ (TM) dependency handling (deps = msvc). + + It is feature-complete (but not bug-compatible) and supports most of the + same options as ninja, using the same format for .ninja_log and + .ninja_deps as the original ninja tool, currently version 5 and 4 + respectively. + ''; license = with licenses; [ mit asl20 ]; # see LICENSE - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill AndersonTorres ]; + platforms = platforms.all; }; } From c6eee6386d4c95fb3917ff60ab6001065ebb4256 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 03:45:14 +0200 Subject: [PATCH 334/385] subversion_1_10: 1.10.7 -> 1.10.8 https://svn.apache.org/repos/asf/subversion/tags/1.10.8/CHANGES https://subversion.apache.org/security/CVE-2021-28544-advisory.txt https://subversion.apache.org/security/CVE-2022-24070-advisory.txt Fixes: CVE-2021-28544, CVE-2022-24070 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 839ddeba9317..2960560b5153 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -120,8 +120,8 @@ let in { subversion_1_10 = common { - version = "1.10.7"; - sha256 = "1nhrd8z6c94sc0ryrzpyd98qdn5a5g3x0xv1kdb9da4drrk8y2ww"; + version = "1.10.8"; + sha256 = "sha256-CnO6MSe1ov/7j+4rcCmE8qgI3nEKjbKLfdQBDYvlDlo="; }; subversion = common { From 5abe58a5496e8b02f67ea85b3c80e3296000b414 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 04:23:55 +0000 Subject: [PATCH 335/385] epiphany: 42.0 -> 42.1 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 43b3eb2ee2fc..649cc71cde0c 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Pb+owA5Ft/ROGCTQHw/r6DcHtfuTMMJhFz9ot/A81eM="; + sha256 = "aKzDxcYpF/G0ORaltGvsE29bMH8DqtpY23QMeLED8Dg="; }; patches = lib.optionals withPantheon [ From 4ba5f26780e7a27aa2e97676603cd9ef04f11e74 Mon Sep 17 00:00:00 2001 From: Luke Rewega Date: Tue, 12 Apr 2022 21:27:41 -0400 Subject: [PATCH 336/385] go_1_18: 1.18 -> 1.18.1 --- pkgs/development/compilers/go/1.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index a4cb013d94f2..94e5ac3eccf6 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -55,11 +55,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.18"; + version = "1.18.1"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-OPQj20zINIg/K1I0QoL6ejn7uTZQ3GKhH98L5kCb2tY="; + sha256 = "sha256-79Q+DxQC4IO3OgPURLe2V2u0xTmsRiCLY6kWtprKQIg="; }; # perl is used for testing go vet From 5f000fa1674ffbbdf3a78a245b52cafae74f1788 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 04:43:22 +0000 Subject: [PATCH 337/385] python310Packages.pex: 2.1.78 -> 2.1.79 --- 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 5aead8eed5ed..ec077edfeb6b 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.78"; + version = "2.1.79"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1bWAEMMBjmyLS1W+VWgD9BsZq5f0DmEOQryXH9vupCY="; + hash = "sha256-XIqof/RZL1dmfPU6NVtkf18zrkG5RPOesGfsDDrPhQ8="; }; nativeBuildInputs = [ From e51d4a13bc9345554991cb4f97a8962e27af98d8 Mon Sep 17 00:00:00 2001 From: 4825764518 <100122841+4825764518@users.noreply.github.com> Date: Tue, 12 Apr 2022 23:46:12 -0400 Subject: [PATCH 338/385] quirc: 2020-04-16 -> 2021-10-08 --- pkgs/tools/graphics/quirc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index dec2a1020c89..1376b34a697c 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub -, SDL_gfx, SDL, libjpeg, libpng, pkg-config +, SDL_gfx, SDL, libjpeg, libpng, opencv, pkg-config }: stdenv.mkDerivation { pname = "quirc"; - version = "2020-04-16"; + version = "2021-10-08"; src = fetchFromGitHub { owner = "dlbeer"; repo = "quirc"; - rev = "ed455904f35270888bc902b9e8c0c9b3184a8302"; - sha256 = "1kqqvcnxcaxdgls9sibw5pqjz3g1gys2v64i4kfqp8wfcgd9771q"; + rev = "516d91a94d880ca1006fc1d57f318bdff8411f0d"; + sha256 = "0jkaz5frm6jr9bxyfympvzh180nczrfvvb3z3qhk21djlas6nr5f"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL SDL_gfx libjpeg libpng ]; + buildInputs = [ SDL SDL_gfx libjpeg libpng opencv ]; makeFlags = [ "PREFIX=$(out)" ]; NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL -I${SDL_gfx}/include/SDL"; From 313e2a51240d632bb4fc1f1c891bcbbd564f9503 Mon Sep 17 00:00:00 2001 From: 4825764518 <100122841+4825764518@users.noreply.github.com> Date: Wed, 13 Apr 2022 00:15:29 -0400 Subject: [PATCH 339/385] quirc: fix darwin build Some linux-only samples prevented this package from building on x86_64 and aarch64 darwin systems. --- .../quirc/0001-dont-build-demos.patch | 29 +++++++++++++++++++ pkgs/tools/graphics/quirc/default.nix | 20 +++++++++---- 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/graphics/quirc/0001-dont-build-demos.patch diff --git a/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch b/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch new file mode 100644 index 000000000000..9ecb6dda4e19 --- /dev/null +++ b/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch @@ -0,0 +1,29 @@ +diff --git a/Makefile b/Makefile +index 2d5b745..ecef988 100644 +--- a/Makefile ++++ b/Makefile +@@ -37,7 +37,7 @@ DEMO_UTIL_OBJ = \ + + OPENCV_CFLAGS != pkg-config --cflags opencv4 + OPENCV_LIBS != pkg-config --libs opencv4 +-QUIRC_CXXFLAGS = $(QUIRC_CFLAGS) $(OPENCV_CFLAGS) --std=c++17 ++QUIRC_CXXFLAGS = $(QUIRC_CFLAGS) --std=c++17 + + .PHONY: all v4l sdl opencv install uninstall clean + +@@ -85,14 +85,11 @@ libquirc.so.$(LIB_VERSION): $(LIB_OBJ) + .cxx.o: + $(CXX) $(QUIRC_CXXFLAGS) -o $@ -c $< + +-install: libquirc.a libquirc.so.$(LIB_VERSION) quirc-demo quirc-scanner ++install: libquirc.a libquirc.so.$(LIB_VERSION) + install -o root -g root -m 0644 lib/quirc.h $(DESTDIR)$(PREFIX)/include + install -o root -g root -m 0644 libquirc.a $(DESTDIR)$(PREFIX)/lib + install -o root -g root -m 0755 libquirc.so.$(LIB_VERSION) \ + $(DESTDIR)$(PREFIX)/lib +- install -o root -g root -m 0755 quirc-demo $(DESTDIR)$(PREFIX)/bin +- # install -o root -g root -m 0755 quirc-demo-opencv $(DESTDIR)$(PREFIX)/bin +- install -o root -g root -m 0755 quirc-scanner $(DESTDIR)$(PREFIX)/bin + + uninstall: + rm -f $(DESTDIR)$(PREFIX)/include/quirc.h \ No newline at end of file diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 1376b34a697c..6ad0262da3a1 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -1,6 +1,5 @@ -{ lib, stdenv, fetchFromGitHub -, SDL_gfx, SDL, libjpeg, libpng, opencv, pkg-config -}: +{ lib, stdenv, fetchFromGitHub, SDL_gfx, SDL, libjpeg, libpng, opencv +, pkg-config }: stdenv.mkDerivation { pname = "quirc"; @@ -19,6 +18,16 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL -I${SDL_gfx}/include/SDL"; + # Disable building of linux-only demos on darwin systems + patches = lib.optionals stdenv.isDarwin [ ./0001-dont-build-demos.patch ]; + + buildPhase = lib.optionalString stdenv.isDarwin '' + runHook preBuild + make libquirc.so + make qrtest + runHook postBuild + ''; + configurePhase = '' runHook preConfigure @@ -27,6 +36,7 @@ stdenv.mkDerivation { runHook postConfigure ''; + preInstall = '' mkdir -p "$out"/{bin,lib,include} @@ -37,7 +47,7 @@ stdenv.mkDerivation { meta = { description = "A small QR code decoding library"; license = lib.licenses.isc; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; }; } From 306ca314d1e5a5fe9b18259c2c064a79dc57d82b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 05:18:30 +0000 Subject: [PATCH 340/385] geeqie: 1.7.2 -> 1.7.3 --- pkgs/applications/graphics/geeqie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 037cf7c8ed62..98103efab64f 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - sha256 = "sha256-Abr7trlms6bxOAqE6xNKRv51TBGNilNdBhUZUg7OTKY="; + sha256 = "sha256-O+yz/uNxueR+naEJG8EZ+k/JutRjJ5wwbB9DYb8YNLw="; }; patches = [ From a03b332b81d8def4c9c9c7e94fa3300b2e551fb3 Mon Sep 17 00:00:00 2001 From: Emil Karlson Date: Tue, 5 Oct 2021 14:33:18 +0300 Subject: [PATCH 341/385] nixos/terminfo: add enableAllTerminfo option Add an option to install all .terminfo packages, normally this should add no runtime bloat, if caches are used. --- nixos/modules/config/terminfo.nix | 26 +++++++++++++++++++++++++- nixos/tests/all-terminfo.nix | 31 +++++++++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/all-terminfo.nix diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix index 1396640af672..693404a429c3 100644 --- a/nixos/modules/config/terminfo.nix +++ b/nixos/modules/config/terminfo.nix @@ -1,9 +1,33 @@ # This module manages the terminfo database # and its integration in the system. -{ config, ... }: +{ config, lib, pkgs, ... }: + +with lib; + { + + options.environment.enableAllTerminfo = with lib; mkOption { + default = false; + type = types.bool; + description = '' + Whether to install all terminfo outputs + ''; + }; + config = { + # can be generated with: filter (drv: (builtins.tryEval (drv ? terminfo)).value) (attrValues pkgs) + environment.systemPackages = mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs; [ + alacritty + foot + kitty + mtm + rxvt-unicode-unwrapped + rxvt-unicode-unwrapped-emoji + termite + wezterm + ])); + environment.pathsToLink = [ "/share/terminfo" ]; diff --git a/nixos/tests/all-terminfo.nix b/nixos/tests/all-terminfo.nix new file mode 100644 index 000000000000..dd47c66ee1c1 --- /dev/null +++ b/nixos/tests/all-terminfo.nix @@ -0,0 +1,31 @@ +import ./make-test-python.nix ({ pkgs, ... }: rec { + name = "all-terminfo"; + meta = with pkgs.lib.maintainers; { + maintainers = [ jkarlson ]; + }; + + nodes.machine = { pkgs, config, lib, ... }: + let + infoFilter = name: drv: + let + o = builtins.tryEval drv; + in + o.success && lib.isDerivation o.value && o.value ? outputs && builtins.elem "terminfo" o.value.outputs; + terminfos = lib.filterAttrs infoFilter pkgs; + excludedTerminfos = lib.filterAttrs (_: drv: !(builtins.elem drv.terminfo config.environment.systemPackages)) terminfos; + includedOuts = lib.filterAttrs (_: drv: builtins.elem drv.out config.environment.systemPackages) terminfos; + in + { + environment = { + enableAllTerminfo = true; + etc."terminfo-missing".text = builtins.concatStringsSep "\n" (builtins.attrNames excludedTerminfos); + etc."terminfo-extra-outs".text = builtins.concatStringsSep "\n" (builtins.attrNames includedOuts); + }; + }; + + testScript = + '' + machine.fail("grep . /etc/terminfo-missing >&2") + machine.fail("grep . /etc/terminfo-extra-outs >&2") + ''; +}) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 44eeceda99eb..734f0b1ca5ac 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -35,6 +35,7 @@ in agate = handleTest ./web-servers/agate.nix {}; agda = handleTest ./agda.nix {}; airsonic = handleTest ./airsonic.nix {}; + allTerminfo = handleTest ./all-terminfo.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; apfs = handleTest ./apfs.nix {}; apparmor = handleTest ./apparmor.nix {}; From 1eac8d2c54b1265159bb2a380439a63d5c86c21d Mon Sep 17 00:00:00 2001 From: Emil Karlson Date: Wed, 17 Nov 2021 09:06:02 +0200 Subject: [PATCH 342/385] wezterm: Add nixosTests.allTerminfo Make allTerminfo test results more visible. --- pkgs/applications/terminal-emulators/wezterm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 17ee157a4406..c51aee526865 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -100,7 +100,10 @@ rustPlatform.buildRustPackage rec { ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP" ''; - passthru.tests.test = nixosTests.terminal-emulators.wezterm; + passthru.tests = { + all-terminfo = nixosTests.allTerminfo; + test = nixosTests.terminal-emulators.wezterm; + }; meta = with lib; { description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; From 4d9a820dc791b641611cd73bd52d0e974e22604b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 13 Apr 2022 09:06:20 +0200 Subject: [PATCH 343/385] mutt: 2.2.2 -> 2.2.3 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 9904e2db362d..c22c7b2c17e0 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1k0ghbpc4gn3sydbw10xv9djin9grk1pkxdwynrw0iknyc68gphh"; + sha256 = "12cds5qm0x51wj1bz1a2f4q4qwbyfssq9pnisxz48ks5mg6xv2lp"; }; patches = optional smimeSupport (fetchpatch { From 17c2ca9084aa4648d31c2de6558921b408aabb00 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 13 Apr 2022 09:49:42 +0200 Subject: [PATCH 344/385] qutebrowser: fix userscripts directory path --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 6d919ce520f5..580cf6978d87 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -77,7 +77,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" - sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py + sed -i "s,/usr,$out,g" qutebrowser/utils/standarddir.py '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; From fd3f39303b4f3831747f6cdf7409915fec77446a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 3 Apr 2022 11:26:38 +0000 Subject: [PATCH 345/385] squashfs-tools-ng: 1.1.3 -> 1.1.4 --- pkgs/tools/filesystems/squashfs-tools-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 1dbaee5ad14c..b2c0ae45f468 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "sha256-q84Pz5qK4cM1Lk5eh+Gwd/VEEdpRczLqg7XnzpSN1w0="; + sha256 = "06pnr3ilywqxch942l8xdg7k053xrqjkkziivx9h89bvy5j7hgvg"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; From 26d66fbfa9bad792b9d8d629808f544f2d21d84e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 3 Apr 2022 11:57:13 +0000 Subject: [PATCH 346/385] crosvm.updateScript: generate Cargo.lock --- .../virtualization/crosvm/generate-cargo.sh | 7 +++++++ pkgs/applications/virtualization/crosvm/update.py | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/virtualization/crosvm/generate-cargo.sh diff --git a/pkgs/applications/virtualization/crosvm/generate-cargo.sh b/pkgs/applications/virtualization/crosvm/generate-cargo.sh new file mode 100644 index 000000000000..216cafe367ca --- /dev/null +++ b/pkgs/applications/virtualization/crosvm/generate-cargo.sh @@ -0,0 +1,7 @@ +dir="$(mktemp -d)" && + cd "$dir" && + unpackPhase && + cd "${sourceRoot:-}" && + cargo generate-lockfile && + mv Cargo.lock "$1" +rm -rf "$dir" diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 6e36e524b78d..f9fc90c6b349 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -5,9 +5,10 @@ import base64 import json import re +import shlex import subprocess from codecs import iterdecode -from os.path import dirname, splitext +from os.path import abspath, dirname, splitext from lxml import etree from lxml.etree import HTMLParser from urllib.request import urlopen @@ -78,7 +79,14 @@ argv = ['nix-instantiate', '--eval', '--json', '-A', 'crosvm.meta.position'] position = json.loads(subprocess.check_output(argv).decode('utf-8')) filename = re.match(r'[^:]*', position)[0] -# Finally, write the output. +# Write the output. with open(dirname(filename) + '/upstream-info.json', 'w') as out: json.dump(data, out, indent=2) out.write('\n') + +# Generate a Cargo.lock +run = ['.', + dirname(abspath(__file__)) + '/generate-cargo.sh', + dirname(filename) + '/Cargo.lock'] +expr = '(import ./. {}).crosvm.overrideAttrs (_: { dontCargoSetupPostUnpack = true; })' +subprocess.run(['nix-shell', '-E', expr, '--run', shlex.join(run)]) From 40f140ad872cb9d85ffff366a45739d30256b350 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 3 Apr 2022 11:58:26 +0000 Subject: [PATCH 347/385] crosvm: 99.14468.0.0-rc1 -> 100.14526.0.0-rc1 --- .../virtualization/crosvm/Cargo.lock | 53 +++++++++++-------- .../virtualization/crosvm/upstream-info.json | 10 ++-- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/virtualization/crosvm/Cargo.lock b/pkgs/applications/virtualization/crosvm/Cargo.lock index 3746d87cf0af..7016457499fc 100644 --- a/pkgs/applications/virtualization/crosvm/Cargo.lock +++ b/pkgs/applications/virtualization/crosvm/Cargo.lock @@ -106,9 +106,9 @@ checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", @@ -141,6 +141,13 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "balloon_control" +version = "0.1.0" +dependencies = [ + "serde", +] + [[package]] name = "base" version = "0.1.0" @@ -360,6 +367,7 @@ dependencies = [ "argh", "async-task", "audio_streams", + "balloon_control", "base", "bit_field", "cros_async", @@ -578,9 +586,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if 1.0.0", "libc", @@ -726,9 +734,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "libcras" @@ -763,9 +771,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if 1.0.0", ] @@ -854,9 +862,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "pin-project-lite" @@ -872,9 +880,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "poll_token_derive" @@ -964,9 +972,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" dependencies = [ "proc-macro2", ] @@ -1088,9 +1096,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] @@ -1209,9 +1217,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" @@ -1221,9 +1229,9 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "syn" -version = "1.0.88" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd69e719f31e88618baa1eaa6ee2de5c9a1c004f1e9ecdb58e8352a13f20a01" +checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f" dependencies = [ "proc-macro2", "quote", @@ -1376,6 +1384,7 @@ dependencies = [ name = "vm_control" version = "0.1.0" dependencies = [ + "balloon_control", "base", "data_model", "gdbstub_arch", @@ -1426,9 +1435,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "which" -version = "4.2.4" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", "lazy_static", diff --git a/pkgs/applications/virtualization/crosvm/upstream-info.json b/pkgs/applications/virtualization/crosvm/upstream-info.json index 437e8f418699..c994ff1a5fda 100644 --- a/pkgs/applications/virtualization/crosvm/upstream-info.json +++ b/pkgs/applications/virtualization/crosvm/upstream-info.json @@ -1,11 +1,11 @@ { - "version": "99.14468.0.0-rc1", + "version": "100.14526.0.0-rc1", "src": { "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", - "rev": "410ea3a1980bfe96968a7dfb7a7d203d43b186b2", - "date": "2022-01-11T00:01:17-08:00", - "path": "/nix/store/y2rpzh1any8c4nwnwkvir7241kbcj8fn-crosvm-410ea3a", - "sha256": "1bgwndh2f60ka1f8c8yqnqqkra510ai9miyfvvm0b3dnsdpy77kd", + "rev": "bdf5e4d4379030cfa2d0510328b8acce73162217", + "date": "2022-02-14T19:13:41+00:00", + "path": "/nix/store/xw31chiwnpzgcp07nf448g2npcwiwkkm-crosvm-bdf5e4d", + "sha256": "0mrnjyyqmz24z1yvdq2mysmhmz0577k8kf9y4v51g7860crqp9ji", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, From 10c1ac7dc996c90948875ec6fc62e2a752a8f1f5 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 13 Apr 2022 11:01:28 +0200 Subject: [PATCH 348/385] terraform-providers.htpasswd: init at 1.0.1 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f78fd4fc20b9..15c7c7ce38e3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -471,6 +471,15 @@ "vendorSha256": "sha256-HrsjhaMlzs+uel5tBlxJD69Kkjl+4qVisWWREANBx40=", "version": "5.0.2" }, + "htpasswd": { + "owner": "loafoe", + "provider-source-address": "registry.terraform.io/loafoe/htpasswd", + "repo": "terraform-provider-htpasswd", + "rev": "v1.0.1", + "sha256": "sha256-RUkPIsKVMooGy2hYsNFkctMFdJ8MEbtbMB9Qak6HJgQ=", + "vendorSha256": "sha256-4P3IX7KGDqcWVYRiD6tXoEjF/phI89rz5QdR09xtnAo=", + "version": "1.0.1" + }, "http": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/http", From 4dd2e406feb4d350a2e239be5b63ad92dbdb64ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 09:17:17 +0000 Subject: [PATCH 349/385] mpris-scrobbler: 0.4.0.1 -> 0.4.90 --- pkgs/tools/audio/mpris-scrobbler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix index 93960a5278fd..f2e23fd2f57d 100644 --- a/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "mpris-scrobbler"; - version = "0.4.0.1"; + version = "0.4.90"; src = fetchFromGitHub { owner = "mariusor"; repo = "mpris-scrobbler"; rev = "v${version}"; - sha256 = "0jzmgcb9a19hl8y7iwy8l3cc2vgzi0scw7r5q72kszfyxn0yk2gs"; + sha256 = "sha256-+Y5d7yFOnSk2gQS/m/01ofbNeDCLXb+cTTlHj4bgO0M="; }; postPatch = '' From b4d69f1fbea22734facb7e54457f557867a88859 Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 13 Apr 2022 12:09:15 +0200 Subject: [PATCH 350/385] ArchiSteamFarm: disable nixpkgs-update --- pkgs/applications/misc/ArchiSteamFarm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 7587a6ee1241..5b221384d038 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,6 +11,7 @@ buildDotnetModule rec { pname = "archisteamfarm"; + # nixpkgs-update: no auto update version = "5.2.2.4"; src = fetchFromGitHub { From db6a3b620a2b4e9432af7824e8ee851d38423328 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 13 Apr 2022 07:13:11 -0300 Subject: [PATCH 351/385] cloudflared: 2022.4.0 -> 2022.4.1 + fix tests for linux (#167419) Co-authored-by: Sandro --- .../networking/cloudflared/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 015612983c29..566178d8305e 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,22 +1,33 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, stdenv }: buildGoModule rec { pname = "cloudflared"; - version = "2022.4.0"; + version = "2022.4.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-+40OK2q4WdvlLhoPfZH6q+pghgS7ZLmaZl2VbZK4rdA="; + hash = "sha256-dgvXbWtLP6sXBlqcx/xpw9LIbcE4VlYZQO5rrS34+9I="; }; vendorSha256 = null; - doCheck = false; - ldflags = [ "-X main.Version=${version}" ]; + preCheck = '' + # Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory + export HOME="$(mktemp -d)"; + + # Workaround for: protocol_test.go:11: + # lookup protocol-v2.argotunnel.com on [::1]:53: read udp [::1]:51876->[::1]:53: read: connection refused + + substituteInPlace "edgediscovery/protocol_test.go" \ + --replace "TestProtocolPercentage" "SkipProtocolPercentage" + ''; + + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)"; homepage = "https://www.cloudflare.com/products/tunnel"; From 93b9c6708e7dfdb1ad18a7854fdb3bb14346f354 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 10:29:55 +0000 Subject: [PATCH 352/385] palemoon: 29.4.5.1 -> 29.4.6 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index cce3f39d3c31..70442e47e66b 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -46,12 +46,12 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.5.1"; + version = "29.4.6"; src = fetchzip { name = "${pname}-${version}"; url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; - sha256 = "sha256-IC7E88dECAz2diVLEEdjMltpNMBhPTlPvbz05BniBMI="; + sha256 = "sha256-6bI3AnIhp0x3BCgTvmbOXDBGrJXg3cN+AmwI8XCKD8g="; }; nativeBuildInputs = [ From 79c22361e387ed761b2feddafd742e8f8191049f Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Wed, 13 Apr 2022 10:50:11 +0000 Subject: [PATCH 353/385] exploitdb: 2022-04-08 -> 2022-04-12 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 2a39c61121a0..bc78eb7f1017 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-04-08"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-yZ/4ULiNekedF0wUwowq5wcen52NbIsbSzINhKuStzo="; + sha256 = "sha256-Ucbw09oFklulyXr8mGO5RskKNZx0rPTA6hPJgYByPAI="; }; nativeBuildInputs = [ makeWrapper ]; From 8c5ed979bea1bebf3a1b650ed36638925cd344ea Mon Sep 17 00:00:00 2001 From: betaboon Date: Wed, 13 Apr 2022 12:53:42 +0200 Subject: [PATCH 354/385] bazel_5: 5.0.0 -> 5.1.1 --- .../build-managers/bazel/bazel_5/default.nix | 4 +- .../bazel/bazel_5/src-deps.json | 112 +++++++++++++++--- 2 files changed, 100 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 8770174ab26c..60e708bb47c8 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -26,12 +26,12 @@ }: let - version = "5.0.0"; + version = "5.1.1"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "By3WLSN9vBHgusAuEY2MLbTQujugnxoOseKkYPuEGds="; + sha256 = "f107wdNEaSskAPN2X9S1wLY26056insXkjCVx7VqT3g="; }; # Update with `eval $(nix-build -A bazel.updater)`, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json index ff010d01aa08..5282e9efc3c1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json @@ -15,6 +15,14 @@ "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" ] }, + "20211102.0.tar.gz": { + "name": "20211102.0.tar.gz", + "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" + ] + }, "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz": { "name": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", @@ -47,14 +55,6 @@ "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" ] }, - "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz": { - "name": "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz", - "sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee", - "urls": [ - "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz" - ] - }, "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", @@ -282,7 +282,8 @@ "-p1" ], "patches": [ - "//third_party/grpc:grpc_1.41.0.patch" + "//third_party/grpc:grpc_1.41.0.patch", + "//third_party/grpc:grpc_1.41.0.win_arm64.patch" ], "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", "strip_prefix": "grpc-1.41.0", @@ -292,14 +293,14 @@ ] }, "com_google_absl": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "com_google_absl", "name": "com_google_absl", - "sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee", - "strip_prefix": "abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6", + "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "strip_prefix": "abseil-cpp-20211102.0", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz" + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" ] }, "com_google_googleapis": { @@ -772,6 +773,13 @@ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.2.1.tar" ] }, + "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { + "name": "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip", + "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" + ] + }, "opencensus_proto": { "generator_function": "grpc_deps", "generator_name": "opencensus_proto", @@ -820,6 +828,15 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip" ] }, + "openjdk11_windows_arm64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_windows_arm64_archive", + "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "strip_prefix": "jdk-11.0.13+8", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" + ] + }, "openjdk15_darwin_aarch64_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "name": "openjdk15_darwin_aarch64_archive", @@ -940,6 +957,18 @@ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip" ] }, + "openjdk17_windows_arm64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk17_windows_arm64_archive", + "name": "openjdk17_windows_arm64_archive", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + ] + }, "openjdk_linux": { "downloaded_file_path": "zulu-linux.tar.gz", "name": "openjdk_linux", @@ -1063,6 +1092,14 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" ] }, + "openjdk_win_arm64_vanilla": { + "downloaded_file_path": "zulu-win-arm64.zip", + "name": "openjdk_win_arm64_vanilla", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + ] + }, "openjdk_win_minimal": { "downloaded_file_path": "zulu-win-minimal.zip", "name": "openjdk_win_minimal", @@ -1472,6 +1509,25 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" ] }, + "remotejdk11_win_arm64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_win_arm64_for_testing", + "name": "remotejdk11_win_arm64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "strip_prefix": "jdk-11.0.13+8", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" + ] + }, "remotejdk11_win_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk11_win_for_testing", @@ -1768,6 +1824,26 @@ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz" ] }, + "remotejdk17_win_arm64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk17_win_arm64_for_testing", + "name": "remotejdk17_win_arm64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + ] + }, "remotejdk17_win_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk17_win_for_testing", @@ -1986,5 +2062,13 @@ "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip" ] + }, + "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip": { + "name": "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + ] } } From c480fadd4bdee91dfdbb8232a1c4ad8432187196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Apr 2022 12:54:54 +0200 Subject: [PATCH 355/385] atuin: simplify completion generation --- pkgs/tools/misc/atuin/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 09827928618a..4bb75f547876 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -26,15 +26,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; postInstall = '' - HOME=$(mktemp -d) - for shell in bash fish zsh; do - $out/bin/atuin gen-completions -s $shell -o . - done - installShellCompletion --cmd atuin \ - --bash atuin.bash \ - --fish atuin.fish \ - --zsh _atuin + --bash <($out/bin/atuin gen-completions -s bash) \ + --fish <($out/bin/atuin gen-completions -s fish) \ + --zsh <($out/bin/atuin gen-completions -s zsh) ''; meta = with lib; { From a1ea14c1d38cb49c5d93e9dc37c6be5d760ffcfd Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 13 Apr 2022 12:22:47 +0100 Subject: [PATCH 356/385] syft: 0.43.2 -> 0.44.0 --- pkgs/tools/admin/syft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index bb14b1c97f19..0128c6191c16 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.43.2"; + version = "0.44.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vGzS5Tpg+3f+ydsNbYza4FnCLBv6hMT3RGdlHrKjtfE="; + sha256 = "sha256-w5/lTGkwH6cLzbj6/ZUJyFtwx9EyA5Q7hs/CwtsdsJA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From ecaee94bc095e30b39fb9ea6334fbd33a4d42845 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 7 Sep 2021 11:01:11 +0200 Subject: [PATCH 357/385] linux-wifi-hotspot: init at 4.4.0 --- .../linux/linux-wifi-hotspot/default.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/os-specific/linux/linux-wifi-hotspot/default.nix diff --git a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix new file mode 100644 index 000000000000..2cefc9b0216d --- /dev/null +++ b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, which +, pkg-config +, glib +, gtk3 +, iw +, makeWrapper +, qrencode +, hostapd }: + +stdenv.mkDerivation rec { + pname = "linux-wifi-hotspot"; + version = "4.4.0"; + + src = fetchFromGitHub { + owner = "lakinduakash"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XCgYWOX7QSdANG6DqYk0yZZqnvZGDl3GaF9KtYRmpJ0="; + }; + + nativeBuildInputs = [ + which + pkg-config + makeWrapper + qrencode + hostapd + ]; + + buildInputs = [ + glib + gtk3 + ]; + + outputs = [ "out" ]; + + postPatch = '' + substituteInPlace ./src/scripts/Makefile \ + --replace "etc" "$out/etc" + substituteInPlace ./src/scripts/wihotspot \ + --replace "/usr" "$out" + substituteInPlace ./src/scripts/create_ap.service \ + --replace "/usr/bin/create_ap" "$out/bin/create_cap" \ + --replace "/etc/create_ap.conf" "$out/etc/create_cap.conf" + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + postInstall = '' + wrapProgram $out/bin/create_ap \ + --prefix PATH : ${lib.makeBinPath [ hostapd ]} + + wrapProgram $out/bin/wihotspot-gui \ + --prefix PATH : ${lib.makeBinPath [ iw ]} \ + --prefix PATH : "${placeholder "out"}/bin" + + wrapProgram $out/bin/wihotspot \ + --prefix PATH : ${lib.makeBinPath [ iw ]} \ + --prefix PATH : "${placeholder "out"}/bin" + ''; + + meta = with lib; { + description = "Feature-rich wifi hotspot creator for Linux which provides both GUI and command-line interface"; + homepage = "https://github.com/lakinduakash/linux-wifi-hotspot"; + license = licenses.bsd2; + maintainers = with maintainers; [ onny ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7a0b0a21dfa..d74be6367612 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22699,6 +22699,8 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + linux-wifi-hotspot = callPackage ../os-specific/linux/linux-wifi-hotspot { }; + linthesia = callPackage ../games/linthesia/default.nix { }; libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; From 3a1ad97bbe28535dece0b120fa6980a9a51a49f8 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 13 Apr 2022 08:07:51 -0400 Subject: [PATCH 358/385] buildkite-agent: 3.35.1 -> 3.35.2 (#168443) --- .../continuous-integration/buildkite-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 70e60d8418ff..43ed263477bd 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.35.1"; + version = "3.35.2"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-fa32tKOlRuKTONiMboX7CUxeknePsNRC7jlBvAtXmus="; + sha256 = "sha256-BpfWeSEX4N77yXfWKpH7KWKsncdOYquxF+L+g13DdiA="; }; - vendorSha256 = "sha256-YnOOJDzdirikFbS9451A/TWOSWv04QsqO68/cSXK82k="; + vendorSha256 = "sha256-E51LBpNN/N3wH1LMxv/+nnwpQAxHhyDW2jgVIDkNeQ4="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash From e76aa74c2824cf0a66a463b67b9b93a2c0cfc046 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 10 Apr 2022 20:38:57 -0300 Subject: [PATCH 359/385] nixos/xfce: option to disable xfce4-screensaver Signed-off-by: lucasew --- .../manual/from_md/release-notes/rl-2205.section.xml | 5 ++++- nixos/doc/manual/release-notes/rl-2205.section.md | 2 +- nixos/modules/services/x11/desktop-managers/xfce.nix | 11 ++++++++--- 3 files changed, 13 insertions(+), 5 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 ceb9ca53716e..0f03c754bdf8 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 @@ -1880,7 +1880,10 @@ services.xserver.desktopManager.xfce now includes Xfce’s screen locker, - xfce4-screensaver. + xfce4-screensaver that is enabled by + default. You can disable it by setting + false to + services.xserver.desktopManager.xfce.enableScreensaver. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index ff628d007250..d75c5e15b34a 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -642,7 +642,7 @@ In addition to numerous new and upgraded packages, this release has the followin - xfsprogs was update to version 5.15, which enables inobtcount and bigtime by default on filesystem creation. Support for these features was added in kernel 5.10 and deemed stable in kernel 5.15. If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than 5.10, you need to format them with `mkfs.xfs -m bigtime=0 -m inobtcount=0`. -- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver`. +- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver` that is enabled by default. You can disable it by setting `false` to [services.xserver.desktopManager.xfce.enableScreensaver](#opt-services.xserver.desktopManager.xfce.enableScreensaver). - The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)). diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 0bb5c1268cac..88b21e59aaa6 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -66,6 +66,12 @@ in default = true; description = "Enable the XFWM (default) window manager."; }; + + enableScreensaver = mkOption { + type = types.bool; + default = true; + description = "Enable the XFCE screensaver."; + }; }; }; @@ -99,7 +105,6 @@ in ristretto xfce4-appfinder xfce4-notifyd - xfce4-screensaver xfce4-screenshooter xfce4-session xfce4-settings @@ -123,7 +128,7 @@ in ] ++ optionals (!cfg.noDesktop) [ xfce4-panel xfdesktop - ]; + ] ++ optional cfg.enableScreensaver xfce4-screensaver; environment.pathsToLink = [ "/share/xfce4" @@ -169,6 +174,6 @@ in xfce4-notifyd ]; - security.pam.services.xfce4-screensaver.unixAuth = true; + security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver; }; } From 39e3510d6d68fd68b4464d32ebcbee4c42df8c54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 12:36:07 +0000 Subject: [PATCH 360/385] python310Packages.appthreat-vulnerability-db: 2.0.1 -> 2.0.2 --- .../python-modules/appthreat-vulnerability-db/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 9fc959126b37..a6984e773dd0 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AppThreat"; repo = "vulnerability-db"; - rev = "v${version}"; - sha256 = "sha256-fqpBnxcRBBXsjJepxDuoDbT3hk5rXAvky11sIvQS9XI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Ozf3qmD9JRH19N/eERhDHz4LUoWwCVepLbSRCg6lWnQ="; }; propagatedBuildInputs = [ From cf43796a27dede10c156d3bd0562cbb90fb196cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 12:43:07 +0000 Subject: [PATCH 361/385] python310Packages.apycula: 0.3 -> 0.3.1 --- pkgs/development/python-modules/apycula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index d8bb92e0d3bc..f9ffeefa296d 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.3"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-Ncecrn5fQW0iAgrE3P7GZTx8E1TiFqiDMhZQSPrDvdk="; + hash = "sha256-RoWZt2Ox0XjJ6vmuCCcNCTMfwZnwJ6fSx71fmipmu2c="; }; nativeBuildInputs = [ From 4a92b1e81fcc8ed7bcdee47591ee4ea261238cc7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 14:46:45 +0200 Subject: [PATCH 362/385] firefox-devedition-bin-unwrapped: 99.0b6 -> 100.0b5 --- .../firefox-bin/devedition_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 25a81d11efaf..b6c6976bbb90 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "99.0b6"; + version = "100.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ach/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ach/firefox-100.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "0bb4605a97661502cb23fe2ebfdb1a31831f8ca015349b3105d1245fcaa5eb69"; + sha256 = "fb1b570f098ca5d80f41f14ada1f7ad6dc43e5e1c6984e1fca29cfd275dabded"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/af/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/af/firefox-100.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "564fd8895c6fa6aecebd5a7250bd73df45a6e51f90845d9597e59cd9175b6c2c"; + sha256 = "31322e6c45045322977b5d240350e0e4740f9c48174b719553410fea3212f475"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/an/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/an/firefox-100.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "76035e42b93995e6cda0de737981760a0025013bc3330142b95ba7329d54153b"; + sha256 = "137eb68b647af950362682646f7edf754bfb51a03b20f59b777f877b3ef003c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ar/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ar/firefox-100.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "31abbbdf4378559e6b612fd3b0167bbaad332edc47d6ff67e8d9aa7e01130808"; + sha256 = "22d24c6bad9ce2ded7634449fbc5d0bcdd4972aac15f60e04cf963ab0ee252bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ast/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ast/firefox-100.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "1c4a2c370c3f566823c722082a3a9f149050cb7a891f3a1f21b7ca8ec899ca92"; + sha256 = "e8a2e7ea146efe41105d84a667568662d029a9773855ae31768ba9c14abbdde7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/az/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/az/firefox-100.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "b1d0effa84614c985001705630da49b70f09e91be3715795fc18d926303b6b95"; + sha256 = "34d76711bdc45cc45650cb4c94e553f67579be3f406c391c9878cb6de1c39bb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/be/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/be/firefox-100.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d0ace001eff838f8dcb80090a193307e143a5c1f3b1dac143ded5af3fecbdfda"; + sha256 = "fdd4d1cea3b71f54b58230a30c744d2ff7b0237869fd14e617ba3322c2d59f6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bg/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/bg/firefox-100.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "784d6029972a843829783581796263899371c777cf669f0e4f6978f35a8d6199"; + sha256 = "e63e65a92f73a31d2adac6a0c1b6dc45f38425ed8596039332108565de43daa6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/bn/firefox-100.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7cdc3a6f35c2a56b87a58eaf3112148c51b2d2d0fe5d9afc5deccfb2d2269b2e"; + sha256 = "29fbffaeb7bd8750cf1fb543692855d427200d7df6e9ca92224bd96103b06b35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/br/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/br/firefox-100.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "abbe12c9d887ea98d85479105bf2640bdbe3d295def41b626d3d8feef3627b36"; + sha256 = "3c1bc8cace7f4d2c7522fc9dd994c42707ca4d54b74ead88726c8e83862c3757"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/bs/firefox-100.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "fc1076c2eda5623869a3af5c850fb51cf8611501f51984c85f690b4c545cc93b"; + sha256 = "3e6c94efea22c4bd2620225e8a339689e3e4f642d474f4580092a85d7c4a4950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ca-valencia/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ca-valencia/firefox-100.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "d328055c61c96c92dd05989c23a3f8f49b36cb755f72118c21331f986ba3b44d"; + sha256 = "485b33fe034acd03412b3407338cd246077209fc1ccd566f2ac9d347c8da6308"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ca/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ca/firefox-100.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6a020e56c5f4136deff38f07d94b516971af1a31a804384a50396dbf6241877e"; + sha256 = "a0b2780c0a634c85a9dbdc00b6952c81b503c3173d2c2cb9df5d9c5958ab640c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cak/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/cak/firefox-100.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c6298bdeba82a637bb3903aaf73b9de9f0a3ce4ec22637b1ee1340273b7e36af"; + sha256 = "360abc1da779874423792e63b545343aaeb3984201193c687c3c8b67b67cecb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/cs/firefox-100.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1facd79fe087052af58205d2a0a9acce68a1d9bc58d1a3bd3e49b740f6e51647"; + sha256 = "1dc722b7931908a38f43254aa1c1c78fb77ee30868c15455c0448927e658613d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cy/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/cy/firefox-100.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e7305badc55114c4a39edc317202338b3e61feba9844fc2cd8edc1518486736a"; + sha256 = "55eba066d11752cbf973312d55568e51b720f21e66bf590adadbe93be386e989"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/da/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/da/firefox-100.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "6b1d2403e1e74c97c763476a128c56079d546967c87f1b225ac790d9acb6940d"; + sha256 = "cc3fa0c0ef8a1af9f8bb78e7196c5cc7a6c6df2d9f25c5fe8d79f47879354331"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/de/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/de/firefox-100.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c8d01b9a1bbcdeb1fa0fa63ff553209d095280ebad4eb03efa47e029505b8204"; + sha256 = "b745aa34eca890302b701be19bdd3affcba37e7b1af388e4844ce61c3a1244fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/dsb/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/dsb/firefox-100.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bea09c23f3099c85e415bb05916ab9e3374f78e897e2b8549fb9f67895b7c052"; + sha256 = "e7a4c1390919cfd01fe13f5a81ce35fbdf0868c725783d603c7d2e210e3ba368"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/el/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/el/firefox-100.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "bd740ab9aaad78e4b16e42d610ea1b914db95e2f8396f0e9c4803e38c9810f20"; + sha256 = "6f0b80919e22ec67f80c7c034fdd9e290cf2ec442ae828a706e780df2ec54d90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-CA/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/en-CA/firefox-100.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "acf5c9da684d5f7bb5b25e5fbd62d5dfafb1a5f33bd6c7baa385a37967e516a1"; + sha256 = "0184e33ff9582a77a5f9d61f1904f3cd097feda7576aaa276480eff92dfcb4de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-GB/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/en-GB/firefox-100.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "76cfab3fb29274bcec47ce72e88f783668653d3f8ea4ad00637bdd7ad5d32364"; + sha256 = "b5affd31a9004c9161d6a55cb713999932b18f1340ce67d0e7f77b0c805ca785"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-US/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/en-US/firefox-100.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "798f68125a37ac1e60d72dff3a773cd167075a58d523d7d9659cd5fb511e2dcb"; + sha256 = "635c5b79c514b9b7717c903cdabc2f6bf3f19cb9689354dc33f21cc8eed3d540"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/eo/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/eo/firefox-100.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0b65dc59679b42a298484d3901f3f47d6073f08e260a792a6e80d9c5a0e6ad0b"; + sha256 = "9e4a718c0932688ece8883fd2fa2d175c3483d73ac16075d8efa0e6758f4cf61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-AR/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/es-AR/firefox-100.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3a894741998ee1a2adb6def1c8d548b2c5fcab8fbea655a013dbeef9a29ab228"; + sha256 = "3bc0ce89dc3ab79108bf527fccc9aa9663f61e6578b2561fc7e1950dcaaed1db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-CL/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/es-CL/firefox-100.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1964534e196d426a9d6dbe664dc16790f010214cfba85e98f5df728e110e0a74"; + sha256 = "966db10e384f875272ffcdb743c472a78a75a95e0990a32fb16fe2b8d5a70761"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-ES/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/es-ES/firefox-100.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "32b21ccb56fbe2e46aba0e21c417e2a7d3404a0a3487186c75d042fd84c5033a"; + sha256 = "8b23f6957fb0825b973c4ab59c80ffdfeb8370a72a291ebec6ae7abff1ca3392"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-MX/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/es-MX/firefox-100.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "d70ff15a4cced1028433e603151af021be98d1026322203f0412605685611e5d"; + sha256 = "75102ce28fbb425fb0c13dccfdbc5095c1c92c4dd83e14140bd672fe60547603"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/et/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/et/firefox-100.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "df844133edc74d396a2fe66b0a71efda2c4797ca7110a12c4c7e620cbacbfe8d"; + sha256 = "ab7d6e1294e49e83307bac9541b15163263bc15693fd0845c335e523e5420623"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/eu/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/eu/firefox-100.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1ca8ba1a7ba29a0c21d7bdf5cbb046fa0e145a9bdad5debd93d121b512a060a4"; + sha256 = "6defedc5c4faacc9765a1d26352d9d8f30f895a6ec5bad1c3ed7c3d98ec42e16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fa/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/fa/firefox-100.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a4c223f683bf75c96650d939c56aa17bfeca975ba8863e44dd5ce0449b436b3e"; + sha256 = "0fe1b25b3b970e04980ca729a6630648b0923b98fd00bc81a4553235d741a6c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ff/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ff/firefox-100.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6b165789213fc3f9c3f46457a04974e3c718b2c0aebd44c57c7bf8f41c73687b"; + sha256 = "e8ad5c7403928bfa5e34c6bbb8958730dba8dcc6d799c9a7676d82440b8f1ab8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fi/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/fi/firefox-100.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "eea67a8d94f324a9ab74caae5a7755f9505781ff690760a06a62ad034ba76bd5"; + sha256 = "37e8619971dffc7c6caa43cf72f5870c5d5d1ed489bf8a3596215f285f17fa1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/fr/firefox-100.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d4cc1a70f8d020870ccac0b023574b9c0f39fd44bbbcfd8a35f6c688183f2a9a"; + sha256 = "90c21cec994d7fa1c4ffa6512c448a4948be5eb5d318a0f6c4ae6d6b6f801780"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fy-NL/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/fy-NL/firefox-100.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "df49ee1a9db407819fcc7baa9c6bc9c6fc9ab2c2b57b08d85c9478f1b0aaf6c0"; + sha256 = "c12a1b475b4d611d4083bb11d7384573817aef22796e91c7df968b7d6d726133"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ga-IE/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ga-IE/firefox-100.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e7e846a95ba695a8a3edf233ad31117f4d35d4942784c5f6c5a1ebed7f2f8e4a"; + sha256 = "fcdf90dbd66c1c87e7f8b25d820c5c866f0d905bbe424a8b6d8c27e7cbef5677"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gd/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/gd/firefox-100.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "48ef5fa12ec7415ad23a5a40f2f882147e03ecc074b33b173f413e53cc0cdde6"; + sha256 = "bfbeca59a046bffa5156621946c397884998fbd383085fab5159ae775db9cc9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/gl/firefox-100.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b44500b87f3b2219ba10e06bd937ba06784fc00085be12a16f69fe26f7733317"; + sha256 = "c0f1de5a454ae0f8df7407d08394f73cf8e09f39342288d6670d4c0b8adf2e77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/gn/firefox-100.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0e521a61d44d1058ceb566ae58272e41f0aab7f2267555781bb3235ff5e3a59c"; + sha256 = "5e177db13df6f5195603d8d2acb92dccdf2989fdb721e6ef6b758120f2efff75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gu-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/gu-IN/firefox-100.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2179c82d7763294f5adedb8c905ed5e009a4d3d176fae58c7503404015214c51"; + sha256 = "748aedc09ffe44b4f8223456afbfb43901b492ff401c6ff39127ff4267ce6123"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/he/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/he/firefox-100.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "69383070d17f2ae68363e8a29efc53e2748b8f784137c854162ec0132295a9e1"; + sha256 = "91c1abfed2e942c076c6b0068edd2dca02e496321fbd79fdd39c7c2dbe7c5c2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hi-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hi-IN/firefox-100.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "71e57a59cfc523d5c1c73c9b5547b3247170865a95022e5bd3098967c3e6002c"; + sha256 = "4e13080d458b980cac72cdda1f40a786db926b494fc905eab71cf3535f5383ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hr/firefox-100.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9ea82b192336e83c7ac450dc7068f2730c031f43633a87b7fa554651cf64a912"; + sha256 = "583c5a5f6aa0e328c57c303ba97d1bdfc0a2a959485560d27aa2e906a0deeb8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hsb/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hsb/firefox-100.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e3814f823f3bde2812751e9dd6a2b51a8861952eb04cb845d543a9252501dbba"; + sha256 = "d8c10888b1e3735fce5d1213322f62732b030919ff4b5df70d12d934d348e91c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hu/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hu/firefox-100.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e647f86de2e7687e23320aa0f36d96743f5da2cf43b2d83444a41506d13face9"; + sha256 = "4133206571188244ddf17b96d287d5683fbfeffe2cdd5b2c8ee63fb7db56e3c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hy-AM/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hy-AM/firefox-100.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "21cc172fad6136a17df0a6ae4c6e90ec72a02db744cfcb5252cedcf48223e543"; + sha256 = "7326ae0a0d0a0afc40f6aa8b0b1506dbe7ead006c641eed4812e63bbb58bdb82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ia/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ia/firefox-100.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5f0c85a36ec40ef57cfa2bbbc1a4663ce10c8659e0d6ecad67ea993186c9cbb6"; + sha256 = "e61cc178ec2a648c0bb229e5145d8755343427388911bc6386fae77a5ecfae5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/id/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/id/firefox-100.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e6671d2ac6b63ea4f2a84d1d0e89038ef1030d85e84d6b47c5b878ddc8d96b60"; + sha256 = "0ac90236941c9a0a5f17e2e5e96ee14c0ef6d5e5645566bc09cb9023359db882"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/is/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/is/firefox-100.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5bcafb210fa3aa06d56f17972d94c17faaaa2937948890b993bbc6c9bfbeecad"; + sha256 = "b1efef91567c6b1d52b5fcccf9fbb3c3f81b05929242ebc68168c4712e47c3b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/it/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/it/firefox-100.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3c14104a82a312324c1d42644eca6f80b7375f946a42edcb0a23f8a824bd0eb7"; + sha256 = "33e8282f6b1b3a9e404374f93eb6207c3110177fdc11c831469fa721c6669d93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ja/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ja/firefox-100.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "00713bc8710add3312294aa755c881701ebbb2d00e1f5f242ca12d102ab6f19b"; + sha256 = "ad13269606214cc9fa7d05037db3c6ecb192a5bcc06872aa487b023c2823862d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ka/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ka/firefox-100.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ba6985797ef85bdccb1f81053456baddbe2cfd9e1097e42b20617270f681c1ad"; + sha256 = "42b97eab01d92ad491e744890fe6984af4f435ce96595c5dd7bed02f6f5ff369"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kab/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/kab/firefox-100.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8be17598d305e257005ba0f9ef2f7053ee7e79bf3c1b4caade77c8e5a7e8a57c"; + sha256 = "64c9abf3921fcf698ed5cda9724884f2e3c1ad8651cbdf9a9fbebf2d8ca930fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/kk/firefox-100.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7e142151f26355256d2923b183fa1d225e3ed26026cbedf9abcebef301dc1045"; + sha256 = "9f4546b31322c74e76b13e4557bc412d5d75adddbba16f4e0b0ca8badc81f83f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/km/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/km/firefox-100.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "0df166d5a55e52ad60f8873afff5c1c43816ef99b56e1d817b4d4c29f173def5"; + sha256 = "daac53a85b255ad6b491efa2c4d021c0aa91f927e3a5f0fb0d1462ae473a9daf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/kn/firefox-100.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "193c7b709c03212ba91ea99da00c6b1c53edebbc9390d7321bd9815e5ced8233"; + sha256 = "20b8072ddf8fc07f5095ad97464fe0b84b10215fa02bdd9a31254a92c12541a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ko/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ko/firefox-100.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d265a984bcc6a381f715eff5e2501acde0c8793b111e15877f7d4e9086ddcf10"; + sha256 = "29be35485bf287596145f26602aac5a520d7e980f3012b564a297e13b83bf489"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lij/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/lij/firefox-100.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4a8327447982439a2f9e5ecff39b77ddd2bfdcb081d9b6f89848f2c93db3b3ca"; + sha256 = "7023d002cc4a7081eccbd5f061bbfe295f1856ed39724be4228e727119bc0a57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lt/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/lt/firefox-100.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cb2a9545762247192f909c1600097b1198fbddfed1c383adf5dfa9666ddc0e80"; + sha256 = "d121af78fa8bddf3825a89e751d37f12ea7c7513f331e015b0a951efedd80609"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lv/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/lv/firefox-100.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "6ed249ade30c7d2d5ff290c4b65d3eaf3df4e49e112412cb3153da15bcf23fcd"; + sha256 = "3f4a005f6ba7b09766f9a9d0186c0d5c82049be965e40f58eaa9c0474fb9d5e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/mk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/mk/firefox-100.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "56af16c66d20eaae2d6b487c3bec4f438d21effd3e3b1582579bb9c1836956d0"; + sha256 = "d1e7703d77584b93261676bb4e5e15a9df0953012392cc52636bafad697bfda8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/mr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/mr/firefox-100.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "fa6f5e496fdac7eda06220a423683f608d6c49b0e3caada52b9fd903b5ebcbe9"; + sha256 = "e7dcd45869323e949baed0e6e561a3051439e190ab3927d59af1008973e58f9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ms/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ms/firefox-100.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0820d7fcdeb7226d067f920e7cb8a0bb3bfd98ea931d468ae58ed54e074dd1f7"; + sha256 = "bb605564c51282e7c5c48150fa61196374b77c2de48c394f4c887c2bd0456f11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/my/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/my/firefox-100.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "20ab8faa3a4aa4b4f94f6c057d4fc9602201a55482d492bc6dd7acc5173364a7"; + sha256 = "9c0bec027eaad1ce4e2e6abeb35e62276805fd49ef818ddc67fd826c8a95f93e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nb-NO/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/nb-NO/firefox-100.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "77bf24610d6ad64859c83125909b70b3dd768e90e563971461f2c18fa2cd7693"; + sha256 = "141aec935cb203578e819481b9548e29212c29c94a6c60dd79bad0f676633cd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ne-NP/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ne-NP/firefox-100.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "fe5477509d83a14875e0409f99e2336abba237da75d1e56d753e27b7d1016c9c"; + sha256 = "5d3e083b078496ca6fa34960a3e480baa69b582bb737fbcded6a119c9216c0b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/nl/firefox-100.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "3b67159e8d34c836d5367a2e17b54bd2aa274e1f602ae42649afc2ba2fa1429f"; + sha256 = "f7a8257d2c2cd266e46db87b6ebd8a7530a486d503760baee3d7ab655dc5e7d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nn-NO/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/nn-NO/firefox-100.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4faf2904a8b9a0c315c222d7e810d2fb3e24947dda1e006ddd1f727d2f9f967a"; + sha256 = "30ec48d85ebccfc9314cb642a8171d5ce98dbd0ab102f6ec00cbff2d26163d0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/oc/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/oc/firefox-100.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "1dfa10fd1d9f958d487023144b7fad8ca8d1e528954f11e28509b7e22e48a341"; + sha256 = "4d580c477ef3dab1f217114b24486d29df4ce022fa444b013a296603c3ff5936"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pa-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/pa-IN/firefox-100.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "e6e4cc03a47ab8ff0546457b2ee0b55b8702463ed5666c15c0d2d98716fa84d2"; + sha256 = "02953120d3becd386ce8551fd4f97e1da930b7778906096fda8d79340e53230f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/pl/firefox-100.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "525023c756ff0a0eae303c02ef9b7155fdad5f0f41bc4e539be5ca21d1af0ceb"; + sha256 = "362c1d650bf4613e46384ba5837daa80a790b504fedc254c8af7cc146127fe1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pt-BR/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/pt-BR/firefox-100.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1a8070c38035f97ed771b02e59b3c2b0ef0073560c8ba285be9779fd4e99b61f"; + sha256 = "38ec5f6aeb156437f2925df9f1e5135bfa9d85e55d570548c56770334fe09bb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pt-PT/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/pt-PT/firefox-100.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ea356edfa8b398ea16719993cf05e65b5c63b4d2c4e589a9a26814ae275e4be2"; + sha256 = "9cfcd7212cd3531ee0694cc58653a53acd211494705f1d3040bbf03b4bb537f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/rm/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/rm/firefox-100.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f07ca7d4233860a6271eaa972358bd05b834c7f56c4b64d45eb9af72bcf2dd9f"; + sha256 = "ffce43f1c388618b53abaec130e288210cdb1361af512eedf0780d591e7ccffe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ro/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ro/firefox-100.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fccb8f523251dba30a73f6ec9259113142514b6d4657f63b88f5b9d9e8a01923"; + sha256 = "62bbfeb4a6692c25a1a2a0eb5e790e262e0141dcb74056cb55dc5e7e4a958954"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ru/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ru/firefox-100.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d87928af8f4a0b28abdcd0386755a3f4f70d7e17e455fe5913b1e177c3edff2c"; + sha256 = "0acf8d6c81c1704a67c9b7b9542ac6f1bd0b929cd0f0814b84cf64a46cc38107"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sco/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sco/firefox-100.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "de3bda2032217c56213f64b31332e8e6ea9598c7f31f3dce1a7b136c40c3153d"; + sha256 = "fc172346729982645acf975a7fba8e045eb81755540faf3eea9699a7474e4ab5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/si/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/si/firefox-100.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "22dbdccec8073bd1d83cc236fc563aa97a3607a92e9b3908d4c8c0307dca8b08"; + sha256 = "64ef404110234acc639faefe93499578b88506e287d0e75ec2fc36be625e7025"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sk/firefox-100.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d5f73c93ef57cd600a2c4269a99a498896b580ec99b549db8b0ee1537a644bb1"; + sha256 = "6fdeb9de76bc3d7d7b5907340368adcd69d28b0db7a46bf96ee54ab731821952"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sl/firefox-100.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "12459b203b0de94241b243b07b9f54e7ae612f7887581c5cd3ac7ca2a08a54d9"; + sha256 = "259b7c2467220ed58a725006b70b1610d7b1589892e75b0eda1ed5a97ea8d65d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/son/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/son/firefox-100.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "2d44c84feaa5c5e3595055289f84f320b447664d01c653b0a3b50f1da24b1a78"; + sha256 = "56f4d79d2e4c3df1ea6903c230d790aa2e40adb704358c6d225fcb2103122cdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sq/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sq/firefox-100.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fa3f9724380818a71d895252631b354ffb692f35679eb9b8ffa5b2beede8ab61"; + sha256 = "73490c2374b06cb4a8fdcf5c1ed32484581b62f380aef5d8d6da8c1319caa0b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sr/firefox-100.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c2e5ad218b8cbadfda7c455266e018a6eaf9b450a905e8a73b01d02b7efed608"; + sha256 = "06070996a689d5cac3f97348af762834d0a9e56446b8b58ceba11235f49f17cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sv-SE/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sv-SE/firefox-100.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "12060ac843f03a7544db8631c7f53bcd0cc6fb15d62cd997b02a83f0560722aa"; + sha256 = "bc2b8826c8635d5e96b596aa5add0a6f6146fd9b70195323b6fac588ad4e0a88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/szl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/szl/firefox-100.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "71ace92d020f3fbd1d5e223dfaa01e3a53ac625ba5ecf074153aad8ccb640ede"; + sha256 = "40eb80afc5f91513f4ee96dddd842b7b424b4caa2b41cbb0542b6a9c009b2099"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ta/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ta/firefox-100.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "6ace267aab85845babad8b11b68e154e1128b920ed16b8b8d011d53f6dced16c"; + sha256 = "79132eab776f5e3eba46368a837297be38123ac7036ab550c82d60037e8bc594"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/te/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/te/firefox-100.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "e381faff48999b63b4981695e7c80bb946b44503ab5275344f12b7005ed49ef3"; + sha256 = "b2062d708ca2964fe0d046da13c6e763dcc6702dbffc4bb32ace4301e2653941"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/th/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/th/firefox-100.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6c2ddea1c0ccf0521b9b647827569b78ac2143163895e67476051f8496011b66"; + sha256 = "4e1ce1968f16403268a69ab85abb33422eb52cb0f36c854a16dda87d5abd941d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/tl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/tl/firefox-100.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9d949c9c61922756d0f2dbcff76906191d438d161c74fbe7d702c7372c11b5d0"; + sha256 = "c1ee82d1b14be9bf7c634029884a7eb59c051f26663e00ea0bf6e5f74ef9e04c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/tr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/tr/firefox-100.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "88763e4847b865603a7d953d54b86e6a053d2476209b4046bcb09149275690f8"; + sha256 = "0c58541768c627cb4d556b34ed8523f3bccfdaa757cdcde37d1fe7d19c934562"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/trs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/trs/firefox-100.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "b6e7aa724a06f85e4eaae7e1c55e3ed1ec9a6b5664150745a257bd3f63310d53"; + sha256 = "139f2a1abb08dc5ef684d51226fbe64c41e08ad4f183a8b15ff155c5fe51e922"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/uk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/uk/firefox-100.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "69b200c0c4c92430f188ea12bf5e60aae18203a76e61cc163738d46c3627b137"; + sha256 = "633fa83f990bc1e8a791a0486bf9034f5b4709fd3e2d868f42895b66c5476ca7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ur/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ur/firefox-100.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "330bb00cc0c0882a1e8aa06fdf7d283eaeef04500a9bfccef50f7b2ab8becf81"; + sha256 = "25d7518b88be9d1cbf504a8c214049f265f74a0def26bf5a1c60d562d999a5e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/uz/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/uz/firefox-100.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a9b7087c1deec3aedcc2c279b135b113e79739a28e31ba6cd090541505e5d9e5"; + sha256 = "39f6c200dc56585bf527e8daa59f460d9193f7d5e7194efb7b1bfbf2d4f92e4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/vi/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/vi/firefox-100.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "76b034ed53b8c99cf7909a6a5651627fcd9cdebd7f8ccdbd3d2286cb19dc7eaa"; + sha256 = "e4d0a5838b837d7020da1595cf77093d53aa5d7f765fcc98da20c11c0e853874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/xh/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/xh/firefox-100.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a1c9ec73200bea835c46879d8196b380a3157c98404e6a009fbdb24b1662ddde"; + sha256 = "679180e00ca70e112d5053c72cabc0ca5eb92f2f16915c556aefc861188d0318"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/zh-CN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/zh-CN/firefox-100.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "74fd44c26c503014d0fc3a32dbb726feefd572ce52697879a392996243b5811d"; + sha256 = "c280eef16ab855db69e975f8cac93a2987e125236d7df34a5a336cc837cfd901"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/zh-TW/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/zh-TW/firefox-100.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "a9d86ddb8f5388370a28ac643e3d21a411625b7098aca9c399551f8e2c125da9"; + sha256 = "2b6d0a74fd53d907a6e0f6e28be41e9cfa62e61c42dbc132d16c39f87980ad49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ach/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ach/firefox-100.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "67b0501117e5d93046031860df5dc6eef3fc3126f0b10240cc13b83f6f1cfdb9"; + sha256 = "579452bc9bf650c9664775a5ec438be6cf4276b807840a38e30a0c08237a777d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/af/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/af/firefox-100.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "43b9b1107fb13b97f6b955b3abaa4f1d590bbb1747859e54bb306c9578fbdfe6"; + sha256 = "a9828b2f4954f63b8b4b37722da0a50f1b9e6230aa981f51597718bf05e52b54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/an/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/an/firefox-100.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "da752ce8f7a9a0769c93f6f1817649354f892c440cdd48f0dd75739baedcff40"; + sha256 = "0d7083b1feef4c8cde1be64ff26c37afdba36454802266c28b1916f760881de4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ar/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ar/firefox-100.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e67fc64daef74e78eee12a1e5d4c1ef5a89a8278d19187d9e0c67ac5ea350623"; + sha256 = "57e5e2863caf348c475daaa6949dabe013aab0b3e63db61b3a9b9ef4049e62e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ast/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ast/firefox-100.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "115cb0605bfb7629b854d242634cd2797b5072f735c840a6611325faf7bc3f77"; + sha256 = "e954fde4dcca82fdfd8605bcd43930f0b85117c1b2dc9edeba75b435b77b121e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/az/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/az/firefox-100.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c839a19dc4f5d938fe7a5426a8abd7b228c89a262201c019b4b53953211aea78"; + sha256 = "a893f228de842c6bdd0c41df3db328c737b57a945a55e1e56f3672a7beffbe5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/be/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/be/firefox-100.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "94c8e688578059f8c4f7fd2a65a8fd77280b4047e845efd6ea66e34f5320d119"; + sha256 = "8cb4ca15ee69f9bb74cd13de82697526d6e64c6968881489b7ddbe4ad9266c54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bg/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/bg/firefox-100.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9f7acb26e7cd9193e9e435da3e2f4e9d9ee82195cc18e8de8295cba2446da1f0"; + sha256 = "2d8a566a4619f549bf6b68a2d1b0fad51843de0257da54039050affbc21de948"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/bn/firefox-100.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "93f31b395a9a42386b0de322db1f675810a3db106a0e8c583f18ad4dd0c56488"; + sha256 = "e75c5aecf6b0bd0d60423bb66980c085957b1acd1549426a44a4a7991d1f2db3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/br/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/br/firefox-100.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a04a2b2f2b70f33bfe288d9907291aa61f2daa64d0d6802c784d7b4f44b38326"; + sha256 = "bb8794c3069989e0f06f0dbd0b7fee638bcf9e6e3d24d28ce41db3a182a83a60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/bs/firefox-100.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "154456c3aeefe93d6891306fe295342aa02c294bf64693fe93943ae836fc796d"; + sha256 = "db964f0e1eb920cac95cd0dc14175f5e20a1ec32f56a3b43554f22cc67dce752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ca-valencia/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ca-valencia/firefox-100.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "c00ab86f77e5113f85feb8eb14b74c2c144e9c7e08c4442b06b749ffccde2cf1"; + sha256 = "ca124cd11585fc521b4e2d1c4bc0c2407056abffbb2b36e46ec568c6490b28d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ca/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ca/firefox-100.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "07de1d9c72f9d5487b9ff57ec609a2b6ce37a8b09fc81200a6cc6610a7e66b9f"; + sha256 = "6ca6e8c905b44c09c4d061656fe2cace22d261ea4efd04917fc2aa2ce13a1cb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cak/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/cak/firefox-100.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ee05ba6ce42f873ab79032553302caae28069d84c5105192623f1261d2d3d609"; + sha256 = "44bfca1c2cac5eea67f68891da93604edbdf6e0eda92fd1686d83512feff2089"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/cs/firefox-100.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9b2af581c1c70b72cbf82cf656f94e65058063f0fd6807d99760dfe9b68af808"; + sha256 = "491a9c7a2471fc1a06751282340f1b6bd00118a8ea11d54420985822c0e9a19e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cy/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/cy/firefox-100.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f638faf94045b5e739736926e4b3e173f8830542287d46aed70337d9ac3a4495"; + sha256 = "b9e55860c0f14afcd2d2cf87e5ca7d4b853fce667f93a6b493323423c16f8adc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/da/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/da/firefox-100.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3dad188b310fef15b704ca788b320d502a0a6ee59538296176fb17d2b440163a"; + sha256 = "899a53b667b4f64e953b7d1cf430eea8e67de747b28c93435cf33f008dc464eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/de/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/de/firefox-100.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1bdb5b60bdf16126de86ba1413eb5ac4184f727b3e57a36d424dfe39647f53be"; + sha256 = "efecb119d1becf00b34babaf42cae5f5c586dc8cc2a29c71d410b68b7aa00cc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/dsb/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/dsb/firefox-100.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b306d40607d73314c0e3e87bb1bce65369846be3e370943088a8e7e9731098fc"; + sha256 = "b47d0bed633a6c8608c600d6b1c8c49bfe40e4b1df6f72bb7dd49e722084cf81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/el/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/el/firefox-100.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "45202f79f9cbf2a44bfefa9ce50bd0a6b88485207105db4df1f26f547c1f556b"; + sha256 = "07b34038828ea049ea6c1bba71d27bada83ec514d8d58be92f9005ff01cd6853"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-CA/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/en-CA/firefox-100.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "78020bb6fa9395fc4e2cf40645e127d0f6d6dfca4044e5c00f63a90e24824add"; + sha256 = "fe1dfeca3de53837003d93aecf5fa971a51e8a585cbe9a1c44f338d8d1d7788c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-GB/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/en-GB/firefox-100.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "647947c0b765d1142947d3cb35ceb308946090e928ecbd4cf8c3eba4b57afa47"; + sha256 = "fe4baa77504d9ed1f789726db85599d5cc634765ae19cb4604234ccf7a43b97d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-US/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/en-US/firefox-100.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "4249f742c2918d66af2e7defe1c6b34870f258fe047ae7b38f91b0394b453cbe"; + sha256 = "6ca97f006b90f98676efae14423c8707527182e118f4d3020e51eddcb14cf8d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/eo/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/eo/firefox-100.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1726df9605c7deafd6963c18c4b8dbd4bbbed86814fa9932367fd04f6ef609fc"; + sha256 = "e9fb1b7b6752629891df490ff625897ae5d929c435c824cb6c5dce18340e3273"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-AR/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/es-AR/firefox-100.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c3820a35047f21efc721889fa0003d8e74e13858aad4d3aea038c01b5cd6c657"; + sha256 = "b18a2fb101d28d1dae1b4a33d63906a7c6720ddf5e4418eecf8f6df0be58e017"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-CL/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/es-CL/firefox-100.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "b1f5bf697007d8b6ac9f1fa057f292bcfb860d71229a7d0ad6d611ab02991211"; + sha256 = "37a54082b8bb69c925894718eefcb1229ad661cfe31aa95906da163a213ea4b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-ES/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/es-ES/firefox-100.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "de33571140d165d0422b2e4543893bab6435b6626333a05bfef39682ef759db0"; + sha256 = "bb38bb93c74878646f31c09d524eaadf18a1e2f6ace957abfabd05e1e63898e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-MX/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/es-MX/firefox-100.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f681be5b92c8959e0e8c90cf4c7f6cd9197e11be1828797e853310a49dc76698"; + sha256 = "6c75d42e34b6fde9e8b3ad31ad3574af87dfab2f5eef71b457fbdb9ca6dbe12e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/et/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/et/firefox-100.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "476a0ccde58372bffea3ebfb0d88795b31db2ec622f9c1b99df51287aa8ba69b"; + sha256 = "e25b97ff49fcfaef9906cee48f0f342272d2b9807a6221aa6b4fa5939bfba70e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/eu/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/eu/firefox-100.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d465a6a4a01853724894fd81e31b63b80e830cee268298d6e037e6877ae77661"; + sha256 = "f929034c74b057e32db4408ca25b9e9aff9b26d487db29cbb0c0fa0ade96748a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fa/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/fa/firefox-100.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "cf8ac9c8d667ccb0066db1d20a9f43af807e40d1746931e001ec900b34fbbc02"; + sha256 = "2fd4af491c79dbceee3de7e04fef413535757c0588072ece7e5ebcf252815782"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ff/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ff/firefox-100.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "86dcb3f9e1d899973eaccd3caf401471b36ff70f4a4693fa9f857083e8641a2e"; + sha256 = "7b0f38144eef79ead877a352a03abb3d50631031b051750d3d9ab84dd8afe319"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fi/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/fi/firefox-100.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ca0b830aa6ec724aa31f957e7c84156726c26fa0a74ace80ecdea899a8091f82"; + sha256 = "fefaec6affe3be2d963967397aa6b0c7495570d0fb437820d87ef6289654fd80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/fr/firefox-100.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e94a7a54ba806e2b4baa0159d2f8cb96e79abc9c01e2526821cac8253c6ad495"; + sha256 = "1dcb22611d288ea566f1d319b4fa8f6ec7057e05d39a1be794ae12f343e29809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fy-NL/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/fy-NL/firefox-100.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "cae5c9c607c0dc99e4645f756befce2c9c4ae83b7edc39cf12af81781b33a7b9"; + sha256 = "fe15fecf740bdc9f9476366f394a10f2f919d7c84f64844025faafbf28fef05f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ga-IE/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ga-IE/firefox-100.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b9b1cb2a48cd17179d5e3a8a3fca9ac25c3367ff6281f632d826cd6a9bb4a633"; + sha256 = "06c5708ca8cf4ded0cbc7b52e0772bc4fb86ae55d822ff09088af5c35e60d917"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gd/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/gd/firefox-100.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b5454de81ba2fee053e98dcb37d3703b5385a51561e45fa32f6872494cfc047b"; + sha256 = "fdbf7f54a4120dee131687fc81e972e4df52347de4e8473a152ca0b98d7bef92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/gl/firefox-100.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "be3b3decd8e75740a317f105bfa2e4c919ad7f31e391845fb60b299fae7bea7c"; + sha256 = "807d0deda34da90207a6ddac26649f38eded1a6b2337d9cb73ed28c55bd316b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/gn/firefox-100.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "394562b739f81ec43a954f7393c5177f87d3d5b36d404d97e2e483f3000bb615"; + sha256 = "a70ec6595f9ff5cfcc8ae0185d4ece632a17ff49817b98052bee8981dbd63d58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gu-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/gu-IN/firefox-100.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "d2e36f37146b48cbc710af7663ad8b4f7770dbb5f6a557e3f54d637e7061ad90"; + sha256 = "44e9a22d946e4405db84069d329b66293b0d789b59d98bed4570d98dd19b6c0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/he/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/he/firefox-100.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "17bbbd7768ff852dc1f27b224b77dfdaaebabaf531028c71a371bf302a9dd92d"; + sha256 = "1855cfb19d6bd857a14950399e238c30768e23c08d21a1db38b49dcedf2302bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hi-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hi-IN/firefox-100.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "2f431a3e50ac0b74a2bda65652a5aa45c0e1b44ef0837645ec49e30c6d0d7fbc"; + sha256 = "47fc9f90b3d52e353594bef6c84bf408ef3e37fa2d0eefe17997bab546b2f9b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hr/firefox-100.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e57e5fe2cb59c25002e9c06cd3298d9cb75c4437ddc9556590d6c56a1eac57bb"; + sha256 = "bcbe511cd9bf09605f1e6bdb3b65e9f8eff6c6e8cbdb904987941d2edbd10b42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hsb/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hsb/firefox-100.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7c1eefa455afacf5b3b1ee1d04b6e793e2db210912dae58910093c70a21a73f5"; + sha256 = "5a5b5063eaeeeec63d13f138ba43280ea6cde0aeb03bcf18c6f5ed0c7ab575d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hu/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hu/firefox-100.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d2b02034ce6686e0743af6444acc2a23ed657124bd7bb6ddfaf6d24cf11730b6"; + sha256 = "7828ea71f5ecf9afcc52fad0047789ece2c8be5c7ba8d390d98a24daffebc0c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hy-AM/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hy-AM/firefox-100.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "75589d2abd9488269693c0a0440d6359bafb354b1b5ee91b90306871903eda0b"; + sha256 = "c76b2e07e5085caf56c8c94848f7d7dc4b40c5000a792921bce762ed55b73f4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ia/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ia/firefox-100.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "b26efd6320a41a558383e22db49cbcdd930161fb48ad0032d24e44b57b01f0c6"; + sha256 = "de9ace36727f9fb070138d30bb854bf28ad57b7a9895cff492d48231826044cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/id/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/id/firefox-100.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d50fff8b0ff7ae5546ad3f25e485ef51280bd022708e3d0aae97d99f79788f0a"; + sha256 = "01dcade8b0d7dd4f4ec9a408291c643bbfbcb922ba0b2cd84645799c22c46082"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/is/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/is/firefox-100.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4cf7fbadac8084b8e134f6110ee07076ddd93cf00a10b6ef3d6276df9080bdc1"; + sha256 = "a8aa5de061a5414e55f45c61bece3f4471662f36e3e30163daef028cbc62a675"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/it/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/it/firefox-100.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "6fabf495a730600869f6d1e2d9382120361f5061e3a893321f68a6378f7eeddc"; + sha256 = "4610c04780fc075cb49a09e0815671dcd8f3b625a5b30913c8ff5be81cfd13cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ja/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ja/firefox-100.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "95a537b3306ae1f6bfe9c4076042d6c29c6478c0f32e5aa4a01e800c1d2a75a5"; + sha256 = "7ca93bd2ab0a1e0e0aa1a41df7331c65f27747b3d511527c557e613272a736ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ka/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ka/firefox-100.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e73b2b555f7318650ca1ea20f9d8c1fbc933d230eba3eaeb5e5a47dac24797b1"; + sha256 = "55cf179d73cfafc5526e5701de3560e4bf9c1d02c28c77cc66801b828fa9e33f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kab/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/kab/firefox-100.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "cd55879a883ac4e4efef972d6200284d6839dc786e7dad4c3a81fd88b89b18ab"; + sha256 = "c7930dbea998892979a16d3e60b19db62cbbe8388e68a2ea59a11e234e8f94b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/kk/firefox-100.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "cf2dd9ae9cd6347eaf976cdcf4a6cce81abb741b0cc273063cbe1274d271e05b"; + sha256 = "771eb9217226b36cb04719555a82c3b11e783059183ebc9c295677ea06d69321"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/km/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/km/firefox-100.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f0f3982e7d838841a01b24c330ed3e74416073c40470293447551aacb5411506"; + sha256 = "970daaec6f449ab1d6dc8688ee9f41b95d295523ed57ec14c5f34fc98ee18dee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/kn/firefox-100.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "3e2953e55e3bc7fa76ff77aac08f79b20bbf2be52683c08b3d54a323a1754ed7"; + sha256 = "fae2d5a9a428ddba10cdafb6fce6e0d591b5ba8353d2cf88ed423602fd150576"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ko/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ko/firefox-100.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5c5bec8a40dbea26674eb2d4b7160c1c2f3ef37f68d67c24a7ca6a2cf77eac85"; + sha256 = "4a66e9cec2224382645d962908218bb89fe4a499b9138c83966dd70d9d25b172"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lij/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/lij/firefox-100.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "7cc492c5eff065cc3cbceb292d18d833e9f2bf76ace0d5ca960256290f049f94"; + sha256 = "85ef4a63c9dc97f9b482382a83f5a7a6880c5df87acce7e142506c2d449e4f69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lt/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/lt/firefox-100.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b4b56e01e65ffe4f7232daf661df178d4af1d813e1c8122c4ba56aada0b2ef52"; + sha256 = "da3ccc7021eb4b62c35c716089599f714cfef218856063e083c3547d64271b4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lv/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/lv/firefox-100.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "b13ac2b90f13813b8252c5eb817d0f55f770a58e05f8a98b1a08fdf59fc9191a"; + sha256 = "6aa1d5453d938f16330e0ed54d63bc59c5b57e7da5ddbc41a05c2f75dea68e73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/mk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/mk/firefox-100.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6b1d2598350feb901e86f332598688853b607c7c14c13ac228610d16e89eeda3"; + sha256 = "e0cc100f8be06fd97cb029837a054e60d136272a9f6b78eaef692d3bc5d8a669"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/mr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/mr/firefox-100.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "9a6a47fc20500b4421b12381374f0a8ecfa9a0929a54a6f6dba73e1c2e5a6c81"; + sha256 = "d3a3d72bebefc51cd8eb1a1ebc1431a9845d15af6321b76e2982a0d210397409"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ms/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ms/firefox-100.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e79c4f88952ec9061b4d90f8ca5970be8b5c19cbc1df8d9970b9b23c801103a1"; + sha256 = "c59362f1817f98ec80ea275b39f50bed7a0ee1154d6a6ea3ad6dbe8f2eb1bf79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/my/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/my/firefox-100.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "f8ce25b87b639843fa6fab4651326719f229f91a4d6b3a6ef17d0e9f4035b1f3"; + sha256 = "ec1d06208223422633c2ca495bb17ca946e379d361a2e00f94ed08588b6b2263"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nb-NO/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/nb-NO/firefox-100.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "03f5550bf0c0f33c3cf252cbad1650204e008d852e6db46a6f7fb6f6b5ac10ed"; + sha256 = "2e31732057bda76dd2d74d8e2b3e6c38a2035bf163234fd82fc867b544d34dc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ne-NP/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ne-NP/firefox-100.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5d94d2dbdbdadf6abb7250772e6e046b9ce03cbf5e4c920ef7e8b5cae69359b7"; + sha256 = "eba3a80cb0b761b68d5e318d5f8110a7d19da1261868cbc1f1a39eb47c08c018"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/nl/firefox-100.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3045ce321c102e2c114a48a46526572a2c52d228b44ab35d8241d92bd65dd9fa"; + sha256 = "1f7ae0dc78d5b30741e8d645471aa1875c2de144742383eb5c24cc2deda79f77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nn-NO/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/nn-NO/firefox-100.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a16aa9b6de0ac4213492ca117eb47fbd4994824c0f080001baa9136231fb69cf"; + sha256 = "acd635ad253a878043ec4121984da468901c49d4fb511ec9cfad478980ecf647"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/oc/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/oc/firefox-100.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "70bf39cd4c3fc4ef772dd71d97f71fdc92324ce2caf9d359cc1d3f3d1557c3a5"; + sha256 = "2721c54a1bee621d9c7cf2f5c657dc48a7d9406d80c5aeb9963bf7b128c17629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pa-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/pa-IN/firefox-100.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "951263906c05aa6f60a65d77e917a95ce10e8ae31f156acac7f47ab4ec36deab"; + sha256 = "97c435e09c0b56bd9bf66d50e90034a502e9af6cc1984d5acdd2d948f7556273"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/pl/firefox-100.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "476ca14396dd7ee636ed1e74a20d9d0ff3b0c452e5b5f61eae6f0594ba060f3e"; + sha256 = "36e81c101b8cb68be0f69339c47ff4e5839397096775cf9ea46f0ff1efe5353a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pt-BR/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/pt-BR/firefox-100.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "33ea09c993bddcc36621ae633713e758ac33349847604995e05fce0d26be398f"; + sha256 = "fb90a3a2a303f945bc34e2a6ec397f0116ac77f02062e7a7c8dcd382606dfec0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pt-PT/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/pt-PT/firefox-100.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "fd4b924d8afa163ec40a2f5ca6ae0b89e1a22a8be8b8fbf9f43012159d0b7172"; + sha256 = "8797c65c277cc0f46a8d8b2cafc370be55c57eccc8e9fc88d3053e2969f9de58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/rm/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/rm/firefox-100.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "97ce5f4af9e8ed2af039255e284ce1b55b6a3ac0eacf4c40be82b635b1df0f2b"; + sha256 = "b8cd7b28f31d4e1ee874f1073065897444eb9503e207b924a875a8c3a0b21509"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ro/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ro/firefox-100.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a959d39333b98c5a479e6975dfa82a4c2b3efe5d69d2d99fddc8d2aabdbe95ce"; + sha256 = "3907d9aa29f56fbf97008e65f83ae25719f4156961ff3e976661a2012f16fafd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ru/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ru/firefox-100.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e4f65bbf839054b7009e01461cf4a0b943e1373df054e9b40797b5d233654aac"; + sha256 = "4913bf6de1f5b14d005f20bbc0d2ef97227903d296851034735e872e28b3f065"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sco/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sco/firefox-100.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "fac16861dbc011655c3b36b31d5e0816a09e1f88e34032d247d09f691c097ddd"; + sha256 = "ac4fb9005a71ca5bd25120946b65ebc0f437d8c86b9dcdc11e9b874ade8b4dbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/si/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/si/firefox-100.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "93423cb2cccf166f374fb4b8779f337fa1cfdff67f0f2c463a398a35ecd251bf"; + sha256 = "8fdac92f650f10a9dc9322f817f1bb6f60b5a9fe97942cc1ca5ae694aad71523"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sk/firefox-100.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e63c2240f7b791b01c94084dbb28d74ddd6528a7bd1e62bb74ee9271d0fd81f6"; + sha256 = "57987896b0e1b8846911b878dc360d139002401ed57a9b95fe47f2801c983848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sl/firefox-100.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "87064873e57431bb9cfd3e231df07753c8f644e218ea0318b3731baa05b16c1e"; + sha256 = "3097cfb125f9b275270955c454577b7aa5ffe68b5ee0917cf6b3e0c31d9c5b25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/son/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/son/firefox-100.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "6ecdf2061f0787fc9adcd27465211446df45751d103e279aa50f278361061728"; + sha256 = "8588038e834177672a47530e8e86c202123606ef6f1a5d9a4d5c40cac8cb9aec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sq/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sq/firefox-100.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "47783d01b35119b158c746c5ccede7e4832d15317958030306035d1b448b77dc"; + sha256 = "cc229e95ce396fc37fd7103e70acae2414de501823beb04e71c702cc65c430f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sr/firefox-100.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4aa1908894de6eb3640b497361d5245ed3379d29ffe6e10401540cc1c10cb965"; + sha256 = "9c134f28f92311c8c8764df4d37727134fecab10197cbbaae01d26773e2897a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sv-SE/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sv-SE/firefox-100.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "2334fb5859711a4471f06a9eb81907d0b41ba52a8fce05b7cec320a0d31a4167"; + sha256 = "40c8f4af652dae7a3eb1b1cab01f032ecb526600cbeea0dd5ccc4319b0d50310"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/szl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/szl/firefox-100.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "39ad1c9f4da42278f2a1b3c125aa7e2a8005376a6f458a03851d42f85d116dee"; + sha256 = "d71882b04563f7f89a4c0bd2431e6b33e2af010b40b1dd50304f9daf0ca66525"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ta/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ta/firefox-100.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "24055aedcf23fcde0dc519bc2124a8d42c82ddd74dda46b694a20d25ff76d2ce"; + sha256 = "a473f9123d53de141e0592e03e8c9dd6ce8f057c57f89f55957c1436d139582f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/te/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/te/firefox-100.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "18a90860a6428ab31229c975927b264d75b2e2f186f83ef270262f7598053d48"; + sha256 = "042aae2c4d10d2b7407b3252a39600217ab8ac0c9e34045c31e70cd8e792968f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/th/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/th/firefox-100.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b965a21a0585cc07714c39ba33afc5ce757294d595c7617ba5b330a0d1d8cf0b"; + sha256 = "6455ef37c941c978b1380f6ff3de41c0b7f8348d498d154e78c9c7b6e8992187"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/tl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/tl/firefox-100.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "cd1fb6553daf6b123e6545cf0553038b2f16c12ae4a21425e253c68124a8ce42"; + sha256 = "b41d0029729bb4fa1e8d8c596232272c1e238d8bbdb675d31e42250faed54396"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/tr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/tr/firefox-100.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "2a2c6abfa119022520e8a3ab4c430c282a7a3f7d5e72d2a67d070a64398b2bb9"; + sha256 = "e0345c71199784d40fa159617371a72e3f3e05d2aadc041d14c6b3e450304afd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/trs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/trs/firefox-100.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "aae079859fcf211c1e465a00a6a07514397a9f715bc02d704daf062e3d75220a"; + sha256 = "4a6afcbbb3d05bf6f3abe3194a21aa6ea6d2f76cc5429ef4ca0a433ab1d97f76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/uk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/uk/firefox-100.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "04ebb332d79d0a9aef5d2e93b2aa8dae0ded8d4e4c639d192ac969e8033ffa24"; + sha256 = "97709ab7965f859da2ce93cd4c22b875a0a94af8b8b7acabd1578d5ae82d6d85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ur/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ur/firefox-100.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "8a8d6d6503657665882ccea44a56b324253adc8d98eba20696ecfd096311821f"; + sha256 = "7c69d7f588540d0a72d9942671d40ab59f066b9798279dbe1b0b0980cfa13a06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/uz/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/uz/firefox-100.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e2990d6a4c3bfb5547bdac49a2499c7dd958d0b8e665b636e0ffd6e9aebaab58"; + sha256 = "53c450eeb1223c2794b9270d257fdeec50bb4deece5bf5d7d05a5819f54989c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/vi/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/vi/firefox-100.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b7c2a4d8c1c400f44fcad7e91572134328097d183c76b8e22d5eaa0a4959d35f"; + sha256 = "395e8ffa9c6a0145f6fdd005df0b73fd4d59410ba780818232cde2f3fc257d50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/xh/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/xh/firefox-100.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "e3dc9942f397812564b5d7728bb4857f0c217183300ac0ab28590921f56bda34"; + sha256 = "22359e92de488a24709445de54499c9ad49e841e4ef6ba45296b44fac089121c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/zh-CN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/zh-CN/firefox-100.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "11ff62d8f465b9ce17591177f1fc98d6dcbbd819332f65bcffd685d43b5aa285"; + sha256 = "7f5d0d771c546d41e835ce7842ee7659ec4a69cd78176b0c679b4b056e8d5499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/zh-TW/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/zh-TW/firefox-100.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "406200aceeae06ce5ae2d736d8ff42713e2275b5f369682cd49946326c5cf21d"; + sha256 = "8bd0dbb9bf1a3682ea39e43da3819a4f12bc147484528d869a252d2ad000f95a"; } ]; } From d1c999a3bc628f0f9e03dc4cdf41d83c0cc1d513 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 13:07:13 +0000 Subject: [PATCH 363/385] python310Packages.geocachingapi: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/geocachingapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix index 952457c5360d..d72a4e3eb6c7 100644 --- a/pkgs/development/python-modules/geocachingapi/default.nix +++ b/pkgs/development/python-modules/geocachingapi/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "geocachingapi"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "Sholofly"; repo = "geocachingapi-python"; - rev = version; - sha256 = "1vdknsxd7rvw6g5lwxlxj97l9ic8cch8rdki3aczs6xzw5adxhcs"; + rev = "refs/tags/${version}"; + sha256 = "sha256-Aj1fZ0dGlV7ynoZ7QwGrbku+IpOCx85wE19JDJaaYmc="; }; nativeBuildInputs = [ From acd683b46285fd2cdacc3a8a16d8f3a1307a90c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Apr 2022 16:42:49 +0200 Subject: [PATCH 364/385] python3Packages.geocachingapi: disable on older Python releases --- pkgs/development/python-modules/geocachingapi/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix index d72a4e3eb6c7..2b4bba0a434b 100644 --- a/pkgs/development/python-modules/geocachingapi/default.nix +++ b/pkgs/development/python-modules/geocachingapi/default.nix @@ -3,6 +3,7 @@ , backoff , buildPythonPackage , fetchFromGitHub +, pythonOlder , setuptools-scm , yarl }: @@ -10,6 +11,9 @@ buildPythonPackage rec { pname = "geocachingapi"; version = "0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Sholofly"; @@ -33,7 +37,9 @@ buildPythonPackage rec { # Tests require a token and network access doCheck = false; - pythonImportsCheck = [ "geocachingapi" ]; + pythonImportsCheck = [ + "geocachingapi" + ]; meta = with lib; { description = "Python API to control the Geocaching API"; From 1337dd75d16ff7126c4a545dee6da6bea913d51c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 17:00:22 +0200 Subject: [PATCH 365/385] lollypop: 1.4.26 -> 1.4.31 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 7c93760d2ca3..8b6e1c7aa4ca 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.26"; + version = "1.4.31"; format = "other"; doCheck = false; @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-Q/z9oET06DimMRZl03TgjEeheoVHtIkH+Z69qWZetcI="; + sha256 = "sha256-kWqTDhk7QDmN0yr6x8ER5oHkUAkP3i5yOabnNXSHSqA="; }; nativeBuildInputs = [ From 252458b9c556a31c5c52f3e9ead169ef49e38d29 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 13 Apr 2022 11:37:59 -0400 Subject: [PATCH 366/385] libsForQt5.qca-qt5_2_3_2: init at 2.3.2 --- pkgs/development/libraries/qca-qt5/2.3.2.nix | 30 ++++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 3 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/qca-qt5/2.3.2.nix diff --git a/pkgs/development/libraries/qca-qt5/2.3.2.nix b/pkgs/development/libraries/qca-qt5/2.3.2.nix new file mode 100644 index 000000000000..098fbacc7ff5 --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/2.3.2.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: + +stdenv.mkDerivation rec { + pname = "qca-qt5"; + version = "2.3.2"; + + src = fetchurl { + url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; + sha256 = "sha256-RpdgAjfEvDqXnofSzIBiTyewYoDmNfXZDsfdTSqfYG0="; + }; + + buildInputs = [ openssl qtbase ]; + nativeBuildInputs = [ cmake pkg-config ]; + + dontWrapQtApps = true; + + # tells CMake to use this CA bundle file if it is accessible + preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt"; + + # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) + cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; + + meta = with lib; { + description = "Qt 5 Cryptographic Architecture"; + homepage = "http://delta.affinix.com/qca"; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21Plus; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 4b00b704d5fb..081fa0c85026 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -176,6 +176,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + # Until macOS SDK allows for Qt 5.15, darwin is limited to 2.3.2 + qca-qt5_2_3_2 = callPackage ../development/libraries/qca-qt5/2.3.2.nix { }; + qcoro = callPackage ../development/libraries/qcoro { }; qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; From fbeaf0e6128d4341dcc4a0f520b8360da9242981 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 13 Apr 2022 11:42:05 -0400 Subject: [PATCH 367/385] libsForQt5.qca-qt5: mark as broken on darwin --- pkgs/development/libraries/qca-qt5/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index d10ebbdd4b77..b85a3ad8c7a7 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -26,5 +26,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; platforms = with platforms; unix; + # until macOS SDK supports Qt 5.15, 2.3.2 is the highest version of qca-qt5 + # that works on darwin + broken = stdenv.isDarwin; }; } From 00214c234683ddc36e29b269b619f80568cea0d6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 11 Apr 2022 14:34:18 +0200 Subject: [PATCH 368/385] nodePackages: add ts-node --- pkgs/development/node-packages/default.nix | 8 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 3613 ++++++++--------- 3 files changed, 1799 insertions(+), 1823 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index d31da0892e4d..9845f291f542 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -459,6 +459,14 @@ let ''; }); + ts-node = super.ts-node.overrideAttrs (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/ts-node" \ + --prefix NODE_PATH : ${self.typescript}/lib/node_modules + ''; + }); + typescript = super.typescript.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { mainProgram = "tsc"; }; }); diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3efdef6cbe6d..7056a985faee 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -347,6 +347,7 @@ , "titanium" , "triton" , "tsun" +, "ts-node" , "ttf2eot" , "typescript" , "typescript-language-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b92ef79406f5..af5ab3f0ba2a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -463,31 +463,31 @@ let sha512 = "+D3xnPD5985iphgAqgUerBDs371a2WzzoEVi7eHJUMMsP/gEnSTdSH0HNxsqhYv6CW4EdKtvDAQdAwA1VtCf2A=="; }; }; - "@aws-sdk/client-s3-3.58.0" = { + "@aws-sdk/client-s3-3.67.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.58.0"; + version = "3.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.58.0.tgz"; - sha512 = "7TAqYFpFeaahLCdIxsdWLz3uRrzITFFFitbfVxQ+eaR6EMuH3VEhbGEZ66+zieWns9a1UXc11918vpwgu0zTtw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.67.0.tgz"; + sha512 = "+wSWhkxXG8mY5rlsTXdDaYULpzq8AZ3B2TZKVGEXb6zs1txedyWSYeZr6ENpBoxtJepmlwXDC7oRm39eVoRixw=="; }; }; - "@aws-sdk/client-sso-3.58.0" = { + "@aws-sdk/client-sso-3.67.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.58.0"; + version = "3.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.58.0.tgz"; - sha512 = "nS5G/OX8Bg4ajBa6+jLcbbr4PpEO+l5eJfGUzoJQwS4Zqa0lF/wC0kyjKm61gLp4JuvhrQskxIC/3IXUqB1XVQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.67.0.tgz"; + sha512 = "njBLSqX2+4eTjeptODxdYgBC8cYwwNE3VwrIFgf+nosIo8Ll07evZgHhfZsyURou0cUUpxFInDf1KaAotH9lBQ=="; }; }; - "@aws-sdk/client-sts-3.58.0" = { + "@aws-sdk/client-sts-3.67.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.58.0"; + version = "3.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.58.0.tgz"; - sha512 = "2cHZsG2eXv/Zl0hvsG9+rdHEuAclMFfkma/3LC3RRwSuZXo1rXoIhFkzHfGfIbivdk738YAo7FT3ZYGlrsK4ow=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.67.0.tgz"; + sha512 = "gTWQU/4tPQLMJpLXgSbUss5s5dsyxpXJW2gWosvLLtX5QlchGBzWEawoA3QIxFRkNJrXqLyaVDBdFFqB+l0mVQ=="; }; }; "@aws-sdk/config-resolver-3.58.0" = { @@ -517,22 +517,22 @@ let sha512 = "CdtnTQ9zqLx1FbXdbgjijLbMcIWOyQM03TFaLSCjI3FNbUwyt3T7StBU9tj/LtbypHhSdXyQBpzUtXTOMWCEhg=="; }; }; - "@aws-sdk/credential-provider-ini-3.58.0" = { + "@aws-sdk/credential-provider-ini-3.67.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.58.0"; + version = "3.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.58.0.tgz"; - sha512 = "uM62hcHUVaHP1YFnbrjf2RlrRj1m/BvMPE+T5jdNRWdE3lvnunhEMawB26HZs9nQqCV6d25I8G9/fGWVL7g3Og=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.67.0.tgz"; + sha512 = "47uNhLsd2eKWOa+alsyoT48TbtIfYtIJmC85APunHczqfpUC1YHOyHZ3pCzByGrgx4khjnJ323gfq9kreEHCvA=="; }; }; - "@aws-sdk/credential-provider-node-3.58.0" = { + "@aws-sdk/credential-provider-node-3.67.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.58.0"; + version = "3.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.58.0.tgz"; - sha512 = "f0wzcgMYCQUrii6TLP2ggCxkQP4HH8PW8tbbWEgt4cdIXcjE9KEuxN5yOV6sFHzL3eJh0QM9Yaz8WzhWn6fT2A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.67.0.tgz"; + sha512 = "nxBUJ4rANue9MWQyhrmkZwuKVVpwbUXEqyMwJD1uxEZnYXksmAoVxKW/m4vxy1nh/65wAFCCipeLmqYzwJ8m0A=="; }; }; "@aws-sdk/credential-provider-process-3.58.0" = { @@ -544,13 +544,13 @@ let sha512 = "npgFqPUjMhUamf1FvJjBYUdpbWx8XWkKCwJsX73I7IYQAvAi2atCOkdtKq+4rds0VWAYu6vzlaI1tXgFxjOPNQ=="; }; }; - "@aws-sdk/credential-provider-sso-3.58.0" = { + "@aws-sdk/credential-provider-sso-3.67.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.58.0"; + version = "3.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.58.0.tgz"; - sha512 = "2qO34s9lJqvCC6zOF4UpopW6xURZpYfVC8xTUDpAUnvTOt4nS5hkx4vNyqPAXILoRHuFJsnlWsBH1UP5ZnBiZg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.67.0.tgz"; + sha512 = "AwS7tvA++2li0+yZkiCL1zk56EC3N6fDXWDqPEG/lKuviwyv1B+up6r/6ks7ADWbXuOKzrmslS7rn3DT2ZUkig=="; }; }; "@aws-sdk/credential-provider-web-identity-3.55.0" = { @@ -751,13 +751,13 @@ let sha512 = "sfSq+t0Yy47DQwrWGpA8iOx9sd26l4l1JDVTwHNi7+OKD4ClRPVCEdw3bTbbyYz/PV4f9AEfAZ6jwtSff4wkGw=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.58.0" = { + "@aws-sdk/middleware-sdk-s3-3.66.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.58.0"; + version = "3.66.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.58.0.tgz"; - sha512 = "vOTPOdhZpNJo4v54evg6JnFz14hK8IW2u8B+12iV5ZQ4zJom6VowzFmIOUn+KIsw/6SrwEX9tFb0aXLlVRw27Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.66.0.tgz"; + sha512 = "4ACAdKAZkIjEK99UwoaKTrTGhS7qGqyLmjiGHlzR0ggMUUVmlep7EtcluImFtT6pi+ANVLDzuZGa+95MwGY/Qg=="; }; }; "@aws-sdk/middleware-sdk-sts-3.58.0" = { @@ -868,13 +868,13 @@ let sha512 = "e+2FLgo+eDx7oh7ap5HngN9XSVMxredAVztLHxCcSN0lFHHHzMa8b2SpXbaowUxQHh7ziymSqvOrPYFQ71Filg=="; }; }; - "@aws-sdk/s3-request-presigner-3.58.0" = { + "@aws-sdk/s3-request-presigner-3.67.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.58.0"; + version = "3.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.58.0.tgz"; - sha512 = "rkwRSLSuTJaW3+rJgfjtJ8VCbuUh3iXKeeml3QP7ldsHg/4knUxEMr/Ja0PIkVrbPts2g4KGr4ZlppvxC9b4lA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.67.0.tgz"; + sha512 = "GOkB+k5EVSRJg6v3th8Ynhrh89hIW4uP0CjrKChvrDpBOyU2cFN0yLYtIVKaY6FZh7wanMGLhDzCsHPnpBKmfQ=="; }; }; "@aws-sdk/service-error-classification-3.55.0" = { @@ -904,6 +904,15 @@ let sha512 = "flEo8p3XkzWoBDqnIUQre4jLuT5aLnmfQNI8c2uSjyJ3OBxpJ0iS1cDu3E++d1/pN6Q8o0KOmr2ypHeiyBOujw=="; }; }; + "@aws-sdk/signature-v4-multi-region-3.66.0" = { + name = "_at_aws-sdk_slash_signature-v4-multi-region"; + packageName = "@aws-sdk/signature-v4-multi-region"; + version = "3.66.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.66.0.tgz"; + sha512 = "Akvc8G9Del2+umg0R/5Gc/PWgQwbxxTXdnm6YTHtDzvyPPiYWBs6au6WqJQqcqk07gcQV67MLVqFFhnFuLlcVg=="; + }; + }; "@aws-sdk/smithy-client-3.55.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; @@ -2434,13 +2443,13 @@ let sha512 = "dta913ZHPpsylXlwAl4++JV64Fy0u0ahp6KoKVzj6Ee9u2CY3P6CDi8NLBAE4orluhHz8aZlkYcL//I5kjBHuA=="; }; }; - "@chemzqm/neovim-5.7.8" = { + "@chemzqm/neovim-5.7.9" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.7.8"; + version = "5.7.9"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.8.tgz"; - sha512 = "QjCwx/71/FoQcrBSPiFTXYbizols+1OR3i6RXAnaOAQeKjc2u8zDYQPv6EYIO/cacFxzwNravXRMzIeD27gF/Q=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.9.tgz"; + sha512 = "ou2lI650Rh+/3tS8HuiVim73RJSkCoVqJsf+Mqyw17+CGxbcCmXQqA2stT81j3QAXsbCF+5Ro/z152TrQLUUBg=="; }; }; "@chinachu/aribts-1.3.5-mirakurun.17" = { @@ -2632,31 +2641,31 @@ let sha512 = "do5jDoX9oCR/dGHE4POVQ3PYDCmQ2Fow4CA72UL4WoE8zUImA/0lChczjfl+ucNjE4sXFWUnzoO6j4WzrUvLnw=="; }; }; - "@cspell/cspell-bundled-dicts-5.19.5" = { + "@cspell/cspell-bundled-dicts-5.19.7" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "5.19.5"; + version = "5.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.5.tgz"; - sha512 = "qXW99H+S/529cTOtRBTPiTV1Ay+I2+kcF5lfVblSRsij7fBM6d99dB3Fg6oL0i6okRwOUNFAV4qbxgg7zxA3wA=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.7.tgz"; + sha512 = "9h2KdI3yKODc8rAxkgB5UZb6RLwwEO25Fo91vnOtM1xfwLhX/scMACU1DoqtnTVaE73HoQ46DYAZAAq/OloRFQ=="; }; }; - "@cspell/cspell-pipe-5.19.5" = { + "@cspell/cspell-pipe-5.19.7" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "5.19.5"; + version = "5.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-5.19.5.tgz"; - sha512 = "dNCMYDgjeWKw7KIptjxHu17UfeT3oiqQk6LkSyi3BewUxpnlLLO7EsxR6GRW+RVU/MrPXe7BF9WgF0gO8m+8cQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-5.19.7.tgz"; + sha512 = "C2+qovrXyZtoM+IcyMuwwYieoGBwwnWORat+j7bkIkVHf6Pa9spxY3D1IdLt04PqWBKWKHb1g9KzJzw5grBqZw=="; }; }; - "@cspell/cspell-types-5.19.5" = { + "@cspell/cspell-types-5.19.7" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "5.19.5"; + version = "5.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.19.5.tgz"; - sha512 = "tOzCzuQQ4DdgfnI6+FGBPOVL/1JbH0pWtoOinPoU93/pH29XOKGW2I24HLeESzgskfoZGK274wMFQfGp6oJw9g=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.19.7.tgz"; + sha512 = "xL9a0oE8kPQ/GCkE/bxE5DTCMTctCpk7tdrhYG26wVbMK1VRGo8fv9w+vRVzXgTfF5jTxolEA1LTtfVBuik1MA=="; }; }; "@cspell/dict-ada-2.0.0" = { @@ -2695,13 +2704,13 @@ let sha512 = "O622rMAaHm85AmqNyMki5je8HB/1XlTKbGOXh2UUhooI5qdgdfrjTQ6VBuHwHrfEfuODBHYTNYXVB2m23XqHCg=="; }; }; - "@cspell/dict-cpp-2.0.1" = { + "@cspell/dict-cpp-2.0.3" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-2.0.1.tgz"; - sha512 = "M7ILooLd8qpAEk2Mr8QG/f5hMSaswKXu10Z4u7bmWJNUutPEMrliFvfY/HoYJoE0zX980wRhZg3UqZYKWjJ2bA=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-2.0.3.tgz"; + sha512 = "aWRvI3CQW2M3XeJpDVffItw/9n4hxsN5EPwyBa6Po6EnCxZZZLOqpieZk4JNz4pH0/xbnOX+sMMuSeKWr71r/w=="; }; }; "@cspell/dict-cryptocurrencies-2.0.0" = { @@ -2812,6 +2821,15 @@ let sha512 = "+JtYO58QAXnetRN+MGVzI8YbkbFTLpYfl/Cw/tmNqy7U1IDVC4sTXQ2pZvbbeKQWFHBqYvBs0YASV+mTouXYBw=="; }; }; + "@cspell/dict-git-1.0.1" = { + name = "_at_cspell_slash_dict-git"; + packageName = "@cspell/dict-git"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-git/-/dict-git-1.0.1.tgz"; + sha512 = "Rk+eTof/9inF11lvxmkCRK+gODatA3qai8kSASv6OG/JfPvpj7fTHErx/rdgPw/LOTDUafnoTjTYmj7B2MOQXg=="; + }; + }; "@cspell/dict-golang-2.0.0" = { name = "_at_cspell_slash_dict-golang"; packageName = "@cspell/dict-golang"; @@ -3433,22 +3451,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-6.0.19" = { + "@expo/config-6.0.20" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "6.0.19"; + version = "6.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-6.0.19.tgz"; - sha512 = "UkLnnKnt4zP382K7s0UDnUNY646Gdw8PoDWnxaIGAL515R9IX8oWef7+7hX/dZMi27d/WLJPmWNRYsEL8Q/3rw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.20.tgz"; + sha512 = "m2T1/hB4TyLkQElOUwOajn/7gBcPaGyfVwoVsuJMEh0yrNvNFtXP+nl87Cm53g5q+VyfwJUgbewPQ3j/UXkI6Q=="; }; }; - "@expo/config-plugins-4.1.0" = { + "@expo/config-plugins-4.1.1" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.0.tgz"; - sha512 = "+Uq7kzi1StUZZZivnnqNV6+v8b+SMF6MDgH+cEZxCoM9uwLXOK0rTAURzBGtl+C6EEbKnoZmnKGuzABBGPRP7A=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.1.tgz"; + sha512 = "lo3tVxRhwM9jfxPHJcURsH5WvU26kX12h5EB3C7kjVhgdQPLkvT8Jk8Cx0KSL8MXKcry2xQvZ2uuwWLkMeplJw=="; }; }; "@expo/config-types-44.0.0" = { @@ -3460,22 +3478,22 @@ let sha512 = "d+gpdKOAhqaD5RmcMzGgKzNtvE1w+GCqpFQNSXLliYlXjj+Tv0eL8EPeAdPtvke0vowpPFwd5McXLA90dgY6Jg=="; }; }; - "@expo/dev-server-0.1.106" = { + "@expo/dev-server-0.1.107" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.106"; + version = "0.1.107"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.106.tgz"; - sha512 = "MEB5YuOkew2O4K3GTDLHS1PT/Ca7B/tGx4J+eH74QK6051PlmrikPA5/buuZd23ww/cmOAAKBw509agcbrpajg=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.107.tgz"; + sha512 = "QL0phPimM/F/fX7tjdxfW8n7lkziHT0GxLFiw6gf4Qa3q6BND3xBrI0U2ZIjVZjQGGrVQUiQhdcfenQUNLHdZg=="; }; }; - "@expo/dev-tools-0.13.146" = { + "@expo/dev-tools-0.13.147" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.146"; + version = "0.13.147"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.146.tgz"; - sha512 = "3bZe8He2uLha2SY1vOp2YnwtuXDHXodQwdkYdN/IL6XBveIKaBR9HDhBg/kBvI+/aNcut6ymwSSo9IOEmvUk5g=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.147.tgz"; + sha512 = "zWZdlRinxKearhkmwfJoCaHA25HGl8WZIehF1dIq2s4UPbQ58hvHBQdB6q9W4d78arRAnJKHljJq3t6Rs4smAQ=="; }; }; "@expo/devcert-1.0.0" = { @@ -3487,67 +3505,67 @@ let sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; - "@expo/image-utils-0.3.18" = { + "@expo/image-utils-0.3.19" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.18"; + version = "0.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.18.tgz"; - sha512 = "77/ub2aGuf7SYfaFhvCHE54Hs/jRuU5j+pemS5seLfVHNwHbJSse91TMhsTLLNz3GwwqTxFVe3KMycSccJ73nA=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.19.tgz"; + sha512 = "mBuWWltyQpl4WF0bIBitfJXOsjB2MOapP+SR3ZnOZ8hOf/a0lzpju94kplK+wa/f80S9owkVu7NZ3wwu+UxljA=="; }; }; - "@expo/json-file-8.2.34" = { + "@expo/json-file-8.2.35" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.34"; + version = "8.2.35"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.34.tgz"; - sha512 = "ZxtBodAZGxdLtgKzmsC+8ViUxt1mhFW642Clu2OuG3f6PAyAFsU/SqEGag9wKFaD3x3Wt8VhL+3y5fMJmUFgPw=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.35.tgz"; + sha512 = "cQFLGSNRRFbN9EIhVDpMCYuzXbrHUOmKEqitBR+nrU6surjKGsOsN9Ubyn/L/LAGlFvT293E4XY5zsOtJyiPZQ=="; }; }; - "@expo/metro-config-0.3.12" = { + "@expo/metro-config-0.3.13" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.3.12"; + version = "0.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.12.tgz"; - sha512 = "8cvsMMe68BfZqNYIXeYDVtf6ijEHmJ27llhFKFwS8XZwKaqcfSLRANK8I8xxTc00tzXaWyE1BKJIY6DMq/gbJA=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.13.tgz"; + sha512 = "SBsCKQdSPGc9GpyYKbDkbnknklnv+dhBX5rTRf9im+bxzj/4w0bKeq2+7AE28QWaTfDXyZqwwkbMjmFbzXeSHA=="; }; }; - "@expo/osascript-2.0.31" = { + "@expo/osascript-2.0.32" = { name = "_at_expo_slash_osascript"; packageName = "@expo/osascript"; - version = "2.0.31"; + version = "2.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.31.tgz"; - sha512 = "5OE8+Fb1mLu9EJNUOx5RcetkJZMXJxthVuIzHPlEZFEAZa3f/zQtJ6vA/hnt1BLZ2X9BR3OzBMALrUzVo95L2w=="; + url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.32.tgz"; + sha512 = "yH95/CwLJzhrzIl0EaDNbK3MevHFzCGM89k/2F3ppltRqhPzu8Vt/8onE3yZPEABluoiTVX79AWPogS35iIRhA=="; }; }; - "@expo/package-manager-0.0.50" = { + "@expo/package-manager-0.0.51" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.50"; + version = "0.0.51"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.50.tgz"; - sha512 = "rDa1MkXFxZb3jj/a1iX12A+6DpWsZgtX8H0d5j+sYeCqjOARTvuvgNS9anpNbdhbGEXSu+1m8YGXK/QmBAo51Q=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.51.tgz"; + sha512 = "Is/HZYb1GiJ/5VLd02sbUopcdBxnI2PCxNCHp/0r0oC4VcZPUvwcVp3avIBFqaCO0u/MP8JvGPyjq0qHUNZhng=="; }; }; - "@expo/plist-0.0.17" = { + "@expo/plist-0.0.18" = { name = "_at_expo_slash_plist"; packageName = "@expo/plist"; - version = "0.0.17"; + version = "0.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.17.tgz"; - sha512 = "5Ul3d/YOYE6mfum0jCE25XUnkKHZ5vGlU/X2275ZmCtGrpRn1Fl8Nq+jQKSaks3NqTfxdyXROi/TgH8Zxeg2wg=="; + url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.18.tgz"; + sha512 = "+48gRqUiz65R21CZ/IXa7RNBXgAI/uPSdvJqoN9x1hfL44DNbUoWHgHiEXTx7XelcATpDwNTz6sHLfy0iNqf+w=="; }; }; - "@expo/prebuild-config-3.1.0" = { + "@expo/prebuild-config-3.1.1" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.1.0.tgz"; - sha512 = "Vwz2L3brsrvLVDBXj2gcB2QfeyAPKxa7rCOSFnPhyHf2qpxtmncv9IVrSdkHyWlPW7KmFVfiRsT3/nHXoataqQ=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.1.1.tgz"; + sha512 = "7COQ0ZjJof7f4w9kBYlvxg8ulCHJKlA4hqZuQQVAoG83gC+j6Hkbi7cbWOHcAEO/FjwFhNzas5l6P5c3wWj5eg=="; }; }; "@expo/rudder-sdk-node-1.1.1" = { @@ -3559,13 +3577,13 @@ let sha512 = "uy/hS/awclDJ1S88w9UGpc6Nm9XnNUjzOAAib1A3PVAnGQIwebg8DpFqOthFBTlZxeuV/BKbZ5jmTbtNZkp1WQ=="; }; }; - "@expo/schemer-1.3.33" = { + "@expo/schemer-1.3.34" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.33"; + version = "1.3.34"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.33.tgz"; - sha512 = "qjbArE6hl+ZKms4Znlv7mXMbCkm8T5BMn3eBzKnHJRCogNti/LOR0t8Nf9aY3QqaUqX1k6/JspLmLWhM/bGYYw=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.34.tgz"; + sha512 = "oEcU9aZclpUfO83RSIxESywzt+NbOCbC/z1//dw8flWW9niu2qkHC8zGWWFU+V36LM3Pdhi+dlUYapo66eTitQ=="; }; }; "@expo/sdk-runtime-versions-1.0.0" = { @@ -3586,13 +3604,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.16.19" = { + "@expo/webpack-config-0.16.20" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.16.19"; + version = "0.16.20"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.19.tgz"; - sha512 = "VB8QNJ4Kvt46cy/y+AbBrJViOH2QY+AEfELNZRDifokZg0wPauxQCz/3Dk7qQnjLYsVOszoH7AtgfOdy/5NSjg=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.20.tgz"; + sha512 = "aj83vpceXfzAVNKYMVqP+j5C/ByaZbKdR6un0swt6axsPe+Qu8gflAtOJy8LhLUGaiijX51oLncj2jKhCTrGPg=="; }; }; "@expo/xcpretty-4.1.1" = { @@ -3622,6 +3640,15 @@ let sha512 = "uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA=="; }; }; + "@fastify/busboy-1.0.0" = { + name = "_at_fastify_slash_busboy"; + packageName = "@fastify/busboy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.0.0.tgz"; + sha512 = "tzTXX1TFEjWCseEsNdIlXXkD+48uJoN+zpqIojUX4pSoMscsbhO/UuVEB5SzJucexqDWOo2ma0ECwdD7hZdrzg=="; + }; + }; "@fluentui/date-time-utilities-8.5.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; @@ -3640,13 +3667,13 @@ let sha512 = "M4SmXu428wwQLu1iw6ST07iACjdKY5HiU+xpcgD3IQMMQazgN616GDzc6KZ1ebuBsF7B4TyQS7KZh9mfxnnldg=="; }; }; - "@fluentui/font-icons-mdl2-8.2.5" = { + "@fluentui/font-icons-mdl2-8.3.0" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.2.5"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.2.5.tgz"; - sha512 = "IgzcoOm+hZMlYJBR1RFb3fner1IxdSLCsnsjkVUtfnwuvGq/zjqEpNgsk5eUG4dHlu3E9dDY86nLqfGJe8R6yw=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.3.0.tgz"; + sha512 = "o67iMsFFqBCSL/l9D+wAguHCPOFd9xde9SztL7zwlf/c3o3+7oPRfzI/Zs1BqMxwd3WDsoKidhS2X6U8sZAuyg=="; }; }; "@fluentui/foundation-legacy-8.2.5" = { @@ -3676,13 +3703,13 @@ let sha512 = "+WoaAaoYx/wfkrz1Ag40JqHvDUFfQcg+dQ3jaEOoau16y7EZGIe7oN8WYIXNMgWuMxH7r1QlanFbQZ+ziKjHmw=="; }; }; - "@fluentui/react-8.64.1" = { + "@fluentui/react-8.64.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.64.1"; + version = "8.64.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.64.1.tgz"; - sha512 = "2xk+LqUwn7Xp3eDIgeLInX4f6hgdie6RGcZo7D1nGSIB0p5EOR8IcwhataYs3HMte3WFWBRJhYbEXYZVfCfvfA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.64.3.tgz"; + sha512 = "zFZIydeLY5rovBXxVNvaRuDM1+TkBJ1h7s7bCGgZHuWbya0vmiWUJOEKsGL2hNJw9nppCrgau7EZU2b5d4xePQ=="; }; }; "@fluentui/react-focus-8.5.6" = { @@ -3865,13 +3892,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.4.2" = { + "@graphql-tools/batch-execute-8.4.4" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.4.2"; + version = "8.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.2.tgz"; - sha512 = "5/el640oG/jfjQCjCRDdtIALyUib8YPONM2NSmckp2g1nOrPTAx/isz3Uptp9y5OI1UXXhONiKy5euTbgsGoXw=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.4.tgz"; + sha512 = "5B3srfrNh7qqaH4FWysiZXPDVD7snwM+qsW3Bkq8M0iRAZVUb3P9o23xJbBwS32g678TuCjKy113K0PSqHyeCw=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -3883,13 +3910,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-8.7.2" = { + "@graphql-tools/delegate-8.7.4" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "8.7.2"; + version = "8.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.2.tgz"; - sha512 = "SSmx5N6Cq23KRT0YepdmcYugey7MDZSXxtJ8KHHdc5eW9IAHXZWsJWdVnI9woU9omsnE6svnxblZb1UUBl7AUg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.4.tgz"; + sha512 = "OXdIHRqqUDFvBebSZ/MQAvQOJ1Kvl7gjD78ClG4bPts6qDfFHwzlX0V8QESFCo8H67VDRzB4nnqlDyOIzjVNlQ=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -3901,22 +3928,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.3.8" = { + "@graphql-tools/graphql-file-loader-7.3.9" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.3.8"; + version = "7.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.8.tgz"; - sha512 = "SpQZQ0klbox/kxYCLFBTmhLuQFm7P6usWVIqwROK4JSomwCuccc2zDsr1H7ayDpanD3yfkzMsl6gPkOkAo52pA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.9.tgz"; + sha512 = "jCc4X6+PFVQlhpd+bvHxfldteYrzWvoYDNy+dzPgw3O/NYtjJ/B1wH6X2L4wXI+CDlKEdUKSEe+Dk6j9gmaItw=="; }; }; - "@graphql-tools/import-6.6.10" = { + "@graphql-tools/import-6.6.11" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.6.10"; + version = "6.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.10.tgz"; - sha512 = "yHdlEPTvIjrngtQFNgkMQJt/DjG3hQKvc6Mb8kaatFV4yERN5zx+0vpdrwxTwRNG1N7bI/YCkbrc7PXOb+g89Q=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.11.tgz"; + sha512 = "lKIRTsDxqdzrJtEOnqW4pr73/QRbGhyc37xewz4EvCYoUk6FEwqilEZIrkChmdQFjOV9BnwxFCp8KaS0P+qU4A=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -3928,13 +3955,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.3.8" = { + "@graphql-tools/json-file-loader-7.3.9" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.3.8"; + version = "7.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.8.tgz"; - sha512 = "W3nVLAp8m787A17wja7ysayij7WMRu+lF8LeCWr9eoyiCuw65i63y0G4eqZ5+Q0+E2BYWlKJyk/Z0vsFVJGMUA=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.9.tgz"; + sha512 = "yLX5ADmT4m8hZvgsh9zjvcfS0ijrh3C/TNroRt81thN2nFMYmglRbxmOZgHXnT5DnL8v/BiqmlVpiq4cWEeJcw=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -3946,13 +3973,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.5.7" = { + "@graphql-tools/load-7.5.8" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.5.7"; + version = "7.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.7.tgz"; - sha512 = "Z4oKf4MdBvl0EyubmvPL14ldhovKz8C61rQPHD8pjnC8Z0RbvW0a/sns/yuHuCVZoJMsSboU65DPzPTIoQUM4w=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.8.tgz"; + sha512 = "+kQ7aT9GEuBmiGQlGsFU5f2e1A0hMbwCePzHYOvHR5BF8soJeToWZLiIC2hJf6z06aco+LC9x/os+6p9U9+7iQ=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -3964,13 +3991,13 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.2.7" = { + "@graphql-tools/merge-8.2.8" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.2.7"; + version = "8.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.7.tgz"; - sha512 = "rKxjNogqu1UYAG/y5FOb6lJsmSQbWA+jq4inWjNEVX54VGGE7/WGnmPaqcsyomNOfS3vIRS6NnG+DxiQSqetjg=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.8.tgz"; + sha512 = "e4kpzgEIlA0sC0NjJlMwUL73Iz/HoP2OgAUReDDsupvWCqW3PMxjNoviS8xmcklVnv1w8Vmr8U2tao+x40ypLA=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -3982,13 +4009,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.3.7" = { + "@graphql-tools/schema-8.3.8" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.3.7"; + version = "8.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.7.tgz"; - sha512 = "7byr9J6rfMPFPfiR4u65dy20xHATTvbgOY7KYd1sYPnMKKfRZe0tUgpnE+noXcfob7N8s366WaVh7bEoztQMwg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.8.tgz"; + sha512 = "Bba60ali4fLOKJz/Kk39RcBrDUBtu0Wy7pjpIOmFIKQKwUBNNB0eAmfpvrjnFhRAVdO2kOkPpc8DQY+SCG+lWw=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -4000,13 +4027,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.9.9" = { + "@graphql-tools/url-loader-7.9.11" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.9.9"; + version = "7.9.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.9.tgz"; - sha512 = "qhjBJ3oCXZrzvJchVwtrahr48TXOHPYZ4YXklGrbJVoJs3LP0a7CYUwuXeiNuN+dpgaxkb175sIEN9m0FadGRw=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.11.tgz"; + sha512 = "janH0mhUxIsttEFwjtFIDAsfQwf1A2f9qKrvBIljF1Gcr/IWVH2DB7HfaQ5jIQrxaKv2wD3VHuU+/vMz+hpyOw=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -4036,13 +4063,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.6.6" = { + "@graphql-tools/utils-8.6.7" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.6.6"; + version = "8.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.6.tgz"; - sha512 = "wjY2ljKLCnnbRrDNPPgPNqCujou0LFSOWcxAjV6DYUlfFWTsAEvlYmsmY4T+K12wI/fnqoJ2bUwIlap1plFDMg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.7.tgz"; + sha512 = "Qi3EN95Rt3hb8CyDKpPKFWOPrnc00P18cpVTXEgtKxetSP39beJBeEEtLB0R53eP/6IolsyTZOTgkET1EaERaw=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -4054,13 +4081,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-8.4.11" = { + "@graphql-tools/wrap-8.4.13" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "8.4.11"; + version = "8.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.11.tgz"; - sha512 = "bif9yNZCoG1fFTGuIV4UblsJI95VSufl0RReXdr6f2yNbnqjSzgoDMB17WQlLrNOBrXa7r8N5aWBr5hBGhtGig=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.13.tgz"; + sha512 = "q0Fa0CVgcaqm4FI4GXAVLjz8TQaF6lpFOm/rlgEkMzW9wFY/ZvDs+K3fVh9BgNvpudJArnVzAZgl2+FHNdY9CA=="; }; }; "@grpc/grpc-js-1.5.10" = { @@ -4639,22 +4666,22 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/check-node-1.55.1" = { + "@jsii/check-node-1.56.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.55.1"; + version = "1.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.55.1.tgz"; - sha512 = "JC9b+y4CXdIICDE6fYjaN0VKPc65lz4dj1T4lnaqMfbXIBGB7sBMLQJ/szVc9U3Z+o/HBzCJndNn86kGRM+lqw=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.56.0.tgz"; + sha512 = "OJZGt2lO7ITY5fnqa0RCBnlaEORCIQq/AWMsJ2OcwOSOGj1Ua+9nsiBvsJ7Dm77k3jLx3IN0odD6/bwP6hQWCA=="; }; }; - "@jsii/spec-1.55.1" = { + "@jsii/spec-1.56.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.55.1"; + version = "1.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.55.1.tgz"; - sha512 = "KSKKN04eO0rTaqzw6j9RTx8HAzhePdmWRC3iJQ90QeZLv/L8Pj4l+nZ4wn77BGxmeULpXkGXUKbhkceArdr4GA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.56.0.tgz"; + sha512 = "nwjVYCXw/KMRokwErkZmSBmYmym3theTptNSaWITwCGSyfDIEvw4ud83CYB3fN4Soa2jsFmIJ2rFffeVuBkOyw=="; }; }; "@juggle/resize-observer-3.3.1" = { @@ -4711,13 +4738,13 @@ let sha512 = "4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA=="; }; }; - "@ledgerhq/devices-6.24.1" = { + "@ledgerhq/devices-6.27.1" = { name = "_at_ledgerhq_slash_devices"; packageName = "@ledgerhq/devices"; - version = "6.24.1"; + version = "6.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-6.24.1.tgz"; - sha512 = "6SNXWXxojUF6WKXMVIbRs15Mveg+9k0RKJK/PKlwZh929Lnr/NcbONWdwPjWKZAp1g82eEPT4jIkG6qc4QXlcA=="; + url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-6.27.1.tgz"; + sha512 = "jX++oy89jtv7Dp2X6gwt3MMkoajel80JFWcdc0HCouwDsV1mVJ3SQdwl/bQU0zd8HI6KebvUP95QTwbQLLK/RQ=="; }; }; "@ledgerhq/errors-5.50.0" = { @@ -4747,31 +4774,31 @@ let sha512 = "6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw=="; }; }; - "@ledgerhq/hw-transport-6.24.1" = { + "@ledgerhq/hw-transport-6.27.1" = { name = "_at_ledgerhq_slash_hw-transport"; packageName = "@ledgerhq/hw-transport"; - version = "6.24.1"; + version = "6.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.24.1.tgz"; - sha512 = "cOhxkQJrN7DvPFLLXAS2nqAZ7NIDaFqnbgu9ugTccgbJm2/z7ClRZX/uQoI4FscswZ47MuJQdXqz4nK48phteQ=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.27.1.tgz"; + sha512 = "hnE4/Fq1YzQI4PA1W0H8tCkI99R3UWDb3pJeZd6/Xs4Qw/q1uiQO+vNLC6KIPPhK0IajUfuI/P2jk0qWcMsuAQ=="; }; }; - "@ledgerhq/hw-transport-node-hid-6.24.1" = { + "@ledgerhq/hw-transport-node-hid-6.27.1" = { name = "_at_ledgerhq_slash_hw-transport-node-hid"; packageName = "@ledgerhq/hw-transport-node-hid"; - version = "6.24.1"; + version = "6.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.24.1.tgz"; - sha512 = "onbxunq8FsiY2sVRR+jRCjC1nx376ANuAtnQsmoHsgxONOVTb5asXWWOV4Cjm8y7RZTCtDw3d1fbziEGRhwiqA=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.1.tgz"; + sha512 = "H3kGFU6lDAZM7ef17nVGTCpgwPzDcbO8dwqvGoIDTopvlNgNqmzw95GT3aCosJMp04C9yYGyMPSF5UFjRX8ckg=="; }; }; - "@ledgerhq/hw-transport-node-hid-noevents-6.24.1" = { + "@ledgerhq/hw-transport-node-hid-noevents-6.27.1" = { name = "_at_ledgerhq_slash_hw-transport-node-hid-noevents"; packageName = "@ledgerhq/hw-transport-node-hid-noevents"; - version = "6.24.1"; + version = "6.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.24.1.tgz"; - sha512 = "z3uXCU13oayRX51MOaTREdrn83ujrBkccdXn3ljdMy4H3pmAvG6QGn4m30gursEUUJkogA6dkcXs3G8IRfOdxA=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.1.tgz"; + sha512 = "nsPo491bslP7QySXIB2asILxws7+t2V/0F4Hjc3IBEkHexH3iS+TmeegE5A72vDXhXKI4wskJ8Pp8Odcz9TN1A=="; }; }; "@ledgerhq/hw-transport-u2f-5.36.0-deprecated" = { @@ -5719,13 +5746,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.251" = { + "@microsoft/load-themed-styles-1.10.257" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.251"; + version = "1.10.257"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.251.tgz"; - sha512 = "Ro0EiAwOIwC6YP00Fw8ixY2xWDQmV+HdfMskcrCfEUZidwBBEt7wlWnjx4SnaJH+sdDTlnnHzuERE2lzH9IvPA=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.257.tgz"; + sha512 = "QRWEP1re0byEdedyYr82/mL8lcKPihNiASO+YJlohX9vsa/FSUSVD5lZQ87xSpgpOjGGc37CuPHhU+xnhLsS7A=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -6916,85 +6943,85 @@ let sha512 = "h2FvqLA75ZQdIXX1y+ylGjIIi7YtbAUJyIapxaO081h3EsYG2jr9sRL4sym5ECgmvbyua/DEgtMLX3eGYn09FA=="; }; }; - "@parcel/css-1.8.0" = { + "@parcel/css-1.8.1" = { name = "_at_parcel_slash_css"; packageName = "@parcel/css"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css/-/css-1.8.0.tgz"; - sha512 = "l6+gGOIk+JEZ+RuqsGzl4yDFKfSC8Uq+FaHzJgwIuIcdHip8ENMr8HMHiOPeO3VSo1JRn3yt5+MIntm2GIzAIA=="; + url = "https://registry.npmjs.org/@parcel/css/-/css-1.8.1.tgz"; + sha512 = "TOfe+msei+NuPPKb60Kc+nPuCThl07L3Fut67nfot1OXy2hKYr/eF7AiAguCaIlRXkjEtXRR4S7fO24dLZ1C9g=="; }; }; - "@parcel/css-darwin-arm64-1.8.0" = { + "@parcel/css-darwin-arm64-1.8.1" = { name = "_at_parcel_slash_css-darwin-arm64"; packageName = "@parcel/css-darwin-arm64"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.8.0.tgz"; - sha512 = "A9taXLx12UTgyH/UGD9KMDNTXmLuH51h5g+AV4ZVo8vUZHSofP/Sb+zphOikdHn+K5gzVai1a06N92F2G8xJGw=="; + url = "https://registry.npmjs.org/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.8.1.tgz"; + sha512 = "PbpIlqLMAhWZlimKCdNP/ZfGNJUlEWgNeTcO2LDjPIK5JK6oTAJHfP/PPzjLS8mu+JIznZ//9MnVOUi1xcjXMA=="; }; }; - "@parcel/css-darwin-x64-1.8.0" = { + "@parcel/css-darwin-x64-1.8.1" = { name = "_at_parcel_slash_css-darwin-x64"; packageName = "@parcel/css-darwin-x64"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-darwin-x64/-/css-darwin-x64-1.8.0.tgz"; - sha512 = "SWmB7fnD0USm9AHZBHx9EJBo1c2dwLFuA/HBD3in4yDPGS5kSqfIJTfux3NO/aySsy7NAC3FOgK/L2A2PdtpGQ=="; + url = "https://registry.npmjs.org/@parcel/css-darwin-x64/-/css-darwin-x64-1.8.1.tgz"; + sha512 = "R4FrwXQGAgW3/YRCSRCBNcV6mz+OKqYuyrVnZBmKTLDuTGhZHCF12qLL7SV5jYsKXBDauYAXDv/SOFIwlikVXg=="; }; }; - "@parcel/css-linux-arm-gnueabihf-1.8.0" = { + "@parcel/css-linux-arm-gnueabihf-1.8.1" = { name = "_at_parcel_slash_css-linux-arm-gnueabihf"; packageName = "@parcel/css-linux-arm-gnueabihf"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.8.0.tgz"; - sha512 = "66ACZD3bnotyLAgJ/D93R28ipFomvxlsMszxv+U45GiSLBwmjKZ7VkTnMHC2/kmQ0NVdlUKh4WqjL/PB4PLkzg=="; + url = "https://registry.npmjs.org/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.8.1.tgz"; + sha512 = "MVRlPGipRrs+f6nURR6cJbFw85YSXkPbR6l/0Hm1vyFlNn0HmRDCEWZFPwvvSavibU968Wgc5yKaC78D6Ecgsw=="; }; }; - "@parcel/css-linux-arm64-gnu-1.8.0" = { + "@parcel/css-linux-arm64-gnu-1.8.1" = { name = "_at_parcel_slash_css-linux-arm64-gnu"; packageName = "@parcel/css-linux-arm64-gnu"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.8.0.tgz"; - sha512 = "oH00san3byQnx2dWp6gsIvbZNonSQ1S+nNsTLjA/Riy2sVYTxYDsLOiNS+ryJwBKchOYSZ5PiMDgJaw7KmgIgg=="; + url = "https://registry.npmjs.org/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.8.1.tgz"; + sha512 = "s6UpF9CjUMeeCELx0Cu+HtR8RKycm516b1mJlQC8hsPtAyDYlByW4tSDwC3By4Fqf3xCan6IH/oaq0ujS0Iqew=="; }; }; - "@parcel/css-linux-arm64-musl-1.8.0" = { + "@parcel/css-linux-arm64-musl-1.8.1" = { name = "_at_parcel_slash_css-linux-arm64-musl"; packageName = "@parcel/css-linux-arm64-musl"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.8.0.tgz"; - sha512 = "0p0AJ3QypEC0NwFWbzy5JbI8ZDLUED3BGXvqdD7jfOx14qCW2apq7OKBSwSCS8ZvBo8G2tkss7nbyOG5NbIjUQ=="; + url = "https://registry.npmjs.org/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.8.1.tgz"; + sha512 = "Tp3Pe2tx7mltPrZ1ZDV8PLkgYcwQOigrH9YjPPOaf8iFptDpHOv1y2cs1eSgnvP+5kBdIXd7H87kGSC7OosuXg=="; }; }; - "@parcel/css-linux-x64-gnu-1.8.0" = { + "@parcel/css-linux-x64-gnu-1.8.1" = { name = "_at_parcel_slash_css-linux-x64-gnu"; packageName = "@parcel/css-linux-x64-gnu"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.8.0.tgz"; - sha512 = "nXWRN7LSXZPic0B8F77AQe7CIqYi4+nD5QVpABX0j7s/UO2BAcfN0vpI0CNAuErX4QOSs3AIWo1XF0qL/mH9DQ=="; + url = "https://registry.npmjs.org/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.8.1.tgz"; + sha512 = "8yqXRlei4qBFSv9R8yru6yB2ak7frA/z6rMB2E5lNN8kMhpB1E0xKYMhsTZdMOV5A/gkPZlP3sHZG4qQ3GOLgQ=="; }; }; - "@parcel/css-linux-x64-musl-1.8.0" = { + "@parcel/css-linux-x64-musl-1.8.1" = { name = "_at_parcel_slash_css-linux-x64-musl"; packageName = "@parcel/css-linux-x64-musl"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.8.0.tgz"; - sha512 = "5Q5SQREh1tSOjvIu55acqEzWDdZJZiwlgdoC8nTYmIRsyFn4SVibVMDau5qWmb3Xtswr/hm41xesG3nIBXCX+Q=="; + url = "https://registry.npmjs.org/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.8.1.tgz"; + sha512 = "S1Qf9tZzX7AnmqKRhR/qpFYsqSCxYSz5KdekdxIijPEMxyI5tpWp6g2adGYxrCuV0E5EpcpmXlBT6d6+8FrgPg=="; }; }; - "@parcel/css-win32-x64-msvc-1.8.0" = { + "@parcel/css-win32-x64-msvc-1.8.1" = { name = "_at_parcel_slash_css-win32-x64-msvc"; packageName = "@parcel/css-win32-x64-msvc"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.8.0.tgz"; - sha512 = "IHFRdgsLHUuXIREtnRE/yNjNyRofySyLvG4lx8sfbBYQFIdelplw6V74kQ/u2iNt4MIOP69CkJxUuF+uX//ooQ=="; + url = "https://registry.npmjs.org/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.8.1.tgz"; + sha512 = "tZ5s2zM/63mEdpdnE82xtfDDR7tAN32REii1EU5LOdfpB2PIw902p30fvklj1pOFBji/v/JdpAdLIYc4W7Gb6w=="; }; }; "@parcel/diagnostic-2.4.1" = { @@ -7708,13 +7735,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.93" = { + "@redocly/openapi-core-1.0.0-beta.94" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.93"; + version = "1.0.0-beta.94"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.93.tgz"; - sha512 = "xQj7UnjPj3mKtkyRrm+bjzEoyo0CVNjGP4pV6BzQ0vgKf0Jqq7apFC703psyBH+JscYr7NKK1hPQU76ylhFDdg=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.94.tgz"; + sha512 = "xTklcobv+51bQVkUOpUiNY0GztL+0u3yGsy2BtldaHpcnNGMu3lu/utsoOHkiNTpgVEGyEWVZzBtF6Sz5v/Fkg=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -9850,13 +9877,13 @@ let sha512 = "Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg=="; }; }; - "@types/uglify-js-3.13.1" = { + "@types/uglify-js-3.13.2" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.13.1"; + version = "3.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz"; - sha512 = "O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.2.tgz"; + sha512 = "/xFrPIo+4zOeNGtVMbf9rUm0N+i4pDf1ynExomqtokIJmVzR3962lJ1UE+MmexMkA0cmN9oTzg5Xcbwge0Ij2Q=="; }; }; "@types/unist-2.0.6" = { @@ -10084,6 +10111,15 @@ let sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; + "@types/yauzl-2.10.0" = { + name = "_at_types_slash_yauzl"; + packageName = "@types/yauzl"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz"; + sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; + }; + }; "@types/yauzl-2.9.2" = { name = "_at_types_slash_yauzl"; packageName = "@types/yauzl"; @@ -10111,13 +10147,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.18.0" = { + "@typescript-eslint/eslint-plugin-5.19.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.18.0"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz"; - sha512 = "tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.19.0.tgz"; + sha512 = "w59GpFqDYGnWFim9p6TGJz7a3qWeENJuAKCqjGSx+Hq/bwq3RZwXYqy98KIfN85yDqz9mq6QXiY5h0FjGQLyEg=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -10138,13 +10174,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.18.0" = { + "@typescript-eslint/parser-5.19.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.18.0"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.18.0.tgz"; - sha512 = "+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.19.0.tgz"; + sha512 = "yhktJjMCJX8BSBczh1F/uY8wGRYrBeyn84kH6oyqdIJwTGKmzX5Qiq49LRQ0Jh0LXnWijEziSo6BRqny8nqLVQ=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -10156,22 +10192,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.18.0" = { + "@typescript-eslint/scope-manager-5.19.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.18.0"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz"; - sha512 = "C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.19.0.tgz"; + sha512 = "Fz+VrjLmwq5fbQn5W7cIJZ066HxLMKvDEmf4eu1tZ8O956aoX45jAuBB76miAECMTODyUxH61AQM7q4/GOMQ5g=="; }; }; - "@typescript-eslint/type-utils-5.18.0" = { + "@typescript-eslint/type-utils-5.19.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.18.0"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz"; - sha512 = "vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.19.0.tgz"; + sha512 = "O6XQ4RI4rQcBGshTQAYBUIGsKqrKeuIOz9v8bckXZnSeXjn/1+BDZndHLe10UplQeJLXDNbaZYrAytKNQO2T4Q=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -10183,13 +10219,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.18.0" = { + "@typescript-eslint/types-5.19.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.18.0"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.18.0.tgz"; - sha512 = "bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.19.0.tgz"; + sha512 = "zR1ithF4Iyq1wLwkDcT+qFnhs8L5VUtjgac212ftiOP/ZZUOCuuF2DeGiZZGQXGoHA50OreZqLH5NjDcDqn34w=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -10201,22 +10237,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.18.0" = { + "@typescript-eslint/typescript-estree-5.19.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.18.0"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz"; - sha512 = "wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.19.0.tgz"; + sha512 = "dRPuD4ocXdaE1BM/dNR21elSEUPKaWgowCA0bqJ6YbYkvtrPVEvZ+zqcX5a8ECYn3q5iBSSUcBBD42ubaOp0Hw=="; }; }; - "@typescript-eslint/utils-5.18.0" = { + "@typescript-eslint/utils-5.19.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.18.0"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.18.0.tgz"; - sha512 = "+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.19.0.tgz"; + sha512 = "ZuEckdupXpXamKvFz/Ql8YnePh2ZWcwz7APICzJL985Rp5C2AYcHO62oJzIqNhAMtMK6XvrlBTZeNG8n7gS3lQ=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -10228,13 +10264,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.18.0" = { + "@typescript-eslint/visitor-keys-5.19.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.18.0"; + version = "5.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz"; - sha512 = "Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.19.0.tgz"; + sha512 = "Ym7zZoMDZcAKWsULi2s7UMLREdVQdScPQ/fKWMYefarCztWlHPFVJo8racf8R0Gc8FAEJ2eD4of8As1oFtnQlQ=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -10264,31 +10300,31 @@ let sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; }; }; - "@vercel/build-utils-2.15.0" = { + "@vercel/build-utils-2.15.1" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "2.15.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.15.0.tgz"; - sha512 = "0SwM19Mn//v5RuLG5gjuZVOnn1iYqJDMA+N0qm8cK7bTBEWMiTKqF+VmdXkvg6Y6X6rKviAJnOBUUUP6va6Xaw=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.15.1.tgz"; + sha512 = "7qwC7wd2Q/MwtD07/La5qIR5nfpfNVPvISp1cfwYs8fe/FUKjDdbhvGLDFrry+DeoeMFJhnJgK2qmvCnucq+GA=="; }; }; - "@vercel/go-1.3.1" = { + "@vercel/go-1.3.2" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-1.3.1.tgz"; - sha512 = "mNo0DWfc49trswz53Gf0Km7KKdOW1zvlBEP6ZWhEhnEjRcNMHZaLg3dq3jWfttLaQ7ihJ+VOyDImd0NX23C42A=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-1.3.2.tgz"; + sha512 = "SS2Iq5NSRrZBphWWX+HpdCf3ji4lUBs9JdLmuvn8anDreY68ubxo53LLTnVOXmzsnHE8G1CiQSNtOapeBxWYyQ=="; }; }; - "@vercel/node-1.14.0" = { + "@vercel/node-1.14.1" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-1.14.0.tgz"; - sha512 = "UAb1qQMeTkSXz95yljJpz0MyTzcj++B/1XR0vKFZOs2CEfSkBO1DjzX6BkaKriaihBdbGM/X9UoMJfWfUBBn8Q=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-1.14.1.tgz"; + sha512 = "/R1tERotQMTBoB4gw390B8wJAOS9IO4iejing9jqLFSISdW7uVU6kgkUbLM8OtuN0DGwi1qYQ6DcdxySX2qYzw=="; }; }; "@vercel/node-bridge-2.2.0" = { @@ -10300,22 +10336,22 @@ let sha512 = "ydYlZyIQfsuriF6qTt/F4vaAt+nb4ZKhLEl2o5AQFa5ED7LoPS5w01Xbujy+25pqS1ODu8/bsqOCUSX8y/+tSQ=="; }; }; - "@vercel/python-2.2.1" = { + "@vercel/python-2.2.2" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-2.2.1.tgz"; - sha512 = "UxftYfkXX+e+5aQK8D3j+N0zb8ob4KFjdbLCnWLCMlxg0lJwD432zArgYgc0BSMrZrHqdiWMvPxIgKkad2takA=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-2.2.2.tgz"; + sha512 = "08x3kzFTiWlY9lSRmIksm1gHzz9wrHoyv2w7DdOHAbueEGJTbbMoHNeBPWwQ7hLjfMhCM5JOMjezAz3Uw0kEJg=="; }; }; - "@vercel/ruby-1.3.1" = { + "@vercel/ruby-1.3.2" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.1.tgz"; - sha512 = "stdlKpBUgQT/AxLz+xFpIy2m8xYr7nOA+hjq+MprktWu4RsyIeltSYX49Ju7DNPXdHxyAWxW6tnVENNvh1SOxA=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.2.tgz"; + sha512 = "SAC1+wHT60IvAJ4CBLylnCZYF7nO7xtvIhO3NL1O4WBMRNgep5oewDNgxIQ/6XzGEymPijI4FP2tBHQ3v557nQ=="; }; }; "@vscode/emmet-helper-2.8.4" = { @@ -10435,22 +10471,22 @@ let sha512 = "KmJUazIEZWhy0UaFHV5Uy8AXpTqJgCPizEHhtxs3f8mIkUnwWjcQFG7FGfsAW7RgsN8hwcSZ5ZFjmXhllVwrkw=="; }; }; - "@vue/compiler-core-3.2.31" = { + "@vue/compiler-core-3.2.32" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.31"; + version = "3.2.32"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz"; - sha512 = "aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.32.tgz"; + sha512 = "bRQ8Rkpm/aYFElDWtKkTPHeLnX5pEkNxhPUcqu5crEJIilZH0yeFu/qUAcV4VfSE2AudNPkQSOwMZofhnuutmA=="; }; }; - "@vue/compiler-dom-3.2.31" = { + "@vue/compiler-dom-3.2.32" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.31"; + version = "3.2.32"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz"; - sha512 = "60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.32.tgz"; + sha512 = "maa3PNB/NxR17h2hDQfcmS02o1f9r9QIpN1y6fe8tWPrS1E4+q8MqrvDDQNhYVPd84rc3ybtyumrgm9D5Rf/kg=="; }; }; "@vue/component-compiler-utils-3.3.0" = { @@ -10489,13 +10525,13 @@ let sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; }; }; - "@vue/shared-3.2.31" = { + "@vue/shared-3.2.32" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.31"; + version = "3.2.32"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz"; - sha512 = "ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.32.tgz"; + sha512 = "bjcixPErUsAnTQRQX4Z5IQnICYjIfNCyCl8p29v1M6kfVzvwOICPw+dz48nNuWlTOOx2RHhzHdazJibE8GSnsw=="; }; }; "@vue/web-component-wrapper-1.3.0" = { @@ -13477,13 +13513,13 @@ let sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; }; - "array.prototype.find-2.1.2" = { + "array.prototype.find-2.2.0" = { name = "array.prototype.find"; packageName = "array.prototype.find"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.2.tgz"; - sha512 = "00S1O4ewO95OmmJW7EesWfQlrCrLEL8kZ40w3+GkLX2yTt0m2ggcePPa2uHPJ9KUmJvwRq+lCV9bD8Yim23x/Q=="; + url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.2.0.tgz"; + sha512 = "sn40qmUiLYAcRb/1HsIQjTTZ1kCy8II8VtZJpMn2Aoen9twULhbWXisfh3HimGqMlHGUul0/TfKCnXg42LuPpQ=="; }; }; "arraybuffer.slice-0.0.6" = { @@ -14233,13 +14269,13 @@ let sha512 = "fChMDiSfWcW0EUWmiqlyc+VAIXKH0w7BBruL3cVWSwO+5oA5A9juGF4NCBV2/KAHzaKaG0hXKPE49Wh6Lq74ag=="; }; }; - "aws-sdk-2.1110.0" = { + "aws-sdk-2.1113.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1110.0"; + version = "2.1113.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1110.0.tgz"; - sha512 = "qxHqzE2ikGNRzhajcmWIBuptML3LBwz9TMnS0jLQjXOP54fZYW6EEKy2Dy7MKjHKeo8QQy/EWtDdWfH9Fu5UIA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1113.0.tgz"; + sha512 = "F+B+HFnKCVIOmErZ1jJ8YL4XxDSaUI9l3JskfpIrk0XdJVcIfyHgA4XUrTUda4z5TOy1Z7eWV2IXgEpVRM4xyw=="; }; }; "aws-sign2-0.6.0" = { @@ -17924,13 +17960,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001325" = { + "caniuse-lite-1.0.30001331" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001325"; + version = "1.0.30001331"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz"; - sha512 = "sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001331.tgz"; + sha512 = "Y1xk6paHpUXKP/P6YjQv1xqyTbgAP05ycHBcRdQjTcyXlWol868sJJPlmk5ylOekw2BrucWes5jk+LvVd7WZ5Q=="; }; }; "canvas-2.9.1" = { @@ -18086,22 +18122,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.5.64" = { + "cdk8s-1.5.67" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.5.64"; + version = "1.5.67"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.64.tgz"; - sha512 = "HogF9VmYgTucZV1jvEujVYe6U1lkHr18Lz5HmcUTLhgGBU+h3XfIWabfpnRgiNn0pWfINvM/WowHZEBL8f8+Tw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.67.tgz"; + sha512 = "T64trVn18NKz3WAlYFavkFS3Cw1eGy/5DkBwNgKL/VIfbaJFfBEIBgATJysECulB1pV4zxFAFLly+h/lFAbdwA=="; }; }; - "cdk8s-plus-22-1.0.0-beta.181" = { + "cdk8s-plus-22-1.0.0-beta.191" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.181"; + version = "1.0.0-beta.191"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.181.tgz"; - sha512 = "IFjdHKx+WlpLjazfpVCPUPkZtTMPKngm2XtajLGp8rvswxNuH6PbekUuT3TnnjXflvSrItQLOs+zbc7SViH3ow=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.191.tgz"; + sha512 = "zDd2VAfaumBEhRMHh0yPMcho15fDHTui8bkxx6yPYa/d8h8RhUkNPcAef2zBClarYdmquFtdo6MS24/6nduw0g=="; }; }; "cdktf-0.10.1" = { @@ -19130,6 +19166,15 @@ let sha512 = "w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA=="; }; }; + "cli-table3-0.6.2" = { + name = "cli-table3"; + packageName = "cli-table3"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.2.tgz"; + sha512 = "QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw=="; + }; + }; "cli-tableau-2.0.1" = { name = "cli-tableau"; packageName = "cli-tableau"; @@ -19688,13 +19733,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.55.1" = { + "codemaker-1.56.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.55.1"; + version = "1.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.55.1.tgz"; - sha512 = "W0MZSFgqfr9mgKbYLHsTNYTMKiXQE9hDHs6qke5dC5S9ZlFgcWG2zdpznknwvPLDDuWP8Z5QL71MjAM21hEPOg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.56.0.tgz"; + sha512 = "KA6B9FpkJIgFMQBIFnxTXofTFXrYhSWGZaL3Z9jaJSnpIMTs7RHF+k79cQdEPGeokwCj00ubmWSCjN8vlAjTbw=="; }; }; "codepage-1.4.0" = { @@ -20750,22 +20795,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.108" = { + "constructs-10.0.113" = { name = "constructs"; packageName = "constructs"; - version = "10.0.108"; + version = "10.0.113"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.108.tgz"; - sha512 = "A5sZMVWEblwtPBAOScOt8lBn2epTUljGy/sVfHi7juLnSNSZd2qaO7t62qvbIWJEpH047uYGd755PomB+sXeHA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.113.tgz"; + sha512 = "Q2UNZz2nGiW2ZDZz7+FLOKQNyGr0LXc6mjuAvxXJ57UMwLabbhva8lKWMv3fztdsqlVbtl1DGq1vw2htbaNNJw=="; }; }; - "constructs-3.3.261" = { + "constructs-3.3.266" = { name = "constructs"; packageName = "constructs"; - version = "3.3.261"; + version = "3.3.266"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.261.tgz"; - sha512 = "WAcluBHRkIlTIW0jXOhp9Fm8ZtjS2cF3MbAxN6/VEdAVtjuXlHqKmrBOVIp8V5L26ze/xuMz3mDhq1CrC2pjsw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.266.tgz"; + sha512 = "J0aAGYEaYU+4J9PTCGgqIE7cZZZrG+1tvuJhcSn7eKkYqshYVMoCglVtStjD9RXs+e8QzQjvYU0D0dJwe8uc0A=="; }; }; "consume-http-header-1.0.0" = { @@ -21642,13 +21687,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-2.11.2" = { + "create-gatsby-2.12.1" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.11.2"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.11.2.tgz"; - sha512 = "EHlULRVoiXoLM400sLYNtFRy5pemp2WoNKR6vjUlFnLBqn+BGe+TJAmKfwqHYFheXMozKqY2bW0ekuDj2x8zAg=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.12.1.tgz"; + sha512 = "dOsEy9feLJVFVzFFnA6xJL9OhfYcKewaGMqI9uUaUdifIehBjb5jdeWi+cNy49j2FQLMm38jfZ2SNSQjEK2yOw=="; }; }; "create-graphback-1.0.1" = { @@ -21831,13 +21876,13 @@ let sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw=="; }; }; - "cross-undici-fetch-0.1.28" = { + "cross-undici-fetch-0.2.5" = { name = "cross-undici-fetch"; packageName = "cross-undici-fetch"; - version = "0.1.28"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.28.tgz"; - sha512 = "/nLMyVE5IC9PQdBtmgjpGZfK0wo8UupomAPx+7HlbEgVDkZOa9xCiZP9goo5aLYofP0gHXgovjXdXrE2obANag=="; + url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.2.5.tgz"; + sha512 = "6IR+JN6o2UMNj2f3fu0ZVkZeP0h22DRKzq78SiMenkqyBYyGIT1AkZjHkItvh0A80LdsAlWENHUpvapapePucw=="; }; }; "crossroads-0.12.2" = { @@ -21912,49 +21957,49 @@ let sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; }; }; - "cspell-gitignore-5.19.5" = { + "cspell-gitignore-5.19.7" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "5.19.5"; + version = "5.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-5.19.5.tgz"; - sha512 = "Wj16pnPmx7PGd2PcVAEsxWnTtfY4qNzUBtfTqo5VEd23WME6SgEtffxm4eSRpHYZmmDclir+Tbb9yQAsZajDeQ=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-5.19.7.tgz"; + sha512 = "rEqlN6wigNj4P/4Z3QCI1P56KhKkPtXNBpGMXC5CbxIK/NTtn3cLaqHKIZp92pypEnU077lxSCSqRRYCPbg/6A=="; }; }; - "cspell-glob-5.19.5" = { + "cspell-glob-5.19.7" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "5.19.5"; + version = "5.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.19.5.tgz"; - sha512 = "fnrUNLNY9CMsr5J1wRPoGpx7aastD05wEZ/NL+Xd7uEmuU+R7gViOjyOPlUMFH+YARwY0youHRiobkl7pJNngw=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.19.7.tgz"; + sha512 = "fqlF7oqYTT2A3SRfQr7gzN21fwPoRO9IGKec1L3QeGkni5UPDxGrM2a5z+oLaYs2GN5pEf29BXVlN7dq0jVxIg=="; }; }; - "cspell-io-5.19.5" = { + "cspell-io-5.19.7" = { name = "cspell-io"; packageName = "cspell-io"; - version = "5.19.5"; + version = "5.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-5.19.5.tgz"; - sha512 = "R6q1Dor6mfs1VBpuXVlcm/Vvr96GclO/BtNDK/8ppcm22Ct1VF24MG2itoYO7296dOgR1H4HkndvvEgx3p8fzw=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-5.19.7.tgz"; + sha512 = "SEy8XkuOhvwleGjh336EBYj5HlH1J5FrCI5GxxGiU2g8zvWlBPQmaCfQPPO4tnDrrXtK76rZvolBu1jfCmWwQA=="; }; }; - "cspell-lib-5.19.5" = { + "cspell-lib-5.19.7" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "5.19.5"; + version = "5.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.19.5.tgz"; - sha512 = "6HOJ7O+vDYzJs49fHZI5xzsL5TxeR7WsfjWvx1BwgRs1rHdA9/8KFZFX2DJazKRGm+kL1kBO0VJlaF0tvVsjzw=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.19.7.tgz"; + sha512 = "d4ewH1RBgcBE9NqAh0FexmVQ6YvkDQv9XOysskeDH+G9wm975owENUU/mBd8AyBt2b4YXL/FoLtaKd/7MRoNDA=="; }; }; - "cspell-trie-lib-5.19.5" = { + "cspell-trie-lib-5.19.7" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "5.19.5"; + version = "5.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.19.5.tgz"; - sha512 = "yNOmd7uzLiu5UDpbIfJlORx8rJZltLz/ebostAV7UC3wzrOIQgS8xKoFfqiE0iWxIMwmV9eyydVcyzh5grx0gg=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.19.7.tgz"; + sha512 = "qr0HS2hGuyIQhDGG5li0nqIjVi039iPRHR8wpeDoSO0YIBCll22i/VlvW3CSmqXLaP5RRoAc9txiZkIGob6DkQ=="; }; }; "csrf-3.1.0" = { @@ -22551,13 +22596,13 @@ let sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw=="; }; }; - "d3-7.4.3" = { + "d3-7.4.4" = { name = "d3"; packageName = "d3"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/d3/-/d3-7.4.3.tgz"; - sha512 = "x5cxHjtlXjtCzzaFv23mk6JKHKJzkYm/ePygQdeztcwYVedTHVQ7INyuAmRfjO7d4HTzQuofxzqva/d06Nh++Q=="; + url = "https://registry.npmjs.org/d3/-/d3-7.4.4.tgz"; + sha512 = "97FE+MYdAlV3R9P74+R3Uar7wUKkIFu89UWMjEaDhiJ9VxKvqaMxauImy8PC2DdBkdM2BxJOIoLxPrcZUyrKoQ=="; }; }; "d3-array-1.2.4" = { @@ -22578,13 +22623,13 @@ let sha512 = "33qQ+ZoZlli19IFiQx4QEpf2CBEayMRzhlisJHSCsSUbDXv6ZishqS1x7uFVClKG4Wr7rZVHvaAttoLow6GqdQ=="; }; }; - "d3-array-3.1.5" = { + "d3-array-3.1.6" = { name = "d3-array"; packageName = "d3-array"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.1.5.tgz"; - sha512 = "Rs6syGyepVjAYXWvhiFiVWUM8l4B/0p33tvlS+eXCVOaFrbz1dU7t+T16SJx/frnaLMXmFmKoXg/5aUVXxmMKQ=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.1.6.tgz"; + sha512 = "DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA=="; }; }; "d3-axis-1.0.12" = { @@ -22893,13 +22938,13 @@ let sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; }; }; - "d3-graphviz-4.1.0" = { + "d3-graphviz-4.1.1" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.1.0.tgz"; - sha512 = "RtCGnEROcte5npTfjhiNR3kSbwhBl8LA6NNq0oFRXEIFB9N4xHQgGjZWfAHVsN9NQVctEEkRQ4H0GGdqfStlZQ=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.1.1.tgz"; + sha512 = "s0IVbKf8rs4eJI2xo5Umr7nXDX/LEZw/x2WtKxmlyQxR0qUY49UiLhBNOX7VDHZywMle43NKEXnU6fn22fpJvQ=="; }; }; "d3-hierarchy-1.1.9" = { @@ -23451,6 +23496,15 @@ let sha512 = "YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="; }; }; + "dataloader-2.1.0" = { + name = "dataloader"; + packageName = "dataloader"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dataloader/-/dataloader-2.1.0.tgz"; + sha512 = "qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ=="; + }; + }; "datauri-4.1.0" = { name = "datauri"; packageName = "datauri"; @@ -25215,13 +25269,13 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; - "dom-serializer-1.3.2" = { + "dom-serializer-1.4.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; - sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; + sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; }; }; "dom-storage-2.1.0" = { @@ -25953,13 +26007,13 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.106" = { + "electron-to-chromium-1.4.107" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.106"; + version = "1.4.107"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz"; - sha512 = "ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz"; + sha512 = "Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -26297,15 +26351,6 @@ let sha512 = "21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA=="; }; }; - "engine.io-4.1.2" = { - name = "engine.io"; - packageName = "engine.io"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.2.tgz"; - sha512 = "t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ=="; - }; - }; "engine.io-6.0.1" = { name = "engine.io"; packageName = "engine.io"; @@ -26405,15 +26450,6 @@ let sha512 = "x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="; }; }; - "engine.io-parser-4.0.3" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.3.tgz"; - sha512 = "xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA=="; - }; - }; "engine.io-parser-5.0.3" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -26441,13 +26477,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.9.2" = { + "enhanced-resolve-5.9.3" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.9.2"; + version = "5.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz"; - sha512 = "GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz"; + sha512 = "Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow=="; }; }; "enquirer-2.3.6" = { @@ -26666,13 +26702,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.19.2" = { + "es-abstract-1.19.4" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.19.2"; + version = "1.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz"; - sha512 = "gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.4.tgz"; + sha512 = "flV8e5g9/xulChMG48Fygk1ptpo4lQRJ0eJYtxJFgi7pklLx7EFcOJ34jnvr8pbWlaFN/AT1cZpe0hiFel9Hqg=="; }; }; "es-get-iterator-1.1.2" = { @@ -26693,6 +26729,15 @@ let sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; }; }; + "es-shim-unscopables-1.0.0" = { + name = "es-shim-unscopables"; + packageName = "es-shim-unscopables"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; + sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; + }; + }; "es-to-primitive-1.2.1" = { name = "es-to-primitive"; packageName = "es-to-primitive"; @@ -27053,13 +27098,13 @@ let sha512 = "/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA=="; }; }; - "eslint-8.12.0" = { + "eslint-8.13.0" = { name = "eslint"; packageName = "eslint"; - version = "8.12.0"; + version = "8.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz"; - sha512 = "it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz"; + sha512 = "D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ=="; }; }; "eslint-config-prettier-6.15.0" = { @@ -27890,15 +27935,6 @@ let sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; - "execa-5.0.0" = { - name = "execa"; - packageName = "execa"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz"; - sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; - }; - }; "execa-5.1.1" = { name = "execa"; packageName = "execa"; @@ -28052,13 +28088,13 @@ let sha512 = "bILEG0Fg+ZhIhdEaShHzsEN1WC0hUmXJ5Kcd4cd+8rVk1Ead9vRZxA/yLx1cNBDCOwMe0GAMrhF7TKT+A1P+YA=="; }; }; - "expo-pwa-0.0.114" = { + "expo-pwa-0.0.115" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.114"; + version = "0.0.115"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.114.tgz"; - sha512 = "vJCpKROPULPrTnLTCytZuxBkm23yS9CBXBald2BDeizgKsJV19vOc2+lmTk4fL5hh+TgHQybwtt6UwEy3ORjgg=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.115.tgz"; + sha512 = "Z10w+JuRYVcRLnM8DTLmqaKJKG7mh8nBgDLvSZ8T6Hw/x7Eoq3YI0mx8aRRDV/uNQBPZZ02QZSNaxLyDtEuCAA=="; }; }; "exponential-backoff-3.1.0" = { @@ -28925,13 +28961,13 @@ let sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; }; - "fecha-4.2.1" = { + "fecha-4.2.2" = { name = "fecha"; packageName = "fecha"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz"; - sha512 = "MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="; + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.2.tgz"; + sha512 = "5rOQWkBVz3FnYWTi/ELZmq4CoK1Pb+xKNZWuJRsOwo0+8DrP43CrWJtyLVvb5U7z7ggE5llahfDbLjaVNzXVJQ=="; }; }; "fetch-blob-3.1.5" = { @@ -29159,15 +29195,6 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.2.0" = { - name = "file-type"; - packageName = "file-type"; - version = "16.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.2.0.tgz"; - sha512 = "1Wwww3mmZCMmLjBfslCluwt2mxH80GsAXYrvPnfQ42G1EGWag336kB1iyCgyn7UXiKY3cJrNykXPrCwA7xb5Ag=="; - }; - }; "file-type-16.5.3" = { name = "file-type"; packageName = "file-type"; @@ -29285,15 +29312,6 @@ let sha512 = "KQV/uJDI9VQgN7sHH1Zbk6+42cD6mnQ2HONzkXUfPJ+K2FC8GZ1dpewbbHw0Sz8Tf5k3EVdHVayM4DoAwWlmtg=="; }; }; - "filenamify-4.2.0" = { - name = "filenamify"; - packageName = "filenamify"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filenamify/-/filenamify-4.2.0.tgz"; - sha512 = "pkgE+4p7N1n7QieOopmn3TqJaefjdWXwEkj2XLZJLKfOgcQKkn11ahvGNgTD8mLggexLiDFQxeTs14xVU22XPA=="; - }; - }; "filenamify-4.3.0" = { name = "filenamify"; packageName = "filenamify"; @@ -29780,13 +29798,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.175.1" = { + "flow-parser-0.176.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.175.1"; + version = "0.176.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.175.1.tgz"; - sha512 = "gYes5/nxeLYiu02MMb+WH4KaOIYrVcTVIuV9M4aP/4hqJ+zULxxS/In+WEj/tEBsQ+8/wSHo9IDWKQL1FhrLmA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.176.0.tgz"; + sha512 = "h3OUIHINMtdOnaMXyJH5ryqly1rft0Lt/di22dJB35FCnulSTxWvQhDtOH2dxQMU48/wtUmAOo4sv7Mj7XNyng=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -30770,22 +30788,22 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.11.1" = { + "gatsby-core-utils-3.12.1" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.11.1"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.11.1.tgz"; - sha512 = "Op9/uihtcsDLlZDfRsGJ1ya2mFx2YH9Zmx93bawElZ0YpIzKjCkNTp+I5i5UANxvs5I+Fljl0WHQRudMWg+fWA=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.12.1.tgz"; + sha512 = "jBG1MfR6t2MZNIl8LQ3Cwc92F6uFNcEC091IK+qKVy9FNT0+WzcKQ6Olip6u1NSvCatfrg1FqrH0K78a6lmnLQ=="; }; }; - "gatsby-telemetry-3.11.1" = { + "gatsby-telemetry-3.12.1" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.11.1"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.11.1.tgz"; - sha512 = "TPNKTpuYFyULOuRvhpXUtj8h2E7bvrTYsRC/aKeHoWqEchwwbzPwBSJd+3ZFjsxLHIXAa5sTAlR2wd9SYBgOlA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.12.1.tgz"; + sha512 = "sAL2T9GdYpceGlFP6CymVDoy0UEhRvrJApv/mu7sU6F0gu8g8rOLvRxVYE3Y2D9RdfCzkuLIonzmscmVIduyOg=="; }; }; "gauge-1.2.7" = { @@ -30833,13 +30851,13 @@ let sha512 = "US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA=="; }; }; - "gaxios-4.3.2" = { + "gaxios-4.3.3" = { name = "gaxios"; packageName = "gaxios"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.2.tgz"; - sha512 = "T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q=="; + url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.3.tgz"; + sha512 = "gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA=="; }; }; "gaze-1.1.3" = { @@ -31526,6 +31544,15 @@ let sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; }; + "glob-8.0.1" = { + name = "glob"; + packageName = "glob"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-8.0.1.tgz"; + sha512 = "cF7FYZZ47YzmCu7dDy50xSRRfO3ErRfrXuLZcNIuyiJEco0XSrGtuilG19L5xp3NcwTx7Gn+X6Tv3fmsUPTbow=="; + }; + }; "glob-base-0.3.0" = { name = "glob-base"; packageName = "glob-base"; @@ -32013,13 +32040,13 @@ let sha512 = "NsuGBpxOzvBS4rbaeicIpgZ1caU3vNcG04kJWb51rlcYJvzXwHgPof9w4UplR2WVqlFzLkDtEStQOKhS/QcLmA=="; }; }; - "google-p12-pem-3.1.3" = { + "google-p12-pem-3.1.4" = { name = "google-p12-pem"; packageName = "google-p12-pem"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.3.tgz"; - sha512 = "MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ=="; + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.4.tgz"; + sha512 = "HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg=="; }; }; "googleapis-76.0.0" = { @@ -32085,15 +32112,6 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; - "got-11.8.2" = { - name = "got"; - packageName = "got"; - version = "11.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.8.2.tgz"; - sha512 = "D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ=="; - }; - }; "got-11.8.3" = { name = "got"; packageName = "got"; @@ -32337,13 +32355,13 @@ let sha512 = "Uiu3X7+s5c056WyrvdZVz2vG1fhAipMlYmtiCU/4Z2mX79OXDr1SqIon2MprC/pExIWJfAQZCcjYDY76fPBUQg=="; }; }; - "graphql-executor-0.0.22" = { + "graphql-executor-0.0.23" = { name = "graphql-executor"; packageName = "graphql-executor"; - version = "0.0.22"; + version = "0.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-executor/-/graphql-executor-0.0.22.tgz"; - sha512 = "WbKSnSHFn6REKKH4T6UAwDM3mLUnYMQlQLNG0Fw+Lkb3ilCnL3m5lkJ7411LAI9sF7BvPbthovVZhsEUh9Xfag=="; + url = "https://registry.npmjs.org/graphql-executor/-/graphql-executor-0.0.23.tgz"; + sha512 = "3Ivlyfjaw3BWmGtUSnMpP/a4dcXCp0mJtj0PiPG14OKUizaMKlSEX+LX2Qed0LrxwniIwvU6B4w/koVjEPyWJg=="; }; }; "graphql-extensions-0.15.0" = { @@ -32463,13 +32481,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.6.4" = { + "graphql-ws-5.7.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.6.4"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.6.4.tgz"; - sha512 = "5r8tAzznI1zeh7k12+3z07KkgXPckQbnC9h4kJ2TBDWG2wb26TJTbVHQOiAncDBgPbtXtc1A2BlttiRuPH2t/w=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.7.0.tgz"; + sha512 = "8yYuvnyqIjlJ/WfebOyu2GSOQeFauRxnfuTveY9yvrDGs2g3kR9Nv4gu40AKvRHbXlSJwTbMJ6dVxAtEyKwVRA=="; }; }; "gray-matter-4.0.3" = { @@ -33435,13 +33453,13 @@ let sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; }; }; - "highlight.js-11.5.0" = { + "highlight.js-11.5.1" = { name = "highlight.js"; packageName = "highlight.js"; - version = "11.5.0"; + version = "11.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.5.0.tgz"; - sha512 = "SM6WDj5/C+VfIY8pZ6yW6Xa0Fm1tniYVYWYW1Q/DcMnISZFrC3aQAZZZFAAZtybKNrGId3p/DNbFTtcTXXgYBw=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.5.1.tgz"; + sha512 = "LKzHqnxr4CrD2YsNoIf/o5nJ09j4yi/GcH5BnYz9UnVpZdS4ucMgvP61TDty5xJcFGRjnH4DpujkS9bHT3hq0Q=="; }; }; "highlight.js-8.2.0" = { @@ -34326,13 +34344,13 @@ let sha512 = "yozWXZx3yXVprf/MM9WqMt5WY60Im8k6ELJDNFGfyMeO+UieITbDmkvVwMnKQA3ptWqUK8fPf/tEGgklWh7Weg=="; }; }; - "hyperbee-1.7.0" = { + "hyperbee-1.8.0" = { name = "hyperbee"; packageName = "hyperbee"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.7.0.tgz"; - sha512 = "gV1maZK6fyD4UlMGTS23bi8/nnsPyq7Jn2Qzr5n3qPCQOUN3Y9vEN4oqnJxTenaOSNvDta6g0wzzSeYxYY21og=="; + url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.8.0.tgz"; + sha512 = "P1eF5bNhlFydbrigHsCNrtr1FAfaNp730LacSARzg8wQqwy6A2rej7REIhLfL3UQNYedBsYYdHvWYuG+wgWPwg=="; }; }; "hypercore-7.7.1" = { @@ -35838,13 +35856,13 @@ let sha512 = "HtszKchBQTcqw1DC09uD7i7vvMayHGM1OCo6AHt5pkgZEyo99ClhHTMJdf+Ezc9ovuNNxcH89QfyclGthjZJOw=="; }; }; - "irc-framework-4.11.0" = { + "irc-framework-4.12.1" = { name = "irc-framework"; packageName = "irc-framework"; - version = "4.11.0"; + version = "4.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.11.0.tgz"; - sha512 = "A7AoNxAGzViARQv4sVchmTzRiWiQZMCuQVnCOhrggEgAMsc8Vr345U5/JMN5I45gqL4LVfjtruWokp5YiU23Iw=="; + url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.12.1.tgz"; + sha512 = "RQBQcn5y4jE/ksPHwM4yoKK/OTC7YSboyqHnX1g/W28HpEWbqdBdYTu6PwfM/2/CCrM6vceaYmCPBO345XY0yg=="; }; }; "irc-framework-4.4.0" = { @@ -38089,13 +38107,13 @@ let sha512 = "NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="; }; }; - "js-beautify-1.14.2" = { + "js-beautify-1.14.3" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.2.tgz"; - sha512 = "H85kX95a53os+q1OCqtYe8AXAmgy3BvtysA/V83S3fdhznm6WlUpGi14DqSPbKFsL3dXZFXYl7YQwW9U1+76ng=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.3.tgz"; + sha512 = "f1ra8PHtOEu/70EBnmiUlV8nJePS58y9qKjl4JHfYWlFH6bo7ogZBz//FAZp7jDuXtYnGYKymZPlrg2I/9Zo4g=="; }; }; "js-git-0.7.8" = { @@ -38377,49 +38395,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.55.1" = { + "jsii-1.56.0" = { name = "jsii"; packageName = "jsii"; - version = "1.55.1"; + version = "1.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.55.1.tgz"; - sha512 = "9L6BztDV8PwNY5C+vwuLRJTzijh5Kyh3eijaz8NS11Jc7rTeTN8AvLxyWsIaPO+ITTP4JTsDKOU3tBaoWabRzA=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.56.0.tgz"; + sha512 = "G1etNH8JRSfSlgicTBYsi/yVUxxreMnWYwAtXN6BH/sIiv5o6gFnYkumF2x+OTqmQAkKj1NxSssn5icvOrONzA=="; }; }; - "jsii-pacmak-1.55.1" = { + "jsii-pacmak-1.56.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.55.1"; + version = "1.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.55.1.tgz"; - sha512 = "E208pgMfxbPbXgmcskDG0/hBbkPLGlU7S79VoXESy1Kegf7TnZjLqpBdJ3mNxIroS5gIC8DToArMHUFAQ6z0lA=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.56.0.tgz"; + sha512 = "7Sk+LHZ98G6G82FZdaUbZU38N/ZSve2kjp0pInkjw3TQUGfO9IdI7EhH5eEUeGO2maTzxIcgn8ZElASUsXk8gA=="; }; }; - "jsii-reflect-1.55.1" = { + "jsii-reflect-1.56.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.55.1"; + version = "1.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.55.1.tgz"; - sha512 = "/Ak+sCuIjJaRCflCWT2UKPdT88EQhbPYLhtF7F42uuUr2tchlNkybNE15bigZbtqLw7SP1fp/6Dedujvf90N9Q=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.56.0.tgz"; + sha512 = "OGpINABFiiwnvndlLjJU3mZSaXwzyuLyIkKidAV24PLS5XkFZYKXlA+Qz6HA8AWdDNJVCW0S9AbAr3Ab4J6QDQ=="; }; }; - "jsii-rosetta-1.55.1" = { + "jsii-rosetta-1.56.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.55.1"; + version = "1.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.55.1.tgz"; - sha512 = "ZUzuO2JgnxE01tgIdZorsUZj5jiHP8uxeLDU/vsnmnAU2ZbMHFDT1cWacoAKESDnCyFF8VRCuPXHx8e5/SOXig=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.56.0.tgz"; + sha512 = "aeFHXnO9hQXirgLjYqYMoAdvBGnpLOEhRVe4w7RuYjaqwsIPof4xIfSj2YvNQ9ZAWalYpg1Tm8kiLeWEyEeX6w=="; }; }; - "jsii-srcmak-0.1.523" = { + "jsii-srcmak-0.1.529" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.523"; + version = "0.1.529"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.523.tgz"; - sha512 = "b7vkOZnBcDYl/32tPn0cSPetl4znNTXP7AHDDi9rhP7rgIQx8YWDaPHZsGSpA6RgvC7aGBgHVVYLsC6qPeLJ7w=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.529.tgz"; + sha512 = "ldLyakH99iz5j0A0sxwXSCIWrAbeSb2QZs13D/3JU83wKzuPNx4f5zgXj/rmjkrF3o2XAkBo4H63P057In4oCQ=="; }; }; "json-bigint-1.0.0" = { @@ -38719,13 +38737,13 @@ let sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; }; }; - "json2jsii-0.2.183" = { + "json2jsii-0.2.190" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.183"; + version = "0.2.190"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.183.tgz"; - sha512 = "Xd8EZ7c0JQ27mqXV4uCSwoRMUjNBnTrEkXOhrd8b0hlJoG4WmUFJRAHanPgfsiMwDJVWHMxss11euEfnYqfe7g=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.190.tgz"; + sha512 = "v8iKJmPIjmoYfoAlhPdtxOonIaRxwe0dI9mfiy7TiYqlYnNH9pKnrFglyDizlvnSeUL5XVUabGiXDkfIDtBw2w=="; }; }; "json3-3.2.6" = { @@ -40483,13 +40501,67 @@ let sha512 = "gto+BB2uEob8qRiTlOq+R3uX0YNHsX9mjxj9Sbdue/LIKqu6IlZjrsjKeGyOMquc/474GEqFyX2pdytpydp0rQ=="; }; }; - "lmdb-2.2.6" = { + "lmdb-2.3.2" = { name = "lmdb"; packageName = "lmdb"; - version = "2.2.6"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.6.tgz"; - sha512 = "UmQV0oZZcV3EN6rjcAjIiuWcc3MYZGWQ0GUYz46Ron5fuTa/dUow7WSQa6leFkvZIKVUdECBWVw96tckfEzUFQ=="; + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.3.2.tgz"; + sha512 = "kgn/zic1JeatYwz/64vpj3SLxff/qS2H1DeTj8mxDrNuF6gDSLdDS2r6YogV4T6eV6GddMu5Zn0E9d/xyo39eA=="; + }; + }; + "lmdb-darwin-arm64-2.3.2" = { + name = "lmdb-darwin-arm64"; + packageName = "lmdb-darwin-arm64"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb-darwin-arm64/-/lmdb-darwin-arm64-2.3.2.tgz"; + sha512 = "20lWWUPGKnSZRFY8FBm+vZEFx/5Deh0joz6cqJ8/0SuO/ejqRCppSsNqAxPqW87KUNR5rNfhaA2oRekMeb0cwQ=="; + }; + }; + "lmdb-darwin-x64-2.3.2" = { + name = "lmdb-darwin-x64"; + packageName = "lmdb-darwin-x64"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb-darwin-x64/-/lmdb-darwin-x64-2.3.2.tgz"; + sha512 = "BsBnOfgK1B11Dh4RgcgBTmkmsPv3mjBPKsA4W4E+18SW9K2aRi86CAMPXqjfY/OJDUe1pSrpVf1A83b8N/C9rg=="; + }; + }; + "lmdb-linux-arm-2.3.2" = { + name = "lmdb-linux-arm"; + packageName = "lmdb-linux-arm"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb-linux-arm/-/lmdb-linux-arm-2.3.2.tgz"; + sha512 = "ofxfxVQqMbaC2Ygjzk8k6xgS5Dg/3cANeLcEx14T35GoU5pQKlLAWjypptyLQEeOboEmEOpZmHMoD7sWu/zakQ=="; + }; + }; + "lmdb-linux-arm64-2.3.2" = { + name = "lmdb-linux-arm64"; + packageName = "lmdb-linux-arm64"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb-linux-arm64/-/lmdb-linux-arm64-2.3.2.tgz"; + sha512 = "DIibLZHpwwlIsP9cBRmw0xqDy6wZH+CDAnOTI+eihQ5PdWjTs+kaQs5O/x8l6/8fwCB0TPYKWTqfdUbvd/F7AA=="; + }; + }; + "lmdb-linux-x64-2.3.2" = { + name = "lmdb-linux-x64"; + packageName = "lmdb-linux-x64"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb-linux-x64/-/lmdb-linux-x64-2.3.2.tgz"; + sha512 = "HBUd013RRQ2KpiyBqqqSPSEwPpVUpTJZdTZGDVQFQZuxqyJumt4Wye3uh6ZgEiBtxzSelt4xvAeNjYPH0dcZSQ=="; + }; + }; + "lmdb-win32-x64-2.3.2" = { + name = "lmdb-win32-x64"; + packageName = "lmdb-win32-x64"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb-win32-x64/-/lmdb-win32-x64-2.3.2.tgz"; + sha512 = "/hir5oU+GYm7/B6QirrpyOmIuzCKiIbWoKIJI2ebXeJlrs6Jj7UY9caPBYVkCzd79QzJnB7hIlX/F6Jx6gcUmg=="; }; }; "ln-accounting-5.0.6" = { @@ -40681,13 +40753,13 @@ let sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; }; }; - "loader-runner-4.2.0" = { + "loader-runner-4.3.0" = { name = "loader-runner"; packageName = "loader-runner"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz"; - sha512 = "92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="; + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"; + sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; }; }; "loader-utils-0.2.17" = { @@ -42490,13 +42562,13 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.8.0" = { + "lru-cache-7.8.1" = { name = "lru-cache"; packageName = "lru-cache"; - version = "7.8.0"; + version = "7.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.0.tgz"; - sha512 = "AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz"; + sha512 = "E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg=="; }; }; "lru-queue-0.1.0" = { @@ -42986,13 +43058,13 @@ let sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA=="; }; }; - "markdown-it-anchor-8.5.0" = { + "markdown-it-anchor-8.6.2" = { name = "markdown-it-anchor"; packageName = "markdown-it-anchor"; - version = "8.5.0"; + version = "8.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.5.0.tgz"; - sha512 = "ii8jRFS4Sxny0nevOOQZqZKswcZyXnD00AlPKctM0PkNRVsT1/2fQMQPXAdWmRz9kYrMupElsEwCikR7Fd2JFQ=="; + url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.2.tgz"; + sha512 = "JNaekTlIwwyYGBN3zifZDxgz4bSL8sbEj58fdTZGmPSMMGXBZapFjcZk2I33Jy79c1fvCKHpF7MA/67FOTjvzA=="; }; }; "markdown-it-deflist-2.1.0" = { @@ -43193,13 +43265,13 @@ let sha512 = "/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA=="; }; }; - "marked-4.0.12" = { + "marked-4.0.14" = { name = "marked"; packageName = "marked"; - version = "4.0.12"; + version = "4.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz"; - sha512 = "hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ=="; + url = "https://registry.npmjs.org/marked/-/marked-4.0.14.tgz"; + sha512 = "HL5sSPE/LP6U9qKgngIIPTthuxC0jrfxpYMZ3LdGDD3vTnLs59m2Z7r6+LNDR3ToqEQdkKd6YaaEfJhodJmijQ=="; }; }; "marked-terminal-3.3.0" = { @@ -44777,13 +44849,13 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-db-1.50.0" = { + "mime-db-1.51.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.50.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz"; - sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; "mime-db-1.52.0" = { @@ -44831,13 +44903,13 @@ let sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; - "mime-types-2.1.33" = { + "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.33"; + version = "2.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz"; - sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; "mime-types-2.1.35" = { @@ -45794,13 +45866,13 @@ let sha512 = "JG0V47xRIQ9pyUnx6Hb4+3TrQoia2nA3UIdmyTldhxaxtKFkekkKpUW/N6fwHwod9o4BGuJGtouxOk+yCP5PEA=="; }; }; - "msgpackr-extract-1.1.3" = { + "msgpackr-extract-1.1.4" = { name = "msgpackr-extract"; packageName = "msgpackr-extract"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.1.3.tgz"; - sha512 = "eFFRviOsqjfr6tOBwuccUdTaTPWn3Rb/Kf5zjoz5IZJMpQD4ZeLecDcRzuze+jzlqQ2cJo1gyuV8dCFEojWkjg=="; + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.1.4.tgz"; + sha512 = "WQbHvsThprXh+EqZYy+SQFEs7z6bNM7a0vgirwUfwUcphWGT2mdPcpyLCNiRsN6w5q5VKJUMblHY+tNEyceb9Q=="; }; }; "msgpackr-extract-darwin-arm64-1.1.0" = { @@ -47289,6 +47361,15 @@ let sha512 = "G6RlQt5Sb4GMBzXvhfkeFmbqR6MzhtnT7VTHuLadjkii3rdYHNdw0m8zA4BTxVIh68FicCQ2NSUANpsqkr9jvQ=="; }; }; + "node-forge-1.3.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz"; + sha512 = "08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA=="; + }; + }; "node-forge-1.3.1" = { name = "node-forge"; packageName = "node-forge"; @@ -47361,13 +47442,13 @@ let sha512 = "amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ=="; }; }; - "node-gyp-build-optional-packages-4.3.1" = { + "node-gyp-build-optional-packages-4.3.2" = { name = "node-gyp-build-optional-packages"; packageName = "node-gyp-build-optional-packages"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-4.3.1.tgz"; - sha512 = "pxljizahvoXKVtlo+D+YOcHYG2931/aBdNoqfynHDNwWRIe94CgkIUZfeOOFaHY+hl5lYkyI9RzGfr/gWxlR4Q=="; + url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-4.3.2.tgz"; + sha512 = "P5Ep3ISdmwcCkZIaBaQamQtWAG0facC89phWZgi5Z3hBU//J6S48OIvyZWSPPf6yQMklLZiqoosWAZUj7N+esA=="; }; }; "node-hid-2.1.1" = { @@ -47514,13 +47595,13 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "node-releases-2.0.2" = { + "node-releases-2.0.3" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz"; - sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz"; + sha512 = "maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw=="; }; }; "node-rsa-1.1.1" = { @@ -48649,6 +48730,15 @@ let sha512 = "gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="; }; }; + "object-hash-3.0.0" = { + name = "object-hash"; + packageName = "object-hash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz"; + sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; + }; + }; "object-inspect-1.12.0" = { name = "object-inspect"; packageName = "object-inspect"; @@ -49072,13 +49162,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.55.1" = { + "oo-ascii-tree-1.56.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.55.1"; + version = "1.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.55.1.tgz"; - sha512 = "wGtYFm45kmxdss2XrdXC14uDUfyekbaqqZJrfvPtYHSa98Bk+RXHdTHHLQ1kwem6HT5c3ogf7+ZUBhX0B034iA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.56.0.tgz"; + sha512 = "tPOSOEjN1uq2NktoBU2KExOU9lVghkpg+tDLWMtnqSSmX+lnDJIYIFpa/HqXwyiAXoHpcKh+bcmTPMZagLNIZA=="; }; }; "open-0.0.2" = { @@ -49612,13 +49702,13 @@ let sha512 = "CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw=="; }; }; - "ordered-binary-1.2.4" = { + "ordered-binary-1.2.5" = { name = "ordered-binary"; packageName = "ordered-binary"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.4.tgz"; - sha512 = "A/csN0d3n+igxBPfUrjbV5GC69LWj2pjZzAAeeHXLukQ4+fytfP4T1Lg0ju7MSPSwq7KtHkGaiwO8URZN5IpLg=="; + url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.5.tgz"; + sha512 = "djRmZoEpOGvIRW7ufsCDHtvcUa18UC9TxnPbHhSVFZHsoyg0dtut1bWtBZ/fmxdPN62oWXrV6adM7NoWU+CneA=="; }; }; "ordered-read-streams-1.0.1" = { @@ -53339,13 +53429,13 @@ let sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; }; }; - "prettier-plugin-svelte-2.6.0" = { + "prettier-plugin-svelte-2.7.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.6.0.tgz"; - sha512 = "NPSRf6Y5rufRlBleok/pqg4+1FyGsL0zYhkYP6hnueeL1J/uCm3OfOZPsLX4zqD9VAdcXfyEL2PYqGv8ZoOSfA=="; + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.0.tgz"; + sha512 = "fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA=="; }; }; "prettier-tslint-0.4.2" = { @@ -53861,13 +53951,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompt-1.2.2" = { + "prompt-1.3.0" = { name = "prompt"; packageName = "prompt"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/prompt/-/prompt-1.2.2.tgz"; - sha512 = "XNXhNv3PUHJDcDkISpCwSJxtw9Bor4FZnlMUDW64N/KCPdxhfVlpD5+YUXI/Z8a9QWmOhs9KSiVtR8nzPS0BYA=="; + url = "https://registry.npmjs.org/prompt/-/prompt-1.3.0.tgz"; + sha512 = "ZkaRWtaLBZl7KKAKndKYUL8WqNT+cQHKRZnT4RYYms48jQkFw3rrBL+/N5K/KtdEveHkxs982MX2BkDKub2ZMg=="; }; }; "promptly-2.2.0" = { @@ -55130,13 +55220,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.235" = { + "pyright-1.1.237" = { name = "pyright"; packageName = "pyright"; - version = "1.1.235"; + version = "1.1.237"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.235.tgz"; - sha512 = "eW40mxHo8WE7WHoBzFfyrH0lQ9nP5rTM5XKvkBgaYjhVafh4MmQeaEm8LmYGN2vUq2//YFLVprvA+U6u+v9i3g=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.237.tgz"; + sha512 = "CU3YsC0+NFtj0TO7wDLTDqNEvnrBuz8foavK7/kgKLhBbF50m6xksrRb61SSDzFYn5+1oWEKNvmzDVCktp39Vg=="; }; }; "q-0.9.7" = { @@ -56012,13 +56102,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.24.3" = { + "react-devtools-core-4.24.4" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.24.3"; + version = "4.24.4"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.3.tgz"; - sha512 = "+htKZxLxDN14jhRG3+IXRiJqNSGHUiPYrMtv9e7qlZxcbKeJjVs+C/hd8kZF5rydp3faBwFN6ZpTaZnLA3/ZGA=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.4.tgz"; + sha512 = "jbX8Yqyq4YvFEobHyXVlGaH0Cs/+EOdb3PL911bxaR5BnzbB5TE4RFHC1iOgT4vRH3VxIIrVQ7lR9vsiFFCYCA=="; }; }; "react-dom-17.0.2" = { @@ -56030,13 +56120,13 @@ let sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="; }; }; - "react-error-overlay-6.0.10" = { + "react-error-overlay-6.0.11" = { name = "react-error-overlay"; packageName = "react-error-overlay"; - version = "6.0.10"; + version = "6.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.10.tgz"; - sha512 = "mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA=="; + url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz"; + sha512 = "/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="; }; }; "react-fast-compare-3.2.0" = { @@ -56993,13 +57083,13 @@ let sha512 = "1CJygtdvsfNFwiyjaMLBWtg2tfEqx/jSZ8S6TV+GlNL8kiH8rb4cm5Pb7A/C2BpyM/fA8ZJEudlCwi/jvAY+Ow=="; }; }; - "regexp.prototype.flags-1.4.1" = { + "regexp.prototype.flags-1.4.2" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz"; - sha512 = "pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.2.tgz"; + sha512 = "Ynz8fTQW5/1elh+jWU2EDDzeoNbD0OQ0R+D1VJU5ATOkUaro4A9YEkdN2ODQl/8UQFPPpZNw91fOcLFamM7Pww=="; }; }; "regexpp-1.1.0" = { @@ -58082,13 +58172,13 @@ let sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA=="; }; }; - "request-light-0.5.7" = { + "request-light-0.5.8" = { name = "request-light"; packageName = "request-light"; - version = "0.5.7"; + version = "0.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/request-light/-/request-light-0.5.7.tgz"; - sha512 = "i/wKzvcx7Er8tZnvqSxWuNO5ZGggu2UgZAqj/RyZ0si7lBTXL7kZiI/dWxzxnQjaY7s5HEy1qK21Do4Ncr6cVw=="; + url = "https://registry.npmjs.org/request-light/-/request-light-0.5.8.tgz"; + sha512 = "3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg=="; }; }; "request-oauth-0.0.3" = { @@ -59891,13 +59981,13 @@ let sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; - "semver-7.3.6" = { + "semver-7.3.7" = { name = "semver"; packageName = "semver"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz"; - sha512 = "HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; "semver-compare-1.0.0" = { @@ -60755,13 +60845,13 @@ let sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; }; }; - "simple-git-3.5.0" = { + "simple-git-3.6.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz"; - sha512 = "fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.6.0.tgz"; + sha512 = "2e+4QhOVO59GeLsHgwSMKNrSKCnuACeA/gMNrLCYR8ID9qwm4hViVt4WsODcUGjx//KDv6GMLC6Hs/MeosgXxg=="; }; }; "simple-handshake-3.0.0" = { @@ -61259,15 +61349,6 @@ let sha512 = "Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w=="; }; }; - "socket.io-3.1.2" = { - name = "socket.io"; - packageName = "socket.io"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz"; - sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; - }; - }; "socket.io-4.3.1" = { name = "socket.io"; packageName = "socket.io"; @@ -61304,15 +61385,6 @@ let sha512 = "WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="; }; }; - "socket.io-adapter-2.1.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz"; - sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg=="; - }; - }; "socket.io-adapter-2.3.3" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; @@ -62348,6 +62420,25 @@ let sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA=="; }; }; + "sqlite3-5.0.3" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.3.tgz"; + sha512 = "/cDwes7XtTOtKH5zYeJSuiavuaJ6jXxPjebw9lDFxBAwR/DvP0tnJ5MPZQ3zpnNzJBa1G6mPTpB+5O1T+AoSdQ=="; + }; + }; + "sqlite3-git+https://github.com/mapbox/node-sqlite3.git#918052b538b0effe6c4a44c74a16b2749c08a0d2" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "5.0.2"; + src = fetchgit { + url = "https://github.com/mapbox/node-sqlite3.git"; + rev = "918052b538b0effe6c4a44c74a16b2749c08a0d2"; + sha256 = "6950459a4c59b28b1126d52e67e722a5d1150fbacfeedb7a9dfa46778a168a04"; + }; + }; "sqlstring-2.3.1" = { name = "sqlstring"; packageName = "sqlstring"; @@ -62771,13 +62862,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.250" = { + "sscaff-1.2.256" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.250"; + version = "1.2.256"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.250.tgz"; - sha512 = "J9asMSddhWmXhjcpm6THvrOgWliXPKmjr6Yzpto64cNPrQOI0RYd8pVTuQNg5bZPDM1/4XM4ywzFcBM7vjeilw=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.256.tgz"; + sha512 = "pVtKvFBNenal5UXDeEDQ98pK1n/mmEI3UYMaBmUImPVZB474uGlD99TkMGNFHUWBMmIf75zcEMezlG2FSxcJxA=="; }; }; "ssh-config-1.1.6" = { @@ -64580,13 +64671,13 @@ let sha1 = "5a7f8a20a71188cf9e75a2cfe8eb182de90daf3b"; }; }; - "svelte-3.46.6" = { + "svelte-3.47.0" = { name = "svelte"; packageName = "svelte"; - version = "3.46.6"; + version = "3.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-3.46.6.tgz"; - sha512 = "o9nNft/OzCz/9kJpmWa1S52GAM+huCjPIsNWydYmgei74ZWlOA9/hN9+Z12INdklghu31seEXZMRHhS1+8DETw=="; + url = "https://registry.npmjs.org/svelte/-/svelte-3.47.0.tgz"; + sha512 = "4JaJp3HEoTCGARRWZQIZDUanhYv0iyoHikklVHVLH9xFE9db22g4TDv7CPeNA8HD1JgjXI1vlhR1JZvvhaTu2Q=="; }; }; "svelte-preprocess-4.10.5" = { @@ -64598,13 +64689,13 @@ let sha512 = "VKXPRScCzAZqeBZOGq4LLwtNrAu++mVn7XvQox3eFDV7Ciq0Lg70Q8QWjH9iXF7J+pMlXhPsSFwpCb2E+hoeyA=="; }; }; - "svelte2tsx-0.5.7" = { + "svelte2tsx-0.5.8" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.5.7"; + version = "0.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.7.tgz"; - sha512 = "rekPWR5at7DNvIlJRSCyKFZ6Go/KyqjDRL/zRWQSNMbvTIocsm/gDtSbLz64ZP5Qz3tUeod7QzDqX13lF60kCg=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.8.tgz"; + sha512 = "z5Mfpmy/jkpFIiePAocgWxGRJg+Ka0zlxyvFlpP2X1BoQuXjFC6pnIR9CGebOTmi+W1JnSUAdxrCCj/sEMXZ8Q=="; }; }; "sver-compat-1.5.0" = { @@ -65058,13 +65149,13 @@ let sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; }; - "tape-4.15.0" = { + "tape-4.15.1" = { name = "tape"; packageName = "tape"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-4.15.0.tgz"; - sha512 = "SfRmG2I8QGGgJE/MCiLH8c11L5XxyUXxwK9xLRD0uiK5fehRkkSZGmR6Y1pxOt8vJ19m3sY+POTQpiaVv45/LQ=="; + url = "https://registry.npmjs.org/tape/-/tape-4.15.1.tgz"; + sha512 = "k7F5pyr91n9D/yjSJwbLLYDCrTWXxMSXbbmHX2n334lSIc2rxeXyFkaBv4UuUd2gBYMrAOalPutAiCxC6q1qbw=="; }; }; "tar-0.1.17" = { @@ -65490,6 +65581,15 @@ let sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291"; }; }; + "text-decoding-1.0.0" = { + name = "text-decoding"; + packageName = "text-decoding"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz"; + sha512 = "/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA=="; + }; + }; "text-encoding-utf-8-1.0.2" = { name = "text-encoding-utf-8"; packageName = "text-encoding-utf-8"; @@ -65598,13 +65698,13 @@ let sha512 = "5hijX1V/4CrgrkqCqtwP32LSbLPSF/10nneI+2doPHKx7AdCgR52HqWZo0AQEPv4fvOqEOMLJ0c9pL6t/jUDwg=="; }; }; - "thelounge-4.3.0" = { + "thelounge-4.3.1" = { name = "thelounge"; packageName = "thelounge"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge/-/thelounge-4.3.0.tgz"; - sha512 = "dkVdH21q9vipV7UU10qQQprPuP8rG+IDJSHUtmOC0WDYvwYTiUC9IYLIpkyWdgfwFYegDTnnR4duHNZynqOXTA=="; + url = "https://registry.npmjs.org/thelounge/-/thelounge-4.3.1.tgz"; + sha512 = "sWitbCj5+Jr+HY8nN2VE01OVeZSaTGyQK76whBgt2LyBih57yQBjZYR3BshPBiUgGb/GMbI+j112myKU9YUh/g=="; }; }; "then-fs-2.0.0" = { @@ -66093,13 +66193,13 @@ let sha512 = "6kbY7GJpRQXwBddSOAbVUZXjObbCGFXliWWN+kOSEoRWIOyRWLB6zdeKC/Tguwwenl/KsUx016XR50EdHYsxZw=="; }; }; - "tlds-1.216.0" = { + "tlds-1.228.0" = { name = "tlds"; packageName = "tlds"; - version = "1.216.0"; + version = "1.228.0"; src = fetchurl { - url = "https://registry.npmjs.org/tlds/-/tlds-1.216.0.tgz"; - sha512 = "y9A+eMRKLdAOclcFRTk3durpvCWiEdWcQhCOopCO654pckH9+o5Z5VgBsTTAFqtyxB8yFRXSG1q7BCCeHyrm0w=="; + url = "https://registry.npmjs.org/tlds/-/tlds-1.228.0.tgz"; + sha512 = "Q0TU9zh5hDs2CpRFNM7SOW3K7OSgUgJC/cMrq9t44ei4tu+G3KV8BZyIJuYVvryJHH96mKgc9WXdhgKVvGD7jg=="; }; }; "tmp-0.0.29" = { @@ -67740,15 +67840,6 @@ let sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="; }; }; - "ua-parser-js-0.7.30" = { - name = "ua-parser-js"; - packageName = "ua-parser-js"; - version = "0.7.30"; - src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.30.tgz"; - sha512 = "uXEtSresNUlXQ1QL4/3dQORcGv7+J2ookOG2ybA/ga9+HYEXueT2o+8dUJQkpedsyTyCJ6jCCirRcKtdtx1kbg=="; - }; - }; "ua-parser-js-0.7.31" = { name = "ua-parser-js"; packageName = "ua-parser-js"; @@ -67794,13 +67885,13 @@ let sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; }; }; - "uglify-js-3.15.3" = { + "uglify-js-3.15.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.3"; + version = "3.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; - sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz"; + sha512 = "vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA=="; }; }; "uglify-js-3.4.10" = { @@ -70207,13 +70298,13 @@ let sha512 = "Yk6ByzVq5F2niFfPlSsrU5wi+NZhsF7IBpJCcTfms4U7eoyNepUXagdFEJ3VWBD/Lit6GorLXFgO17NYcyS5gg=="; }; }; - "vega-typings-0.22.2" = { + "vega-typings-0.22.3" = { name = "vega-typings"; packageName = "vega-typings"; - version = "0.22.2"; + version = "0.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.22.2.tgz"; - sha512 = "op4bNiyS150V7gnuIdjwFYB1belYB8qnapqLQQ+ZBJQ+r7a+IbvXphEUf8AkBlOoGPN1ITNdhlIsq9WWiuxu8Q=="; + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.22.3.tgz"; + sha512 = "PREcya3nXT9Tk7xU0IhEpOLVTlqizNtKXV55NhI6ApBjJtqVYbJL7IBh2ckKxGBy3YeUQ37BQZl56UqqiYVWBw=="; }; }; "vega-util-1.17.0" = { @@ -71755,15 +71846,6 @@ let sha512 = "2njbTqZ6Q7ZqqK14YpK1GGmaZs3NmuGYF5b7abCXulUIWFSlSYcZ3NBJQRFcMiQDceD7vQknb8FUuvI1F7Qe/g=="; }; }; - "web-streams-polyfill-3.2.0" = { - name = "web-streams-polyfill"; - packageName = "web-streams-polyfill"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz"; - sha512 = "EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA=="; - }; - }; "web-streams-polyfill-3.2.1" = { name = "web-streams-polyfill"; packageName = "web-streams-polyfill"; @@ -71800,13 +71882,13 @@ let sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; }; }; - "web3-utils-1.7.1" = { + "web3-utils-1.7.3" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.1.tgz"; - sha512 = "fef0EsqMGJUgiHPdX+KN9okVWshbIumyJPmR+btnD1HgvoXijKEkuKBv0OmUqjbeqmLKP2/N9EiXKJel5+E1Dw=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.3.tgz"; + sha512 = "g6nQgvb/bUpVUIxJE+ezVN+rYwYmlFyMvMIRSuqpi1dk6ApDD00YNArrk7sPcZnjvxOJ76813Xs2vIN2rgh4lg=="; }; }; "webassemblyjs-1.11.1" = { @@ -72763,6 +72845,15 @@ let sha512 = "Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A=="; }; }; + "workerpool-6.2.1" = { + name = "workerpool"; + packageName = "workerpool"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz"; + sha512 = "ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="; + }; + }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -73168,13 +73259,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.2.30" = { + "xdl-59.2.31" = { name = "xdl"; packageName = "xdl"; - version = "59.2.30"; + version = "59.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.2.30.tgz"; - sha512 = "Id4b3prDMPlW9OuycaeQwXeD/3tAgTmJY0N1blRL5Xr3KXhybXkyCsnvOaFyvQ+luqnmsOUdJQkfzL0JuyIauw=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.2.31.tgz"; + sha512 = "RCx00veTOTZeB2aCz84wBJw4dgOJPR5cEBgngyFf33hK5VCP/2+YjzNEAkKbZySjfG6q5pY1Wli9ktlLbFdwDA=="; }; }; "xenvar-0.5.1" = { @@ -73862,6 +73953,15 @@ let sha512 = "WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA=="; }; }; + "yargs-17.4.1" = { + name = "yargs"; + packageName = "yargs"; + version = "17.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.4.1.tgz"; + sha512 = "WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -74051,13 +74151,13 @@ let sha512 = "gBnfbL9rYY05Gt0cjJhs/siqQXHYlZalTjK3nXn2QO20xbkIFPob+LlH44ML47GcR4VU9/2dYck1BWFM0Javxw=="; }; }; - "yarn-1.22.10" = { + "yarn-1.22.17" = { name = "yarn"; packageName = "yarn"; - version = "1.22.10"; + version = "1.22.17"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.10.tgz"; - sha512 = "IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.17.tgz"; + sha512 = "H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ=="; }; }; "yarn-1.22.18" = { @@ -74509,7 +74609,7 @@ in sources."@tootallnate/once-2.0.0" sources."cacache-16.0.4" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-7.8.1" (sources."make-fetch-happen-10.1.2" // { dependencies = [ sources."minipass-fetch-2.1.0" @@ -74896,7 +74996,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.3" + sources."uglify-js-3.15.4" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unxhr-1.0.1" @@ -74936,10 +75036,10 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.13.4"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.13.4.tgz"; - sha512 = "xWtzZMEVsEZkRLlHMKiOoQIXyQwdMkBPHsRcO1IbzpCmaMQGfKKYNANJ1FKZSHsybbXG/BBaB+LqgVPFNFufew=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.14.0.tgz"; + sha512 = "JxyjiH4Ve/jRaOhWGsTfVtzTULK+LX3oXROgl4NXOAiI2b5bzNuL3n4jyFSNA3oO3BkjjQKpauXYxpkPe7YMEQ=="; }; dependencies = [ sources."@astrojs/svelte-language-integration-0.1.2" @@ -74959,8 +75059,8 @@ in sources."no-case-3.0.4" sources."pascal-case-3.1.2" sources."source-map-0.7.3" - sources."svelte-3.46.6" - sources."svelte2tsx-0.5.7" + sources."svelte-3.47.0" + sources."svelte2tsx-0.5.8" sources."tslib-2.3.1" sources."typescript-4.6.3" sources."vscode-css-languageservice-5.4.1" @@ -75455,7 +75555,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" - (sources."yargs-17.4.0" // { + (sources."yargs-17.4.1" // { dependencies = [ sources."yargs-parser-21.0.1" ]; @@ -75599,13 +75699,13 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" - sources."gaxios-4.3.2" + sources."gaxios-4.3.3" sources."gcp-metadata-4.3.1" sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."glob-parent-5.1.2" sources."google-auth-library-7.14.1" - sources."google-p12-pem-3.1.3" + sources."google-p12-pem-3.1.4" sources."googleapis-76.0.0" sources."googleapis-common-5.1.0" sources."got-11.8.3" @@ -75680,8 +75780,7 @@ in sources."normalize-newline-4.1.0" (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."lru-cache-7.8.0" - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."normalize-path-3.0.0" @@ -75930,7 +76029,7 @@ in sources."hrpc-2.2.0" sources."hrpc-runtime-2.1.1" sources."hyperbeam-1.1.3" - sources."hyperbee-1.7.0" + sources."hyperbee-1.8.0" sources."hypercore-9.12.0" (sources."hypercore-byte-stream-1.0.12" // { dependencies = [ @@ -76619,8 +76718,8 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."markdown-it-12.3.2" - sources."markdown-it-anchor-8.5.0" - sources."marked-4.0.12" + sources."markdown-it-anchor-8.6.2" + sources."marked-4.0.14" sources."md5.js-1.3.5" sources."mdurl-1.0.1" (sources."mem-4.3.0" // { @@ -77020,7 +77119,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uc.micro-1.0.6" - sources."uglify-js-3.15.3" + sources."uglify-js-3.15.4" sources."underscore-1.13.2" sources."union-value-1.0.1" (sources."universal-url-2.0.0" // { @@ -77280,7 +77379,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -77299,10 +77398,10 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.9.2" + sources."enhanced-resolve-5.9.3" sources."error-ex-1.3.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -77374,14 +77473,14 @@ in sources."jsonc-parser-3.0.0" sources."jsonfile-6.1.0" sources."lines-and-columns-1.2.4" - sources."loader-runner-4.2.0" + sources."loader-runner-4.3.0" sources."lodash-4.17.21" (sources."log-symbols-4.1.0" // { dependencies = [ sources."chalk-4.1.2" ]; }) - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."macos-release-2.5.0" sources."magic-string-0.25.7" sources."memfs-3.4.1" @@ -77394,7 +77493,7 @@ in sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.11.0" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" @@ -77436,7 +77535,7 @@ in sources."json-schema-traverse-0.4.1" ]; }) - sources."semver-7.3.6" + sources."semver-7.3.7" sources."serialize-javascript-6.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -77492,6 +77591,7 @@ in sources."which-2.0.2" sources."windows-release-4.0.0" sources."wrappy-1.0.2" + sources."yallist-4.0.0" sources."yaml-1.10.2" ]; buildInputs = globalBuildInputs; @@ -77548,7 +77648,7 @@ in sources."util-deprecate-1.0.2" sources."wasm-feature-detect-1.2.11" sources."wcwidth-1.0.1" - sources."web-streams-polyfill-3.2.0" + sources."web-streams-polyfill-3.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -77683,7 +77783,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1110.0" // { + (sources."aws-sdk-2.1113.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78175,9 +78275,9 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.4" sources."@vue/cli-ui-addon-widgets-5.0.4" - sources."@vue/compiler-core-3.2.31" - sources."@vue/compiler-dom-3.2.31" - sources."@vue/shared-3.2.31" + sources."@vue/compiler-core-3.2.32" + sources."@vue/compiler-dom-3.2.32" + sources."@vue/shared-3.2.32" (sources."@wry/equality-0.1.11" // { dependencies = [ sources."tslib-1.14.1" @@ -78286,7 +78386,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -78407,14 +78507,14 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -78512,7 +78612,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.175.1" + sources."flow-parser-0.176.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forwarded-0.2.0" @@ -78727,7 +78827,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -78880,11 +78980,7 @@ in sources."commander-2.20.3" ]; }) - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" (sources."send-0.17.2" // { dependencies = [ (sources."debug-2.6.9" // { @@ -79673,11 +79769,7 @@ in sources."retext-profanities-7.1.0" sources."sade-1.8.1" sources."safe-buffer-5.2.1" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -79861,7 +79953,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.20.2" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -79871,7 +79963,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -79922,7 +80014,7 @@ in sources."minimatch-3.1.2" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -80137,7 +80229,7 @@ in ]; }) sources."y18n-5.0.8" - sources."yargs-17.4.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" sources."ylru-1.3.2" ]; @@ -80247,11 +80339,11 @@ in }; dependencies = [ sources."browserslist-4.20.2" - sources."caniuse-lite-1.0.30001325" - sources."electron-to-chromium-1.4.106" + sources."caniuse-lite-1.0.30001331" + sources."electron-to-chromium-1.4.107" sources."escalade-3.1.1" sources."fraction.js-4.2.0" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" sources."postcss-value-parser-4.2.0" @@ -80277,13 +80369,13 @@ in dependencies = [ sources."@tootallnate/once-1.1.2" sources."@types/node-17.0.23" - sources."@types/yauzl-2.9.2" + sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1110.0" // { + (sources."aws-sdk-2.1113.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -80324,7 +80416,7 @@ in sources."degenerator-2.2.0" sources."depd-2.0.0" sources."devtools-protocol-0.0.901419" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" @@ -80676,8 +80768,7 @@ in sources."nice-try-1.0.5" (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."lru-cache-7.8.0" - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."normalize-url-4.5.1" @@ -81367,7 +81458,7 @@ in }) sources."long-4.0.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."luxon-2.3.1" sources."macaroon-3.0.4" (sources."make-dir-3.1.0" // { @@ -81498,7 +81589,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" - sources."semver-7.3.6" + sources."semver-7.3.7" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -81611,6 +81702,7 @@ in sources."ws-8.5.0" sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" + sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -81803,7 +81895,7 @@ in sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."doctoc-2.1.0" - (sources."dom-serializer-1.3.2" // { + (sources."dom-serializer-1.4.1" // { dependencies = [ sources."domhandler-4.3.1" ]; @@ -82161,7 +82253,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" @@ -82527,7 +82619,7 @@ in sources."ws-8.2.3" sources."xmlhttprequest-ssl-2.0.0" sources."y18n-5.0.8" - (sources."yargs-17.4.0" // { + (sources."yargs-17.4.1" // { dependencies = [ sources."yargs-parser-21.0.1" ]; @@ -82916,11 +83008,7 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" (sources."send-0.17.2" // { dependencies = [ (sources."debug-2.6.9" // { @@ -84047,14 +84135,14 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.143"; + version = "1.0.146"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.143.tgz"; - sha512 = "H2aROcLGTNDjTdpFf1C3wniW8HtsoKkoL9JX/0Yddu+yBx7Kens2B9Hlh83qgb2PWIqWfiXtYpy4ug/jTLAtqA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.146.tgz"; + sha512 = "DPTpfMPJFC82Qqyx7Ci5XYwJ6bOE1UWozEw9lbw70nTEPoCWfO2Yu45A/68491xVp22eRbMQ0wbP7eSHRtCS5Q=="; }; dependencies = [ - sources."@jsii/check-node-1.55.1" - sources."@jsii/spec-1.55.1" + sources."@jsii/check-node-1.56.0" + sources."@jsii/spec-1.56.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -84069,12 +84157,12 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.5.64" - sources."cdk8s-plus-22-1.0.0-beta.181" + sources."cdk8s-1.5.67" + sources."cdk8s-plus-22-1.0.0-beta.191" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.55.1" // { + (sources."codemaker-1.56.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -84083,7 +84171,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.261" + sources."constructs-3.3.266" sources."date-format-4.0.6" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -84094,7 +84182,7 @@ in sources."dot-case-3.0.4" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -84146,44 +84234,44 @@ in sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" sources."isarray-2.0.5" - (sources."jsii-1.55.1" // { + (sources."jsii-1.56.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.55.1" // { + (sources."jsii-pacmak-1.56.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.55.1" // { + (sources."jsii-reflect-1.56.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.55.1" // { + (sources."jsii-rosetta-1.56.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.523" // { + (sources."jsii-srcmak-0.1.529" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.183" + sources."json2jsii-0.2.190" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" sources."log4js-6.4.4" sources."lower-case-2.0.2" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -84195,7 +84283,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.55.1" + sources."oo-ascii-tree-1.56.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -84203,14 +84291,14 @@ in sources."picomatch-2.3.1" sources."punycode-2.1.1" sources."queue-microtask-1.2.3" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."run-parallel-1.2.0" - sources."semver-7.3.6" + sources."semver-7.3.7" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.1" @@ -84221,7 +84309,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.1" sources."spdx-license-list-6.5.0" - sources."sscaff-1.2.250" + sources."sscaff-1.2.256" (sources."streamroller-3.0.6" // { dependencies = [ sources."fs-extra-10.0.1" @@ -84243,10 +84331,11 @@ in sources."which-collection-1.0.1" sources."which-module-2.0.0" sources."which-typed-array-1.1.7" - sources."workerpool-6.2.0" + sources."workerpool-6.2.1" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" + sources."yallist-4.0.0" sources."yaml-2.0.0-11" (sources."yargs-15.4.1" // { dependencies = [ @@ -84288,7 +84377,7 @@ in sources."@cdktf/hcl2cdk-0.10.1" sources."@cdktf/hcl2json-0.10.1" sources."@cdktf/provider-generator-0.10.1" - (sources."@jsii/check-node-1.55.1" // { + (sources."@jsii/check-node-1.56.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -84298,7 +84387,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.55.1" + sources."@jsii/spec-1.56.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -84331,7 +84420,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.108" + sources."constructs-10.0.113" sources."date-format-4.0.6" sources."debug-4.3.4" sources."decamelize-1.2.0" @@ -84342,7 +84431,7 @@ in sources."detect-newline-2.1.0" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -84405,7 +84494,7 @@ in sources."isarray-2.0.5" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.55.1" // { + (sources."jsii-1.56.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -84423,11 +84512,11 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.55.1" // { + (sources."jsii-pacmak-1.56.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" - sources."codemaker-1.55.1" + sources."codemaker-1.56.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."decamelize-5.0.1" @@ -84441,7 +84530,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.55.1" // { + (sources."jsii-reflect-1.56.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -84459,7 +84548,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.55.1" // { + (sources."jsii-rosetta-1.56.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -84474,7 +84563,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.523" // { + (sources."jsii-srcmak-0.1.529" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -84487,7 +84576,7 @@ in sources."locate-path-5.0.0" sources."lodash.isequal-4.5.0" sources."log4js-6.4.4" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -84509,7 +84598,7 @@ in sources."object.assign-4.1.2" sources."obliterator-2.0.2" sources."once-1.4.0" - sources."oo-ascii-tree-1.55.1" + sources."oo-ascii-tree-1.56.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -84519,7 +84608,7 @@ in sources."prettier-2.6.2" sources."punycode-2.1.1" sources."queue-microtask-1.2.3" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."reserved-words-0.1.2" @@ -84527,7 +84616,7 @@ in sources."rfdc-1.3.0" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."semver-7.3.6" + sources."semver-7.3.7" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.1" @@ -84564,7 +84653,7 @@ in sources."which-collection-1.0.1" sources."which-module-2.0.0" sources."which-typed-array-1.1.7" - sources."workerpool-6.2.0" + sources."workerpool-6.2.1" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -84575,7 +84664,8 @@ in sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" sources."y18n-4.0.3" - (sources."yargs-17.4.0" // { + sources."yallist-4.0.0" + (sources."yargs-17.4.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -84727,11 +84817,7 @@ in sources."read-pkg-6.0.0" sources."read-pkg-up-8.0.0" sources."redent-4.0.0" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -84771,7 +84857,7 @@ in dependencies = [ sources."@colors/colors-1.5.0" sources."ansi-styles-3.2.1" - sources."async-0.9.2" + sources."async-3.2.3" sources."chalk-2.4.2" sources."cli-spinner-0.2.10" sources."clubhouse-lib-0.10.0" @@ -84796,7 +84882,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."node-fetch-1.7.3" - sources."prompt-1.2.2" + sources."prompt-1.3.0" sources."punycode-2.1.1" sources."query-string-6.14.1" sources."read-1.0.7" @@ -85216,7 +85302,7 @@ in sha512 = "zFExh1wGAZl4LXSp76NAjWORO9Tyhfw8WtALnhDv741p4tjWjVSEl6GmXTQN0U0tXz8UZ8ln2rL2OaxOdgMCTA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.7.8" + sources."@chemzqm/neovim-5.7.9" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -85252,7 +85338,7 @@ in sources."define-properties-1.1.3" sources."duplexer2-0.1.4" sources."end-of-stream-1.4.4" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" sources."execa-1.0.0" @@ -85315,7 +85401,7 @@ in }) sources."lodash-4.17.21" sources."log4js-6.4.4" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" sources."minimist-1.2.6" @@ -85357,7 +85443,7 @@ in sources."rfdc-1.3.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -85450,13 +85536,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.232"; + version = "1.1.235"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.232.tgz"; - sha512 = "1ytGBG4gmz/M/6guRKUvTSltXDpoWlcbqq7RsMi3fFEBhYvSQVpy3MkKgxjkJNVbp+YKuJpcuNAhCIjq0+BHAg=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.235.tgz"; + sha512 = "7hF2rkGFbx4KQrYflu12OlPVV/7lQxaJWyslJMsdElEVOVOpO5C6wmwf2+6Xnzm65i6mFIg5lO7zYAz6nRSMFg=="; }; dependencies = [ - sources."pyright-1.1.235" + sources."pyright-1.1.237" ]; buildInputs = globalBuildInputs; meta = { @@ -85667,7 +85753,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -85704,7 +85790,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -85800,11 +85886,10 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."lru-cache-7.8.0" - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."normalize-range-0.1.2" @@ -86076,10 +86161,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.9.16"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.16.tgz"; - sha512 = "aTEVdLHrxbvlw1EctzSIzATXk10NBskOXk15LA6gCFsLC8sctzf437BHr+IfW5Le4kCTb4+Nrr+RYMl2+i7EAw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.10.0.tgz"; + sha512 = "5NTbIKgRAo2to0h2+PsC3zaScfJVs9btnzDi807StRS7OZjFRAAx4G4331UrfeCtugrgHoasxtb7RZQO6x5FYg=="; }; dependencies = [ sources."typescript-4.6.3" @@ -86235,7 +86320,7 @@ in sources."lodash-4.17.21" sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-0.5.6" @@ -86259,7 +86344,7 @@ in sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -86307,6 +86392,7 @@ in sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -86320,10 +86406,10 @@ in coc-vimlsp = nodeEnv.buildNodePackage { name = "coc-vimlsp"; packageName = "coc-vimlsp"; - version = "0.12.5"; + version = "0.12.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.12.5.tgz"; - sha512 = "IUewjywQmqGxjnvCO1chR1jOaqkXz6Hhxrtf8WIZynEfz/TNqfkuLGB5K8XqJtN54uLeMUg2VvVkjnPvhBRXPw=="; + url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.12.8.tgz"; + sha512 = "t03LSLQgHXvlNcifKTohzNbWq3//sp8B442mwKIUFJshd+1rdMUZfgZCgisMcQjuWaQCG491VYnm/wAP4o0ifA=="; }; buildInputs = globalBuildInputs; meta = { @@ -86714,7 +86800,7 @@ in sources."commander-7.2.0" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" - sources."fecha-4.2.1" + sources."fecha-4.2.2" sources."fn.name-1.1.0" sources."follow-redirects-1.14.9" sources."http-proxy-1.18.1" @@ -86893,8 +86979,7 @@ in sources."neo-async-2.6.2" (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."lru-cache-7.8.0" - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."p-limit-1.3.0" @@ -86947,7 +87032,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."uglify-js-3.15.3" + sources."uglify-js-3.15.4" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -87456,11 +87541,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -87666,8 +87747,7 @@ in sources."nested-error-stacks-2.1.1" (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."lru-cache-7.8.0" - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."p-event-4.2.0" @@ -87884,10 +87964,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-5.0.0.tgz"; - sha512 = "r1hJymk28l9HiGNatNq92txdua5pq5z4jHsYRG4g2BME7cDtRcCiuUsZzT1tPqjapSHT0Zwpwnp0gdTaqPzyBA=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-5.0.1.tgz"; + sha512 = "UkxTKK8I9HuZZHqkNq/JkKXDgdLeiRGc+bL58Iae2g+7WwFomAj4wppn6JfqlZM2IKYRlZtgLlmVr5oZfdd1xg=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -87920,7 +88000,7 @@ in sources."isexe-2.0.0" sources."jsonfile-6.1.0" sources."kleur-3.0.3" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-0.5.6" @@ -87933,7 +88013,7 @@ in sources."readable-stream-1.1.14" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."sisteransi-1.0.5" @@ -87964,6 +88044,7 @@ in sources."which-2.0.2" sources."wrappy-1.0.2" sources."xtend-4.0.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -87996,10 +88077,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "5.19.5"; + version = "5.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-5.19.5.tgz"; - sha512 = "LFKWBBOY6s1SYJcMlWmFP2ml3kxgzUcUCOY4JYDCAzA088gbBEiSN8sM0X6MhobsMJx4MchxjwveXFRP+1umyA=="; + url = "https://registry.npmjs.org/cspell/-/cspell-5.19.7.tgz"; + sha512 = "7/y+k708tv68+5lpN23Ew1/djx/EnG838zZ8W2ZDWCc6uRHutqRhpxsjMZr/MT3RHN44iKUj2MgT5+sfnhr4eg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -88014,14 +88095,14 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cspell/cspell-bundled-dicts-5.19.5" - sources."@cspell/cspell-pipe-5.19.5" - sources."@cspell/cspell-types-5.19.5" + sources."@cspell/cspell-bundled-dicts-5.19.7" + sources."@cspell/cspell-pipe-5.19.7" + sources."@cspell/cspell-types-5.19.7" sources."@cspell/dict-ada-2.0.0" sources."@cspell/dict-aws-2.0.0" sources."@cspell/dict-bash-2.0.2" sources."@cspell/dict-companies-2.0.3" - sources."@cspell/dict-cpp-2.0.1" + sources."@cspell/dict-cpp-2.0.3" sources."@cspell/dict-cryptocurrencies-2.0.0" sources."@cspell/dict-csharp-2.0.1" sources."@cspell/dict-css-2.0.0" @@ -88034,6 +88115,7 @@ in sources."@cspell/dict-filetypes-2.0.1" sources."@cspell/dict-fonts-2.0.0" sources."@cspell/dict-fullstack-2.0.4" + sources."@cspell/dict-git-1.0.1" sources."@cspell/dict-golang-2.0.0" sources."@cspell/dict-haskell-2.0.0" sources."@cspell/dict-html-3.0.1" @@ -88075,11 +88157,11 @@ in sources."core-util-is-1.0.3" sources."cosmiconfig-7.0.1" sources."crypto-random-string-2.0.0" - sources."cspell-gitignore-5.19.5" - sources."cspell-glob-5.19.5" - sources."cspell-io-5.19.5" - sources."cspell-lib-5.19.5" - sources."cspell-trie-lib-5.19.5" + sources."cspell-gitignore-5.19.7" + sources."cspell-glob-5.19.7" + sources."cspell-io-5.19.7" + sources."cspell-lib-5.19.7" + sources."cspell-trie-lib-5.19.7" sources."dot-prop-5.3.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" @@ -88119,7 +88201,7 @@ in sources."jsonfile-6.1.0" sources."lines-and-columns-1.2.4" sources."locate-path-6.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -88140,7 +88222,7 @@ in sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" sources."rimraf-3.0.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."signal-exit-3.0.7" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" @@ -88153,6 +88235,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" + sources."yallist-4.0.0" sources."yaml-1.10.2" sources."yocto-queue-0.1.0" ]; @@ -88233,7 +88316,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-0.9.2" + sources."async-3.2.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."atomic-batcher-1.0.2" @@ -88583,7 +88666,7 @@ in sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-string-1.2.2" - sources."prompt-1.2.2" + sources."prompt-1.3.0" (sources."protocol-buffers-encodings-1.1.1" // { dependencies = [ sources."varint-5.0.0" @@ -89036,7 +89119,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -89103,7 +89186,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-14.2.9" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -89184,7 +89267,7 @@ in sources."glob-watcher-5.0.5" (sources."global-agent-3.0.0" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."global-tunnel-ng-2.7.1" @@ -89250,7 +89333,7 @@ in sources."lodash.debounce-4.0.8" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" (sources."mapbox-gl-1.13.2" // { @@ -89283,7 +89366,7 @@ in sources."napi-macros-2.0.0" sources."node-fetch-2.6.7" sources."node-gyp-build-4.4.0" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."normalize.css-8.0.1" @@ -89360,7 +89443,7 @@ in sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."regexpu-core-5.0.1" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { @@ -89527,6 +89610,7 @@ in sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" sources."xml-js-1.6.11" + sources."yallist-4.0.0" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -89891,7 +89975,7 @@ in sources."@types/minimatch-3.0.5" sources."@types/node-17.0.23" sources."@types/responselike-1.0.0" - sources."@types/yauzl-2.9.2" + sources."@types/yauzl-2.10.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.2.1" @@ -90293,11 +90377,7 @@ in sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" sources."semver-compare-1.0.0" sources."serialize-error-7.0.1" sources."set-blocking-2.0.0" @@ -90380,7 +90460,7 @@ in sources."xtend-2.1.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.4.0" // { + (sources."yargs-17.4.1" // { dependencies = [ sources."yargs-parser-21.0.1" ]; @@ -90500,7 +90580,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -90514,7 +90594,7 @@ in sources."concat-map-0.0.1" (sources."conf-7.1.2" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."convert-source-map-1.8.0" @@ -90529,7 +90609,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -90598,7 +90678,7 @@ in sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."loose-envify-1.4.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -90618,7 +90698,7 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -90654,7 +90734,7 @@ in sources."punycode-2.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.24.3" + sources."react-devtools-core-4.24.4" sources."react-is-16.13.1" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { @@ -90724,6 +90804,7 @@ in }) sources."wrappy-1.0.2" sources."ws-7.5.7" + sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" ]; @@ -90782,21 +90863,23 @@ in (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."ajv-6.12.6" + sources."brace-expansion-1.1.11" sources."debug-4.3.4" sources."ignore-4.0.6" sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" + sources."minimatch-3.1.2" sources."ms-2.1.2" sources."strip-json-comments-3.1.1" ]; }) sources."@fluentui/date-time-utilities-8.5.0" sources."@fluentui/dom-utilities-2.2.0" - sources."@fluentui/font-icons-mdl2-8.2.5" + sources."@fluentui/font-icons-mdl2-8.3.0" sources."@fluentui/foundation-legacy-8.2.5" sources."@fluentui/keyboard-key-0.4.0" sources."@fluentui/merge-styles-8.5.0" - sources."@fluentui/react-8.64.1" + sources."@fluentui/react-8.64.3" sources."@fluentui/react-focus-8.5.6" sources."@fluentui/react-hooks-8.5.3" sources."@fluentui/react-window-provider-2.2.0" @@ -90818,12 +90901,14 @@ in }) (sources."@humanwhocodes/config-array-0.5.0" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."debug-4.3.4" + sources."minimatch-3.1.2" sources."ms-2.1.2" ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@microsoft/load-themed-styles-1.10.251" + sources."@microsoft/load-themed-styles-1.10.257" 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" @@ -91016,7 +91101,7 @@ in sources."bindings-1.5.0" sources."block-stream-0.0.9" sources."body-parser-1.19.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."bson-4.6.2" sources."buffer-5.7.1" @@ -91177,6 +91262,9 @@ in sources."define-property-2.0.2" (sources."del-6.0.0" // { dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.0" + sources."minimatch-3.1.2" sources."rimraf-3.0.2" ]; }) @@ -91223,7 +91311,7 @@ in ]; }) sources."engine.io-parser-5.0.3" - sources."enhanced-resolve-5.9.2" + sources."enhanced-resolve-5.9.3" sources."enquirer-2.3.6" sources."error-ex-1.3.2" sources."es5-ext-0.10.60" @@ -91237,6 +91325,7 @@ in dependencies = [ sources."ajv-6.12.6" sources."ansi-regex-5.0.1" + sources."brace-expansion-1.1.11" sources."debug-4.3.4" sources."escape-string-regexp-4.0.0" (sources."eslint-utils-2.1.0" // { @@ -91247,6 +91336,7 @@ in sources."ignore-4.0.6" sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" + sources."minimatch-3.1.2" sources."ms-2.1.2" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" @@ -91349,7 +91439,10 @@ in sources."flagged-respawn-1.0.1" (sources."flat-cache-3.0.4" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."flatted-3.2.5" + sources."glob-7.2.0" + sources."minimatch-3.1.2" sources."rimraf-3.0.2" ]; }) @@ -91389,13 +91482,16 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.2.0" + sources."glob-8.0.1" sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.0" sources."glob-parent-3.1.0" sources."is-glob-3.1.0" sources."isarray-1.0.0" + sources."minimatch-3.1.2" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -91426,6 +91522,7 @@ in sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."astral-regex-1.0.0" + sources."brace-expansion-1.1.11" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -91442,6 +91539,7 @@ in sources."espree-6.2.1" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" + sources."glob-7.2.0" sources."globals-12.4.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -91449,6 +91547,7 @@ in sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" sources."levn-0.3.0" + sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-0.5.6" sources."ms-2.1.2" @@ -91529,7 +91628,12 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.2.0" - sources."ignore-walk-3.0.4" + (sources."ignore-walk-3.0.4" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -91627,7 +91731,7 @@ in }) sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" sources."make-error-1.3.6" sources."make-iterator-1.0.1" @@ -91658,13 +91762,18 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" + sources."minimatch-5.0.1" sources."minimist-1.2.5" - sources."minipass-2.9.0" + (sources."minipass-2.9.0" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) sources."minizlib-1.3.3" (sources."mirakurun-3.9.0-beta.26" // { dependencies = [ sources."ajv-6.12.6" + sources."brace-expansion-1.1.11" sources."eventemitter3-4.0.7" (sources."express-openapi-8.0.0" // { dependencies = [ @@ -91672,7 +91781,9 @@ in ]; }) sources."fs-routes-8.0.0" + sources."glob-7.2.0" sources."json-schema-traverse-0.4.1" + sources."minimatch-3.1.2" (sources."openapi-default-setter-8.0.0" // { dependencies = [ sources."openapi-types-8.0.0" @@ -91763,6 +91874,9 @@ in sources."node-addon-api-3.2.1" (sources."node-gyp-3.8.0" // { dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.0" + sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-0.5.6" sources."nopt-3.0.6" @@ -91993,7 +92107,13 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rfdc-1.3.0" - sources."rimraf-2.7.1" + (sources."rimraf-2.7.1" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.0" + sources."minimatch-3.1.2" + ]; + }) sources."run-async-2.4.1" sources."run-parallel-1.2.0" (sources."rxjs-6.6.7" // { @@ -92007,7 +92127,7 @@ in sources."saslprep-1.0.3" sources."sax-1.2.4" sources."scheduler-0.20.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."semver-greatest-satisfied-range-1.1.0" (sources."send-0.17.1" // { dependencies = [ @@ -92152,6 +92272,7 @@ in sources."minimist-1.2.6" sources."mkdirp-0.5.6" sources."safe-buffer-5.2.1" + sources."yallist-3.1.1" ]; }) sources."text-table-0.2.0" @@ -92205,8 +92326,11 @@ in sources."typedarray-0.0.6" (sources."typeorm-0.2.38" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."buffer-6.0.3" sources."debug-4.3.4" + sources."glob-7.2.0" + sources."minimatch-3.1.2" sources."ms-2.1.2" ]; }) @@ -92293,7 +92417,7 @@ in sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-3.1.1" + sources."yallist-4.0.0" (sources."yargonaut-1.1.4" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -92301,7 +92425,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."yargs-17.4.0" // { + (sources."yargs-17.4.1" // { dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" @@ -92395,7 +92519,7 @@ in 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" // { + (sources."@types/uglify-js-3.13.2" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -92510,6 +92634,7 @@ in 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" // { @@ -92668,6 +92793,7 @@ in (sources."cacache-12.0.4" // { dependencies = [ sources."lru-cache-5.1.1" + sources."yallist-3.1.1" ]; }) sources."cache-base-1.0.1" @@ -92697,7 +92823,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -92938,7 +93064,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92964,7 +93090,7 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.7" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."escalade-3.1.1" @@ -93228,7 +93354,7 @@ in }) (sources."htmlparser2-6.1.0" // { dependencies = [ - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domutils-2.8.0" ]; @@ -93375,7 +93501,7 @@ in sources."log-symbols-2.2.0" sources."loglevel-1.8.0" sources."lower-case-1.1.4" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -93418,11 +93544,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - (sources."minipass-3.1.6" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-3.1.6" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -93450,7 +93572,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -93726,7 +93848,7 @@ in 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."regexp.prototype.flags-1.4.2" sources."regexpp-3.2.0" sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" @@ -93735,7 +93857,7 @@ in sources."ansi-regex-2.1.1" sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domutils-2.8.0" sources."nth-check-2.0.1" @@ -93786,7 +93908,7 @@ in sources."schema-utils-1.0.0" sources."select-hose-2.0.0" sources."selfsigned-1.10.14" - sources."semver-7.3.6" + sources."semver-7.3.7" (sources."send-0.17.2" // { dependencies = [ (sources."debug-2.6.9" // { @@ -94256,7 +94378,7 @@ in sources."xmlhttprequest-ssl-2.0.0" sources."xtend-4.0.2" sources."y18n-4.0.3" - sources."yallist-3.1.1" + sources."yallist-4.0.0" sources."yaml-1.10.2" (sources."yargs-16.2.0" // { dependencies = [ @@ -94305,10 +94427,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.12.0"; + version = "8.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz"; - sha512 = "it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz"; + sha512 = "D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ=="; }; dependencies = [ sources."@eslint/eslintrc-1.2.1" @@ -94441,7 +94563,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.12.0" + sources."eslint-8.13.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -94537,10 +94659,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.3.0.tgz"; - sha512 = "Oi5E+C3AtAHOwqBbL3GL1eQErfDnZGmIqbMjlDGp8WtELN0f+fdfWA4ZldCOSjnqsYg7hYQFgrZXjIXbjYsC9Q=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.3.1.tgz"; + sha512 = "iNJLde2HDRiQTNGBlhNfWcTQQCKOwZoXsl55YV2YlRWWiWhLCWFrC8+j5OxD2PRiRqueSOtwR+Kf+ODD60dBAA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -94580,15 +94702,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.19" - (sources."@expo/config-plugins-4.1.0" // { + sources."@expo/config-6.0.20" + (sources."@expo/config-plugins-4.1.1" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."@expo/config-types-44.0.0" - sources."@expo/dev-server-0.1.106" - sources."@expo/dev-tools-0.13.146" + sources."@expo/dev-server-0.1.107" + sources."@expo/dev-tools-0.13.147" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -94596,34 +94718,34 @@ in sources."sudo-prompt-8.2.5" ]; }) - (sources."@expo/image-utils-0.3.18" // { + (sources."@expo/image-utils-0.3.19" // { dependencies = [ sources."temp-dir-1.0.0" sources."tempy-0.3.0" sources."type-fest-0.3.1" ]; }) - sources."@expo/json-file-8.2.34" - sources."@expo/metro-config-0.3.12" - sources."@expo/osascript-2.0.31" - (sources."@expo/package-manager-0.0.50" // { + sources."@expo/json-file-8.2.35" + sources."@expo/metro-config-0.3.13" + sources."@expo/osascript-2.0.32" + (sources."@expo/package-manager-0.0.51" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" sources."semver-5.7.1" ]; }) - (sources."@expo/plist-0.0.17" // { + (sources."@expo/plist-0.0.18" // { dependencies = [ sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-3.1.0" + sources."@expo/prebuild-config-3.1.1" sources."@expo/rudder-sdk-node-1.1.1" - sources."@expo/schemer-1.3.33" + sources."@expo/schemer-1.3.34" sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.16.19" // { + (sources."@expo/webpack-config-0.16.20" // { dependencies = [ sources."is-wsl-2.2.0" ]; @@ -94642,7 +94764,7 @@ in sources."@nodelib/fs.walk-1.2.8" (sources."@npmcli/fs-1.1.1" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) (sources."@npmcli/move-file-1.1.2" // { @@ -94688,7 +94810,7 @@ in sources."@types/retry-0.12.1" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.13.1" // { + (sources."@types/uglify-js-3.13.2" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -94867,7 +94989,6 @@ in sources."bytes-3.0.0" (sources."cacache-15.3.0" // { dependencies = [ - sources."lru-cache-6.0.0" sources."minipass-3.1.6" sources."mkdirp-1.0.4" sources."rimraf-3.0.2" @@ -94888,7 +95009,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -94939,7 +95060,7 @@ in sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-spinners-2.6.1" - sources."cli-table3-0.6.1" + sources."cli-table3-0.6.2" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -94963,7 +95084,6 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.9.0" - sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.17.1" @@ -95123,7 +95243,7 @@ in sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."dom-converter-0.2.0" - (sources."dom-serializer-1.3.2" // { + (sources."dom-serializer-1.4.1" // { dependencies = [ sources."domhandler-4.3.1" ]; @@ -95147,7 +95267,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -95168,7 +95288,7 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."errorhandler-1.5.1" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -95219,7 +95339,7 @@ in sources."fs-extra-9.1.0" ]; }) - (sources."expo-pwa-0.0.114" // { + (sources."expo-pwa-0.0.115" // { dependencies = [ sources."commander-2.20.0" ]; @@ -95383,11 +95503,7 @@ in sources."he-1.2.0" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" - (sources."hosted-git-info-3.0.8" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) + sources."hosted-git-info-3.0.8" sources."hpack.js-2.1.6" sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" @@ -95597,7 +95713,7 @@ in ]; }) sources."lowercase-keys-2.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -95709,7 +95825,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" (sources."npm-package-arg-6.1.0" // { @@ -96074,7 +96190,7 @@ in sources."which-2.0.2" ]; }) - sources."react-error-overlay-6.0.10" + sources."react-error-overlay-6.0.11" sources."react-is-17.0.2" sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" @@ -96087,7 +96203,7 @@ in }) sources."regenerator-runtime-0.13.9" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."relateurl-0.2.7" @@ -96642,7 +96758,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.2.30" // { + (sources."xdl-59.2.31" // { dependencies = [ sources."bplist-parser-0.3.1" sources."chownr-1.1.4" @@ -96741,7 +96857,7 @@ in sources."@types/minimist-1.2.2" sources."@types/node-17.0.23" sources."@types/normalize-package-data-2.4.1" - sources."@types/yauzl-2.9.2" + sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" sources."agent-base-6.0.2" (sources."ansi-escapes-4.3.2" // { @@ -96766,7 +96882,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -96791,7 +96907,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.969999" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -96858,11 +96974,10 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."node-fetch-2.6.7" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."lru-cache-7.8.0" - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."object-assign-4.1.1" @@ -96889,7 +97004,7 @@ in }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.24.3" + sources."react-devtools-core-4.24.4" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -97234,7 +97349,7 @@ in sources."lodash.templatesettings-4.2.0" sources."log-symbols-4.1.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mime-db-1.52.0" @@ -97299,7 +97414,7 @@ in sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.7" @@ -97355,6 +97470,7 @@ in sources."widest-line-3.1.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -97393,7 +97509,7 @@ in sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/fs-1.1.1" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) (sources."@npmcli/move-file-1.1.2" // { @@ -97504,7 +97620,6 @@ in sources."bytes-3.1.2" (sources."cacache-15.3.0" // { dependencies = [ - sources."lru-cache-6.0.0" sources."mkdirp-1.0.4" ]; }) @@ -97657,7 +97772,7 @@ in dependencies = [ sources."ajv-8.11.0" sources."json-schema-traverse-1.0.0" - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."exegesis-express-4.0.0" @@ -97692,7 +97807,7 @@ in sources."punycode-1.4.1" ]; }) - sources."fecha-4.2.1" + sources."fecha-4.2.2" sources."figures-3.2.0" sources."file-uri-to-path-2.0.0" sources."filesize-6.4.0" @@ -97740,7 +97855,7 @@ in }) sources."function-bind-1.1.1" sources."gauge-4.0.4" - sources."gaxios-4.3.2" + sources."gaxios-4.3.3" sources."gcp-metadata-4.3.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -97756,13 +97871,9 @@ in sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" - (sources."google-auth-library-7.14.1" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) + sources."google-auth-library-7.14.1" sources."google-gax-2.29.6" - sources."google-p12-pem-3.1.3" + sources."google-p12-pem-3.1.4" sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."gtoken-5.3.2" @@ -97887,7 +97998,7 @@ in sources."logform-2.4.0" sources."long-4.0.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -97896,11 +98007,10 @@ in }) (sources."make-fetch-happen-9.1.0" // { dependencies = [ - sources."lru-cache-6.0.0" sources."socks-proxy-agent-6.1.1" ]; }) - sources."marked-4.0.12" + sources."marked-4.0.14" (sources."marked-terminal-3.3.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -97955,7 +98065,7 @@ in sources."node-forge-1.3.1" (sources."node-gyp-8.4.1" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" sources."which-2.0.2" ]; }) @@ -98202,7 +98312,7 @@ in sources."ini-2.0.0" sources."is-installed-globally-0.4.0" sources."is-npm-5.0.0" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."type-fest-0.20.2" ]; }) @@ -98471,11 +98581,7 @@ in sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -98722,7 +98828,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.7.1" + sources."web3-utils-1.7.3" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -98863,7 +98969,7 @@ in sources."dot-prop-4.2.1" sources."duplexer-0.1.2" sources."enabled-2.0.0" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" @@ -98896,7 +99002,7 @@ in ]; }) sources."eyes-0.1.8" - sources."fecha-4.2.1" + sources."fecha-4.2.2" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -99067,7 +99173,7 @@ in }) sources."readdirp-2.2.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" @@ -99266,10 +99372,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.11.2"; + version = "4.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.11.2.tgz"; - sha512 = "MypoVvMwWcDEtf5JTm1UTdGeOavRjnNRKfuUqvbhvb+q1vQ2xIFhu/pK9sdOlQfL6v6Fl8xwO2FuOfz+i53z3w=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.12.1.tgz"; + sha512 = "vlSqri0p9HpLfACFtUCJhxQArzxSvdcUkrN4Jlw8RgeJYxcJyb8VPPDJHJT3rMGRKZFeBaAeqMbqx/eK4K5F1w=="; }; dependencies = [ sources."@ampproject/remapping-2.1.2" @@ -99366,7 +99472,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -99404,7 +99510,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.8.0" - sources."create-gatsby-2.11.2" + sources."create-gatsby-2.12.1" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -99425,13 +99531,13 @@ in sources."defer-to-connect-2.0.1" sources."delayed-stream-1.0.0" sources."dom-converter-0.2.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -99466,8 +99572,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.11.1" - (sources."gatsby-telemetry-3.11.1" // { + sources."gatsby-core-utils-3.12.1" + (sources."gatsby-telemetry-3.12.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -99534,7 +99640,13 @@ in sources."keyv-4.2.2" sources."kleur-3.0.3" sources."latest-version-5.1.0" - sources."lmdb-2.2.6" + sources."lmdb-2.3.2" + sources."lmdb-darwin-arm64-2.3.2" + sources."lmdb-darwin-x64-2.3.2" + sources."lmdb-linux-arm-2.3.2" + sources."lmdb-linux-arm64-2.3.2" + sources."lmdb-linux-x64-2.3.2" + sources."lmdb-win32-x64-2.3.2" sources."locate-path-5.0.0" sources."lock-1.1.0" sources."lodash-4.17.21" @@ -99555,7 +99667,7 @@ in sources."minimist-1.2.6" sources."ms-2.1.2" sources."msgpackr-1.5.5" - sources."msgpackr-extract-1.1.3" + sources."msgpackr-extract-1.1.4" sources."msgpackr-extract-darwin-arm64-1.1.0" sources."msgpackr-extract-darwin-x64-1.1.0" sources."msgpackr-extract-linux-arm-1.1.0" @@ -99565,11 +99677,11 @@ in sources."mute-stream-0.0.8" sources."nan-2.15.0" sources."nice-try-1.0.5" + sources."node-addon-api-4.3.0" sources."node-fetch-2.6.7" - sources."node-gyp-build-4.4.0" - sources."node-gyp-build-optional-packages-4.3.1" + sources."node-gyp-build-optional-packages-4.3.2" sources."node-object-hash-2.3.10" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."nth-check-2.0.1" @@ -99578,7 +99690,7 @@ in sources."onetime-5.1.2" sources."open-7.4.2" sources."opentracing-0.14.7" - sources."ordered-binary-1.2.4" + sources."ordered-binary-1.2.5" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" @@ -99656,11 +99768,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -99833,7 +99941,7 @@ in sources."lines-and-columns-1.2.4" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" @@ -99866,11 +99974,11 @@ in }) sources."read-pkg-up-7.0.1" sources."rechoir-0.6.2" - sources."request-light-0.5.7" + sources."request-light-0.5.8" sources."resolve-1.22.0" sources."run-async-2.4.1" sources."sanitize-filename-1.6.3" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.5" @@ -99908,6 +100016,7 @@ in ]; }) sources."wrappy-1.0.2" + sources."yallist-4.0.0" sources."yeoman-generator-5.6.1" (sources."yosay-2.0.2" // { dependencies = [ @@ -100326,10 +100435,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.12.0"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.12.0.tgz"; - sha512 = "selN2/DBH5qN27r0PH6FuEO6B5X1qFd3x8M9YP3+23NjgPM6sUOSw2V0phP9Ofir/uubKl7jEao+rVH/NONJdg=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.13.0.tgz"; + sha512 = "HF4X8Ov5uw32ksrJAJb2eG/lHu2yPe1+VZg+A5vl6rWn/GeCiuQeJdvjZB2RWJ4c0yDoGd16UbLvpUdnWZk6jg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -100427,7 +100536,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."execa-5.0.0" + sources."execa-5.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" @@ -100456,11 +100565,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - (sources."hosted-git-info-4.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) + sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" @@ -100515,7 +100620,7 @@ in sources."lodash-4.17.21" sources."log-symbols-4.1.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -100613,7 +100718,7 @@ in sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -100686,19 +100791,18 @@ in glob = nodeEnv.buildNodePackage { name = "glob"; packageName = "glob"; - version = "7.2.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; - sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + url = "https://registry.npmjs.org/glob/-/glob-8.0.1.tgz"; + sha512 = "cF7FYZZ47YzmCu7dDy50xSRRfO3ErRfrXuLZcNIuyiJEco0XSrGtuilG19L5xp3NcwTx7Gn+X6Tv3fmsUPTbow=="; }; dependencies = [ sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" + sources."brace-expansion-2.0.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.1.2" + sources."minimatch-5.0.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" @@ -100858,7 +100962,7 @@ in sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yargs-17.4.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" ]; @@ -100925,9 +101029,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.6.10" // { + (sources."@graphql-tools/import-6.6.11" // { dependencies = [ - sources."@graphql-tools/utils-8.6.6" + sources."@graphql-tools/utils-8.6.7" sources."tslib-2.3.1" ]; }) @@ -100952,10 +101056,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.3.7" // { + (sources."@graphql-tools/schema-8.3.8" // { dependencies = [ - sources."@graphql-tools/merge-8.2.7" - sources."@graphql-tools/utils-8.6.6" + sources."@graphql-tools/merge-8.2.8" + sources."@graphql-tools/utils-8.6.7" sources."tslib-2.3.1" ]; }) @@ -101080,7 +101184,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" @@ -101282,7 +101386,7 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ - sources."yargs-17.4.0" + sources."yargs-17.4.1" ]; }) sources."oas-schema-walker-1.1.5" @@ -101344,7 +101448,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."reftools-1.1.9" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" @@ -101395,7 +101499,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ - sources."yargs-17.4.0" + sources."yargs-17.4.1" ]; }) sources."symbol-observable-1.2.0" @@ -101476,15 +101580,15 @@ in }) sources."@cronvel/get-pixels-3.4.0" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.4.2" - sources."@graphql-tools/delegate-8.7.2" - sources."@graphql-tools/graphql-file-loader-7.3.8" - sources."@graphql-tools/import-6.6.10" - sources."@graphql-tools/json-file-loader-7.3.8" - sources."@graphql-tools/load-7.5.7" - sources."@graphql-tools/merge-8.2.7" - sources."@graphql-tools/schema-8.3.7" - (sources."@graphql-tools/url-loader-7.9.9" // { + sources."@graphql-tools/batch-execute-8.4.4" + sources."@graphql-tools/delegate-8.7.4" + sources."@graphql-tools/graphql-file-loader-7.3.9" + sources."@graphql-tools/import-6.6.11" + sources."@graphql-tools/json-file-loader-7.3.9" + sources."@graphql-tools/load-7.5.8" + sources."@graphql-tools/merge-8.2.8" + sources."@graphql-tools/schema-8.3.8" + (sources."@graphql-tools/url-loader-7.9.11" // { dependencies = [ (sources."subscriptions-transport-ws-0.11.0" // { dependencies = [ @@ -101494,8 +101598,8 @@ in sources."ws-8.5.0" ]; }) - sources."@graphql-tools/utils-8.6.6" - sources."@graphql-tools/wrap-8.4.11" + sources."@graphql-tools/utils-8.6.7" + sources."@graphql-tools/wrap-8.4.13" sources."@iarna/toml-2.2.5" sources."@n1ru4l/graphql-live-query-0.9.0" sources."@nodelib/fs.scandir-2.1.5" @@ -101598,9 +101702,9 @@ in sources."semver-5.7.1" ]; }) - sources."cross-undici-fetch-0.1.28" + sources."cross-undici-fetch-0.2.5" sources."cwise-compiler-1.1.3" - sources."dataloader-2.0.0" + sources."dataloader-2.1.0" sources."debug-4.3.4" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -101648,7 +101752,7 @@ in sources."graceful-fs-4.2.10" sources."graphql-15.4.0" sources."graphql-config-4.3.0" - sources."graphql-executor-0.0.22" + sources."graphql-executor-0.0.23" (sources."graphql-language-service-interface-2.10.2" // { dependencies = [ sources."graphql-language-service-utils-2.7.1" @@ -101658,7 +101762,7 @@ in sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" sources."graphql-sse-1.1.0" - sources."graphql-ws-5.6.4" + sources."graphql-ws-5.7.0" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" @@ -101697,7 +101801,7 @@ in sources."lodash.get-4.4.2" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."make-error-1.3.6" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -101750,7 +101854,7 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.1.1" - sources."semver-7.3.6" + sources."semver-7.3.7" (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" @@ -101806,7 +101910,7 @@ in sources."value-or-promise-1.0.11" sources."vary-1.1.2" sources."vscode-languageserver-types-3.16.0" - sources."web-streams-polyfill-3.2.0" + sources."web-streams-polyfill-3.2.1" sources."webidl-conversions-3.0.1" sources."whatwg-fetch-3.6.2" sources."whatwg-url-5.0.0" @@ -101814,6 +101918,7 @@ in sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" sources."ws-7.4.2" + sources."yallist-4.0.0" sources."yaml-1.10.2" sources."yn-3.1.1" sources."yocto-queue-0.1.0" @@ -102068,8 +102173,7 @@ in sources."cardinal-2.1.1" sources."chalk-1.1.3" sources."charm-0.1.2" - sources."cli-table3-0.6.1" - sources."colors-1.4.0" + sources."cli-table3-0.6.2" sources."core-util-is-1.0.3" sources."drawille-blessed-contrib-1.0.0" sources."drawille-canvas-blessed-contrib-0.1.3" @@ -102090,7 +102194,7 @@ in sources."isarray-0.0.1" sources."lodash-4.17.21" sources."map-canvas-0.1.5" - sources."marked-4.0.12" + sources."marked-4.0.14" (sources."marked-terminal-5.1.1" // { dependencies = [ sources."chalk-5.0.1" @@ -103019,7 +103123,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.15.3" + sources."uglify-js-3.15.4" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -103035,10 +103139,10 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.3.tgz"; - sha512 = "Z2GtamhFnhCAXKP5lsfqShIDlk6eHEI5U6B9A/JXstdgakoOC2y9nF1b38DcVNBJ8eHn/wfSdh4GVrW4NmmFEQ=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.4.tgz"; + sha512 = "tSKPefhIaaWDk/vKxAOQbN+QwZmDeJCq3bZZGbJMoMQAfTjepudC+MkuT9MOBbuQI3dLLzDWbmU7fLV3JASC7Q=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -103320,7 +103424,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1110.0" + sources."aws-sdk-2.1113.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -103437,9 +103541,9 @@ in sources."optionator-0.8.3" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" - (sources."prompt-1.2.2" // { + (sources."prompt-1.3.0" // { dependencies = [ - sources."async-0.9.2" + sources."async-3.2.3" ]; }) sources."psl-1.8.0" @@ -104003,7 +104107,7 @@ in }) sources."diagnostic-channel-publishers-0.4.4" sources."discontinuous-range-1.0.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" @@ -104090,11 +104194,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."selderee-0.6.0" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" sources."shimmer-1.2.1" sources."sigmund-1.0.1" sources."sshpk-1.17.0" @@ -104578,9 +104678,9 @@ in sources."resumer-0.0.0" sources."safer-buffer-2.1.2" sources."semaphore-async-await-1.5.1" - (sources."semver-7.3.6" // { + (sources."semver-7.3.7" // { dependencies = [ - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" ]; }) sources."seq-0.3.5" @@ -104600,7 +104700,7 @@ in sources."universalify-2.0.0" (sources."verda-1.5.0" // { dependencies = [ - sources."yargs-17.4.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" ]; }) @@ -104611,6 +104711,7 @@ in sources."wrap-ansi-7.0.0" sources."xpath-0.0.32" sources."y18n-5.0.8" + sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -104792,16 +104893,16 @@ in sources."@aws-sdk/abort-controller-3.55.0" sources."@aws-sdk/chunked-blob-reader-3.55.0" sources."@aws-sdk/chunked-blob-reader-native-3.58.0" - sources."@aws-sdk/client-s3-3.58.0" - sources."@aws-sdk/client-sso-3.58.0" - sources."@aws-sdk/client-sts-3.58.0" + sources."@aws-sdk/client-s3-3.67.0" + sources."@aws-sdk/client-sso-3.67.0" + sources."@aws-sdk/client-sts-3.67.0" sources."@aws-sdk/config-resolver-3.58.0" sources."@aws-sdk/credential-provider-env-3.55.0" sources."@aws-sdk/credential-provider-imds-3.58.0" - sources."@aws-sdk/credential-provider-ini-3.58.0" - sources."@aws-sdk/credential-provider-node-3.58.0" + sources."@aws-sdk/credential-provider-ini-3.67.0" + sources."@aws-sdk/credential-provider-node-3.67.0" sources."@aws-sdk/credential-provider-process-3.58.0" - sources."@aws-sdk/credential-provider-sso-3.58.0" + sources."@aws-sdk/credential-provider-sso-3.67.0" sources."@aws-sdk/credential-provider-web-identity-3.55.0" sources."@aws-sdk/eventstream-marshaller-3.58.0" sources."@aws-sdk/eventstream-serde-browser-3.58.0" @@ -104828,7 +104929,7 @@ in sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.58.0" + sources."@aws-sdk/middleware-sdk-s3-3.66.0" sources."@aws-sdk/middleware-sdk-sts-3.58.0" sources."@aws-sdk/middleware-serde-3.55.0" sources."@aws-sdk/middleware-signing-3.58.0" @@ -104841,10 +104942,11 @@ in sources."@aws-sdk/protocol-http-3.58.0" sources."@aws-sdk/querystring-builder-3.55.0" sources."@aws-sdk/querystring-parser-3.55.0" - sources."@aws-sdk/s3-request-presigner-3.58.0" + sources."@aws-sdk/s3-request-presigner-3.67.0" sources."@aws-sdk/service-error-classification-3.55.0" sources."@aws-sdk/shared-ini-file-loader-3.58.0" sources."@aws-sdk/signature-v4-3.58.0" + sources."@aws-sdk/signature-v4-multi-region-3.66.0" sources."@aws-sdk/smithy-client-3.55.0" sources."@aws-sdk/types-3.55.0" sources."@aws-sdk/url-parser-3.55.0" @@ -104873,6 +104975,7 @@ in sources."@aws-sdk/xml-builder-3.55.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" + sources."@gar/promisify-1.1.3" sources."@joplin/fork-htmlparser2-4.1.39" sources."@joplin/fork-sax-1.2.43" (sources."@joplin/htmlpack-2.6.1" // { @@ -104895,6 +104998,37 @@ in ]; }) sources."@joplin/turndown-plugin-gfm-1.0.43" + (sources."@mapbox/node-pre-gyp-1.0.9" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."are-we-there-yet-2.0.0" + sources."chownr-2.0.0" + sources."fs-minipass-2.1.0" + sources."gauge-3.0.2" + sources."is-fullwidth-code-point-3.0.0" + sources."minipass-3.1.6" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."node-fetch-2.6.7" + sources."npmlog-5.0.1" + sources."readable-stream-3.6.0" + sources."rimraf-3.0.2" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."tar-6.1.11" + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + ]; + }) + sources."@npmcli/fs-1.1.1" + (sources."@npmcli/move-file-1.1.2" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."rimraf-3.0.2" + ]; + }) + sources."@tootallnate/once-1.1.2" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -104904,6 +105038,17 @@ in ]; }) sources."acorn-walk-6.2.0" + (sources."agent-base-6.0.2" // { + dependencies = [ + sources."debug-4.3.4" + ]; + }) + (sources."agentkeepalive-4.2.1" // { + dependencies = [ + sources."debug-4.3.4" + ]; + }) + sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ @@ -104930,7 +105075,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1110.0" // { + (sources."aws-sdk-2.1113.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -104952,13 +105097,23 @@ in sources."readable-stream-3.6.0" ]; }) - sources."block-stream-0.0.9" sources."bowser-2.11.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" sources."buffer-4.9.2" sources."builtin-modules-3.2.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."mkdirp-1.0.4" + sources."rimraf-3.0.2" + sources."tar-6.1.11" + ]; + }) sources."camel-case-3.0.0" sources."camelcase-4.1.0" sources."caseless-0.12.0" @@ -104968,12 +105123,14 @@ in sources."chownr-1.1.4" sources."chroma-js-2.4.2" sources."clean-css-4.2.4" + sources."clean-stack-2.2.0" sources."cliss-0.0.2" sources."code-point-at-1.1.0" sources."color-3.1.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.9.0" + sources."color-support-1.1.3" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" sources."commander-2.17.1" @@ -104995,8 +105152,8 @@ in ]; }) sources."cwise-compiler-1.1.3" - sources."d3-7.4.3" - sources."d3-array-3.1.5" + sources."d3-7.4.4" + sources."d3-array-3.1.6" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" @@ -105083,7 +105240,7 @@ in sources."depd-1.1.2" sources."detect-libc-2.0.1" sources."diff-match-patch-1.0.5" - (sources."dom-serializer-1.3.2" // { + (sources."dom-serializer-1.4.1" // { dependencies = [ sources."domhandler-4.3.1" ]; @@ -105098,6 +105255,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -105114,6 +105272,8 @@ in }) sources."end-of-stream-1.4.4" sources."entities-2.2.0" + sources."env-paths-2.2.1" + sources."err-code-2.0.3" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.3" @@ -105149,7 +105309,6 @@ in sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."fstream-1.0.12" (sources."gauge-2.7.4" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -105170,15 +105329,26 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" - sources."highlight.js-11.5.0" + sources."highlight.js-11.5.1" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" + sources."http-cache-semantics-4.1.0" sources."http-errors-1.8.1" + (sources."http-proxy-agent-4.0.1" // { + dependencies = [ + sources."debug-4.3.4" + ]; + }) sources."http-signature-1.2.0" + (sources."https-proxy-agent-5.0.0" // { + dependencies = [ + sources."debug-4.3.4" + ]; + }) + sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" - sources."ignore-walk-3.0.4" (sources."image-data-uri-2.0.1" // { dependencies = [ sources."fs-extra-0.26.7" @@ -105188,6 +105358,9 @@ in sources."image-size-1.0.0" sources."image-type-3.1.0" sources."immer-7.0.15" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -105219,6 +105392,7 @@ in }) sources."internmap-2.0.3" sources."iota-array-1.0.0" + sources."ip-1.1.5" sources."ip-regex-2.1.0" sources."is-absolute-0.2.6" sources."is-arrayish-0.3.2" @@ -105228,6 +105402,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.3" + sources."is-lambda-1.0.1" sources."is-number-7.0.0" sources."is-relative-0.2.1" sources."is-stream-1.1.0" @@ -105280,8 +105455,18 @@ in sources."highlight.js-9.12.0" ]; }) - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."magicli-0.0.8" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."make-fetch-happen-9.1.0" // { + dependencies = [ + sources."minipass-3.1.6" + ]; + }) (sources."markdown-it-10.0.0" // { dependencies = [ sources."argparse-1.0.10" @@ -105311,24 +105496,50 @@ in sources."mimic-response-3.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-2.9.0" + (sources."minipass-2.9.0" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.1.6" + ]; + }) + (sources."minipass-fetch-1.4.1" // { + dependencies = [ + sources."minipass-3.1.6" + sources."minizlib-2.1.2" + ]; + }) + (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."minipass-sized-1.0.3" // { + dependencies = [ + sources."minipass-3.1.6" + ]; + }) sources."minizlib-1.3.3" sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" sources."moment-2.29.2" sources."moment-mini-2.24.0" - sources."ms-2.1.3" + sources."ms-2.1.2" sources."multiparty-4.2.3" sources."mustache-4.2.0" sources."nanoid-3.3.2" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - (sources."needle-2.9.1" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) + sources."negotiator-0.6.3" sources."nextgen-events-1.5.2" sources."no-case-2.3.2" sources."node-abi-3.8.0" @@ -105336,12 +105547,23 @@ in sources."node-bitmap-0.0.1" sources."node-emoji-1.11.0" sources."node-fetch-1.7.3" - (sources."node-gyp-3.8.0" // { + (sources."node-gyp-8.4.1" // { dependencies = [ - sources."nopt-3.0.6" - sources."semver-5.3.0" - sources."tar-2.2.2" - sources."which-1.3.1" + sources."ansi-regex-5.0.1" + sources."are-we-there-yet-3.0.0" + sources."chownr-2.0.0" + sources."fs-minipass-2.1.0" + sources."gauge-4.0.4" + sources."is-fullwidth-code-point-3.0.0" + sources."minipass-3.1.6" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."npmlog-6.0.1" + sources."readable-stream-3.6.0" + sources."rimraf-3.0.2" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."tar-6.1.11" ]; }) (sources."node-notifier-8.0.2" // { @@ -105350,18 +105572,9 @@ in ]; }) sources."node-persist-2.1.0" - (sources."node-pre-gyp-0.11.0" // { - dependencies = [ - sources."detect-libc-1.0.3" - sources."semver-5.7.1" - ]; - }) sources."node-rsa-1.1.1" - sources."nopt-4.0.3" + sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."nwsapi-2.2.0" @@ -105377,11 +105590,9 @@ in sources."once-1.4.0" sources."open-7.4.2" sources."optionator-0.8.3" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-limit-1.3.0" sources."p-locate-2.0.0" + sources."p-map-4.0.0" sources."p-try-1.0.0" sources."param-case-2.1.1" sources."parse5-5.1.0" @@ -105397,6 +105608,12 @@ in sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" + sources."promise-inflight-1.0.1" + (sources."promise-retry-2.0.1" // { + dependencies = [ + sources."retry-0.12.0" + ]; + }) sources."proper-lockfile-2.0.1" sources."psl-1.8.0" sources."pump-3.0.0" @@ -105444,7 +105661,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."saxes-3.1.11" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" @@ -105479,17 +105696,34 @@ in sources."is-fullwidth-code-point-2.0.0" ]; }) + sources."smart-buffer-4.2.0" + sources."socks-2.6.2" + (sources."socks-proxy-agent-6.1.1" // { + dependencies = [ + sources."debug-4.3.4" + ]; + }) sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - (sources."sqlite3-5.0.2" // { + (sources."sqlite3-5.0.3" // { dependencies = [ - sources."node-addon-api-3.2.1" + sources."chownr-2.0.0" + sources."fs-minipass-2.1.0" + sources."minipass-3.1.6" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."tar-6.1.11" ]; }) sources."sshpk-1.17.0" + (sources."ssri-8.0.1" // { + dependencies = [ + sources."minipass-3.1.6" + ]; + }) sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" @@ -105522,7 +105756,11 @@ in sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" - sources."tar-4.4.19" + (sources."tar-4.4.19" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ @@ -105565,6 +105803,8 @@ in sources."uid-safe-2.1.5" sources."unc-path-regex-0.1.2" sources."uniq-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" sources."universalify-2.0.0" sources."unorm-1.6.0" sources."unpack-string-0.0.2" @@ -105604,7 +105844,7 @@ in sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmlchars-2.2.0" - sources."yallist-3.1.1" + sources."yallist-4.0.0" sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; @@ -105620,10 +105860,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.2.tgz"; - sha512 = "H85kX95a53os+q1OCqtYe8AXAmgy3BvtysA/V83S3fdhznm6WlUpGi14DqSPbKFsL3dXZFXYl7YQwW9U1+76ng=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.3.tgz"; + sha512 = "f1ra8PHtOEu/70EBnmiUlV8nJePS58y9qKjl4JHfYWlFH6bo7ogZBz//FAZp7jDuXtYnGYKymZPlrg2I/9Zo4g=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -105704,8 +105944,8 @@ in sources."linkify-it-3.0.3" sources."lodash-4.17.21" sources."markdown-it-12.3.2" - sources."markdown-it-anchor-8.5.0" - sources."marked-4.0.12" + sources."markdown-it-anchor-8.6.2" + sources."marked-4.0.14" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" @@ -105797,10 +106037,10 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.3.tgz"; - sha512 = "VBvNBt3cIrCBHa3gYbVsCFUEReqWZPf+Biq1ZtFdIiQ6rytRLDp3qvtrGv7z/iZDd1D4vXWpW7Nx1nP8muLzkg=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.4.tgz"; + sha512 = "FJ2P+ShDbzu9epF+kCKgoSUhPIUW7Ta7A4XlIT0L5LzgaR/z1TBF1mm0XhRGj8RlA3Xm0j+c/FsWOHDtuoYejA=="; }; dependencies = [ sources."cli-color-2.0.2" @@ -106032,7 +106272,7 @@ in sources."lodash-id-0.14.1" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -106094,7 +106334,7 @@ in sources."responselike-1.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."semver-compare-1.0.0" (sources."semver-diff-3.1.1" // { dependencies = [ @@ -106139,7 +106379,8 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" - sources."yargs-17.4.0" + sources."yallist-4.0.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; @@ -106918,7 +107159,7 @@ in sources."jsonfile-4.0.0" sources."locate-path-3.0.0" sources."lodash-4.17.21" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -106967,7 +107208,7 @@ in ]; }) sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" @@ -106993,6 +107234,7 @@ in sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" sources."write-file-atomic-3.0.3" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -107028,10 +107270,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.3.17"; + version = "6.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz"; - sha512 = "2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.18.tgz"; + sha512 = "YEwXVHRILKWKN7uEW9IkgTPjnYGb3YA3MDvlp04xpSRAyrNPoRmsBayLDgHykKAwBm6/mAOckj4xi/1JdQfhzQ=="; }; dependencies = [ sources."@colors/colors-1.5.0" @@ -107337,7 +107579,7 @@ in sources."buffer-from-1.1.2" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."chalk-2.4.2" sources."chardet-1.4.0" sources."chownr-1.1.4" @@ -107405,12 +107647,12 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -107558,7 +107800,7 @@ in sources."levn-0.3.0" sources."locate-path-3.0.0" sources."lodash-4.17.21" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."ltx-3.0.0" sources."make-dir-2.1.0" sources."md5.js-1.3.5" @@ -107583,7 +107825,7 @@ in sources."node-abi-2.30.1" sources."node-environment-flags-1.0.6" sources."node-fetch-2.6.7" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."nwsapi-2.2.0" @@ -107632,7 +107874,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."supports-color-7.2.0" ]; }) @@ -107768,6 +108010,7 @@ in sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" + sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" @@ -108661,7 +108904,7 @@ in sources."envinfo-7.8.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -109023,11 +109266,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" sources."set-blocking-2.0.0" sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" @@ -109084,7 +109323,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.3" + sources."uglify-js-3.15.4" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -110397,7 +110636,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.30001325" + sources."caniuse-lite-1.0.30001331" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -110520,7 +110759,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110818,7 +111057,7 @@ in sources."util-0.11.1" ]; }) - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -111625,7 +111864,7 @@ in sources."link-check-5.1.0" sources."lodash-4.17.21" sources."markdown-link-extractor-2.0.1" - sources."marked-4.0.12" + sources."marked-4.0.14" sources."ms-2.1.3" sources."needle-3.1.0" sources."progress-2.0.3" @@ -112126,7 +112365,7 @@ in dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@types/node-17.0.23" - sources."@types/yauzl-2.9.2" + sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" @@ -112142,8 +112381,8 @@ in sources."commander-9.1.0" sources."concat-map-0.0.1" sources."cross-fetch-3.1.5" - sources."d3-7.4.3" - sources."d3-array-3.1.5" + sources."d3-7.4.4" + sources."d3-array-3.1.6" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" @@ -112567,11 +112806,11 @@ in sources."@jest/environment-27.5.1" sources."@jest/fake-timers-27.5.1" sources."@jest/types-27.5.1" - sources."@ledgerhq/devices-6.24.1" + sources."@ledgerhq/devices-6.27.1" sources."@ledgerhq/errors-6.10.0" - sources."@ledgerhq/hw-transport-6.24.1" - sources."@ledgerhq/hw-transport-node-hid-6.24.1" - sources."@ledgerhq/hw-transport-node-hid-noevents-6.24.1" + sources."@ledgerhq/hw-transport-6.27.1" + sources."@ledgerhq/hw-transport-node-hid-6.27.1" + sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.1" (sources."@ledgerhq/hw-transport-u2f-5.36.0-deprecated" // { dependencies = [ sources."@ledgerhq/devices-5.51.1" @@ -112751,7 +112990,7 @@ in sources."latest-version-5.1.0" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -112825,7 +113064,7 @@ in sources."ripemd160-2.0.2" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" - sources."semver-7.3.6" + sources."semver-7.3.7" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -112895,6 +113134,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" + sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -112927,20 +113167,20 @@ in sources."color-string-1.9.0" sources."colorspace-1.1.4" sources."enabled-2.0.0" - sources."fecha-4.2.1" + sources."fecha-4.2.2" sources."fn.name-1.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" sources."logform-2.4.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."ms-2.1.3" sources."one-time-1.0.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."string_decoder-1.3.0" @@ -112949,6 +113189,7 @@ in sources."util-deprecate-1.0.2" sources."winston-3.3.3" sources."winston-transport-4.5.0" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -113037,7 +113278,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-7.8.1" sources."make-fetch-happen-10.1.2" sources."minimatch-3.1.2" sources."minipass-3.1.6" @@ -113062,7 +113303,11 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + (sources."semver-7.3.7" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" @@ -113639,7 +113884,7 @@ in sources."destroy-1.0.4" sources."detect-libc-2.0.1" sources."dicer-0.2.5" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" @@ -113981,7 +114226,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.2" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" @@ -114042,7 +114287,7 @@ in sources."rimraf-2.2.8" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."slasp-0.0.4" @@ -114184,7 +114429,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -114238,7 +114483,7 @@ in sources."unique-string-2.0.0" (sources."update-notifier-5.1.0" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."url-parse-lax-3.0.0" @@ -114247,6 +114492,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -114713,11 +114959,7 @@ in sources."rxjs-6.6.7" sources."safer-buffer-2.1.2" sources."scoped-regex-2.1.0" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -114812,10 +115054,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "12.5.8"; + version = "12.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.8.tgz"; - sha512 = "8SDZ6qYXI0aKf63zSbByqB9QmK8ygrZ+UVcXg9kGQyvH7dGIcFauFF0ksC0NdThHkU/5QhowJVSHXva9zujkJg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.9.tgz"; + sha512 = "l9iOvD7EsQb96gFJL45V01YG6bP8+dmobYnSguvehPuNwgdWNMrE8RC8bSfURX5iUmX4bkobN4T8XMHXN9GMHA=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -114974,7 +115216,7 @@ in sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-7.8.1" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -115051,7 +115293,11 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + (sources."semver-7.3.7" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -115669,7 +115915,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -115806,7 +116052,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.106" + sources."electron-to-chromium-1.4.107" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -115816,7 +116062,7 @@ in sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.19.2" // { + (sources."es-abstract-1.19.4" // { dependencies = [ sources."object-inspect-1.12.0" ]; @@ -115922,7 +116168,7 @@ in }) (sources."htmlparser2-6.1.0" // { dependencies = [ - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domutils-2.8.0" ]; @@ -116074,7 +116320,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -116466,15 +116712,15 @@ in sources."@parcel/compressor-raw-2.4.1" sources."@parcel/config-default-2.4.1" sources."@parcel/core-2.4.1" - sources."@parcel/css-1.8.0" - sources."@parcel/css-darwin-arm64-1.8.0" - sources."@parcel/css-darwin-x64-1.8.0" - sources."@parcel/css-linux-arm-gnueabihf-1.8.0" - sources."@parcel/css-linux-arm64-gnu-1.8.0" - sources."@parcel/css-linux-arm64-musl-1.8.0" - sources."@parcel/css-linux-x64-gnu-1.8.0" - sources."@parcel/css-linux-x64-musl-1.8.0" - sources."@parcel/css-win32-x64-msvc-1.8.0" + sources."@parcel/css-1.8.1" + sources."@parcel/css-darwin-arm64-1.8.1" + sources."@parcel/css-darwin-x64-1.8.1" + sources."@parcel/css-linux-arm-gnueabihf-1.8.1" + sources."@parcel/css-linux-arm64-gnu-1.8.1" + sources."@parcel/css-linux-arm64-musl-1.8.1" + sources."@parcel/css-linux-x64-gnu-1.8.1" + sources."@parcel/css-linux-x64-musl-1.8.1" + sources."@parcel/css-win32-x64-msvc-1.8.1" sources."@parcel/diagnostic-2.4.1" sources."@parcel/events-2.4.1" sources."@parcel/fs-2.4.1" @@ -116543,7 +116789,7 @@ in sources."browserslist-4.20.2" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -116564,7 +116810,7 @@ in sources."css-what-6.1.0" sources."csso-4.2.0" sources."detect-libc-1.0.3" - (sources."dom-serializer-1.3.2" // { + (sources."dom-serializer-1.4.1" // { dependencies = [ sources."entities-2.2.0" ]; @@ -116574,7 +116820,7 @@ in sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -116595,7 +116841,7 @@ in sources."lmdb-2.2.4" sources."mdn-data-2.0.14" sources."msgpackr-1.5.5" - sources."msgpackr-extract-1.1.3" + sources."msgpackr-extract-1.1.4" sources."msgpackr-extract-darwin-arm64-1.1.0" sources."msgpackr-extract-darwin-x64-1.1.0" sources."msgpackr-extract-linux-arm-1.1.0" @@ -116605,11 +116851,11 @@ in sources."nan-2.15.0" sources."node-addon-api-3.2.1" sources."node-gyp-build-4.4.0" - sources."node-gyp-build-optional-packages-4.3.1" - sources."node-releases-2.0.2" + sources."node-gyp-build-optional-packages-4.3.2" + sources."node-releases-2.0.3" sources."nth-check-2.0.1" sources."nullthrows-1.1.1" - sources."ordered-binary-1.2.4" + sources."ordered-binary-1.2.5" sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."path-type-4.0.0" @@ -116808,7 +117054,7 @@ in sources."lodash-4.17.21" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."media-typer-0.3.0" sources."mediawiki-title-0.6.5" sources."merge-descriptors-1.0.1" @@ -116888,7 +117134,7 @@ in sources."serve-static-1.14.2" (sources."service-runner-2.9.0" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" sources."yargs-14.2.3" ]; }) @@ -116909,7 +117155,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.15.3" + sources."uglify-js-3.15.4" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -116931,6 +117177,7 @@ in sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" sources."y18n-4.0.3" + sources."yallist-4.0.0" (sources."yargs-13.3.2" // { dependencies = [ sources."yargs-parser-13.1.2" @@ -117246,7 +117493,7 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.7" sources."redent-1.0.0" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."repeating-2.0.1" sources."resolve-1.22.0" sources."restore-cursor-2.0.0" @@ -117839,7 +118086,7 @@ in sources."isarray-1.0.0" sources."jsonfile-6.1.0" sources."levn-0.3.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-response-2.1.0" @@ -117881,7 +118128,7 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" @@ -117916,6 +118163,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" + sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -118115,9 +118363,10 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - (sources."semver-7.3.6" // { + (sources."semver-7.3.7" // { dependencies = [ - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" ]; }) sources."setprototypeof-1.2.0" @@ -118169,10 +118418,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.32.4"; + version = "6.32.6"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.4.tgz"; - sha512 = "rOG+VpOzs6g/MR5HWc8KTlLAx3ljdRJCMQwSg1DE/hzAaqF/Y2zIHH0u6dZw/XnRb9w1U8rOs9MJT9jMt7e+Qw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.6.tgz"; + sha512 = "ucrdCw3F/qjjzoR9+UtLXH1jkDqsbinz+hzSz54WQOOPt/F+9uxm8irrO/mdGkmsy844kAX6vsfS85gZLTg+yA=="; }; buildInputs = globalBuildInputs; meta = { @@ -118304,7 +118553,7 @@ in sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yaml-1.10.2" - sources."yargs-17.4.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; @@ -118355,7 +118604,7 @@ in sources."ini-1.3.8" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."mimic-response-3.1.0" sources."minimist-1.2.6" sources."mkdirp-classic-0.5.3" @@ -118370,7 +118619,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" @@ -118389,6 +118638,7 @@ in sources."util-deprecate-1.0.2" sources."wide-align-1.1.5" sources."wrappy-1.0.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -119010,10 +119260,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.235"; + version = "1.1.237"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.235.tgz"; - sha512 = "eW40mxHo8WE7WHoBzFfyrH0lQ9nP5rTM5XKvkBgaYjhVafh4MmQeaEm8LmYGN2vUq2//YFLVprvA+U6u+v9i3g=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.237.tgz"; + sha512 = "CU3YsC0+NFtj0TO7wDLTDqNEvnrBuz8foavK7/kgKLhBbF50m6xksrRb61SSDzFYn5+1oWEKNvmzDVCktp39Vg=="; }; buildInputs = globalBuildInputs; meta = { @@ -119276,7 +119526,7 @@ in sources."cycle-1.0.3" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -119329,7 +119579,7 @@ in sources."pkginfo-0.4.1" sources."prompt-0.2.14" sources."read-1.0.7" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."semver-5.7.1" @@ -119702,7 +119952,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -119932,7 +120182,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -119963,7 +120213,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -120162,7 +120412,7 @@ in }) (sources."htmlparser2-6.1.0" // { dependencies = [ - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domutils-2.8.0" ]; @@ -120368,7 +120618,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -120653,7 +120903,7 @@ in sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."regexpu-core-5.0.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -120670,7 +120920,7 @@ in sources."ansi-regex-2.1.1" sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domutils-2.8.0" sources."nth-check-2.0.1" @@ -121288,7 +121538,7 @@ in sources."xml-name-validator-4.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-17.4.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; @@ -121335,7 +121585,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.93" + sources."@redocly/openapi-core-1.0.0-beta.94" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.11" sources."@types/node-14.18.12" @@ -121472,7 +121722,7 @@ in sources."loose-envify-1.4.0" sources."lunr-2.3.9" sources."mark.js-8.11.1" - sources."marked-4.0.12" + sources."marked-4.0.14" sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { dependencies = [ @@ -121578,7 +121828,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.3" + sources."uglify-js-3.15.4" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -121611,7 +121861,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - sources."yargs-17.4.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; @@ -121932,7 +122182,7 @@ in sources."livereload-js-3.3.3" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -122002,7 +122252,7 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -122060,6 +122310,7 @@ in sources."write-file-atomic-3.0.3" sources."ws-7.5.7" sources."xdg-basedir-4.0.0" + sources."yallist-4.0.0" sources."yaml-front-matter-4.1.1" sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" @@ -122143,14 +122394,14 @@ in sources."@types/json-schema-7.0.11" sources."@types/node-14.17.34" sources."@types/vscode-1.63.2" - sources."@typescript-eslint/eslint-plugin-5.18.0" - sources."@typescript-eslint/parser-5.18.0" - sources."@typescript-eslint/scope-manager-5.18.0" - sources."@typescript-eslint/type-utils-5.18.0" - sources."@typescript-eslint/types-5.18.0" - sources."@typescript-eslint/typescript-estree-5.18.0" - sources."@typescript-eslint/utils-5.18.0" - sources."@typescript-eslint/visitor-keys-5.18.0" + sources."@typescript-eslint/eslint-plugin-5.19.0" + sources."@typescript-eslint/parser-5.19.0" + sources."@typescript-eslint/scope-manager-5.19.0" + sources."@typescript-eslint/type-utils-5.19.0" + sources."@typescript-eslint/types-5.19.0" + sources."@typescript-eslint/typescript-estree-5.19.0" + sources."@typescript-eslint/utils-5.19.0" + sources."@typescript-eslint/visitor-keys-5.19.0" sources."@vscode/test-electron-2.1.3" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -122199,8 +122450,8 @@ in sources."cross-spawn-7.0.3" sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."d3-7.4.3" - sources."d3-array-3.1.5" + sources."d3-7.4.4" + sources."d3-array-3.1.6" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" @@ -122215,7 +122466,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.0.1" - (sources."d3-graphviz-4.1.0" // { + (sources."d3-graphviz-4.1.1" // { dependencies = [ sources."d3-color-2.0.0" sources."d3-dispatch-2.0.0" @@ -122254,7 +122505,7 @@ in sources."detect-libc-2.0.1" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" @@ -122264,6 +122515,7 @@ in sources."commander-2.20.3" sources."lru-cache-4.1.5" sources."semver-5.7.1" + sources."yallist-2.1.2" ]; }) sources."emoji-regex-8.0.0" @@ -122271,7 +122523,7 @@ in sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.12.0" // { + (sources."eslint-8.13.0" // { dependencies = [ sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" @@ -122338,12 +122590,7 @@ in sources."has-flag-4.0.0" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" - (sources."hosted-git-info-4.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) + sources."hosted-git-info-4.1.0" sources."htmlparser2-6.1.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" @@ -122371,7 +122618,7 @@ in sources."linkify-it-3.0.3" sources."listenercount-1.0.1" sources."lodash.merge-4.6.2" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."markdown-it-12.3.2" // { dependencies = [ sources."entities-2.1.0" @@ -122438,7 +122685,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" @@ -122509,8 +122756,8 @@ in sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" - sources."yallist-2.1.2" - sources."yargs-17.4.0" + sources."yallist-4.0.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" sources."yazl-2.5.1" @@ -122689,13 +122936,14 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz"; - sha512 = "HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; dependencies = [ - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -122831,10 +123079,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.12.0.tgz"; - sha512 = "CKpJGnKYxfxCYw0IojoidfZiueOl0bhbzTcRcHDVDPJLi3DYMQ+o6EwWtF7m36Nkw6FXT36Wot7pmljHoXYrQQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.13.0.tgz"; + sha512 = "IICXx9c2jAZzE+tPiO5E/DZ6J7Lglhg8PkeeYbYNozNtlzPl9rNUoeSyKkWVrZtt7DG+iQZtBaJtu8e/Y2vB2w=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -122889,7 +123137,7 @@ in sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1110.0" // { + (sources."aws-sdk-2.1113.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -123144,7 +123392,7 @@ in sources."log-node-8.0.3" sources."log-symbols-4.1.0" sources."lowercase-keys-2.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -123229,13 +123477,13 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."set-immediate-shim-1.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.5.0" + sources."simple-git-3.6.0" sources."slash-3.0.0" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" @@ -123954,10 +124202,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.898.0"; + version = "1.905.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.898.0.tgz"; - sha512 = "FwBO3h3RFJuUVtH8zs6xyca6SsFmp+qDHkOubak6hhsL1SIp2t9Rvpjv8S6+S6S3hktK3KVecKlYhFdmVAK5CA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.905.0.tgz"; + sha512 = "VAUwhWBeWONI/a2ky0ONMizr74zCmEJuMej5zV8XgmowONj6KwQotm0k7kfs3l1ZH5RKHBMWREA65TulcGGObA=="; }; buildInputs = globalBuildInputs; meta = { @@ -124120,11 +124368,7 @@ in sources."round-to-6.0.0" sources."safe-buffer-5.2.1" sources."sax-1.2.4" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" sources."signal-exit-3.0.7" (sources."slice-ansi-5.0.0" // { dependencies = [ @@ -124363,7 +124607,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -124852,7 +125096,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."relative-url-1.0.2" (sources."remark-3.2.3" // { dependencies = [ @@ -125052,7 +125296,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tape-4.15.0" // { + (sources."tape-4.15.1" // { dependencies = [ sources."glob-7.2.0" ]; @@ -125221,7 +125465,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1110.0" // { + (sources."aws-sdk-2.1113.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -126181,11 +126425,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -126379,10 +126619,10 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.5.0.tgz"; - sha512 = "/laO032JQ1TpmYHgaaLndHNPeWW3VSL3liMB97sA9fYTEzlIy3jIo4Rgr7EzjNvieiNWG73C5voOAeNHlrwbpg=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.6.0.tgz"; + sha512 = "POL3IqLUuGqb9DdvuXQaSTNXYnw/odK4hqW86+2LwGcZTdbUPKBBln7pq74wXmcnRE+12bXMY1CvbcUNa2d5nw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -126461,10 +126701,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.24"; + version = "0.14.25"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.24.tgz"; - sha512 = "SwRYWCSA9hb6W5VX7zO7CF9+Va31boaei69mq3Z2HatxPZ9FRh1gebCuYZOfHdSKtSgc3BK9uCmyoaLRjUUHIg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.25.tgz"; + sha512 = "IdQP7sSFH0UgtFhpFu29GfWPR8obahr/k3ntXsW4AlGxplsnDTd7cLkmtkoNZe+gcXV9ixvcBi7LzR+FY3Nssg=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.3" @@ -126520,7 +126760,7 @@ in sources."path-is-absolute-1.0.1" sources."picomatch-2.3.1" sources."prettier-2.5.1" - sources."prettier-plugin-svelte-2.6.0" + sources."prettier-plugin-svelte-2.7.0" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reusify-1.0.4" @@ -126531,9 +126771,9 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" - sources."svelte-3.46.6" + sources."svelte-3.47.0" sources."svelte-preprocess-4.10.5" - sources."svelte2tsx-0.5.7" + sources."svelte2tsx-0.5.8" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" sources."typescript-4.6.3" @@ -126588,7 +126828,7 @@ in sources."css-tree-1.1.3" sources."css-what-6.1.0" sources."csso-4.2.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" @@ -127199,7 +127439,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.3" + sources."uglify-js-3.15.4" sources."undefsafe-2.0.5" (sources."union-value-1.0.1" // { dependencies = [ @@ -127259,54 +127499,34 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.0.23"; + version = "3.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.23.tgz"; - sha512 = "+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz"; + sha512 = "H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.9" // { - 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."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/parse-json-4.0.0" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."arg-5.0.1" sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."callsites-3.1.0" sources."camelcase-css-2.0.1" - sources."chalk-4.1.2" (sources."chokidar-3.5.3" // { dependencies = [ sources."glob-parent-5.1.2" ]; }) - sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."cosmiconfig-7.0.1" sources."cssesc-3.0.0" sources."defined-1.0.0" sources."detective-5.2.0" sources."didyoumean-1.2.2" sources."dlv-1.1.3" - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" (sources."fast-glob-3.2.11" // { dependencies = [ sources."glob-parent-5.1.2" @@ -127318,28 +127538,19 @@ in sources."function-bind-1.1.1" sources."glob-parent-6.0.2" sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."import-fresh-3.3.0" - sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.1" sources."lilconfig-2.0.5" - sources."lines-and-columns-1.2.4" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimist-1.2.6" sources."nanoid-3.3.2" sources."normalize-path-3.0.0" - sources."object-hash-2.2.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" + sources."object-hash-3.0.0" sources."path-parse-1.0.7" - sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."postcss-8.4.12" @@ -127352,11 +127563,9 @@ in sources."quick-lru-5.1.1" sources."readdirp-3.6.0" sources."resolve-1.22.0" - sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" - sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."to-regex-range-5.0.1" sources."util-deprecate-1.0.2" @@ -127766,7 +127975,7 @@ in sources."strip-bom-3.0.0" ]; }) - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."remark-footnotes-3.0.0" sources."remark-frontmatter-3.0.0" sources."remark-gfm-1.0.0" @@ -127858,7 +128067,7 @@ in sources."has-symbols-1.0.3" sources."match-index-1.0.3" sources."object-keys-1.1.1" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" ]; buildInputs = globalBuildInputs; meta = { @@ -128457,13 +128666,14 @@ in sha512 = "47yQZ14SbNfyBGKcSV/89eXwxLlGIwj8WzbKk1jvDh/uPy59skVfFbWoF4tUn09mYnRyVldMsdqB0llYgQMLUA=="; }; dependencies = [ - sources."array.prototype.find-2.1.2" + sources."array.prototype.find-2.2.0" sources."call-bind-1.0.2" sources."check-ends-with-period-1.0.1" sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" + sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" @@ -128573,7 +128783,7 @@ in sources."array-includes-3.1.4" sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" @@ -128652,13 +128862,16 @@ in thelounge = nodeEnv.buildNodePackage { name = "thelounge"; packageName = "thelounge"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge/-/thelounge-4.3.0.tgz"; - sha512 = "dkVdH21q9vipV7UU10qQQprPuP8rG+IDJSHUtmOC0WDYvwYTiUC9IYLIpkyWdgfwFYegDTnnR4duHNZynqOXTA=="; + url = "https://registry.npmjs.org/thelounge/-/thelounge-4.3.1.tgz"; + sha512 = "sWitbCj5+Jr+HY8nN2VE01OVeZSaTGyQK76whBgt2LyBih57yQBjZYR3BshPBiUgGb/GMbI+j112myKU9YUh/g=="; }; dependencies = [ + sources."@fastify/busboy-1.0.0" + sources."@mapbox/node-pre-gyp-1.0.9" sources."@sindresorhus/is-4.6.0" + sources."@socket.io/base64-arraybuffer-1.0.2" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -128672,79 +128885,59 @@ in sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - (sources."accepts-1.3.8" // { - dependencies = [ - sources."mime-types-2.1.35" - ]; - }) + sources."accepts-1.3.8" (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."ajv-6.12.6" - sources."ansi-regex-2.1.1" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.7" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."aproba-2.0.0" + sources."are-we-there-yet-2.0.0" sources."array-flatten-1.1.1" sources."asn1-0.2.6" sources."asn1.js-5.4.1" sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."backoff-2.5.0" sources."balanced-match-1.0.2" - sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" sources."base64id-2.0.0" - sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."block-stream-0.0.9" sources."bn.js-4.12.0" - sources."body-parser-1.19.0" + sources."body-parser-1.19.2" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" - sources."busboy-0.3.1" - sources."bytes-3.1.0" + sources."bytes-3.1.2" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."call-bind-1.0.2" - sources."caseless-0.12.0" sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."clone-response-1.0.2" - sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."commander-7.2.0" + sources."color-support-1.1.3" + sources."commander-9.0.0" sources."component-emitter-1.3.0" sources."compress-brotli-1.3.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.3" + sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.0" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-js-3.21.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."dashdash-1.14.1" sources."debug-2.6.9" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -128754,67 +128947,53 @@ in sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" sources."define-properties-1.1.3" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."detect-libc-1.0.3" - sources."dicer-0.3.0" - sources."dom-serializer-1.3.2" + sources."detect-libc-2.0.1" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - sources."duplexer3-0.1.4" - sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-4.1.2" // { + (sources."engine.io-6.1.3" // { dependencies = [ - sources."cookie-0.4.2" sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."engine.io-parser-4.0.3" + sources."engine.io-parser-5.0.3" sources."entities-2.2.0" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."eventemitter3-4.0.7" - sources."express-4.17.1" - sources."extend-3.0.2" + sources."express-4.17.3" sources."extsprintf-1.4.1" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."fast-text-encoding-1.0.3" - sources."file-type-16.2.0" + sources."file-type-16.5.3" sources."filename-reserved-regex-2.0.0" - sources."filenamify-4.2.0" + sources."filenamify-4.3.0" sources."finalhandler-1.1.2" sources."foreach-2.0.5" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."fstream-1.0.12" sources."function-bind-1.1.1" - sources."gauge-2.7.4" + sources."gauge-3.0.2" sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."get-symbol-description-1.0.0" - sources."getpass-0.1.7" sources."glob-7.2.0" - sources."got-11.8.2" - sources."graceful-fs-4.2.10" + sources."got-11.8.3" sources."grapheme-splitter-1.0.4" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" @@ -128823,8 +129002,7 @@ in sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.7.2" - sources."http-signature-1.2.0" + sources."http-errors-1.8.1" sources."http2-wrapper-1.0.3" sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { @@ -128835,14 +129013,13 @@ in }) sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.4" sources."inflight-1.0.6" - sources."inherits-2.0.3" + sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."ipaddr.js-1.9.1" - (sources."irc-framework-4.11.0" // { + (sources."irc-framework-4.12.1" // { dependencies = [ sources."iconv-lite-0.6.3" ]; @@ -128852,7 +129029,7 @@ in sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" sources."is-negative-zero-2.0.2" sources."is-number-object-1.0.7" @@ -128861,24 +129038,10 @@ in sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.8" - sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-weakref-1.0.2" - sources."isarray-1.0.0" - sources."isexe-2.0.0" sources."isomorphic-textencoder-1.0.1" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" sources."json-buffer-3.0.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - (sources."jsprim-1.4.2" // { - dependencies = [ - sources."extsprintf-1.3.0" - sources."verror-1.10.0" - ]; - }) sources."jwa-2.0.0" sources."jws-4.0.0" sources."keyv-4.2.2" @@ -128888,114 +129051,59 @@ in sources."lodash-4.17.21" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.52.0" - (sources."mime-types-2.1.33" // { - dependencies = [ - sources."mime-db-1.50.0" - ]; - }) + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) - sources."minizlib-1.3.3" - sources."mkdirp-0.5.6" + sources."minipass-3.1.6" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" - (sources."needle-2.9.1" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) sources."negotiator-0.6.3" - sources."node-addon-api-3.2.1" - sources."node-forge-0.10.0" - (sources."node-gyp-3.8.0" // { - dependencies = [ - sources."nopt-3.0.6" - sources."semver-5.3.0" - sources."tar-2.2.2" - ]; - }) - (sources."node-pre-gyp-0.11.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."nopt-4.0.3" + sources."node-addon-api-4.3.0" + sources."node-fetch-2.6.7" + sources."node-forge-1.3.0" + sources."nopt-5.0.0" sources."normalize-url-6.1.0" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" - sources."npmlog-4.1.2" + sources."npmlog-5.0.1" sources."nth-check-2.0.1" - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-try-2.2.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."decompress-response-3.3.0" - sources."defer-to-connect-1.1.3" - sources."get-stream-4.1.0" - sources."got-9.6.0" - sources."json-buffer-3.0.0" - sources."keyv-3.1.0" - sources."lowercase-keys-1.0.1" - sources."normalize-url-4.5.1" - sources."p-cancelable-1.1.0" - sources."responselike-1.0.2" - sources."semver-6.3.0" - ]; - }) + sources."package-json-7.0.0" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."peek-readable-4.1.0" - sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" - sources."prepend-http-2.0.0" - sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.7.0" + sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" - sources."raw-body-2.4.0" + sources."raw-body-2.4.3" sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" @@ -129004,37 +129112,30 @@ in sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.3" - sources."uuid-3.4.0" - ]; - }) sources."resolve-alpn-1.2.1" sources."responselike-2.0.0" - sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" + sources."rimraf-3.0.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" sources."semver-7.3.5" - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) - sources."serve-static-1.14.1" + sources."serve-static-1.14.2" sources."set-blocking-2.0.0" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - (sources."socket.io-3.1.2" // { + (sources."socket.io-4.4.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.1.0" + sources."socket.io-adapter-2.3.3" (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.4" @@ -129042,55 +129143,31 @@ in ]; }) sources."socks-2.6.2" - sources."sqlite3-5.0.2" - sources."sshpk-1.17.0" + sources."sqlite3-git+https://github.com/mapbox/node-sqlite3.git#918052b538b0effe6c4a44c74a16b2749c08a0d2" sources."statuses-1.5.0" - (sources."stream-browserify-3.0.0" // { - dependencies = [ - sources."inherits-2.0.4" - ]; - }) - sources."streamsearch-0.1.2" - sources."string-width-1.0.2" + sources."stream-browserify-3.0.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.3.0" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."strip-ansi-3.0.1" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" sources."strtok3-6.3.0" sources."supports-color-7.2.0" - (sources."tar-4.4.19" // { - dependencies = [ - sources."safe-buffer-5.2.1" - sources."yallist-3.1.1" - ]; - }) - sources."tlds-1.216.0" - sources."to-readable-stream-1.0.0" - sources."toidentifier-1.0.0" - (sources."token-types-2.1.1" // { - dependencies = [ - sources."@tokenizer/token-0.1.1" - ]; - }) - sources."tough-cookie-2.5.0" + sources."tar-6.1.11" + sources."text-decoding-1.0.0" + sources."tlds-1.228.0" + sources."toidentifier-1.0.1" + sources."token-types-4.2.0" + sources."tr46-0.0.3" sources."trim-repeated-1.0.0" sources."tslib-2.3.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typedarray-to-buffer-3.1.5" - sources."ua-parser-js-0.7.30" + sources."ua-parser-js-1.0.2" sources."uc.micro-1.0.6" sources."unbox-primitive-1.0.1" sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."url-parse-lax-3.0.0" sources."urlsafe-base64-1.0.0" sources."util-0.12.4" sources."util-deprecate-1.0.2" @@ -129104,15 +129181,16 @@ in }) sources."verror-1.10.1" sources."web-push-3.4.5" - sources."which-1.3.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-boxed-primitive-1.0.2" sources."which-typed-array-1.1.7" sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.4.6" + sources."ws-8.2.3" sources."yallist-4.0.0" - sources."yarn-1.22.10" + sources."yarn-1.22.17" ]; buildInputs = globalBuildInputs; meta = { @@ -129133,7 +129211,10 @@ in sha512 = "o24rZwvzeMbbvuara2bGaX6eHw925aQw1BZhl7VHtY6xlWrJ9Sy7P29/Q2GQNIP4Otzcf09TX29zTBbRjKbrSA=="; }; dependencies = [ + sources."@fastify/busboy-1.0.0" + sources."@mapbox/node-pre-gyp-1.0.9" sources."@sindresorhus/is-4.6.0" + sources."@socket.io/base64-arraybuffer-1.0.2" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -129147,79 +129228,59 @@ in sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - (sources."accepts-1.3.8" // { - dependencies = [ - sources."mime-types-2.1.35" - ]; - }) + sources."accepts-1.3.8" (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."ajv-6.12.6" - sources."ansi-regex-2.1.1" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.7" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."aproba-2.0.0" + sources."are-we-there-yet-2.0.0" sources."array-flatten-1.1.1" sources."asn1-0.2.6" sources."asn1.js-5.4.1" sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."backoff-2.5.0" sources."balanced-match-1.0.2" - sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" sources."base64id-2.0.0" - sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."block-stream-0.0.9" sources."bn.js-4.12.0" - sources."body-parser-1.19.0" + sources."body-parser-1.19.2" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" - sources."busboy-0.3.1" - sources."bytes-3.1.0" + sources."bytes-3.1.2" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."call-bind-1.0.2" - sources."caseless-0.12.0" sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."clone-response-1.0.2" - sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."commander-7.2.0" + sources."color-support-1.1.3" + sources."commander-9.0.0" sources."component-emitter-1.3.0" sources."compress-brotli-1.3.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.3" + sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.0" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-js-3.21.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."dashdash-1.14.1" sources."debug-2.6.9" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -129229,67 +129290,53 @@ in sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" sources."define-properties-1.1.3" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."detect-libc-1.0.3" - sources."dicer-0.3.0" - sources."dom-serializer-1.3.2" + sources."detect-libc-2.0.1" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - sources."duplexer3-0.1.4" - sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-4.1.2" // { + (sources."engine.io-6.1.3" // { dependencies = [ - sources."cookie-0.4.2" sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."engine.io-parser-4.0.3" + sources."engine.io-parser-5.0.3" sources."entities-2.2.0" - sources."es-abstract-1.19.2" + sources."es-abstract-1.19.4" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."eventemitter3-4.0.7" - sources."express-4.17.1" - sources."extend-3.0.2" + sources."express-4.17.3" sources."extsprintf-1.4.1" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."fast-text-encoding-1.0.3" - sources."file-type-16.2.0" + sources."file-type-16.5.3" sources."filename-reserved-regex-2.0.0" - sources."filenamify-4.2.0" + sources."filenamify-4.3.0" sources."finalhandler-1.1.2" sources."foreach-2.0.5" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."fstream-1.0.12" sources."function-bind-1.1.1" - sources."gauge-2.7.4" + sources."gauge-3.0.2" sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."get-symbol-description-1.0.0" - sources."getpass-0.1.7" sources."glob-7.2.0" - sources."got-11.8.2" - sources."graceful-fs-4.2.10" + sources."got-11.8.3" sources."grapheme-splitter-1.0.4" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" @@ -129298,8 +129345,7 @@ in sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.7.2" - sources."http-signature-1.2.0" + sources."http-errors-1.8.1" sources."http2-wrapper-1.0.3" sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { @@ -129310,14 +129356,13 @@ in }) sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.4" sources."inflight-1.0.6" - sources."inherits-2.0.3" + sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."ipaddr.js-1.9.1" - (sources."irc-framework-4.11.0" // { + (sources."irc-framework-4.12.1" // { dependencies = [ sources."iconv-lite-0.6.3" ]; @@ -129327,7 +129372,7 @@ in sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" sources."is-negative-zero-2.0.2" sources."is-number-object-1.0.7" @@ -129336,24 +129381,10 @@ in sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.8" - sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-weakref-1.0.2" - sources."isarray-1.0.0" - sources."isexe-2.0.0" sources."isomorphic-textencoder-1.0.1" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" sources."json-buffer-3.0.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - (sources."jsprim-1.4.2" // { - dependencies = [ - sources."extsprintf-1.3.0" - sources."verror-1.10.0" - ]; - }) sources."jwa-2.0.0" sources."jws-4.0.0" sources."keyv-4.2.2" @@ -129363,114 +129394,59 @@ in sources."lodash-4.17.21" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.52.0" - (sources."mime-types-2.1.33" // { - dependencies = [ - sources."mime-db-1.50.0" - ]; - }) + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) - sources."minizlib-1.3.3" - sources."mkdirp-0.5.6" + sources."minipass-3.1.6" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" - (sources."needle-2.9.1" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) sources."negotiator-0.6.3" - sources."node-addon-api-3.2.1" - sources."node-forge-0.10.0" - (sources."node-gyp-3.8.0" // { - dependencies = [ - sources."nopt-3.0.6" - sources."semver-5.3.0" - sources."tar-2.2.2" - ]; - }) - (sources."node-pre-gyp-0.11.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."nopt-4.0.3" + sources."node-addon-api-4.3.0" + sources."node-fetch-2.6.7" + sources."node-forge-1.3.0" + sources."nopt-5.0.0" sources."normalize-url-6.1.0" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" - sources."npmlog-4.1.2" + sources."npmlog-5.0.1" sources."nth-check-2.0.1" - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-try-2.2.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."decompress-response-3.3.0" - sources."defer-to-connect-1.1.3" - sources."get-stream-4.1.0" - sources."got-9.6.0" - sources."json-buffer-3.0.0" - sources."keyv-3.1.0" - sources."lowercase-keys-1.0.1" - sources."normalize-url-4.5.1" - sources."p-cancelable-1.1.0" - sources."responselike-1.0.2" - sources."semver-6.3.0" - ]; - }) + sources."package-json-7.0.0" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."peek-readable-4.1.0" - sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" - sources."prepend-http-2.0.0" - sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.7.0" + sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" - sources."raw-body-2.4.0" + sources."raw-body-2.4.3" sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" @@ -129479,37 +129455,30 @@ in sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.3" - sources."uuid-3.4.0" - ]; - }) sources."resolve-alpn-1.2.1" sources."responselike-2.0.0" - sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" + sources."rimraf-3.0.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" sources."semver-7.3.5" - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) - sources."serve-static-1.14.1" + sources."serve-static-1.14.2" sources."set-blocking-2.0.0" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - (sources."socket.io-3.1.2" // { + (sources."socket.io-4.4.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.1.0" + sources."socket.io-adapter-2.3.3" (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.4" @@ -129517,56 +129486,32 @@ in ]; }) sources."socks-2.6.2" - sources."sqlite3-5.0.2" - sources."sshpk-1.17.0" + sources."sqlite3-git+https://github.com/mapbox/node-sqlite3.git#918052b538b0effe6c4a44c74a16b2749c08a0d2" sources."statuses-1.5.0" - (sources."stream-browserify-3.0.0" // { - dependencies = [ - sources."inherits-2.0.4" - ]; - }) - sources."streamsearch-0.1.2" - sources."string-width-1.0.2" + sources."stream-browserify-3.0.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.3.0" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."strip-ansi-3.0.1" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" sources."strtok3-6.3.0" sources."supports-color-7.2.0" - (sources."tar-4.4.19" // { - dependencies = [ - sources."safe-buffer-5.2.1" - sources."yallist-3.1.1" - ]; - }) - sources."thelounge-4.3.0" - sources."tlds-1.216.0" - sources."to-readable-stream-1.0.0" - sources."toidentifier-1.0.0" - (sources."token-types-2.1.1" // { - dependencies = [ - sources."@tokenizer/token-0.1.1" - ]; - }) - sources."tough-cookie-2.5.0" + sources."tar-6.1.11" + sources."text-decoding-1.0.0" + sources."thelounge-4.3.1" + sources."tlds-1.228.0" + sources."toidentifier-1.0.1" + sources."token-types-4.2.0" + sources."tr46-0.0.3" sources."trim-repeated-1.0.0" sources."tslib-2.3.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typedarray-to-buffer-3.1.5" - sources."ua-parser-js-0.7.30" + sources."ua-parser-js-1.0.2" sources."uc.micro-1.0.6" sources."unbox-primitive-1.0.1" sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."url-parse-lax-3.0.0" sources."urlsafe-base64-1.0.0" sources."util-0.12.4" sources."util-deprecate-1.0.2" @@ -129580,15 +129525,16 @@ in }) sources."verror-1.10.1" sources."web-push-3.4.5" - sources."which-1.3.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-boxed-primitive-1.0.2" sources."which-typed-array-1.1.7" sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.4.6" + sources."ws-8.2.3" sources."yallist-4.0.0" - sources."yarn-1.22.10" + sources."yarn-1.22.17" ]; buildInputs = globalBuildInputs; meta = { @@ -131716,7 +131662,7 @@ in sources."jsonfile-6.1.0" sources."jsprim-1.4.2" sources."keypress-0.2.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" @@ -131740,7 +131686,7 @@ in sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."sprintf-0.1.5" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" @@ -131763,6 +131709,7 @@ in ]; }) sources."wrappy-1.0.2" + sources."yallist-4.0.0" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -132026,6 +131973,40 @@ in bypassCache = true; reconstructLock = true; }; + ts-node = nodeEnv.buildNodePackage { + name = "ts-node"; + packageName = "ts-node"; + version = "10.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz"; + sha512 = "TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A=="; + }; + dependencies = [ + sources."@cspotcode/source-map-consumer-0.8.0" + sources."@cspotcode/source-map-support-0.7.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."acorn-8.7.0" + sources."acorn-walk-8.2.0" + sources."arg-4.1.3" + sources."create-require-1.1.1" + sources."diff-4.0.2" + sources."make-error-1.3.6" + sources."v8-compile-cache-lib-3.0.0" + sources."yn-3.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "TypeScript execution environment and REPL for node.js, with source map support"; + homepage = "https://typestrong.org/ts-node"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; packageName = "ttf2eot"; @@ -132111,7 +132092,7 @@ in sources."isexe-2.0.0" sources."jsonfile-6.1.0" sources."locate-path-3.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimatch-3.1.2" @@ -132130,7 +132111,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."slash-3.0.0" sources."temp-dir-2.0.0" sources."tempy-1.0.1" @@ -132146,6 +132127,7 @@ in sources."vscode-uri-3.0.3" sources."which-2.0.2" sources."wrappy-1.0.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -132159,10 +132141,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.3"; + version = "3.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; - sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz"; + sha512 = "vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA=="; }; buildInputs = globalBuildInputs; meta = { @@ -132302,7 +132284,7 @@ in sources."depd-2.0.0" ]; }) - sources."fecha-4.2.1" + sources."fecha-4.2.2" sources."finalhandler-1.1.2" sources."fn.name-1.1.0" sources."forwarded-0.2.0" @@ -132417,9 +132399,10 @@ in sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" - (sources."semver-7.3.6" // { + (sources."semver-7.3.7" // { dependencies = [ - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" ]; }) (sources."send-0.17.2" // { @@ -132573,7 +132556,7 @@ in sources."lines-and-columns-2.0.3" sources."load-plugin-4.0.1" sources."locate-path-3.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."minimatch-3.1.2" sources."ms-2.1.2" sources."once-1.4.0" @@ -132585,7 +132568,7 @@ in sources."path-is-absolute-1.0.1" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" @@ -132612,6 +132595,7 @@ in sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."wrappy-1.0.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -132651,7 +132635,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."d3-array-3.1.5" + sources."d3-array-3.1.6" sources."d3-color-3.1.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" @@ -132688,7 +132672,7 @@ in sources."inherits-2.0.4" sources."internmap-2.0.3" sources."is-fullwidth-code-point-3.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -132714,7 +132698,7 @@ in sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" @@ -132758,7 +132742,7 @@ in sources."vega-statistics-1.8.0" sources."vega-time-2.1.0" sources."vega-transforms-4.10.0" - sources."vega-typings-0.22.2" + sources."vega-typings-0.22.3" sources."vega-util-1.17.0" sources."vega-view-5.11.0" sources."vega-view-transforms-4.5.8" @@ -132771,7 +132755,7 @@ in sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.4.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; @@ -132834,21 +132818,21 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "24.0.1"; + version = "24.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-24.0.1.tgz"; - sha512 = "LmWW65KyWJV/GTxlcVwcifGp1yywUSNP3fcMNZQLdd6fVC3CHJUyHz5t4GD8O1VM56NqvnnYgqNbGYBQXLN5gQ=="; + url = "https://registry.npmjs.org/vercel/-/vercel-24.1.0.tgz"; + sha512 = "OSX9Dn7+EAQnITdx4+cvfhtOLIi81qzbQwh9FtLmDOarba+reXDDTAJX/yxtcohSLT2NmyJ8mDyIdhr/5FeE8g=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/node-17.0.23" - sources."@vercel/build-utils-2.15.0" - sources."@vercel/go-1.3.1" - sources."@vercel/node-1.14.0" + sources."@vercel/build-utils-2.15.1" + sources."@vercel/go-1.3.2" + sources."@vercel/node-1.14.1" sources."@vercel/node-bridge-2.2.0" - sources."@vercel/python-2.2.1" - sources."@vercel/ruby-1.3.1" + sources."@vercel/python-2.2.2" + sources."@vercel/ruby-1.3.2" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -132953,10 +132937,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.2.6"; + version = "2.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.6.tgz"; - sha512 = "mgX18AzHsg2sDqh4aVVjk23iXf2s93lN7SZnZq2JE74/uGeXfrBckix3YdKtxgZe1vb1tiwDz9JRqoRV9SyGng=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.10.tgz"; + sha512 = "Z98jMgnyPCUKVqLZZhsypCLehpE+FbQZjv20IT+TTeAYDqqX0wGRcvkUsDgcw2x2xc2xKdN1Rgp71WGzydGINg=="; }; buildInputs = globalBuildInputs; meta = { @@ -133091,7 +133075,7 @@ in sources."lodash-4.17.21" sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-0.5.6" @@ -133115,7 +133099,7 @@ in sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -133162,6 +133146,7 @@ in sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -133342,7 +133327,7 @@ in sources."core-js-3.21.1" sources."jsonc-parser-3.0.0" sources."regenerator-runtime-0.13.9" - sources."request-light-0.5.7" + sources."request-light-0.5.8" sources."typescript-4.6.3" sources."vscode-css-languageservice-5.4.1" sources."vscode-html-languageservice-4.2.4" @@ -133384,7 +133369,7 @@ in sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" sources."@types/vscode-1.66.0" - sources."@types/yauzl-2.9.2" + sources."@types/yauzl-2.10.0" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -133428,7 +133413,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -133464,14 +133449,14 @@ in sources."decamelize-4.0.0" sources."denodeify-1.2.1" sources."diff-5.0.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.106" + sources."electron-to-chromium-1.4.107" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."enhanced-resolve-5.9.2" + sources."enhanced-resolve-5.9.3" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."errno-0.1.8" @@ -133535,12 +133520,12 @@ in sources."kind-of-6.0.3" sources."leven-3.1.0" sources."linkify-it-2.2.0" - sources."loader-runner-4.2.0" + sources."loader-runner-4.3.0" sources."loader-utils-2.0.2" sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."log-symbols-4.0.0" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."markdown-it-10.0.0" // { dependencies = [ sources."argparse-1.0.10" @@ -133569,7 +133554,7 @@ in sources."mute-stream-0.0.8" sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.1" @@ -133650,7 +133635,7 @@ in (sources."ts-loader-8.3.0" // { dependencies = [ sources."enhanced-resolve-4.5.0" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."tapable-1.1.3" ]; }) @@ -133699,6 +133684,7 @@ in }) sources."wrappy-1.0.2" sources."y18n-5.0.8" + sources."yallist-4.0.0" sources."yaml-1.10.2" (sources."yargs-16.2.0" // { dependencies = [ @@ -133979,7 +133965,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.15.3" + sources."uglify-js-3.15.4" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -134431,7 +134417,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."js-beautify-1.14.2" + sources."js-beautify-1.14.3" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."json-buffer-3.0.0" @@ -135065,7 +135051,7 @@ in sources."levn-0.3.0" sources."lodash-4.17.21" sources."logidrom-0.3.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -135104,7 +135090,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."saxes-5.0.1" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" @@ -135144,7 +135130,7 @@ in sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.4.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; @@ -135295,7 +135281,7 @@ in sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."doctrine-3.0.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" @@ -135576,7 +135562,7 @@ in sources."readable-stream-3.6.0" sources."real-require-0.1.0" sources."regenerator-runtime-0.13.9" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.2" sources."regexpp-3.2.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -135750,11 +135736,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.20.2" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001325" + sources."caniuse-lite-1.0.30001331" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.106" - sources."enhanced-resolve-5.9.2" + sources."electron-to-chromium-1.4.107" + sources."enhanced-resolve-5.9.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -135773,12 +135759,12 @@ in sources."jest-worker-27.5.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."loader-runner-4.2.0" + sources."loader-runner-4.3.0" sources."merge-stream-2.0.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."picocolors-1.0.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -136528,7 +136514,7 @@ in sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" - sources."yargs-17.4.0" + sources."yargs-17.4.1" sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; @@ -136596,7 +136582,7 @@ in }; dependencies = [ sources."jsonc-parser-3.0.0" - sources."request-light-0.5.7" + sources."request-light-0.5.8" sources."vscode-json-languageservice-4.1.8" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" @@ -136713,25 +136699,19 @@ in (sources."@npmcli/arborist-4.3.1" // { dependencies = [ sources."mkdirp-1.0.4" - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) (sources."@npmcli/fs-1.1.1" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) (sources."@npmcli/git-2.1.0" // { dependencies = [ - sources."lru-cache-6.0.0" sources."mkdirp-1.0.4" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) + sources."semver-7.3.7" sources."which-2.0.2" - sources."yallist-4.0.0" ]; }) sources."@npmcli/installed-package-contents-1.0.7" @@ -136743,7 +136723,7 @@ in }) (sources."@npmcli/metavuln-calculator-2.0.0" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) (sources."@npmcli/move-file-1.1.2" // { @@ -136830,9 +136810,7 @@ in sources."builtins-1.0.3" (sources."cacache-15.3.0" // { dependencies = [ - sources."lru-cache-6.0.0" sources."mkdirp-1.0.4" - sources."yallist-4.0.0" ]; }) (sources."cacheable-request-2.1.4" // { @@ -136957,7 +136935,7 @@ in sources."glob-parent-5.1.2" (sources."global-agent-2.2.0" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) sources."global-dirs-0.1.1" @@ -137110,14 +137088,12 @@ in sources."log-symbols-2.2.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.8.0" + sources."lru-cache-6.0.0" sources."macos-release-2.5.0" sources."make-dir-1.3.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ sources."http-cache-semantics-4.1.0" - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" ]; }) sources."map-age-cleaner-0.1.3" @@ -137146,22 +137122,14 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - (sources."minipass-3.1.6" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minizlib-2.1.2" sources."mkdirp-0.5.6" (sources."mkdirp-infer-owner-2.0.0" // { dependencies = [ @@ -137182,7 +137150,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."npmlog-6.0.1" sources."readable-stream-3.6.0" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."which-2.0.2" @@ -137196,7 +137164,7 @@ in sources."npm-conf-1.1.3" (sources."npm-install-checks-4.0.0" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) (sources."npm-keyword-5.0.0" // { @@ -137213,19 +137181,13 @@ in (sources."npm-package-arg-8.1.5" // { dependencies = [ sources."hosted-git-info-4.1.0" - sources."lru-cache-6.0.0" - (sources."semver-7.3.6" // { - dependencies = [ - sources."lru-cache-7.8.0" - ]; - }) - sources."yallist-4.0.0" + sources."semver-7.3.7" ]; }) sources."npm-packlist-3.0.0" (sources."npm-pick-manifest-6.1.1" // { dependencies = [ - sources."semver-7.3.6" + sources."semver-7.3.7" ]; }) (sources."npm-registry-fetch-12.0.2" // { @@ -137237,6 +137199,7 @@ in sources."debug-4.3.4" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-5.0.0" + sources."lru-cache-7.8.1" (sources."make-fetch-happen-10.1.2" // { dependencies = [ sources."minipass-fetch-2.1.0" @@ -137244,7 +137207,11 @@ in }) sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."semver-7.3.6" + (sources."semver-7.3.7" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."ssri-9.0.0" ]; }) @@ -137521,7 +137488,6 @@ in (sources."tar-6.1.11" // { dependencies = [ sources."mkdirp-1.0.4" - sources."yallist-4.0.0" ]; }) (sources."term-size-1.2.0" // { @@ -137530,6 +137496,7 @@ in sources."execa-0.7.0" sources."get-stream-3.0.0" sources."lru-cache-4.1.5" + sources."yallist-2.1.2" ]; }) sources."text-table-0.2.0" @@ -137605,7 +137572,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."yallist-2.1.2" + sources."yallist-4.0.0" (sources."yeoman-character-1.1.0" // { dependencies = [ sources."has-flag-1.0.0" @@ -137654,7 +137621,7 @@ in sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."rxjs-7.5.5" - sources."semver-7.3.6" + sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."string-width-4.2.3" From 7eb14b532a042604efbcbda094e3d082543962f9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 17:07:47 +0200 Subject: [PATCH 369/385] nixos/gnome: set default wallpaper for dark mode as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GNOME 42 needs two wallpaper pictures – for the default (light) colour scheme and for the dark one. Because we are clearing out the paths in `gsettings-desktop-schemas` to prevent closure from bloating, we need to set them in the NixOS module. Since the wallpaper for the default colour scheme is dark, will relegate it to the dark colour scheme and switch to a light blue variant for the default colour scheme. That one has inverted roundel for the NixOS logo but it is the only light-ish background that has the logo of the same size and placing as the dark wallpaper. --- nixos/modules/services/x11/desktop-managers/gnome.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 35d80abb05f3..d503cc271cfe 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -42,7 +42,8 @@ let chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] - picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}' + picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-blue.gnomeFilePath}' + picture-uri-dark='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}' [org.gnome.desktop.screensaver] picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}' From 8c44d65e63d2ca2b2e1111e5193ddb88362eed28 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Tue, 12 Apr 2022 10:42:21 +0200 Subject: [PATCH 370/385] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 604 +++++++++--------- 1 file changed, 302 insertions(+), 302 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 59fe030b2412..6b13befbcc30 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-03-28"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "cb8f43b2f09f3d41e2821e458901666a82a61298"; - sha256 = "0h5r0r7hh4g7p874l7fajq30k4z3a88vm3db6583q611h9bwcfrf"; + rev = "3fcd57f9b46d76c5e35c6c974b57ab7e3f1f0603"; + sha256 = "11n5z3hcllw74ndibi8axkv94my7szdxy84b4q98in2ls9y3kh1k"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -77,12 +77,12 @@ final: prev: FTerm-nvim = buildVimPluginFrom2Nix { pname = "FTerm.nvim"; - version = "2022-03-13"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "numToStr"; repo = "FTerm.nvim"; - rev = "233633a5f6fe8398187a4eba93eba0828ef3d5f3"; - sha256 = "0sxnii921xia4mrf67qz7ichi9xqr9zf193hb9dx199l7hl6k1p8"; + rev = "5a4f2837f57a1643635db5c872ce2e1c939c1632"; + sha256 = "0fqyh7wsssw1726dhg4wj4p5vf0fkwcmavhd575jqb7gfkdyqqzg"; }; meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; @@ -149,12 +149,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-04-05"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "7292967624ba89e2c3ab2f374959d5a25d5c9d9f"; - sha256 = "0l2vnickmgcvnlqv13bcqgvpsygkbwzgc70bx253cfbnddqssbpj"; + rev = "e33c9128893a69808b8a1aa077ebeeb86fd9e9b3"; + sha256 = "03c4m7nk40l5xpg041iqjlr66l5qhiffxbkbc04z509fcxm8aail"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -173,12 +173,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-03-28"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "6c50f278482dc5388743cb5c6eddb146059252f9"; - sha256 = "1qr2blrr6ihr1adld1cyc98b64s2s4y2876bmlbxg4q17y1zv3l6"; + rev = "52225923679ec866651bb0c2e0691374131ec939"; + sha256 = "0knzisdbaa3aa20ai8lwi8v4ai49jl741a1slpcrjnm6zhb484nv"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -269,12 +269,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-04-03"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "6598caa4ca4f6fa28f975025bec411611abbcb4d"; - sha256 = "1p0w9i471gqknb8w89ifggsa4hdgdx5zm09mzypqq9344w68fsds"; + rev = "c76b696f37efe4ffe7786ccb22355fd818c32bec"; + sha256 = "0jp4070yz1vzkvv4id0xpxsyy80vgw9p6dnyjpf0wvc7md44fac5"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -329,12 +329,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-04-05"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "77378e06df9c7ac4345fee932b9c1923a15e8ef9"; - sha256 = "1274xhabkhkla2qljsdby4klyr05hf5vpbrra6i08pm5jhzp5h90"; + rev = "39cbef5f3f65252a4beb9a1d08fb6eb7e27e3e31"; + sha256 = "005z6z5hrqdlagrh13whpy77qx8b64ykf9ml7hb6jy5wlc13nq6m"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-04-05"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "85c9bbb69f0cdf7949ace27030e4d130cb9ffca3"; - sha256 = "1lpl9f96m9vkz8lzpq68rvycapy29dbzfm0sdmpx6mccygdb6ds1"; + rev = "3c64c5b76f2f09e23b91fd7c1dc29a6e0b953e68"; + sha256 = "0gqxv5yqsk4861s5ln03bccpmrrz1r75hmafjycs3sw65cc2fw3p"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-04-05"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "cae550f07b608ab591f7fd37ffcab78a07caad8f"; - sha256 = "0dfhqbfarynnw6p3fq81k2wadinm1fz3z6c3as5kv1bn34y528rn"; + rev = "607f33a1b0f662d9809d54363e8e81a4965862ce"; + sha256 = "0bqd1h1hid68x51032ysr44i4gg12xkqqfj1zn3hli31xf9zgcnx"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -546,12 +546,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2022-03-26"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "68ad878e7d7546b291ebff43fd53544b2f6de401"; - sha256 = "16jsvpfacks2nw4s7qk8qh1xf9jkg6hnvnryp4p2gi0s3x5rfsws"; + rev = "c55d4879935f07dbf46e86389246449d7af272b1"; + sha256 = "0yghy4yh5qw5x2qxwz8wp27gmhh7yp0pcgkdv2p1lcilvdz9321s"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -654,12 +654,12 @@ final: prev: asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2022-01-12"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "dfecf57c79ded5ead2911e32caff46d8cede8c5c"; - sha256 = "1w58y2ccgry47nhidqv4vg1wag7saphs2xad9wfpq65sj8vva3kk"; + rev = "f1da08bb6bc1a458a7d0b3325eeabd0c77e08ff5"; + sha256 = "1whc7irj0p07x3iy2r2rkkx89flsbv42pbjjbvhkj90fsv9wxcpd"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -870,12 +870,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-03-24"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "05f9b2831abc693996b335494337b88e616e9eed"; - sha256 = "09a5r51k8926v51ma45jfqqwwjnk52yy5ql9swmrxnvnrdsjah3p"; + rev = "96454aedf95f52393a28cfcfc76482895de014ee"; + sha256 = "0rr87wbqil2k2cia759kisllwcsbq0s3yhcl9h849qgd4gr2926h"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -894,12 +894,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-04-01"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "004cd5734fb21e39d48c1fb1469fa63e2797880b"; - sha256 = "1rr69n4mpkr6ky093fxabf3dcnngam3a01zl71ylvz27lv7gphqh"; + rev = "bb3ac3053f65f03b997b4f21ef37f4e7249389c3"; + sha256 = "07x5z5axybhsfgihxw1w58bsjp3y84rz341izl35k37nlvyg1j7c"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1050,12 +1050,12 @@ final: prev: cmp-calc = buildVimPluginFrom2Nix { pname = "cmp-calc"; - version = "2021-10-11"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-calc"; - rev = "eb7bd1d7382ac26d8eb7346e36405c0ae94333a2"; - sha256 = "0b88fn4zb2sp4c9fnn9m8qb41djv17mmydhx6bryqnrc8mqycajy"; + rev = "3bb9f0da74979ed1f5d77afa26aa8155daa9288f"; + sha256 = "1qvpd3xx42rg38zdni85bcvakln5dz4xh79rqxa6z21dd3clp3ch"; }; meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; @@ -1314,12 +1314,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-03-08"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "5581530535bc10c42f84c16665d79fbaf7d49806"; - sha256 = "1qf8gihw8bdn6253qly2d9d60ng95r20fy8v8l2vv5lfmzdaaz27"; + rev = "22cc82d2ecc918282fcfca9e104c9df0e974693b"; + sha256 = "1inqiffjsnwp507q29a9dndrd6hjk8x2wzbhgakbd0zj48fgmisa"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1374,12 +1374,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-04-05"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "1d85f511f9966b445b5200f35f8db8d4cc0af805"; - sha256 = "0yk9wghix3mh63p7w6hqk7crv4z6c2hi7ywdg6cnnkhnxviih7lp"; + rev = "ac40a80aaf261cdce2537529b0bc2396a426636b"; + sha256 = "07vv8b9y19ayif7p2cnyr6f2di05kv89mqsx82i7add199i09rqq"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1579,12 +1579,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-03-28"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0c85b2ecce542ce8ee336bf01f433950cf51f31e"; - sha256 = "15nqxzf2q8iwkc3b09crd66cb38cnh2sv4q49vv9x6nkxar69hgc"; + rev = "422cadf51dd44306713f3f7965e40ec606290c49"; + sha256 = "04m1p4l2i61g7d3yax1g7c1h38pkkzz1jvirvd1xcyzw08wn7ldh"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1603,12 +1603,12 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-02-15"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "47eb231463d3654de1a205c4e30567fbd006965d"; - sha256 = "06znz1869h7cdh9xc0b54mysslgpf3qdwsj5zvnzrzk6fnfin03q"; + rev = "573da1aaadd7402c3ab22fb1ae6853db1dc82acb"; + sha256 = "1j2rva50rl8kn480b613z6a0xnfwkvyi4amg9n4r2l89dxdsni84"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -1627,12 +1627,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-04-05"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "60df9082402acb1d9d258fb9f9763a085ca04952"; - sha256 = "0gv4h0imxbfgw0g3z6xwqk7iczcs1zq5jdvpbn20gwsizrfgk6ap"; + rev = "0a7cc42f0d97d01f2c527c3f62088ff8c91a1e95"; + sha256 = "02rrhw7db6rc4lqshdikpsx0pflac17n02jpl21f8fgmprs32qih"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -1795,12 +1795,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2022-03-01"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "6d97ad7fae49f7c00644dd96da64e14c3e23c835"; - sha256 = "0vyahlli5jg1a8m3dnln16n93jlzyimj0jx76dlbg7x906hkjd91"; + rev = "1abee7e407dbd0fe1a4b614dfb98c8d444f4081d"; + sha256 = "183j4rhwaa7j8vhq2bz4smb9lw6sgmll8833vm4csd3wx0p6pk5b"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -2145,24 +2145,24 @@ final: prev: direnv-vim = buildVimPluginFrom2Nix { pname = "direnv.vim"; - version = "2022-03-04"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "451e3637a15af7d4a206ac761af7a2247f139e0e"; - sha256 = "0bynm225is7xkzkllx7d95cjarpxaj2yq1p0g2svgwxgqjhb6yhx"; + rev = "4c858b8cd8cbfac998534096e6ffb710d7a07358"; + sha256 = "1yjrjdwgsv6vi7mlabinxwfaizrd09jkg4w57gkch4xxw7sk6y23"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-03-31"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "047caeccfe2052d5be42f0e26986c31bd2e0d5f0"; - sha256 = "0zbq3c25q03frav7scch5sghwa27swbamlrdnvkmiqw1qfk27r72"; + rev = "5aa443597811208f5d3afbdbe9d4ead79339de58"; + sha256 = "0jwm03fhwi9q57fgis31kgdf7l8jdb8glbh1is6rl9g0vb0a40ba"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -2339,12 +2339,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-03-24"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "290bea8e8a782586de32bb8d0bfb056ff8acdb9c"; - sha256 = "0sjg8hb6z9c7kscx26jkdxl31qy244w76iywy8xp7143kb9p0qx1"; + rev = "79f5e9e5a76842b72f1814dcd4fc239a95ead391"; + sha256 = "1svj1464hlash4igbai9mdman7cvlb8rfiyyylm7yn4wh8c2xb3k"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2363,12 +2363,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-03-28"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "53d8cf7cd96fcde4138ba1ad67971a594b4abbd4"; - sha256 = "1dicpzqmpxclrv3v48ipk79yfblhlva42kzrl8hxly95isq2kznp"; + rev = "1237977da5ae1fb5901d712745b1b5d0eeecdc51"; + sha256 = "00w7n9v0krraqyr47rrcwlhf2ap8s7ids7s6y5771j9gszva5xd2"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2387,12 +2387,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-03-20"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "d47f2bbf7d984f69dc53bf2d37f9292e3e99ae8a"; - sha256 = "0nw05yzy1a9yq8jvjgzq1y2wbq1x8rski6brmz3pn4rdmpkzqvsd"; + rev = "f3146acf9b3357206da11c06af1e7a5206a146d8"; + sha256 = "1f1dhrwrbrawbbqappd0axlf2yhhzgy1vsiq6g7mgxg1zfbwxw1w"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2568,12 +2568,12 @@ final: prev: fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-03-07"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "b23e4bb8f853cb9641a609c5c8545751276958b0"; - sha256 = "02gz5j1pa8d7sgksjfikv8vf3gz41r6z33qwhiy9nvgnrwwmckwf"; + rev = "d5f1f8641b24c0fd5b10a299824362a2a1b20ae0"; + sha256 = "19yidjybsp41yj1yvdq5b01yph7sbd976bfq476hh7920ij6zqh2"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2712,12 +2712,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-04-02"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "83ab3ca26ff5038f823060dfddda7a053e579b67"; - sha256 = "1hrzk6nr1w9747h0fn9h5cm1pgx1sw6njyf3pyr7p220gnh87vzp"; + rev = "ac5ba87898dda3893610ed4023f40c4493f4a07f"; + sha256 = "0dzqm4av7ayhlbyq0zv8dqiwahpr7l0canhib8f09xrpbgf8axw6"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2892,12 +2892,12 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-03-31"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "b6a363c037505c30a41042580729dc09e9bd00ed"; - sha256 = "0v917h34fha7ww2shrnwaqajp5f0s6qb9rbcmf4f504rpkfbnavl"; + rev = "28762aa04d6395538e26e1efff5213b26720e68f"; + sha256 = "0c2fpwm8v2fzkg8rq7lhpv8lzm614y4x6n2xp612sj824jm7aj03"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -2988,12 +2988,12 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-03-23"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "72704e1914648774a4fb42f57ca411d689e08ae6"; - sha256 = "1dh6i2asqrhxc1irnhr46drn8ksj7xq81m6ankvy1gj8bkc74dmp"; + rev = "8ccf600ccb5dbc28ea329d641a58e2fd6974d38e"; + sha256 = "0kppddixgkzn3q8zbkgllqmwbxlr46p5hlnddqdv5lnp6fw4w6xf"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3096,12 +3096,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-03-28"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "9920ceb79bffd0e6b7064be63439e38da0741d03"; - sha256 = "15wqnd72j98w15i7dhzjdxbyxk766vcb844xdrvany3zwqn5p58x"; + rev = "db7d3ad34e020f1cc30e06bab9dd4e98ebde5643"; + sha256 = "1bm3yzzjad4n3xfi2pxbpdx4jkj24k3y96wi62f2fkdnpsarwh3p"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -3204,12 +3204,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-01-30"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "32d05f7742dfb0ef84bee99e059ac3b7cb9526eb"; - sha256 = "19z9i07w3wgf939fiy6kh7mq5pvlay3w37sm0sv4bmrdi42p8b4z"; + rev = "e82d07faa17c3b3fe04b4fa6ab074e8e8601a596"; + sha256 = "1h5zdwfi584kgjh1mws240mgirf9ai0nrc0rx0zylvcdfk19l9v1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -3361,12 +3361,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-04-04"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "ca6a46c5ecba9f8957948e26b71c226d738f1efa"; - sha256 = "0mxd9xgnfgal9dd56vchqhkg0hhw4jn6mrqm0b885j9krl78hbvq"; + rev = "4e510fab0be981ae51bcf047a0d7b72e08b3d476"; + sha256 = "1x5xdji485nbdzd5dadmf9gwryl2dr8x806s3mgvbfnmd8jc750l"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3553,12 +3553,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-03-27"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "00c30733467be30a72311e08030bba34ceb4f6df"; - sha256 = "1psyvz4qb28mlkbxjs5xy6l4vhw9jyzc0j460xx2phiiz7raq852"; + rev = "6428afd03ee590254426066be4e202d83159e002"; + sha256 = "0mgn6gvcdb0bq04f7z6i3c0q3nx8ws331a4sjk16f1k0qj9cac8l"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3589,12 +3589,12 @@ final: prev: litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-03-26"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "59259b0d0716b628a3e4f44098bd87ff54cf9cba"; - sha256 = "02awfwdzgcqsvs8p8a4m29c648phy6h5x1l49gklrmp8ymg2xgq3"; + rev = "2a59ba7c362d1e39b80baa47dc237a7eeca42ba0"; + sha256 = "1xw3p3jhyyggp82a8n99nqk9hnm8z6n84lclb2wjbma9a0xzk9kl"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; @@ -3684,12 +3684,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-03-05"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "e4f7dad45a1a3bb390977b4e69a528993bcefeac"; - sha256 = "0smxcvgyc575kmz9aw20k47awh5j11ywnc1lpq1hdgkppxm7lnm2"; + rev = "48e5fb895ed541d6d8ccc3b8ac3e9f4b8ff39466"; + sha256 = "1ymq0nc1f3gfy16xcf7aaxwp8cgj9id150bcc7i6463yqkpvb8jn"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3756,12 +3756,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-04-05"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "69cb81cf7490666890545fef905d31a414edc15b"; - sha256 = "1dj86wljkhxri6k536ihds9v27wvs672rgmaj5i4migwxjlh6jb8"; + rev = "5d3b468f18c244b0467e1ac2ea22460262175bc3"; + sha256 = "142vdlcb8xs3hl1f2fjjs7rrydv1cz8zmjl02pnwlr3hcshgs0dz"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3780,12 +3780,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-03-24"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "fa7694fe221ca595d6f8c4f1aab531b4c1d48d7b"; - sha256 = "14cs574nk0hr6mbf80gcjdarwbngbgj73s1grn6yczr2gqqqmhwk"; + rev = "87e9039138051ae75f76235924a273ac1a78cc3e"; + sha256 = "1plsm3xsf7bm709l6q341cbvm7na78a11b32n3j86j204zybdvbs"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3840,12 +3840,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-04-01"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "fc3e3d04f9646404dcbf3692e83ad0eecee8bfe8"; - sha256 = "0zqs3hn946gzcsm4qggakd45qnw5mvas1j6i71l8i55xabkgiffj"; + rev = "528c095f3ed798aa56f9787f7c0d4f7c7a4d5422"; + sha256 = "1mki988xgk7f3igaz8g00is5y4dv8kcdcgpj5g6wpk5hya9y2lpz"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -3864,12 +3864,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-04-05"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "10b1fb8ead63309be01f48da78d7d83d0f2b041f"; - sha256 = "015ls360cwifh1jdzf6zxbqlc0dd0mgl029vs3brsn8h7b78rbv0"; + rev = "53791f5e66254b143d02f3ccb836d1c79d6f5579"; + sha256 = "174wfsmasm3qmnganlmpa3wx4hrrq0i7xji70hzjpyk6gpkdnwf3"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -3912,12 +3912,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-03-22"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "e3f0718d53347e884f9f2282c35df0063ec6f9b1"; - sha256 = "13j611r2hzz2ldbvir89bxab4cicy5nrg9s780dsriz2g4slj5hg"; + rev = "a4645528e2ddedfb6350c142660c3e0468057f1c"; + sha256 = "11vz3wmii9d1dhz4bvfqlax5s6yawd640xflyqvd1i45102p55vd"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -4284,12 +4284,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-04-02"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "aec45ca94975c0072516523fec32d69044db36b6"; - sha256 = "1g1kyhwqdxbshbfqzrwzav9afkl7psys8w5i2h4gkn8dda1h59g6"; + rev = "09d4ac8640d1c593fca9d0a85744b0ce6aa247f4"; + sha256 = "07l7iqk7xbrhkdpfanj3wyx8ilbg7qy1lnsqgsrda8vk2zigxkyl"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4464,12 +4464,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-04-05"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "0670b85c5322da682498be9f355e050507fa6622"; - sha256 = "11gzi6kx1f57a6b5w7rqjwh0qah757g9814fw7qv76wc9cwbki1v"; + rev = "4272798f7cf6efd344341edf2317c1b812d49561"; + sha256 = "06l1r6qbghjik8vcicffxjd0i1849w3ff1dwg67ajyz9vil9p97p"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4536,12 +4536,12 @@ final: prev: nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-03-13"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "612f7db0b904d11eeddd41474e71e4bf67acc453"; - sha256 = "000s48f80gpwsqfgxcsafifd10ii99w8kw237i9afa2msrk9w1fs"; + rev = "fd9bfa20eb7513ac95fc49952949ae1ee3e0956a"; + sha256 = "0isxr0a8v7rfcv7cgyz1g9q9m7z9a2ng3bsw4cfq8x3xzhhgka7l"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -4560,24 +4560,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-03-08"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "513ff9bbdde7da53e209232d4328e734ea2bd96a"; - sha256 = "08r2ifkj9zj8c771ahl2i0b8crp3cw2cdshkpq26ci14ypdq0304"; + rev = "42552b3797c3452c5c94e0c84a04fbda9591b9d1"; + sha256 = "0ggiq9yvrkv2fff41qzvz82lsxxc8swlxfvv1n9g5am8zym2ssk1"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-04-05"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "f3107c3b211d62f53d34cbf0ca100fc948bc42d4"; - sha256 = "07x55chr28f9azqgjjwv0dnn9l0gm0n4z1wdf6libikbnh9jm522"; + rev = "82be4bf6ee7b1c2605758b06d918c9dcf6f8e3f2"; + sha256 = "1cdrsq4kqgvhhick0h8c0vlpjjny098lj88cpgn7sdfircnpn55p"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4620,12 +4620,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-04-02"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "06535b1f1aefc98df464d180efa693bb696736c4"; - sha256 = "12ii6vap3s2c58fmr01r900cidifr50pdpbl2ssx78w26qvc7qz4"; + rev = "6fb0479704709526022d099b2f1baafa6abdbc4e"; + sha256 = "0d3di7ybpp3fhj6y1agg609q90gjjq1232srk1n814fkkiplrdk9"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4644,12 +4644,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-04-03"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "d67a9b5173806e3f2297ee42b298d1345acb9c24"; - sha256 = "1g6jvlx78s4a56p0nxg5z3s2g06snnsyq3bllvqf48qy2s43g286"; + rev = "d8afd4d398237866eef6e5376fe5e83fe74303b3"; + sha256 = "1dyg1js3azr9iz0q48s8akj3dksqvnjk3pip9sjb0vj1jq474ajs"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4680,12 +4680,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-04-01"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "7dbe34e36d9de4912a5f3aa5279540445765814c"; - sha256 = "0v5z1m7n6q183l9a6pajfqbg6n2cxdkcpx7xmalyh99x9ax0pazf"; + rev = "3192a0c57837c1ec5bf298e4f3ec984c7d2d60c0"; + sha256 = "117y1xdzmfj95gfdhgcfz6rdhjwmccwxl4k2h32adhvnys66n492"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4764,24 +4764,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-04-02"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c20c78d7c6c82f16a2d1abec31f4273194e3987b"; - sha256 = "16vlsydx950s6v1nzpw0h38vmykcp9f3wsaxg09sjvc2isgd4f8b"; + rev = "10b5781be6d3e19578c2662c8c1a736ce29ea089"; + sha256 = "16jwpnm3wprscl7rkpljzcndj5kpnw9171rzsqiyy1kbqp41wg52"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-03-29"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "33f33dfced1d7d98e2b934bd663175a062d8db39"; - sha256 = "00achlynnv1qhs0vqp0q40pzx95bxf9cgsgrpwg6p3fwb2f4ssdi"; + rev = "041f6a78ee3f850dfcec5b3c5a6e81bca9164ae0"; + sha256 = "0kaf5b726ljm1lhsaxpnr6wj879g9bdbnx5l3agnlb51fm6fqy8m"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -4848,12 +4848,12 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-03-29"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "9f2adbce23a383243458f41654c07e57dc1b7635"; - sha256 = "1gwq7qrbcmh4nqdgl4pv83b8x5wxaks4vxgq3yryjj6n4x5b56fw"; + rev = "49f68ec4591b2b22bc1217d91951f14d9f80abab"; + sha256 = "08slvkidi024hs1v01w56jpq2i50dwgsfsz5iw8xpirm0sd09xb8"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4968,12 +4968,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-03-28"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "3d1baa811b351078e5711be1a1158e33b074be9e"; - sha256 = "0470h3vaw6zmmayfd9rzlh5myzmdc2wa5qlfmax21k0jna62zzr1"; + rev = "fd7843ad04cbc8ee2181bed9c3e83839b0d0b285"; + sha256 = "014c2lllka7knw2mn2amns2c7p54gacjka4g6808cn0mh4nhxbf6"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4992,24 +4992,24 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-04-04"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "6da18b24f1215f05c7c7edbf460c93cefb9b5688"; - sha256 = "1mv41ryxsx6wm909yby6z84xmhw3ibigw8zk34prhyvszz3psmvl"; + rev = "82b0ac693435a03072960f930572e9bd177d15c8"; + sha256 = "066iknrc68n4fb0fxm3jcp1kvsydq2by29n1dz9j5vsx7w7yv8xz"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-02-22"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "d859891e4bff9729ad6e63bd4aebc51946de8786"; - sha256 = "17dbvr1y7hzrv04c89b4nmgmgg0qccrkz6qsh7vsava0lvjs4zm5"; + rev = "09fa54a2e9866ba05d08980e27b29099d6d0ed6e"; + sha256 = "0l17anql1a5vbh5v8djlssfh3a09y6zxrs6vpabkfsj9lp8sls46"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -5028,12 +5028,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-03-20"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "da1030208347ad8937fdad1d4f8092b578e3ea2f"; - sha256 = "0myrcm6170ncff7ymdlaiahh9230yff794f4dc2lzwv5igkxxiha"; + rev = "96559369b391856a9a14a9be06be8ae5524589f4"; + sha256 = "1zfc5rdvxav3ir3xf0ryvql79n4544m80qirjj4xjvi0g4h35ym7"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5076,12 +5076,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-03-28"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "fbb03990539d5d484fe10de805772b4b86792c1a"; - sha256 = "1iw4gnsc72r5rj7z5g3jbxqcnfzzhi9r84zpik8pfjnx8r79ncnj"; + rev = "345e5dd57773e2b4b425a2515c831108b9808a0f"; + sha256 = "1lyqzzl1722hdx0cwry8659dbd679nilx5lb1w52ym3sixz4a9hy"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -5100,24 +5100,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-04-04"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "924aa290921426682f86495cf64f48fcdab3c2fd"; - sha256 = "01wn4vfk23ciyd69drh49jz67x254dn0q6k55akqc9pxlllds4pg"; + rev = "9c272b97bce2ed85dba00d45036e849725c66c52"; + sha256 = "13lfz593pd4ds2hi4p2ym1i25hd7jbwvfgh052j3gkglmzahxgx2"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-04-05"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f083b7bbfe9480df00a45ab5a0978cb2586dddf2"; - sha256 = "0zhgkbzr2hnwy94zfg2mk9l364rcmw7z2bvhbbriywg5k7drpla8"; + rev = "d0fc6845da9f161a0b6887bf85f06c99212c83d1"; + sha256 = "1iq02f7bcw8jax4vb38cdx9nh90fcyq48yvp40yjcf4gn4fx6lwd"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -5160,12 +5160,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-03-29"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "c4b41e42dad700b23c6ea86ecb69c9deb55a8fbb"; - sha256 = "1l8fbn1rvyifvaplmyp38sf73payy1wlglnrb5xl4dxpcfd6yvzc"; + rev = "8af3045c2703248b58d8ee3ee3b18399525bd5d6"; + sha256 = "0brdd7ja38wldyjxdbcq9fiiblx5bpqzqv4chgmcnmij682j5mfa"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5184,24 +5184,24 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2022-03-18"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "7810f1fe706092290dd338f40e5e857bac4a03cf"; - sha256 = "0hl3fivd0yn9g1di2545inz92szsqxq0svwhr8ymyg5sgx465rfc"; + rev = "88343753dbe81c227a1c1fd2c8d764afb8d36269"; + sha256 = "1qfgg9lzva7m3kbrxhhccf766by5n2sf456cdvadypr83sniq6ay"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-04-02"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "dee11b86ae2419e3f7484197c597a0e634a37a56"; - sha256 = "1rmv8lmxx4ji4lacgws3vfaaj8df2zbc3vs6sbj9mmzmfg3q38py"; + rev = "ee433343a698cdf804389db30f96b88d138de18c"; + sha256 = "1akk2dyk75qmak5w32s5nwlybfyj8xlk0r2fkhzlkw0r3vmq83kz"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5256,12 +5256,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-03-28"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "ebe8f689a9867c6ce57d748a80a2157b49764f13"; - sha256 = "0r07x8i7w9rk8n1zrdyvqr9pfjv3dihb2hy1100jl4xxc11g43an"; + rev = "79f06ba252a5a8a525475f6072bd99494da9a1d7"; + sha256 = "0wm6hm97rrpw45jyihydxyy98vxgypcvwnx6406609s8n8w0sbyz"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5292,12 +5292,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-04-03"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "50d58b195ea1f1ac620d775f39c95fe524f051d1"; - sha256 = "0cmzb6cp8n8jwzjmv3h0ikv5gn3dn3aq8kgsnmrkqlafh19692rr"; + rev = "85821c4eab634b272b30f8f13dae501dc26e4099"; + sha256 = "1lljf66f0l4638lwgm5gl7bb0zj9h61q5smpd27p1aypn4sl9j7j"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5340,12 +5340,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-04-04"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "86d633963bfbd6ff5448589a20a41deb8c19f90e"; - sha256 = "0nrq65gd2arxg4r0sqh4y4ikaadlrsbgcz1zq7yfpfbb76cia26w"; + rev = "8c41989613af62ba41b3458084cbd23bfb19e972"; + sha256 = "10q3n5mkyap76qr9w3x4jbxk359p4hv8qypl591vi4c621kah1d8"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5388,12 +5388,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-04-03"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "8e52714a1851bb3c781a744489c31bf8fb2c4e28"; - sha256 = "1h3rzab981y0yp7kfkjpgjlj03kf6lyxxg2wikbdbkyz1c2bbkvk"; + rev = "40cc0cb938bf847eb657000ad70927272688d21b"; + sha256 = "15b5afsl7bqsi2nazihlgcvs3dwkfgdcqizg3pjk71ikwfphn3rw"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5520,24 +5520,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2022-03-30"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "7dbcd4d647010a80d135804b3fc1da3fb77083d6"; - sha256 = "0g7rqw2vm00rrbbnhc8b9hyljc7q8qc0lywg63lkj63ks9j4m8y7"; + rev = "13e2d2d63ce7bc5d875e8bdf89cb070bc8cc7a00"; + sha256 = "1klkg3n3rymb6b9im7hq9yq26mqf2v79snsqbx72am649c6qc0ns"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-04-03"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "f9c65cd76ffa76a0818923c6bce5771687dfe64c"; - sha256 = "1kgi4q7n8m0hv6hn82bs8xhm8n34qmzcq4l8prki1127gfa2gpqj"; + rev = "13f99594c14a379ed6f24a3d6ac9efa18c64f7de"; + sha256 = "0grnz2rvyx0r9y0jgbxrrmym3fxknr8s3fh9ddhwx1qggs901q9v"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5556,12 +5556,12 @@ final: prev: popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2021-03-11"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "f3571e676739208871bd38f9fa0fddf554b6a7a8"; - sha256 = "19hvwxcqca8l6dvlaccfvqc8755bpr0z0hi7l9qiw6rm458bhchi"; + rev = "ea262861ce3905b90c2c203b74a7be2539f1aba4"; + sha256 = "082dppmfppzam9y2x7drmrdd704hh2j2lw84rrkh8033gpnrn341"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; @@ -5678,12 +5678,12 @@ final: prev: pywal-nvim = buildVimPluginFrom2Nix { pname = "pywal.nvim"; - version = "2022-02-20"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "AlphaTechnolog"; repo = "pywal.nvim"; - rev = "bd58195939d31dd0f15a720fba2956e91598cefe"; - sha256 = "10fs5assp96rvlcxckd8cwnkfwfckjmf0j8cqq91vb2wx8knxc8g"; + rev = "475a9f0be1d111cfad2049245fd81448a51c124d"; + sha256 = "0by27995bkn21qiiyvw1danydagi4issfrah2zi5480qnwir6s7r"; }; meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; @@ -5810,12 +5810,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-03-23"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "93967110eb45d7234802c0c0e2ef909968e8461e"; - sha256 = "1mphqq650d3x0g2nl4pkgflp3hsi68agzj807r64x82p3266abzs"; + rev = "94eaa199ad892f26d2c8594dbbc5656314cf5bdb"; + sha256 = "1smq4snh40ljhyc32qvj3w51xpl7ci0navm1l8xr03z8hpssz39w"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5870,12 +5870,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-03-16"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "26dc0949680b77216ab4de7ae909b324944a493c"; - sha256 = "1ci10s7kcpvg1g9k33ydn4zp8bnm69271mbhys5k9lc50qky2cp2"; + rev = "65705df886624833105f6f146ac4cf8c4d426aad"; + sha256 = "1xc83qih6pw1g3qrkjzmn3bri0xn8cmqiqykxajd77ijxjaq9xsp"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -6510,12 +6510,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-03-28"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "2137c1437012afc82b5d50404b1404aec8699f7b"; - sha256 = "099000mv3d2l7aidvrwgfrks48xa5xv38fvqrs6svabqg20k2wwk"; + rev = "ccee72f1d1ed71a001e57592bd585ae77c5f83b2"; + sha256 = "1k6vsrvdsb1hkjfff3pbqf57zglwsh2csc6aj6lan790n9p63a3m"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -6570,12 +6570,12 @@ final: prev: telescope-asynctasks-nvim = buildVimPluginFrom2Nix { pname = "telescope-asynctasks.nvim"; - version = "2021-10-22"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "GustavoKatel"; repo = "telescope-asynctasks.nvim"; - rev = "80bd6570e5423d14ad1e6fd56a199955ac1b895f"; - sha256 = "1vhjdj0jqxlyj6lmysjalnsbh5365fm2irs733hwycicd95f43iv"; + rev = "065300fb0a8ba6a1c81991da1873c73e136dcdc0"; + sha256 = "077jj9zmd7ybgpdbc06mjkwdvjvbsa93dc45jbsiqs0yl8vf4hg7"; }; meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim/"; }; @@ -6594,12 +6594,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-04-03"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "9748123aafbe915f34ddcfe583fc868f301f51ba"; - sha256 = "0kvwp5bpqw5vygacrq9cdr3237w7fmj3sqx1vk12sxbx85cdcvz9"; + rev = "e5c3c4855a0bb6859975209a480dc830ea802540"; + sha256 = "02lap2sx1502kwva457z0gdisb28iwf38n7dpw6kdhnxl63yad0n"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -6679,12 +6679,12 @@ final: prev: telescope-github-nvim = buildVimPluginFrom2Nix { pname = "telescope-github.nvim"; - version = "2022-01-25"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-github.nvim"; - rev = "b46686fd5a928aaf5d433dc9e2aae7d26453f530"; - sha256 = "1dv4m8xycqq1npc99m5mdv4vh6dwcgf6p7nh1lk82kwyhz1rcw8l"; + rev = "c66aee748d572961af0e6ad5130b994343f922a7"; + sha256 = "11crv79xbhxzp9y35rf9fg4mgbwsrj709aw22n98575f0r2vqfgz"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; @@ -6787,12 +6787,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-04-03"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "6e7ee3829225d5c97c1ebfff686050142ffe5867"; - sha256 = "0qlv63jll4ja4x2njxvz1h9mlh92akzif06qy8gr7f61gfvfaaca"; + rev = "b7ae91c82b33f8f347fa060208adb3da80ae9260"; + sha256 = "1kn7y6pmvrzlf6l3cajabf6la9wg63s4abs0bmsn1a2y6v0vkx2x"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6968,12 +6968,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-04-02"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "5733b24c684d202f978ccedca4a8c7571889bf28"; - sha256 = "00z21wvgjks5mqrqja1kc1wnwxpjyy2fl3sn8f16692hz2wcavrd"; + rev = "1a608cc9ab269ec2877e617696cd2cf84f4a0e08"; + sha256 = "17ynzqgljk5c7bxpkg4r8gh62klnmriv48czn93kfdfjlpg5k1xg"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6992,12 +6992,12 @@ final: prev: traces-vim = buildVimPluginFrom2Nix { pname = "traces.vim"; - version = "2021-11-17"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "803d97786d0fbe95d33fe3c69e213518ea296839"; - sha256 = "1hqma8pjl1ladw8iraa6cnsp9jasx4w08zxq5q63ff5mzdb1avn1"; + rev = "9663fcf84de5776bee71b6c816c25ccb6ea11d1a"; + sha256 = "0gwn1kclcqp1yvaja6wqf27ng8d4wrd2j7795syxdk3d8vmpn55d"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -7136,12 +7136,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-04-03"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "8815c06145f36dce7734ba4b95eb50c3e24074c4"; - sha256 = "1n46x1v2rw70ad6b6z04ik9rjvpkl8bbw62l8wfn7lkzdjgwi50d"; + rev = "15fbc7ce032f2df3e0e67b84ca51ea9f0daddbd4"; + sha256 = "1zfsml3mp4ccff16ksrnn69w5ra4r5b2d28m4n8fnh80whg6zr88"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -7544,12 +7544,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-03-30"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "dc65eea5d9225758d4556278b3d808baa6ab4d0e"; - sha256 = "1mkfssssgsaqx770rarpgryp4zimfq7ljv14jzmb2bqx9iyqz5xb"; + rev = "904979339cc93a10f8cee2f9c59c2b1b69d6665f"; + sha256 = "0q5w4dcdnjxsxpzq11b9bignnj79pzif1m73j050yzwh6cdb8r4i"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7724,12 +7724,12 @@ final: prev: vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2021-01-31"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "58c750d13ec2337ba3e5992f96891bbb843a9dbf"; - sha256 = "0xsgj1j8xamkri75cjnih5xzwp8y7g1i7hgbbbmknz5d8jm3p204"; + rev = "31b0d5e4f51da1aeb56d65bf505a744e6de405de"; + sha256 = "1cx4axwcm7mm2c2xi4ghv1nlgfzl29g820znbpm77r8hpaqkj7ki"; }; meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; @@ -7848,8 +7848,8 @@ final: prev: src = fetchFromGitHub { owner = "qpkorr"; repo = "vim-bufkill"; - rev = "ba6253de82f982722ef7eaee6751d788aefd568a"; - sha256 = "187pj4dw78xd3wlpf24nll89kggk4q38gi51dnq95qywfk4w2k5h"; + rev = "1ea7ea2f65ffdaf147305f61e65b6af53f2abcc0"; + sha256 = "082lgjaqr3hyc3k7xmprw3qw4hprls2x2pnminb3jnlsa7h2k6yi"; }; meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; @@ -7916,12 +7916,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-03-25"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "6fd4fecaf8b1da31c625e5f02822778d4a2a08b5"; - sha256 = "0h9z49r20wyqwvj4dr5grq0zdaz2d728jxc29l5q3rb1nh9nqbfi"; + rev = "6e99d7924862b0a929983a36dd1d9bb9ae87ec44"; + sha256 = "1w7sjryw6inq2v4ryfabphbavmpgz6qa6f7jxyx1irjsd3293z65"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8504,12 +8504,12 @@ final: prev: vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2022-03-31"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "c70b0ed50b5c0d806df012526104fc5342753749"; - sha256 = "1pj6rzdwalnv3x8xdgfsqh79pc21b0lhlp6ry5yzjcprghw1547d"; + rev = "b0c0f6a6f0458d6cb5d27d29302e55ad24035ce1"; + sha256 = "1v75qgr5qv17z0jn4cj5cvgnsqy0lzz4h2b6ld7hyw0pqgrjch76"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -8840,12 +8840,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-04-03"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "119797938eeb875e91182d6bd86eb001d0ef9029"; - sha256 = "1rclpd2nf26slz38imq8g5h1pknkwdbgnv4iz04vhq7k3gvls6vk"; + rev = "f42b069ffd4ba756461b717411595ffc7b2bccb2"; + sha256 = "0n1fb078rbkhqjafnbgspsylrrn9zq9dwx1rshz5hs2bbkp5i60n"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -9141,12 +9141,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-04-02"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "3b9b6481a659bdc37a55f488c92839e3804ca098"; - sha256 = "1vki4g6gvmr6l9yb1xhv92yix2595b17j7m75ak15k25w1dnig7h"; + rev = "c82e6d04f27a41d7fdcad9be0bce5bb59fcb78e5"; + sha256 = "192a6il56r4cfkqq67vh5kbdfa7vzwmh33sb8zy6zlri0a0h7dw8"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -9502,12 +9502,12 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2022-03-10"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "4c768d215a0654d61ea72eeec423716bd971948e"; - sha256 = "0q2c8n1kbqsx005cn0p1f5334qgslkla2zag03q0vy57g3yhydv4"; + rev = "b0a81e42e6036f716bd9e6b025978dfb7dacaa53"; + sha256 = "1327i1pamz3bwhj1zyr2bjn142bhp45y1xlv8gs7dm7zyixfksd3"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -9550,12 +9550,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-04-05"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "edd6629f0940e37ca988620e404e79e600962a6f"; - sha256 = "0qc2x0la72xhbbwdrm6iyjlip3pcfj0wk4msi6zfz9zmyrzcfnhb"; + rev = "78e07f96840394ea49696f68fb6a156bba8dd154"; + sha256 = "1gijdqkbmwrvmiqhdvcxxkmi11n7l2algcm5v1s3f9yfh6prh06l"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -10631,12 +10631,12 @@ final: prev: vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-11-24"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "2d9f34c09f548ed4df213389caa2882bfe56db58"; - sha256 = "153i3kh44ri046va3qdrbvvsv7gy25fsd9pc2yhrg23lvj169zfp"; + rev = "226203be173bf0b95ee2a5cb6575ae604b3f9f7a"; + sha256 = "0hi64zsg2acrmzshmvrmgjqd7wjgghpggw0rmjx8kd7vwcmwvfcl"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -10823,12 +10823,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-04-02"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "c6d4b1cfa7a349ca561b86227cb46c4147b9c23c"; - sha256 = "0idmrcb4xigmds1iwz5rixvdcanqvv0qx7v3yg4d4p1xd4yjsiw1"; + rev = "b18094041f30db7afe1577ef9369c395759ffd4a"; + sha256 = "1ws0l788cydyygp0ckvv6yczihc0jkddf1w5f5snygh4p4w066hy"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10967,12 +10967,12 @@ final: prev: vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2022-03-25"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "9857a874632d1b983a7f4b1c85e3d15990c8b101"; - sha256 = "0ihcqrgvrllnrll9vgg1ywmhsvf43dwdpqv89r8mi70wsnzbgk3v"; + rev = "81fc0ec460dd8b25a76346e09aecdbca2677f1a7"; + sha256 = "0k8fyyjak1l6f1hsb3pbyri1jsgxzbhcbih7p4vc8cdm346yms1i"; }; meta.homepage = "https://github.com/tpope/vim-surround/"; }; @@ -11003,12 +11003,12 @@ final: prev: vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2022-03-01"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "698ff3074c45d4292ed6a2f629e6114fdaf4420b"; - sha256 = "0a8lzjp0mj2ml82sql44qbq1dwxmrxjp5h3snzclw4y64919yf21"; + rev = "816072c0f50ba753458ea466eb2349799a4467f9"; + sha256 = "1ndj4f1rlyq7kpbmv7y79c2vnh0brz2m8nh13jw1y7sv7gbkxyxf"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -11064,12 +11064,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-04-04"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "d340f840725e6ee1b8abc63e852d80ded496ffc9"; - sha256 = "08y4x97l0749i6d7qc512irql5zpxdwyzrbsw6h507jq7cvaw8hb"; + rev = "2240d7a4b868cb594b7d83544e1b6db4df806e5e"; + sha256 = "12qn395bnmxxsq64c60s46gdz4ad2hbhn3g2kbnw9d56dyb47vag"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -11304,12 +11304,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-03-19"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "2a35653111b023660b519f6dbd95c97996ce8b02"; - sha256 = "1b840fnfqh19p2gzhc1xxisn0gyw756miian4znk0zzj2wlja151"; + rev = "a99eb0bdf7d901d538b5dd724e2ab3a958c1799c"; + sha256 = "0mlb2qvxw7ds0b6jrxw5224mz1bzlzb4vly2wnygzrl6mhsk2xyw"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11376,12 +11376,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2022-03-25"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "4fcd3797e380f2e4c8ea8be31ec6469e6f86f971"; - sha256 = "135jggj34pdczjby1p2vpr1b30whcabsfxjgvyrra45hlg45kzgn"; + rev = "d5b820655e17c6ccd363885e5614652e4cffae95"; + sha256 = "0mp8g825l0zcj0gh3v5wa29dq5hhx0f96ijsd5bxhh694vppx8q5"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -11532,12 +11532,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2022-03-23"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "d6c9b8e06c1e7b3f14abc772ad61d73e687eede6"; - sha256 = "015jr832zwa7gcakbllifh3r45iyfywraswsm70vvbam165wwxph"; + rev = "a0a7dd335189c5ba0c6afee875c6713d70e6e3fc"; + sha256 = "09lpivh5a6n61ypw0n31ncy5bj4cpzvvn4s6666yjnpsmi2phsix"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -11724,12 +11724,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-04-03"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "da851334c72c44de95d00a152f98ee8e628be68f"; - sha256 = "16390g548y5bp6c08d481jafav83rbg4zd69r6fbfcnhzxmv7vhs"; + rev = "9563849496f888289ab6fe4c3eaca5b2cbed8701"; + sha256 = "0pfcikhwvyny88769c7dlk2yjwhqc6xmsl62sx9wjmmfiqkim37f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11737,12 +11737,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-04-01"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "3c14f6912318ac3d92d32eca7d66c7c1c4f3e92c"; - sha256 = "1wnj1j38gs6xcdyhia6cmd010rv2g85s816hxd1qc1zlimfvi5gr"; + rev = "7bfcfb7b9a734b07e04209350bbe56d7123efb48"; + sha256 = "1w09kmrm6rpffzh3xz9zsqm7h9f56a6p1wzclz96wvy8mr6hd6bn"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11797,12 +11797,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista.vim"; - version = "2021-11-15"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "a0469c645dcbe4033b857da27d35491f39e2f776"; - sha256 = "1i0j11lbqdych2914chb9rlmr902q52v400y3ifzi38g5md9zv3w"; + rev = "d2e6949678892714006d84911a9e64f6fdfbfdb3"; + sha256 = "1zxnnrzidsynl3g8698x2zkq97m3z13s738s8ajnkv9fzjh5n52s"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -12062,12 +12062,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-04-05"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e03f7c8cbaeb85272d2d3d2c24af5065be4f5e71"; - sha256 = "08971zkma4zwz5511vzhgi99000xin5psy1hkancxr4v2bw68dh3"; + rev = "5ff24125588cdf4823fe64057f07a2c1d20f7e77"; + sha256 = "0b76g27vz5wkfy0rkim5v2f72qs9hcb4yqmzjnnqiczbkdn6vksn"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -12086,12 +12086,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2022-03-28"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "a57dbdbd2790c52563e1194c17e6de38a0c941cf"; - sha256 = "07yzy4yjxaf59b6pyf05jrawvc4y37v2x07n1vfc2dbsxkxdygq1"; + rev = "d231d6f6ddb9c405ccf9ec2331deaf1d0b2c8d2a"; + sha256 = "0pbzjmywkxsfr3dw1gvaisnq87ryzk9565s4gj77yr8qrbjh1k1j"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -12134,12 +12134,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-04-01"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "40c4fd7f5551710e388e0df85bb43d6e1627ca80"; - sha256 = "0ihzf18146q9bkqa22jq6xa2i394y6bn3fnjjgjz3zf8g8pcr6bl"; + rev = "0439bb7eee21ef2024ce9d34f99df37cfcd49e12"; + sha256 = "1mq00qw81irysdjh6j8d8v2v24gjd6fkg6igvndr9dfwv1s19mdb"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; From d2979650299c077d7f25c2662f2dcd27106fc8c3 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Tue, 12 Apr 2022 10:42:46 +0200 Subject: [PATCH 371/385] vimPlugins.vim-vp4: init at 2021-01-06 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6b13befbcc30..12873ef18980 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11398,6 +11398,18 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-visualstar/"; }; + vim-vp4 = buildVimPluginFrom2Nix { + pname = "vim-vp4"; + version = "2021-01-06"; + src = fetchFromGitHub { + owner = "ngemily"; + repo = "vim-vp4"; + rev = "511ec1cd651a25b30d75ec6df29e61b9ca75d1b9"; + sha256 = "1vr8j4w6s26hjbil2kx57nnslrjczp4jvmc7s8lhl41z0r6nj4fb"; + }; + meta.homepage = "https://github.com/ngemily/vim-vp4/"; + }; + vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; version = "2022-02-26"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 065063091a5c..81e97ffe9867 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -956,6 +956,7 @@ https://github.com/tpope/vim-vinegar/,, https://github.com/triglav/vim-visual-increment/,, https://github.com/mg979/vim-visual-multi/,, https://github.com/thinca/vim-visualstar/,, +https://github.com/ngemily/vim-vp4/,HEAD, https://github.com/hrsh7th/vim-vsnip/,, https://github.com/hrsh7th/vim-vsnip-integ/,, https://github.com/posva/vim-vue/,, From 7ce4bc7ef288dc7d85833da6d613370839c9c0d2 Mon Sep 17 00:00:00 2001 From: TQ Hirsch Date: Wed, 13 Apr 2022 22:15:02 +0200 Subject: [PATCH 372/385] iperf3: Add support for SCTP Iperf3 can also benchmark SCTP when it has access to netinet/sctp.h, which is part of lksctp-tools --- pkgs/tools/networking/iperf/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 9ec491f1c570..f27a296d0462 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, fetchpatch }: +{ lib, stdenv, fetchurl, openssl, fetchpatch, lksctp-tools }: stdenv.mkDerivation rec { pname = "iperf"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pvy1cj92phpbldw0bdc0ds70n8irqcyn1ybyis0a6nnz84v936y"; }; - buildInputs = [ openssl ]; + buildInputs = [ openssl lksctp-tools ]; configureFlags = [ "--with-openssl=${openssl.dev}" ]; From 62b81e9edba8b7bfecf246dbf67bc5df749a21e1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 13 Apr 2022 14:31:24 -0700 Subject: [PATCH 373/385] chicken: disable tests for darwin Test suite assumes access to the `hostname` command, and a few other gnu coreutil assumptions, not compatible with darwin. Enable doInstallCheck to compensate --- pkgs/development/compilers/chicken/5/chicken.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 7793dd4e17df..32d8435e378d 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -45,12 +45,17 @@ stdenv.mkDerivation rec { done ''; - doCheck = true; + doCheck = !stdenv.isDarwin; postCheck = '' ./csi -R chicken.pathname -R chicken.platform \ -p "(assert (equal? \"${toString binaryVersion}\" (pathname-file (car (repository-path)))))" ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/chicken -version + ''; + meta = { homepage = "https://call-cc.org/"; license = lib.licenses.bsd3; From 6826bc67ffb00f62696f2464a57b47d7f4b52414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 13 Apr 2022 22:49:34 +0200 Subject: [PATCH 374/385] gh: 2.7.0 -> 2.8.0 https://github.com/cli/cli/releases/tag/v2.8.0 --- .../version-management/git-and-tools/gh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 3a66a4d8af7d..7e9b6e006509 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-edlGJD+80k1ySpyNcKc5c2O0MX+S4fQgH5mwHQUxXM8="; + sha256 = "sha256-oPLnc3Fv8oGbfQMujcVIwKJrQ3vCV9yIB4rUtjeVOV0="; }; vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ="; From c94363142d10937b1af659446438c3e7a7451285 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 6 Apr 2022 13:56:09 +0200 Subject: [PATCH 375/385] kaidan: add missing dependency --- .../networking/instant-messengers/kaidan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/applications/networking/instant-messengers/kaidan/default.nix index fc14f77198b5..c296118eff9e 100644 --- a/pkgs/applications/networking/instant-messengers/kaidan/default.nix +++ b/pkgs/applications/networking/instant-messengers/kaidan/default.nix @@ -12,6 +12,7 @@ , knotifications , zxing-cpp , qxmpp +, sonnet , gst_all_1 }: @@ -38,6 +39,7 @@ mkDerivation rec { knotifications zxing-cpp qxmpp + sonnet gstreamer gst-plugins-bad gst-plugins-base From 66beaa922580bbb76bd26ebb5156bcd78959d3bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Apr 2022 16:13:59 +0200 Subject: [PATCH 376/385] cpython: update patches for 3.11a7 on darwin --- .../3.11/python-3.x-distutils-C++.patch | 257 ++++++++++++++++++ .../interpreters/python/cpython/default.nix | 6 +- 2 files changed, 261 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/python/cpython/3.11/python-3.x-distutils-C++.patch diff --git a/pkgs/development/interpreters/python/cpython/3.11/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.11/python-3.x-distutils-C++.patch new file mode 100644 index 000000000000..335e06b93c39 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.11/python-3.x-distutils-C++.patch @@ -0,0 +1,257 @@ +diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py +index aa66c8b9f4..71e6556bac 100644 +--- a/Lib/_osx_support.py ++++ b/Lib/_osx_support.py +@@ -14,13 +14,13 @@ + # configuration variables that may contain universal build flags, + # like "-arch" or "-isdkroot", that may need customization for + # the user environment +-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', +- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', +- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', +- 'PY_CORE_CFLAGS', 'PY_CORE_LDFLAGS') ++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', ++ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', ++ 'PY_CPPFLAGS', 'PY_CORE_LDFLAGS', 'PY_CORE_CFLAGS') + + # configuration variables that may contain compiler calls +-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') ++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') + + # prefix added to original configuration variable names + _INITPRE = '_OSX_SUPPORT_INITIAL_' +diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py +index 66c12dd358..dddb9fd2d4 100644 +--- a/Lib/distutils/cygwinccompiler.py ++++ b/Lib/distutils/cygwinccompiler.py +@@ -123,8 +123,10 @@ def __init__(self, verbose=0, dry_run=0, force=0): + # dllwrap 2.10.90 is buggy + if self.ld_version >= "2.10.90": + self.linker_dll = "gcc" ++ self.linker_dll_cxx = "g++" + else: + self.linker_dll = "dllwrap" ++ self.linker_dll_cxx = "dllwrap" + + # ld_version >= "2.13" support -shared so use it instead of + # -mdll -static +@@ -138,9 +140,13 @@ def __init__(self, verbose=0, dry_run=0, force=0): + self.set_executables(compiler='gcc -mcygwin -O -Wall', + compiler_so='gcc -mcygwin -mdll -O -Wall', + compiler_cxx='g++ -mcygwin -O -Wall', ++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', + linker_exe='gcc -mcygwin', + linker_so=('%s -mcygwin %s' % +- (self.linker_dll, shared_option))) ++ (self.linker_dll, shared_option)), ++ linker_exe_cxx='g++ -mcygwin', ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll_cxx, shared_option))) + + # cygwin and mingw32 need different sets of libraries + if self.gcc_version == "2.91.57": +@@ -164,8 +170,12 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + raise CompileError(msg) + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -300,9 +310,14 @@ def __init__(self, verbose=0, dry_run=0, force=0): + self.set_executables(compiler='gcc -O -Wall', + compiler_so='gcc -mdll -O -Wall', + compiler_cxx='g++ -O -Wall', ++ compiler_so_cxx='g++ -mdll -O -Wall', + linker_exe='gcc', + linker_so='%s %s %s' + % (self.linker_dll, shared_option, ++ entry_point), ++ linker_exe_cxx='g++', ++ linker_so_cxx='%s %s %s' ++ % (self.linker_dll_cxx, shared_option, + entry_point)) + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 3414a761e7..f1af560cc1 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -216,9 +216,11 @@ def customize_compiler(compiler): + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' + +- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ ++ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ ++ cxxflags = cflags + + if 'CC' in os.environ: + newcc = os.environ['CC'] +@@ -233,19 +235,27 @@ def customize_compiler(compiler): + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = cflags + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: +@@ -254,13 +264,17 @@ def customize_compiler(compiler): + archiver = ar + ' ' + ar_flags + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, + linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx, + archiver=archiver) + + compiler.shared_lib_extension = shlib_suffix +diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py +index d00c48981e..4a3d271fee 100644 +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). +- executables = {'preprocessor' : None, +- 'compiler' : ["cc"], +- 'compiler_so' : ["cc"], +- 'compiler_cxx' : ["cc"], +- 'linker_so' : ["cc", "-shared"], +- 'linker_exe' : ["cc"], +- 'archiver' : ["ar", "-cr"], +- 'ranlib' : None, ++ executables = {'preprocessor' : None, ++ 'compiler' : ["cc"], ++ 'compiler_so' : ["cc"], ++ 'compiler_cxx' : ["c++"], ++ 'compiler_so_cxx' : ["c++"], ++ 'linker_so' : ["cc", "-shared"], ++ 'linker_exe' : ["cc"], ++ 'linker_so_cxx' : ["c++", "-shared"], ++ 'linker_exe_cxx' : ["c++"], ++ 'archiver' : ["ar", "-cr"], ++ 'ranlib' : None, + } + + if sys.platform[:6] == "darwin": +@@ -110,12 +113,19 @@ def preprocess(self, source, output_file=None, macros=None, + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = self.compiler_so ++ compiler_so_cxx = self.compiler_so_cxx + if sys.platform == 'darwin': + compiler_so = _osx_support.compiler_fixup(compiler_so, + cc_args + extra_postargs) ++ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, ++ cc_args + extra_postargs) + try: +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -173,30 +183,16 @@ def link(self, target_desc, objects, + ld_args.extend(extra_postargs) + self.mkpath(os.path.dirname(output_filename)) + try: +- if target_desc == CCompiler.EXECUTABLE: +- linker = self.linker_exe[:] ++ if target_lang == "c++": ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe_cxx[:] ++ else: ++ linker = self.linker_so_cxx[:] + else: +- linker = self.linker_so[:] +- if target_lang == "c++" and self.compiler_cxx: +- # skip over environment variable settings if /usr/bin/env +- # is used to set up the linker's environment. +- # This is needed on OSX. Note: this assumes that the +- # normal and C++ compiler have the same environment +- # settings. +- i = 0 +- if os.path.basename(linker[0]) == "env": +- i = 1 +- while '=' in linker[i]: +- i += 1 +- +- if os.path.basename(linker[i]) == 'ld_so_aix': +- # AIX platforms prefix the compiler with the ld_so_aix +- # script, so we need to adjust our linker index +- offset = 1 ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe[:] + else: +- offset = 0 +- +- linker[i+offset] = self.compiler_cxx[i] ++ linker = self.linker_so[:] + + if sys.platform == 'darwin': + linker = _osx_support.compiler_fixup(linker, ld_args) +diff --git a/Makefile.pre.in b/Makefile.pre.in +index f803391346..090f14c46c 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -732,9 +732,9 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt @LIBMPDEC_INTERNAL@ @LIBEXPAT_INTERNAL + *\ -s*|s*) quiet="-q";; \ + *) quiet="";; \ + esac; \ +- echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ +- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build + + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 02ecf8d25b1e..fd5f40918461 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -236,7 +236,7 @@ in with passthru; stdenv.mkDerivation { else ./3.5/profile-task.patch ) - ] ++ optionals (pythonAtLeast "3.9" && stdenv.isDarwin) [ + ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [ @@ -247,8 +247,10 @@ in with passthru; stdenv.mkDerivation { ( if isPy35 then ./3.5/python-3.x-distutils-C++.patch - else if pythonAtLeast "3.7" then + else if pythonAtLeast "3.7" && pythonOlder "3.11" then ./3.7/python-3.x-distutils-C++.patch + else if pythonAtLeast "3.11" then + ./3.11/python-3.x-distutils-C++.patch else fetchpatch { url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; From e10c716ece359529341cee8a8ad1af4501265d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Thu, 14 Apr 2022 00:12:44 +0200 Subject: [PATCH 377/385] dagger: init at 0.2.6 Add dagger package --- .../continuous-integration/dagger/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/dagger/default.nix diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix new file mode 100644 index 000000000000..b204cfc1ae5e --- /dev/null +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "dagger"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "dagger"; + repo = "dagger"; + rev = "v${version}"; + sha256 = "sha256-3rkHWWpZGUL+7DoUtwY3v2tlcNXdbfVqs+u1wq3jNVI="; + }; + + vendorSha256 = "sha256-DKjVY2G+sG5CjwN262aZkH90fosuBCKHlB8sRbILjaI="; + + subPackages = [ + "cmd/dagger" + ]; + + ldflags = [ "-s" "-w" "-X go.dagger.io/dagger/version.Revision=${version}" ]; + + meta = with lib; { + description = "A portable devkit for CICD pipelines"; + homepage = "https://dagger.io"; + license = licenses.asl20; + maintainers = with maintainers; [ jfroche ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27e83d8d1e77..5ea58814ab09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2858,6 +2858,8 @@ with pkgs; daemontools = callPackage ../tools/admin/daemontools { }; + dagger = callPackage ../development/tools/continuous-integration/dagger { }; + dale = callPackage ../development/compilers/dale { }; damon = callPackage ../tools/admin/damon { }; From 095da8fd9d663eb25566f109cb7c84fc3189fa00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Apr 2022 06:28:54 +0000 Subject: [PATCH 378/385] =?UTF-8?q?gnome.swell-foop:=2041.0.1=20=E2=86=92?= =?UTF-8?q?=2041.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/swell-foop/-/compare/41.0.1...41.1 --- pkgs/desktops/gnome/games/swell-foop/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/games/swell-foop/default.nix b/pkgs/desktops/gnome/games/swell-foop/default.nix index b36f273f6d2f..61d3e2c0bb67 100644 --- a/pkgs/desktops/gnome/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "swell-foop"; - version = "41.0.1"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "YEL/MTxsh9VkgnxwNpazsgkTbD/Dn+Jkpu+k4wWTg9g="; + sha256 = "JD96VeXnU6UQhu7CVoMg12ktWxWmanI6tZFwXg2O9t0="; }; nativeBuildInputs = [ @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { glib gtk3 libgnome-games-support - gnome.adwaita-icon-theme clutter clutter-gtk ]; @@ -66,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; description = "Puzzle game, previously known as Same GNOME"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From b2070af53e5e1f14cd75e41233be87afd0482efa Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 13 Apr 2022 18:58:31 -0400 Subject: [PATCH 379/385] starship: use unstable to fix darwin --- pkgs/tools/misc/starship/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index b595cf102946..bbb4efef940a 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,19 +14,25 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.5.4"; + # unstable was used for a quick fix for darwin + # revert to stable for the release after 1.5.4 + version = "unstable-2022-04-12"; src = fetchFromGitHub { owner = "starship"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-nLzqfSRmA+D310MDvX+g8nNsoaiSixG+j+g87CPzYMs="; + rev = "a02e87833d6a0e0da3c239d0bbbf3b485356a655"; + sha256 = "sha256-oe/dKFgM8h+ur8E9/dw4byBl9vD6foUXyKX19HDozYU="; }; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ]; + buildNoDefaultFeatures = true; + # the "notify" feature is currently broken on darwin + buildFeatures = if stdenv.isDarwin then [ "battery" ] else [ "default" ]; + postInstall = '' for shell in bash fish zsh; do STARSHIP_CACHE=$TMPDIR $out/bin/starship completions $shell > starship.$shell @@ -34,7 +40,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-FXzAvO11NIr6dxF2OeV5XJWHG2kgZiASuBnoC6mSps8="; + cargoSha256 = "sha256-lku+K1Y5HIt4gDHqudhDMVs7XGoKw8HcMjXMGDu1vkg="; preCheck = '' HOME=$TMPDIR From 42e4eb37475c3421caa767ddba0a9db713530748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Apr 2022 20:45:54 +0000 Subject: [PATCH 380/385] libdeltachat: 1.76.0 -> 1.77.0 https://github.com/deltachat/deltachat-core-rust/blob/1.77.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 5b969284995c..990a9e40960e 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.76.0"; + version = "1.77.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo="; + hash = "sha256-SEsa83PQ2r3PBJuJhTMeje1n2mZUt/f61DvoVPwyxvs="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; + hash = "sha256-6srybgs1DGaE6iMrnRUWRnoQM00VCsZwMNdKQ2eqqxg="; }; nativeBuildInputs = [ From 16710ae6de2a8396e3c066622ea341656f7cf557 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 07:26:27 +0000 Subject: [PATCH 381/385] esbuild: 0.14.32 -> 0.14.34 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 1dcd8ff7b2e0..3a8fcd67dd0c 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.32"; + version = "0.14.34"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-NIF47eTGAC//4aPojrJbokB434MfGudi1pD+liRsA8k="; + sha256 = "sha256-TnX/vd12GStzFsCaRYOY7VyDYRw5qP4EeAa0GmWlFWc="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; From 8ceeec3f8d49dd95082a71a1b9c0b4acd42cd5c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 03:50:05 +0000 Subject: [PATCH 382/385] cargo-tally: 1.0.2 -> 1.0.4 --- pkgs/development/tools/rust/cargo-tally/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 808cda01fe54..278782436781 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.2"; + version = "1.0.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-m5NLI0C7ett5Fmvs9t1vl2W6h7mjCtEFBc1AzYg9JfY="; + sha256 = "sha256-GUH/qWAC1vBLVV3K/qjkABH1agkyJEuhZGds+8UP1kQ="; }; - cargoSha256 = "sha256-AxjQUyxX5lLFPdEdETvZLHbgMYg/xOo7bcqn1TiDKsE="; + cargoSha256 = "sha256-qvWJvkNG7rPHvv2hqJrOyZOqqAhRvgWdrkgr/Tefnps="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration From ae6932e7b9b411fd561ccc52e32f33a9aac865d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 07:02:35 +0000 Subject: [PATCH 383/385] elan: 1.3.1 -> 1.4.0 --- pkgs/applications/science/logic/elan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 89331f53686a..7e4cc08d358a 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-QNVzpnT77+9PXhq4Yz0q3o+GiQTVy7dOrg2yBTscoek="; + sha256 = "sha256-86O2P48wcib22IRB8niqVLIukGECbBV9ZufEUZEkvnQ="; }; - cargoSha256 = "sha256-G70QopoMqFrkOnuui3+3cEHYvmnf0meX1Ecv4q8FCpM="; + cargoSha256 = "sha256-2kTAFyFDeFQn7x2oVHZvFzJVs4jLBgl0pSOCcj6Vzdk="; nativeBuildInputs = [ pkg-config makeWrapper ]; From 569f8c87c00ca28189c5e7a62fe458b74ee019c4 Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Sat, 9 Apr 2022 18:02:15 -0400 Subject: [PATCH 384/385] bore-cli: init at 0.2.1 --- pkgs/tools/networking/bore-cli/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/bore-cli/default.nix diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix new file mode 100644 index 000000000000..9d9d99b45fa7 --- /dev/null +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "bore-cli"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "ekzhang"; + repo = "bore"; + rev = "v${version}"; + sha256 = "sha256-k1QpNpN6MVt7+PIDFcJtd7yD1ZpBJ9GFBBagVArRifs="; + }; + + cargoSha256 = "sha256-fNsMNU4npChqyIeonMSc6AjcBxVYVJhiG++HkQ3FM9M="; + + # tests do not find grcov path correctly + meta = with lib; { + description = "Rust tool to create TCP tunnels"; + homepage = "https://github.com/ekzhang/bore"; + license = licenses.mit; + maintainers = with maintainers; [ DieracDelta ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ea58814ab09..7886e861cd30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14653,6 +14653,7 @@ with pkgs; libodb = callPackage ../development/libraries/libodb { }; libodb-sqlite = callPackage ../development/libraries/libodb-sqlite { }; bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { }; + bore-cli = callPackage ../tools/networking/bore-cli/default.nix {}; bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; From 5db92536331da585eafa2aa55ce232ac900c9e9d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 Apr 2022 06:53:08 +0200 Subject: [PATCH 385/385] nixos/desktop-managers: Fix eval nixos/lib/utils.nix is actually passed as `utils` argument to modules so https://github.com/NixOS/nixpkgs/pull/168194 broke the eval. Fixes: https://github.com/NixOS/nixpkgs/issues/168569 --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 4 ++-- nixos/modules/services/x11/desktop-managers/gnome.nix | 8 ++++---- nixos/modules/services/x11/desktop-managers/lxqt.nix | 4 ++-- nixos/modules/services/x11/desktop-managers/mate.nix | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a8ec5d5e5906..705dbec5e742 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -196,7 +196,7 @@ in programs.evince.enable = mkDefault true; programs.file-roller.enable = mkDefault true; - environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; lib.utils.removePackagesByName [ + environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ # cinnamon team apps bulky blueberry diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index d503cc271cfe..258d39d49185 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -456,7 +456,7 @@ in (mkIf serviceCfg.core-utilities.enable { environment.systemPackages = with pkgs.gnome; - lib.utils.removePackagesByName + utils.removePackagesByName ([ baobab cheese @@ -516,7 +516,7 @@ in }) (mkIf serviceCfg.games.enable { - environment.systemPackages = with pkgs.gnome; lib.utils.removePackagesByName [ + environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ aisleriot atomix five-or-more @@ -542,7 +542,7 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst (mkIf serviceCfg.core-developer-tools.enable { - environment.systemPackages = with pkgs.gnome; lib.utils.removePackagesByName [ + environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ dconf-editor devhelp pkgs.gnome-builder diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 9c8bfab077a6..1bc6c906c479 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -51,7 +51,7 @@ in environment.systemPackages = pkgs.lxqt.preRequisitePackages ++ pkgs.lxqt.corePackages ++ - (lib.utils.removePackagesByName + (utils.removePackagesByName pkgs.lxqt.optionalPackages config.environment.lxqt.excludePackages); diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index dd19d9cdff98..9ab4c6e7e984 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -47,7 +47,7 @@ in # Debugging environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; - environment.systemPackages = lib.utils.removePackagesByName + environment.systemPackages = utils.removePackagesByName (pkgs.mate.basePackages ++ pkgs.mate.extraPackages ++ [